- Wikitty-commits - mailman.cloud.codelutin.com

r916 - in trunk/wikitty-publication/src/main: java/org/nuiton/wikitty/publication/action webapp/WEB-INF/jsp
by mfortun＠users.nuiton.org May 24, 2011

May 24, 2011

Author: mfortun Date: 2011-05-24 17:01:48 +0200 (Tue, 24 May 2011) New Revision: 916 Url: http://nuiton.org/repositories/revision/wikitty/916 Log: * correct edit page struts migration finished #1500 Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java 2011-05-24 09:43:17 UTC (rev 915) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java 2011-05-24 15:01:48 UTC (rev 916) @@ -32,14 +32,19 @@ */ private static final long serialVersionUID = -590087371230933701L; - protected String newExtension; - protected Wikitty wikitty; private HashMap<String, Object> wikittyFieldMap; - protected File upload;// The actual file + protected WikittyProxy proxy; + protected boolean isDelete = false; + protected boolean isStore = false; + protected String wikittyId = ""; + protected String version = ""; + + protected File uploadedFile; + static public PublicationActionEdit getAction() { return (PublicationActionEdit) ActionContext.getContext().get( CONTEXT_ACTION_KEY); @@ -48,28 +53,36 @@ @Override public String execute() throws Exception { - doAction(); + proxy = getWikittyPublicationProxy(); + Map<String, Object> param = ActionContext.getContext().getParameters(); + this.formatArgs(param); - return SUCCESS; - } + isDelete = param.containsKey("delete"); + isStore = param.containsKey("store"); - public void doAction() { + wikittyId = getArgument("id", ""); + version = getArgument("version", ""); - WikittyProxy proxy = getWikittyPublicationProxy(); + - Object context; + putIdArgs(wikitty.getId()); - Map<String, Object> param = ActionContext.getContext().getParameters(); + return SUCCESS; + } - if (param.containsKey("delete")) { + public void doAction() { + + if (isDelete) { // on nous demande supprimer le wikitty, on l'efface et on // affichera un wikitty vide - String id = getArgument("id", ""); + String id = this.wikittyId; proxy.delete(id); // apres un effacement on reprend l'edition d'un tout nouveau // wikitty wikitty = new WikittyImpl(); + } else { + List<String> argsString = new ArrayList<String>(); String args = ActionContext.getContext().getParameters() .get(ARGS_KEY).toString(); @@ -81,26 +94,20 @@ // recherche du Wikitty a editer ou creation d'un nouveau si // necessaire Criteria criteria = searchCriteria(argsString); + if (criteria == null) { wikitty = new WikittyImpl(); - ActionContext.getContext().getParameters() - .put(ARGS_KEY, Element.ELT_ID + ":" + wikitty.getId()); - } else { wikitty = proxy.findByCriteria(criteria); } // si on ne retrouve pas le wikitty, mais qu'il vient d'etre cree // pour l'edition, on recree un wikitty avec ce meme identifiant - if (wikitty == null && "0.0".equals(getArgument("version", ""))) { + if (wikitty == null && "0.0".equals(version)) { // c'est un nouvel objet, il n'a pas encore ete sauve, mais on // veut le faire - String id = getArgument("id", ""); - ; + String id = this.wikittyId; wikitty = new WikittyImpl(id); - ActionContext.getContext().getParameters() - .put(ARGS_KEY, Element.ELT_ID + ":" + wikitty.getId()); - } if (wikitty == null) { @@ -108,21 +115,20 @@ // cela signifie qu'on ne retrouve pas le wikitty a editer // on creer un nouveau wikitty vide que l'on editera wikitty = new WikittyImpl(); - ActionContext.getContext().getParameters() - .put(ARGS_KEY, Element.ELT_ID + ":" + wikitty.getId()); - } else { // on met a jour le wikitty avec les infos trouvees dans les // arguments // ajout des extensions deja existante si necessaire String extensions = getArgument("extensions", null); + if (extensions != null) { String[] exts = StringUtil.split(extensions .replace("[", "").replace("]", ""), ","); for (String extName : exts) { + WikittyExtension ext = proxy - .restoreExtensionLastVersion(extName); + .restoreExtensionLastVersion(extName.trim()); if (ext != null) { wikitty.addExtension(ext); } @@ -139,9 +145,8 @@ } } - Map<String, Object> args1 = new HashMap<String, Object>(); - args1.putAll(getFieldArguments()); - for (Map.Entry<String, Object> field : args1.entrySet()) { + for (Map.Entry<String, Object> field : wikittyFieldMap + .entrySet()) { String key = field.getKey(); Object value = null; if (key.contains(WikittyUtil.FQ_FIELD_NAME_SEPARATOR)) { @@ -158,6 +163,7 @@ FieldType extFieldType = wikitty.getExtension(ext) .getFieldType(fieldName); + // allow collection string to be parse and save if (extFieldType.isCollection() && extFieldType.getType() == TYPE.STRING && value != null) { @@ -181,6 +187,7 @@ } else { wikitty.setField(ext, fieldName, value); } + // si w est un WikittyPubData on essai de mettre a // jour si besoin les champs mimetype et name if (ext.equals(WikittyPubData.EXT_WIKITTYPUBDATA) @@ -188,43 +195,38 @@ .equals(WikittyPubData.FIELD_WIKITTYPUBDATA_CONTENT)) { if (null == WikittyPubDataHelper .getName(wikitty)) { - WikittyPubDataHelper.setName( - wikitty, - String.valueOf(args1.get(key - + "-filename"))); + WikittyPubDataHelper.setName(wikitty, + String.valueOf(wikittyFieldMap + .get(key + "-filename"))); } if (null == WikittyPubDataHelper .getMimeType(wikitty)) { - WikittyPubDataHelper.setMimeType( - wikitty, - String.valueOf(args1.get(key - + "-contentType"))); + WikittyPubDataHelper + .setMimeType( + wikitty, + String.valueOf(wikittyFieldMap + .get(key + + "-contentType"))); } } } } } - if (param.containsKey("store")) { + if (isStore) { // on nous demande la sauvegarde proxy.store(wikitty); } } } - } - public File getUpload() { - return upload; } + public void setFile(File upload) { - this.upload = upload; + this.uploadedFile = upload; } - public void setUpload(File upload) { - this.upload = upload; - } - public Wikitty getWikitty() { return wikitty; } @@ -233,35 +235,14 @@ this.wikitty = wikitty; } - public List<String> getWikittyExtentionAviable() { - List<String> result = new ArrayList<String>(); - result.add("ponay"); - result.add("machin"); - - return result; - } - - public String getNewExtension() { - return newExtension; - } - - /* - * <s:combobox list="wikittyExtentionAviable" label="test" - * name="newExtension" /> - */ - public void setNewExtension(String newExtension) { - this.newExtension = newExtension; - } - public String getPostUrl() { return this.getArgument(ARGS_KEY, "") + ".action"; } - protected Map<String, Object> getFieldArguments() { + protected Map<String, Object> formatArgs(Map<String, Object> args) { wikittyFieldMap = new HashMap<String, Object>(); - for (Entry<String, Object> en : ActionContext.getContext() - .getParameters().entrySet()) { + for (Entry<String, Object> en : args.entrySet()) { if (en.getKey().startsWith("Wikitty")) { @@ -275,11 +256,11 @@ value = String.valueOf(en.getValue()); } - if ("BINARY".equals(value) && upload != null) { + if ("BINARY".equals(value) && uploadedFile != null) { try { wikittyFieldMap.put(en.getKey(), - FileUtil.fileToByte(upload)); - upload.deleteOnExit(); + FileUtil.fileToByte(uploadedFile)); + uploadedFile.deleteOnExit(); } catch (IOException e) { // TODO mfortun-2011-05-24 really handle exception e.printStackTrace(); @@ -293,4 +274,10 @@ } return wikittyFieldMap; } + + protected void putIdArgs(String id) { + ActionContext.getContext().getParameters() + .put(ARGS_KEY, Element.ELT_ID + ":" + id); + } + } Modified: trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp =================================================================== --- trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp 2011-05-24 09:43:17 UTC (rev 915) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp 2011-05-24 15:01:48 UTC (rev 916) @@ -98,8 +98,8 @@ case BINARY: %> - <input type="hidden" name="<%=extName%>.<%=fieldName%>" value="BINARY" /> - <input type="file" name="File" label ="File"/> + <input type="hidden" name="<%=extName%>.<%=fieldName%>" value="BINARY" /> + <input type="file" name="File" label ="File"/> <%

1 0

r915 - in trunk/wikitty-publication/src/main: java/org/nuiton/wikitty/publication/action webapp/WEB-INF/jsp
by mfortun＠users.nuiton.org May 24, 2011

May 24, 2011

Author: mfortun Date: 2011-05-24 11:43:17 +0200 (Tue, 24 May 2011) New Revision: 915 Url: http://nuiton.org/repositories/revision/wikitty/915 Log: * upload rework Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java 2011-05-24 00:12:31 UTC (rev 914) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java 2011-05-24 09:43:17 UTC (rev 915) @@ -1,6 +1,7 @@ package org.nuiton.wikitty.publication.action; import java.io.File; +import java.io.IOException; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -8,6 +9,7 @@ import java.util.Map; import java.util.Map.Entry; +import org.nuiton.util.FileUtil; import org.nuiton.util.StringUtil; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.WikittyUtil; @@ -21,11 +23,9 @@ import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.operators.Element; - - import com.opensymphony.xwork2.ActionContext; -public class PublicationActionEdit extends PublicationBaseAction{ +public class PublicationActionEdit extends PublicationBaseAction { /** * @@ -33,44 +33,34 @@ private static final long serialVersionUID = -590087371230933701L; protected String newExtension; - + protected Wikitty wikitty; private HashMap<String, Object> wikittyFieldMap; - - - protected File upload;//The actual file - - + protected File upload;// The actual file + static public PublicationActionEdit getAction() { return (PublicationActionEdit) ActionContext.getContext().get( CONTEXT_ACTION_KEY); } - + @Override public String execute() throws Exception { - System.out.println(upload); - doAction(); - - - + doAction(); + return SUCCESS; } - - - - - public void doAction(){ - + + public void doAction() { + WikittyProxy proxy = getWikittyPublicationProxy(); Object context; - + Map<String, Object> param = ActionContext.getContext().getParameters(); - - + if (param.containsKey("delete")) { // on nous demande supprimer le wikitty, on l'efface et on // affichera un wikitty vide @@ -81,8 +71,8 @@ wikitty = new WikittyImpl(); } else { List<String> argsString = new ArrayList<String>(); - String args = ActionContext.getContext().getParameters().get(ARGS_KEY) - .toString(); + String args = ActionContext.getContext().getParameters() + .get(ARGS_KEY).toString(); String[] argsTab = StringUtil.split(args, SEPARATOR); for (String arg : argsTab) { @@ -94,7 +84,7 @@ if (criteria == null) { wikitty = new WikittyImpl(); ActionContext.getContext().getParameters() - .put(ARGS_KEY, Element.ELT_ID + ":" + wikitty.getId()); + .put(ARGS_KEY, Element.ELT_ID + ":" + wikitty.getId()); } else { wikitty = proxy.findByCriteria(criteria); @@ -102,14 +92,14 @@ // si on ne retrouve pas le wikitty, mais qu'il vient d'etre cree // pour l'edition, on recree un wikitty avec ce meme identifiant - if (wikitty == null - && "0.0".equals( getArgument("version", ""))) { + if (wikitty == null && "0.0".equals(getArgument("version", ""))) { // c'est un nouvel objet, il n'a pas encore ete sauve, mais on // veut le faire - String id = getArgument("id", "");; + String id = getArgument("id", ""); + ; wikitty = new WikittyImpl(id); ActionContext.getContext().getParameters() - .put(ARGS_KEY, Element.ELT_ID + ":" + wikitty.getId()); + .put(ARGS_KEY, Element.ELT_ID + ":" + wikitty.getId()); } @@ -119,7 +109,7 @@ // on creer un nouveau wikitty vide que l'on editera wikitty = new WikittyImpl(); ActionContext.getContext().getParameters() - .put(ARGS_KEY, Element.ELT_ID + ":" + wikitty.getId()); + .put(ARGS_KEY, Element.ELT_ID + ":" + wikitty.getId()); } else { // on met a jour le wikitty avec les infos trouvees dans les @@ -160,8 +150,8 @@ .extractFieldName(key); if (wikitty.hasField(ext, fieldName)) { - if (!"true".equals(getArgument("isNull-" - + key, "false"))) { + if (!"true".equals(getArgument("isNull-" + key, + "false"))) { value = field.getValue(); } @@ -196,13 +186,15 @@ if (ext.equals(WikittyPubData.EXT_WIKITTYPUBDATA) && fieldName .equals(WikittyPubData.FIELD_WIKITTYPUBDATA_CONTENT)) { - if (null == WikittyPubDataHelper.getName(wikitty)) { + if (null == WikittyPubDataHelper + .getName(wikitty)) { WikittyPubDataHelper.setName( wikitty, String.valueOf(args1.get(key + "-filename"))); } - if (null == WikittyPubDataHelper.getMimeType(wikitty)) { + if (null == WikittyPubDataHelper + .getMimeType(wikitty)) { WikittyPubDataHelper.setMimeType( wikitty, String.valueOf(args1.get(key @@ -220,23 +212,18 @@ } } } - - - - - public File getUpload() { + + public File getUpload() { return upload; - } - - public void setFile(File upload){ - this.upload = upload; - } - - public void setUpload(File upload) { + } + + public void setFile(File upload) { this.upload = upload; - } + } - + public void setUpload(File upload) { + this.upload = upload; + } public Wikitty getWikitty() { return wikitty; @@ -245,13 +232,12 @@ public void setWikitty(Wikitty wikitty) { this.wikitty = wikitty; } - - - public List<String> getWikittyExtentionAviable(){ + + public List<String> getWikittyExtentionAviable() { List<String> result = new ArrayList<String>(); result.add("ponay"); result.add("machin"); - + return result; } @@ -260,42 +246,51 @@ } /* - * <s:combobox list="wikittyExtentionAviable" label="test" name="newExtension" /> + * <s:combobox list="wikittyExtentionAviable" label="test" + * name="newExtension" /> */ public void setNewExtension(String newExtension) { this.newExtension = newExtension; } - - - public String getPostUrl(){ - + + public String getPostUrl() { + return this.getArgument(ARGS_KEY, "") + ".action"; } - - + protected Map<String, Object> getFieldArguments() { - wikittyFieldMap = new HashMap<String, Object>(); - for (Entry<String, Object> en : ActionContext.getContext() - .getParameters().entrySet()) { + wikittyFieldMap = new HashMap<String, Object>(); + for (Entry<String, Object> en : ActionContext.getContext() + .getParameters().entrySet()) { - if (en.getKey().startsWith("Wikitty")) { + if (en.getKey().startsWith("Wikitty")) { - String value = ""; + String value = ""; - if (en.getValue() instanceof String[]) { - for (String occu : (String[]) en.getValue()) { - value += occu; - } - } else { - value = String.valueOf(en.getValue()); - } + if (en.getValue() instanceof String[]) { + for (String occu : (String[]) en.getValue()) { + value += occu; + } + } else { + value = String.valueOf(en.getValue()); + } - wikittyFieldMap.put(en.getKey(), value); - } + if ("BINARY".equals(value) && upload != null) { + try { + wikittyFieldMap.put(en.getKey(), + FileUtil.fileToByte(upload)); + upload.deleteOnExit(); + } catch (IOException e) { + // TODO mfortun-2011-05-24 really handle exception + e.printStackTrace(); + } + } else { + wikittyFieldMap.put(en.getKey(), value); + } - } - return wikittyFieldMap; -} -} + } - + } + return wikittyFieldMap; + } +} Modified: trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp =================================================================== --- trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp 2011-05-24 00:12:31 UTC (rev 914) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp 2011-05-24 09:43:17 UTC (rev 915) @@ -48,9 +48,8 @@ <h1>Edit <%=wikitty.getId()%></h1> <pre><%=StringEscapeUtils.escapeHtml(String.valueOf(wikitty))%></pre> -<s:set var="urlPost"><%=action.getPostUrl()%></s:set> -<s:form action="%{#urlPost}" method="POST" enctype="multipart/form-data"> - + + <form class="edit" action="<%=action.getPostUrl()%>" method="post" enctype="multipart/form-data" > <input type="hidden" name="id" value="<%=wikitty.getId()%>" /> <input type="hidden" name="version" value="<%=wikitty.getVersion()%>" /> <input type="hidden" name="extensions" value="<%=wikitty.getExtensionNames()%>"/> @@ -99,9 +98,9 @@ case BINARY: %> - <input type="hidden" name="<%=extName%>.<%=fieldName%>" value="file" /> + <input type="hidden" name="<%=extName%>.<%=fieldName%>" value="BINARY" /> <input type="file" name="File" label ="File"/> -  + <% break; @@ -148,5 +147,5 @@ %> <input type="submit" name="store" value="Store" /> <input type="submit" name="delete" value="Delete" /> - </s:form> - \ No newline at end of file + + </form> \ No newline at end of file

1 0

r914 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities
by bpoussin＠users.nuiton.org May 24, 2011

May 24, 2011

Author: bpoussin Date: 2011-05-24 02:12:31 +0200 (Tue, 24 May 2011) New Revision: 914 Url: http://nuiton.org/repositories/revision/wikitty/914 Log: - hasField never throw exception but return false - add getFieldValue method on Wikitty to return unmodifable Map of field value Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/Wikitty.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyCopyOnWrite.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/Wikitty.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/Wikitty.java 2011-05-23 16:16:03 UTC (rev 913) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/Wikitty.java 2011-05-24 00:12:31 UTC (rev 914) @@ -30,6 +30,7 @@ import java.util.Collection; import java.util.Date; import java.util.List; +import java.util.Map; import java.util.Set; public interface Wikitty extends Cloneable, Serializable { @@ -206,6 +207,12 @@ Set<String> fieldNames(); /** + * All field value in unmodifiable map + * @return + */ + Map<String, Object> getFieldValue(); + + /** * Return all fieldName available in all extension * @return * Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyCopyOnWrite.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyCopyOnWrite.java 2011-05-23 16:16:03 UTC (rev 913) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyCopyOnWrite.java 2011-05-24 00:12:31 UTC (rev 914) @@ -29,6 +29,7 @@ import java.util.Collection; import java.util.Date; import java.util.List; +import java.util.Map; import java.util.Set; import org.apache.commons.logging.Log; @@ -350,6 +351,11 @@ } @Override + public Map<String, Object> getFieldValue() { + return target.getFieldValue(); + } + + @Override public Set<String> getAllFieldNames() { return target.getAllFieldNames(); } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java 2011-05-23 16:16:03 UTC (rev 913) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/entities/WikittyImpl.java 2011-05-24 00:12:31 UTC (rev 914) @@ -32,6 +32,7 @@ import java.util.AbstractSet; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.HashSet; @@ -367,10 +368,15 @@ @Override public boolean hasField(String fqfieldName) { - String extName = WikittyExtension.extractExtensionName(fqfieldName); - String fieldName = WikittyExtension.extractFieldName(fqfieldName); + boolean result = false; + try { + String extName = WikittyExtension.extractExtensionName(fqfieldName); + String fieldName = WikittyExtension.extractFieldName(fqfieldName); - boolean result = hasField(extName, fieldName); + result = hasField(extName, fieldName); + } catch (Exception eee) { + log.trace("Invalide field name is never field", eee); + } return result; } @@ -861,6 +867,11 @@ } @Override + public Map<String, Object> getFieldValue() { + return Collections.unmodifiableMap(fieldValue); + } + + @Override public Set<String> getAllFieldNames() { Set<String> result = new HashSet<String>(); for (WikittyExtension ext : getExtensions()) {

1 0

r913 - in trunk/wikitty-publication/src/main: java/org/nuiton/wikitty/publication/action resources webapp/WEB-INF/jsp
by mfortun＠users.nuiton.org May 23, 2011

May 23, 2011

Author: mfortun Date: 2011-05-23 18:16:03 +0200 (Mon, 23 May 2011) New Revision: 913 Url: http://nuiton.org/repositories/revision/wikitty/913 Log: * file are uploaded but not store inside wikittyPubData Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java trunk/wikitty-publication/src/main/resources/struts.xml trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java 2011-05-23 09:31:33 UTC (rev 912) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionEdit.java 2011-05-23 16:16:03 UTC (rev 913) @@ -1,5 +1,6 @@ package org.nuiton.wikitty.publication.action; +import java.io.File; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; @@ -38,7 +39,10 @@ private HashMap<String, Object> wikittyFieldMap; + protected File upload;//The actual file + + static public PublicationActionEdit getAction() { return (PublicationActionEdit) ActionContext.getContext().get( CONTEXT_ACTION_KEY); @@ -46,7 +50,8 @@ @Override public String execute() throws Exception { - + System.out.println(upload); + doAction(); @@ -218,6 +223,19 @@ + + public File getUpload() { + return upload; + } + + public void setFile(File upload){ + this.upload = upload; + } + + public void setUpload(File upload) { + this.upload = upload; + } + public Wikitty getWikitty() { Modified: trunk/wikitty-publication/src/main/resources/struts.xml =================================================================== --- trunk/wikitty-publication/src/main/resources/struts.xml 2011-05-23 09:31:33 UTC (rev 912) +++ trunk/wikitty-publication/src/main/resources/struts.xml 2011-05-23 16:16:03 UTC (rev 913) @@ -15,7 +15,7 @@ <interceptors> <interceptor-stack name="publicAreaStack"> <interceptor-ref name="defaultStack"> - + <param name="fileUpload.maximumSize">104857600</param> </interceptor-ref> </interceptor-stack> </interceptors> Modified: trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp =================================================================== --- trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp 2011-05-23 09:31:33 UTC (rev 912) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/edit.jsp 2011-05-23 16:16:03 UTC (rev 913) @@ -36,30 +36,21 @@ <%@page import="org.nuiton.wikitty.WikittyService"%> <%@page import="org.nuiton.wikitty.entities.WikittyExtension"%> <%@page import="org.nuiton.wikitty.entities.Wikitty"%> +<%@ taglib prefix="s" uri="/struts-tags" %> - <% PublicationActionEdit action = PublicationActionEdit.getAction(); Wikitty wikitty = action.getWikitty(); - -/* -WikittyPublicationContext context = (WikittyPublicationContext) - request.getAttribute(ActionEval.CONTEXT_VAR); -Wikitty wikitty = (Wikitty)request.getAttribute(ActionEval.WIKITTY_VAR); -ActionEdit action = context.getAction(ActionEdit.class); -String url = action.makeUrl(context, wikitty); - -*/ - %> <h1>Edit <%=wikitty.getId()%></h1> <pre><%=StringEscapeUtils.escapeHtml(String.valueOf(wikitty))%></pre> - -<form class="edit" action="<%=action.getPostUrl()%>" method="post" > +<s:set var="urlPost"><%=action.getPostUrl()%></s:set> +<s:form action="%{#urlPost}" method="POST" enctype="multipart/form-data"> + <input type="hidden" name="id" value="<%=wikitty.getId()%>" /> <input type="hidden" name="version" value="<%=wikitty.getVersion()%>" /> <input type="hidden" name="extensions" value="<%=wikitty.getExtensionNames()%>"/> @@ -107,7 +98,11 @@ switch(fieldType.getType()) { case BINARY: %> - <input type="file" name="<%=extName%>.<%=fieldName%>"/> + + <input type="hidden" name="<%=extName%>.<%=fieldName%>" value="file" /> + <input type="file" name="File" label ="File"/> +  + <% break; case BOOLEAN: @@ -153,4 +148,5 @@ %> <input type="submit" name="store" value="Store" /> <input type="submit" name="delete" value="Delete" /> -</form> + </s:form> + \ No newline at end of file

1 0

r912 - trunk/wikitty-publication/src/main/webapp
by mfortun＠users.nuiton.org May 23, 2011

May 23, 2011

Author: mfortun Date: 2011-05-23 11:31:33 +0200 (Mon, 23 May 2011) New Revision: 912 Url: http://nuiton.org/repositories/revision/wikitty/912 Log: * correct default login error redirect to ensure that redirect on the same action with all parameters preserved Modified: trunk/wikitty-publication/src/main/webapp/login.jsp Modified: trunk/wikitty-publication/src/main/webapp/login.jsp =================================================================== --- trunk/wikitty-publication/src/main/webapp/login.jsp 2011-05-21 11:36:45 UTC (rev 911) +++ trunk/wikitty-publication/src/main/webapp/login.jsp 2011-05-23 09:31:33 UTC (rev 912) @@ -17,7 +17,8 @@ //TODO mfortun-2011-05-13 find how to have default value configured by struts if (errorValue == null || errorValue == "") { - errorValue = PublicationActionLogin.DEFAULT_ERROR; + errorValue = "login_input.action" + "?success=" + + request.getParameter("success"); } %>

1 0

r911 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org May 21, 2011

May 21, 2011

Author: bpoussin Date: 2011-05-21 13:36:45 +0200 (Sat, 21 May 2011) New Revision: 911 Url: http://nuiton.org/repositories/revision/wikitty/911 Log: Evolution #1544: add proxy.restore(Set) method Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2011-05-20 16:05:23 UTC (rev 910) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2011-05-21 11:36:45 UTC (rev 911) @@ -55,6 +55,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Set; import org.nuiton.wikitty.entities.WikittyTokenHelper; import org.nuiton.wikitty.search.TreeNodeResult; @@ -372,13 +373,18 @@ /** * Restore wikitty entity with specified id or {@code null} if entity can't be be found. * - * @param id entity id + * @param id entity ids if null return is empty list * @return wikitty entity with specified id or {@code null} if entity can't be found */ public List<Wikitty> restore(List<String> id) { long start = TimeLog.getTime(); - List<Wikitty> result = wikittyService.restore(securityToken, id); + List<Wikitty> result; + if (id == null) { + result = new ArrayList<Wikitty>(); + } else { + result = wikittyService.restore(securityToken, id); + } timeLog.log(start, "restoreWikitty<list>"); return result; @@ -390,7 +396,7 @@ * * @param <E> object type * @param clazz entity class - * @param id entity id + * @param id entity ids if null return is empty list * @param checkExtension if true check that Wikitty result has all extension * @return wikitty entity with specified id or {@code null} if entity * can't be found or if one wikitty don't have extension wanted by E type @@ -398,39 +404,40 @@ public <E extends BusinessEntity> List<E> restore( Class<E> clazz, List<String> id, boolean checkExtension) { long start = TimeLog.getTime(); - - List<Wikitty> wikitties = wikittyService.restore(securityToken, id); List<E> result = new ArrayList<E>(); - for (Wikitty w : wikitties) { - HashSet<String> extNames = null; - if (checkExtension) { - extNames = new HashSet<String>(w.getExtensionNames()); - } - E dto = WikittyUtil.newInstance( - securityToken, wikittyService, clazz, w); - if (checkExtension) { - // WikittyUtil.newInstance instanciate only BusinessEntityWikittyImpl - BusinessEntityImpl b = (BusinessEntityImpl) dto; - for (WikittyExtension ext : b.getStaticExtensions()) { - if (!extNames.contains(ext.getName())) { - // extension wanted by BusinessEntity (clazz) - // is not in wikitty, then wikitty is not good type - // for business - result = null; + if (id != null) { + List<Wikitty> wikitties = wikittyService.restore(securityToken, id); + for (Wikitty w : wikitties) { + HashSet<String> extNames = null; + if (checkExtension) { + extNames = new HashSet<String>(w.getExtensionNames()); + } + + E dto = WikittyUtil.newInstance( + securityToken, wikittyService, clazz, w); + if (checkExtension) { + // WikittyUtil.newInstance instanciate only BusinessEntityWikittyImpl + BusinessEntityImpl b = (BusinessEntityImpl) dto; + for (WikittyExtension ext : b.getStaticExtensions()) { + if (!extNames.contains(ext.getName())) { + // extension wanted by BusinessEntity (clazz) + // is not in wikitty, then wikitty is not good type + // for business + result = null; + break; + } + } + // le break au dessus permet de soritr d'une boucle + // met si result est null il faut sortir de la methode et donc + // sortir de la deuxieme boucle + if (result == null) { break; } } - // le break au dessus permet de soritr d'une boucle - // met si result est null il faut sortir de la methode et donc - // sortir de la deuxieme boucle - if (result == null) { - break; - } + result.add(dto); } - result.add(dto); } - timeLog.log(start, "restore<list>"); return result; } @@ -440,6 +447,31 @@ return result; } + public Set<Wikitty> restore(Set<String> id) { + ArrayList<String> list = null; + if (id != null) { + list = new ArrayList<String>(id); + } + List<Wikitty> resultList = restore(list); + Set<Wikitty> result = new HashSet<Wikitty>(resultList); + return result; + } + + public <E extends BusinessEntity> Set<E> restore(Class<E> clazz, Set<String> id) { + Set<E> result = restore(clazz, id, false); + return result; + } + + public <E extends BusinessEntity> Set<E> restore(Class<E> clazz, Set<String> id, boolean checkExtension) { + ArrayList<String> list = null; + if (id != null) { + list = new ArrayList<String>(id); + } + List<E> resultList = restore(clazz, list, checkExtension); + Set<E> result = new HashSet<E>(resultList); + return result; + } + public void delete(String id) { long start = TimeLog.getTime(); wikittyService.delete(securityToken, id);

1 0

r910 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication
by mfortun＠users.nuiton.org May 20, 2011

May 20, 2011

Author: mfortun Date: 2011-05-20 18:05:23 +0200 (Fri, 20 May 2011) New Revision: 910 Url: http://nuiton.org/repositories/revision/wikitty/910 Log: * correct redirection's url Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/LoginInterceptor.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/LoginInterceptor.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/LoginInterceptor.java 2011-05-20 14:15:51 UTC (rev 909) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/LoginInterceptor.java 2011-05-20 16:05:23 UTC (rev 910) @@ -25,18 +25,21 @@ import java.util.Map; +import javax.servlet.ServletRequest; +import javax.servlet.http.HttpServletRequest; + import org.apache.struts2.ServletActionContext; +import org.apache.struts2.interceptor.RequestAware; import org.nuiton.wikitty.entities.WikittyUser; +import org.nuiton.wikitty.publication.action.PublicationActionView; - import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.interceptor.AbstractInterceptor; - /** - * Interceptor used to redirect a non-logged user if he tries to access a page - * where logging is mandatory + * Interceptor used to redirect a non-logged user if he tries to access a page + * where logging is mandatory */ public class LoginInterceptor extends AbstractInterceptor { private static final long serialVersionUID = -7520186185205372272L; @@ -50,27 +53,30 @@ public void setError(String error) { this.error = error; } - - + @Override public String intercept(ActionInvocation invocation) throws Exception { + Map<String, Object> session = ActionContext.getContext().getSession(); - - WikittyPublicationSession pubSession = WikittyPublicationSession.getWikittyPublicationSession(session); + + WikittyPublicationSession pubSession = WikittyPublicationSession + .getWikittyPublicationSession(session); WikittyUser user = pubSession.getUser(); String result = null; - + + HttpServletRequest request = ServletActionContext.getRequest(); - //If the user isn't logged in + error = request.getContextPath() + error ; + error += "?success="+request.getServletPath(); + + // If the user isn't logged in if (user == null) { ServletActionContext.getResponse().sendRedirect(error); } else { - result = invocation.invoke(); + result = invocation.invoke(); } - + return result; } - - }

1 0

r909 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication
by mfortun＠users.nuiton.org May 20, 2011

May 20, 2011

Author: mfortun Date: 2011-05-20 16:15:51 +0200 (Fri, 20 May 2011) New Revision: 909 Url: http://nuiton.org/repositories/revision/wikitty/909 Log: * futur service to handle multicontext instead of using a proxy Added: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationMultiService.java Added: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationMultiService.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationMultiService.java (rev 0) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationMultiService.java 2011-05-20 14:15:51 UTC (rev 909) @@ -0,0 +1,163 @@ +package org.nuiton.wikitty.publication; + +import java.util.Collection; +import java.util.List; + +import org.nuiton.util.ApplicationConfig; +import org.nuiton.wikitty.WikittyService; +import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.entities.WikittyExtension; +import org.nuiton.wikitty.search.Criteria; +import org.nuiton.wikitty.search.PagedResult; +import org.nuiton.wikitty.search.TreeNodeResult; +import org.nuiton.wikitty.services.WikittyEvent; +import org.nuiton.wikitty.services.WikittyListener; + +/** + * class meant to handle multicontext for wikitty publication. + * @author mfortun + * + */ +public class WikittyPublicationMultiService implements WikittyService { + + protected WikittyService mainService; + protected WikittyService fallbackService; + + public WikittyPublicationMultiService(WikittyService serv, + ApplicationConfig config) { + this.mainService = serv; + + } + + public boolean isFallBack() { + return fallbackService != null; + } + + /* + * TODO mfortun-2011-05-20 see if allow a special mode to enable login on + * both wikitty service, see if fallback service has to be construct with a + * special stack of component in the application config under specific + * properties name, or if the fallback service is already construct and pass + * threw this constructor + */ + + public void addWikittyServiceListener(WikittyListener listener, + ServiceListenerType type) { + mainService.addWikittyServiceListener(listener, type); + } + + public void removeWikittyServiceListener(WikittyListener listener, + ServiceListenerType type) { + mainService.removeWikittyServiceListener(listener, type); + } + + public String login(String login, String password) { + return mainService.login(login, password); + } + + public void logout(String securityToken) { + mainService.logout(securityToken); + } + + public WikittyEvent clear(String securityToken) { + return mainService.clear(securityToken); + } + + public boolean canWrite(String securityToken, Wikitty wikitty) { + return mainService.canWrite(securityToken, wikitty); + } + + public boolean canDelete(String securityToken, String wikittyId) { + return mainService.canDelete(securityToken, wikittyId); + } + + public boolean canRead(String securityToken, String wikittyId) { + return mainService.canRead(securityToken, wikittyId); + } + + public boolean exists(String securityToken, String wikittyId) { + return mainService.exists(securityToken, wikittyId); + } + + public boolean isDeleted(String securityToken, String wikittyId) { + return mainService.isDeleted(securityToken, wikittyId); + } + + public WikittyEvent replay(String securityToken, List<WikittyEvent> events, + boolean force) { + return mainService.replay(securityToken, events, force); + } + + public WikittyEvent store(String securityToken, + Collection<Wikitty> wikitties, boolean force) { + return mainService.store(securityToken, wikitties, force); + } + + public List<String> getAllExtensionIds(String securityToken) { + return mainService.getAllExtensionIds(securityToken); + } + + public List<String> getAllExtensionsRequires(String securityToken, + String extensionName) { + return mainService.getAllExtensionsRequires(securityToken, + extensionName); + } + + public WikittyEvent storeExtension(String securityToken, + Collection<WikittyExtension> exts) { + return mainService.storeExtension(securityToken, exts); + } + + public WikittyEvent deleteExtension(String securityToken, + Collection<String> extNames) { + return mainService.deleteExtension(securityToken, extNames); + } + + public WikittyExtension restoreExtension(String securityToken, + String extensionId) { + return mainService.restoreExtension(securityToken, extensionId); + } + + public WikittyExtension restoreExtensionLastVersion(String securityToken, + String name) { + return mainService.restoreExtensionLastVersion(securityToken, name); + } + + public List<Wikitty> restore(String securityToken, List<String> id) { + return mainService.restore(securityToken, id); + } + + public WikittyEvent delete(String securityToken, Collection<String> ids) { + return mainService.delete(securityToken, ids); + } + + public List<PagedResult<String>> findAllByCriteria(String securityToken, + List<Criteria> criteria) { + return mainService.findAllByCriteria(securityToken, criteria); + } + + public List<String> findByCriteria(String securityToken, + List<Criteria> criteria) { + return mainService.findByCriteria(securityToken, criteria); + } + + public WikittyEvent deleteTree(String securityToken, String treeNodeId) { + return mainService.deleteTree(securityToken, treeNodeId); + } + + public TreeNodeResult<String> findTreeNode(String securityToken, + String wikittyId, int depth, boolean count, Criteria filter) { + return mainService.findTreeNode(securityToken, wikittyId, depth, count, + filter); + } + + public Wikitty restoreVersion(String securityToken, String wikittyId, + String version) { + return mainService.restoreVersion(securityToken, wikittyId, version); + } + + public void syncSearchEngine(String securityToken) { + mainService.syncSearchEngine(securityToken); + } + +} Property changes on: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationMultiService.java ___________________________________________________________________ Added: svn:mime-type + text/plain

1 0

r908 - in trunk/wikitty-publication/src/main: java/org/nuiton/wikitty/publication/action resources webapp/WEB-INF/jsp
by mfortun＠users.nuiton.org May 20, 2011

May 20, 2011

Author: mfortun Date: 2011-05-20 16:09:19 +0200 (Fri, 20 May 2011) New Revision: 908 Url: http://nuiton.org/repositories/revision/wikitty/908 Log: * Correct url construction in view page Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationBaseAction.java trunk/wikitty-publication/src/main/resources/struts.xml trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java 2011-05-20 10:19:56 UTC (rev 907) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationActionView.java 2011-05-20 14:09:19 UTC (rev 908) @@ -1,24 +1,22 @@ package org.nuiton.wikitty.publication.action; - import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.PagedResult; import org.nuiton.wikitty.search.Search; -import org.nuiton.wikitty.search.operators.Element; - import com.opensymphony.xwork2.ActionContext; -public class PublicationActionView extends PublicationBaseAction { +public class PublicationActionView extends PublicationBaseAction { protected PagedResult<Wikitty> pagedResult; protected Wikitty wikittyResult; protected String search = "*"; protected int first = 0; protected int end = 100; - + + /** * */ @@ -32,12 +30,15 @@ @Override public String execute() throws Exception { + // search = this.getArgument("r", "*"); // first = this.getArgument("first", "0"); // end = this.getArgument("end", "100"); String id = getArgument("id", ""); + + if (!"".equals(id)) { wikittyResult = getWikittyPublicationProxy().restore(id); } @@ -102,14 +103,7 @@ this.end = end; } - public String makeUrlEdit(Wikitty w) { + - String result = getArgument("context", "") + "/edit/" + Element.ELT_ID - + ":" + w.getId() + ".action"; - return (result); - - } - - } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationBaseAction.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationBaseAction.java 2011-05-20 10:19:56 UTC (rev 907) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/action/PublicationBaseAction.java 2011-05-20 14:09:19 UTC (rev 908) @@ -122,4 +122,14 @@ } + + public String getContextArgs(){ + return (String) ActionContext.getContext().getParameters().get(CONTEXT_KEY); + } + + public String getArgs(){ + return (String) ActionContext.getContext().getParameters().get(ARGS_KEY); + } + + } Modified: trunk/wikitty-publication/src/main/resources/struts.xml =================================================================== --- trunk/wikitty-publication/src/main/resources/struts.xml 2011-05-20 10:19:56 UTC (rev 907) +++ trunk/wikitty-publication/src/main/resources/struts.xml 2011-05-20 14:09:19 UTC (rev 908) @@ -5,106 +5,106 @@ <struts> - <constant name="struts.devMode" value="true" /> - <constant name="struts.ognl.allowStaticMethodAccess" value="true" /> - <constant name="struts.enable.SlashesInActionNames" value="true" /> + <constant name="struts.devMode" value="true" /> + <constant name="struts.ognl.allowStaticMethodAccess" value="true" /> + <constant name="struts.enable.SlashesInActionNames" value="true" /> -  - <package name="publicArea" extends="struts-default"> - <interceptors> - <interceptor-stack name="publicAreaStack"> - <interceptor-ref name="defaultStack"> +  + <package name="publicArea" extends="struts-default"> + <interceptors> + <interceptor-stack name="publicAreaStack"> + <interceptor-ref name="defaultStack"> - </interceptor-ref> - </interceptor-stack> - </interceptors> - <default-interceptor-ref name="publicAreaStack" /> - </package> + </interceptor-ref> + </interceptor-stack> + </interceptors> + <default-interceptor-ref name="publicAreaStack" /> + </package> -  - <package name="loginArea" extends="publicArea"> - <interceptors> - <interceptor name="logout" - class="org.nuiton.wikitty.publication.LogoutInterceptor" /> - <interceptor-stack name="loginAreaStack"> - <interceptor-ref name="logout" /> - <interceptor-ref name="publicAreaStack" /> - </interceptor-stack> - </interceptors> - <default-interceptor-ref name="loginAreaStack" /> - </package> +  + <package name="loginArea" extends="publicArea"> + <interceptors> + <interceptor name="logout" + class="org.nuiton.wikitty.publication.LogoutInterceptor" /> + <interceptor-stack name="loginAreaStack"> + <interceptor-ref name="logout" /> + <interceptor-ref name="publicAreaStack" /> + </interceptor-stack> + </interceptors> + <default-interceptor-ref name="loginAreaStack" /> + </package> -  - <package name="restrictedArea" extends="publicArea"> - <interceptors> - <interceptor name="login" - class="org.nuiton.wikitty.publication.LoginInterceptor"> - <param name="error">login_input.action</param> - </interceptor> - <interceptor-stack name="restrictedAreaStack"> - <interceptor-ref name="login" /> - <interceptor-ref name="publicAreaStack" /> - </interceptor-stack> - </interceptors> - <default-interceptor-ref name="restrictedAreaStack" /> - </package> +  + <package name="restrictedArea" extends="publicArea"> + <interceptors> + <interceptor name="login" + class="org.nuiton.wikitty.publication.LoginInterceptor"> + <param name="error">/login_input.action</param> + </interceptor> + <interceptor-stack name="restrictedAreaStack"> + <interceptor-ref name="login" /> + <interceptor-ref name="publicAreaStack" /> + </interceptor-stack> + </interceptors> + <default-interceptor-ref name="restrictedAreaStack" /> + </package> - <package name="login" extends="loginArea"> - <action name="register_*" method="{1}" - class="org.nuiton.wikitty.publication.action.PublicationActionRegister"> - <result name="input">register.jsp</result> - <result type="redirect">index.jsp</result> - </action> - <action name="login_*" method="{1}" - class="org.nuiton.wikitty.publication.action.PublicationActionLogin"> - <result name="input">login.jsp</result> - <result name="success" type="redirect">${success}</result> - <result name="error" type="redirect">${error}</result> - </action> - <action name="logout" - class="org.nuiton.wikitty.publication.action.PublicationActionLogout"> - <result type="redirect">${success}</result> - </action> - </package> + <package name="login" extends="loginArea"> + <action name="register_*" method="{1}" + class="org.nuiton.wikitty.publication.action.PublicationActionRegister"> + <result name="input">/register.jsp</result> + <result type="redirect">/index.jsp</result> + </action> + <action name="login_*" method="{1}" + class="org.nuiton.wikitty.publication.action.PublicationActionLogin"> + <result name="input">login.jsp</result> + <result name="success" type="redirect">${success}</result> + <result name="error" type="redirect">${error}</result> + </action> + <action name="logout" + class="org.nuiton.wikitty.publication.action.PublicationActionLogout"> + <result type="redirect">${success}</result> + </action> + </package> -  - <package name="publication" extends="restrictedArea"> +  + <package name="publication" extends="restrictedArea"> - <action name="*/edit/*" - class="org.nuiton.wikitty.publication.action.PublicationActionEdit"> - <param name="context">{1}</param> - <param name="args">{2}</param> - <result>/WEB-INF/jsp/edit.jsp</result> - </action> + <action name="*/edit/*" + class="org.nuiton.wikitty.publication.action.PublicationActionEdit"> + <param name="context">{1}</param> + <param name="args">{2}</param> + <result>/WEB-INF/jsp/edit.jsp</result> + </action> - <action name="*/view/*" - class="org.nuiton.wikitty.publication.action.PublicationActionView"> - <param name="context">{1}</param> - <param name="args">{2}</param> - <result>/WEB-INF/jsp/view.jsp</result> - </action> + <action name="*/view/*" + class="org.nuiton.wikitty.publication.action.PublicationActionView"> + <param name="context">{1}</param> + <param name="args">{2}</param> + <result>/WEB-INF/jsp/view.jsp</result> + </action> - <action name="*/raw/*" - class="org.nuiton.wikitty.publication.action.PublicationActionRaw"> - <param name="context">{1}</param> - <param name="args">{2}</param> - <result type="stream"> - <param name="contentType">mimeType</param> - <param name="inputName">inputStream</param> - </result> - </action> + <action name="*/raw/*" + class="org.nuiton.wikitty.publication.action.PublicationActionRaw"> + <param name="context">{1}</param> + <param name="args">{2}</param> + <result type="stream"> + <param name="contentType">mimeType</param> + <param name="inputName">inputStream</param> + </result> + </action> - <action name="*/eval/*" - class="org.nuiton.wikitty.publication.action.PublicationActionEval"> - <param name="context">{1}</param> - <param name="args">{2}</param> - <result type="stream"> - <param name="contentType">mimeType</param> - <param name="inputName">inputStream</param> - </result> - </action> - </package> + <action name="*/eval/*" + class="org.nuiton.wikitty.publication.action.PublicationActionEval"> + <param name="context">{1}</param> + <param name="args">{2}</param> + <result type="stream"> + <param name="contentType">mimeType</param> + <param name="inputName">inputStream</param> + </result> + </action> + </package> </struts> Modified: trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp =================================================================== --- trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp 2011-05-20 10:19:56 UTC (rev 907) +++ trunk/wikitty-publication/src/main/webapp/WEB-INF/jsp/view.jsp 2011-05-20 14:09:19 UTC (rev 908) @@ -92,11 +92,12 @@ for (Wikitty w : action.getPagedResult().getAll()) { %> <tr> - <td><s:url var="editlink" action="wiki/edit"> - <s:param name="id"><%=w.getId()%></s:param> - </s:url> <s:a href="%{editlink}" id="regenPermToken"> - <s:text name="edit" /> - </s:a> <a href="<%=action.makeUrlEdit(w)%>">edit</a></td> + <td><s:set var="wid"><%=w.getId()%></s:set> <s:set var="localContext"><%=action.getContextArgs()%></s:set> + <s:url var="urledit" action="%{#localContext}/edit/elt_id:%{#wid}" /> + <a href="${urledit}">Edit</a> <s:url var="urlraw" + action="%{#localContext}/raw/elt_id:%{#wid}" /> <a href="${urlraw}">Raw</a> + <s:url var="urleval" action="%{#localContext}/eval/elt_id:%{#wid}" /> + <a href="${urleval}">Eval</a></td> <td><input type="submit" name="id" value="<%=w.getId()%>" /> </td>

1 0

r907 - trunk/wikitty-publication
by mfortun＠users.nuiton.org May 20, 2011

May 20, 2011

Author: mfortun Date: 2011-05-20 12:19:56 +0200 (Fri, 20 May 2011) New Revision: 907 Url: http://nuiton.org/repositories/revision/wikitty/907 Log: * change tab inserted to space Modified: trunk/wikitty-publication/pom.xml Modified: trunk/wikitty-publication/pom.xml =================================================================== --- trunk/wikitty-publication/pom.xml 2011-05-20 10:10:46 UTC (rev 906) +++ trunk/wikitty-publication/pom.xml 2011-05-20 10:19:56 UTC (rev 907) @@ -1,158 +1,158 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.nuiton</groupId> - <artifactId>wikitty</artifactId> - <version>3.1-SNAPSHOT</version> - </parent> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>wikitty</artifactId> + <version>3.1-SNAPSHOT</version> + </parent> -  -  -  +  +  +  - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-publication</artifactId> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-publication</artifactId> - <dependencies> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-jdbc</artifactId> - <version>${project.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-solr</artifactId> - <version>${project.version}</version> - <scope>runtime</scope> - </dependency> + <dependencies> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-jdbc</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-solr</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-core</artifactId> - <version>${struts2Version}</version> - </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-core</artifactId> + <version>${struts2Version}</version> + </dependency> - <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-sitemesh-plugin</artifactId> - <version>${struts2Version}</version> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-sitemesh-plugin</artifactId> + <version>${struts2Version}</version> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - </dependency> - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <version>3.8.0.GA</version> - <scope>runtime</scope> - </dependency> - </dependencies> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + </dependency> + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.8.0.GA</version> + <scope>runtime</scope> + </dependency> + </dependencies> -  -  -  +  +  +  - <name>Wikitty :: publication</name> + <name>Wikitty :: publication</name> - <description>Web publication for Wikitty</description> - <inceptionYear>2010</inceptionYear> + <description>Web publication for Wikitty</description> + <inceptionYear>2010</inceptionYear> -  -  -  +  +  +  - <packaging>war</packaging> + <packaging>war</packaging> - <build> + <build> - <resources> - <resource> - <directory>src/main/resources</directory> - </resource> - <resource> - <directory>${project.build.directory}/generated-sources/models</directory> - <includes> - <include>*.objectmodel</include> - <include>*.properties</include> - </includes> - </resource> - </resources> + <resources> + <resource> + <directory>src/main/resources</directory> + </resource> + <resource> + <directory>${project.build.directory}/generated-sources/models</directory> + <includes> + <include>*.objectmodel</include> + <include>*.properties</include> + </includes> + </resource> + </resources> - <plugins> - <plugin> - <groupId>org.nuiton.eugene</groupId> - <artifactId>maven-eugene-plugin</artifactId> - <executions> - <execution> - <id>api-generation</id> - <phase>generate-sources</phase> - <configuration> - <inputs> - <input>zargo</input> - </inputs> - <fullPackagePath>org.nuiton.wikitty.publication.entities</fullPackagePath> - <defaultPackage>org.nuiton.wikitty.publication.entities</defaultPackage> - <extractedPackages>org.nuiton.wikitty.publication.entities</extractedPackages> - <templates>org.nuiton.wikitty.generator.WikittyMetaGenerator</templates> - </configuration> - <goals> - <goal>smart-generate</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> + <plugins> + <plugin> + <groupId>org.nuiton.eugene</groupId> + <artifactId>maven-eugene-plugin</artifactId> + <executions> + <execution> + <id>api-generation</id> + <phase>generate-sources</phase> + <configuration> + <inputs> + <input>zargo</input> + </inputs> + <fullPackagePath>org.nuiton.wikitty.publication.entities</fullPackagePath> + <defaultPackage>org.nuiton.wikitty.publication.entities</defaultPackage> + <extractedPackages>org.nuiton.wikitty.publication.entities</extractedPackages> + <templates>org.nuiton.wikitty.generator.WikittyMetaGenerator</templates> + </configuration> + <goals> + <goal>smart-generate</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> - <properties> - <struts2Version>2.2.3</struts2Version> - </properties> + <properties> + <struts2Version>2.2.3</struts2Version> + </properties> </project>

1 0