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

r1226 - in trunk/wikitty-publication-ui/src/main: java/org/nuiton/wikitty/publication/ui/action webapp/WEB-INF/jsp
by mfortun＠users.nuiton.org Sept. 1, 2011

Sept. 1, 2011

Author: mfortun Date: 2011-09-01 19:05:35 +0200 (Thu, 01 Sep 2011) New Revision: 1226 Url: http://nuiton.org/repositories/revision/wikitty/1226 Log: Correct struts migration, mandatory args handled directly by struts Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEdit.java trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEval.java trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionLogin.java trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionRaw.java trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionView.java trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationBaseAction.java trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/edit.jsp trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/view.jsp Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEdit.java =================================================================== --- trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEdit.java 2011-08-31 14:21:51 UTC (rev 1225) +++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEdit.java 2011-09-01 17:05:35 UTC (rev 1226) @@ -111,7 +111,7 @@ doAction(); - putIdArgs(wikitty.getId()); + args = Element.ELT_ID + ":" + wikitty.getId(); return SUCCESS; } @@ -134,8 +134,6 @@ } else { List<String> argsString = new ArrayList<String>(); - String args = ActionContext.getContext().getParameters() - .get(ARGS_KEY).toString(); String[] argsTab = StringUtil.split(args, SEPARATOR); Collections.addAll(argsString, argsTab); @@ -325,7 +323,7 @@ public String getPostUrl() { - return getArgument(ARGS_KEY, "") + ".action"; + return args + ".action"; } protected Map<String, Object> formatArgs(Map<String, Object> args) { @@ -367,12 +365,9 @@ return wikittyFieldMap; } - protected void putIdArgs(String id) { - ActionContext.getContext().getParameters() - .put(ARGS_KEY, Element.ELT_ID + ":" + id); - } + public String getMimeType (){ if (wikitty.hasExtension(WikittyPubText.EXT_WIKITTYPUBTEXT)){ return WikittyPubTextHelper.getMimeType(wikitty); Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEval.java =================================================================== --- trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEval.java 2011-08-31 14:21:51 UTC (rev 1225) +++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEval.java 2011-09-01 17:05:35 UTC (rev 1226) @@ -536,7 +536,7 @@ // TODO mforun-2011-05-09 rework on this method finalUrl = getRequest().getContextPath() + "/" - + getArgument(CONTEXT_DATA_KEY, "") + finalUrl; + + contextData + finalUrl; finalUrl = getResponse().encodeURL(finalUrl) + ".action"; if (log.isInfoEnabled()) { log.info(String.format("transforme url from '%s' to '%s'", url, @@ -554,8 +554,7 @@ @Override public List<String> getMandatoryArguments() { List<String> argsString = new ArrayList<String>(); - String args = ActionContext.getContext().getParameters().get(ARGS_KEY) - .toString(); + String[] argsTab = StringUtil.split(args, SEPARATOR); Collections.addAll(argsString, argsTab); Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionLogin.java =================================================================== --- trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionLogin.java 2011-08-31 14:21:51 UTC (rev 1225) +++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionLogin.java 2011-09-01 17:05:35 UTC (rev 1226) @@ -94,7 +94,7 @@ if (password != null) { String md5 = StringUtil.encodeMD5(password); - getWikittyPublicationSession().login(getContextArgs(), login, + getWikittyPublicationSession().login(contextData, login, md5); result = SUCCESS; Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionRaw.java =================================================================== --- trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionRaw.java 2011-08-31 14:21:51 UTC (rev 1225) +++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionRaw.java 2011-09-01 17:05:35 UTC (rev 1226) @@ -69,8 +69,6 @@ public String execute() throws Exception { List<String> argsString = new ArrayList<String>(); - String args = ActionContext.getContext().getParameters().get(ARGS_KEY) - .toString(); String[] argsTab = StringUtil.split(args, SEPARATOR); Collections.addAll(argsString, argsTab); Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionView.java =================================================================== --- trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionView.java 2011-08-31 14:21:51 UTC (rev 1225) +++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionView.java 2011-09-01 17:05:35 UTC (rev 1226) @@ -142,9 +142,6 @@ @Override public String execute() throws Exception { List<String> argsString = new ArrayList<String>(); - String args = ActionContext.getContext().getParameters().get(ARGS_KEY) - .toString(); - String[] argsTab = StringUtil.split(args, SEPARATOR); Collections.addAll(argsString, argsTab); Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationBaseAction.java =================================================================== --- trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationBaseAction.java 2011-08-31 14:21:51 UTC (rev 1225) +++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationBaseAction.java 2011-09-01 17:05:35 UTC (rev 1226) @@ -62,17 +62,24 @@ final static protected String CONTEXT_ACTION_KEY = "action"; static public String SEPARATOR = "/"; - static public String CONTEXT_DATA_KEY = "contextData"; - static public String CONTEXT_APPS_KEY = "contextApps"; - static public String ARGS_KEY = "args"; + protected Map<String, Object> session; protected String contextData; protected String contextApps; + protected String args; + public String getArgs() { + return args; + } + + public void setArgs(String args) { + this.args = args; + } + public String getContextApps() { return contextApps; } @@ -93,13 +100,13 @@ public WikittyPublicationSession getWikittyPublicationSession() { WikittyPublicationSession result = WikittyPublicationSession - .getWikittyPublicationSession(session, getContextArgs()); + .getWikittyPublicationSession(session, contextData); return result; } public WikittyPublicationProxy getWikittyPublicationProxy() { WikittyPublicationProxy result = getWikittyPublicationSession() - .getProxy(getContextArgs()); + .getProxy(contextData); return result; } @@ -194,14 +201,6 @@ return result; } - public String getContextArgs() { - return (String) ActionContext.getContext().getParameters() - .get(CONTEXT_DATA_KEY); - } - public String getArgs() { - return (String) ActionContext.getContext().getParameters() - .get(ARGS_KEY); - } } Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/edit.jsp =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/edit.jsp 2011-08-31 14:21:51 UTC (rev 1225) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/edit.jsp 2011-09-01 17:05:35 UTC (rev 1226) @@ -75,7 +75,7 @@ <h1>Edit <%=wikitty.getId()%></h1> <p> - <s:set var="localContext"><%=action.getContextArgs()%></s:set> + <s:set var="localContext"><%=action.getContextData()%></s:set> <s:url var="urledit" action="%{#localContext}/view/" /> <a href="${urledit}">View</a> <s:url var="urledit" action="%{#localContext}/edit/" /> Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/view.jsp =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/view.jsp 2011-08-31 14:21:51 UTC (rev 1225) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/view.jsp 2011-09-01 17:05:35 UTC (rev 1226) @@ -69,8 +69,8 @@ %> <p> - <s:set var="localContext"><%=action.getContextArgs()%></s:set><s:url - var="urledit" action="%{#localContext}/edit/" /> + <s:set var="contextData"><%=action.getContextData()%></s:set> <s:url + var="urledit" action="%{#contextData}/edit/" /> <a href="${urledit}">New wikitty</a> </p> @@ -113,30 +113,28 @@ for (Wikitty w : action.getPagedResult().getAll()) { %> <tr> - <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}" /> - <s:set - var="contextData"><%=action.getContextData()%></s:set> - + <td> + + + <s:set var="wid"><%=w.getId()%></s:set> + <s:url var="urledit" action="%{#contextData}/edit/elt_id:%{#wid}" /> + <a href="${urledit}">Edit</a> <s:url var="urlraw" + action="%{#contextData}/raw/elt_id:%{#wid}" /> <s:url var="urlFragment" action="%{#contextData}/wikittyInfo" namespace="/fragment"> - <s:param name="id"><%=w.getId()%></s:param> + </s:url> <sj:a targets="wikittyInfo" href="%{#urlFragment}"> view</sj:a> <% - if (w.hasExtension(WikittyPubText.EXT_WIKITTYPUBTEXT) - || w.hasExtension(WikittyPubData.EXT_WIKITTYPUBDATA)) { - %> + if (w.hasExtension(WikittyPubText.EXT_WIKITTYPUBTEXT) + || w.hasExtension(WikittyPubData.EXT_WIKITTYPUBDATA)) { + %> <a href="${urlraw}">Raw</a> <s:url var="urleval" - action="%{#localContext}/eval/elt_id:%{#wid}" /> <a + action="%{#contextData}/eval/elt_id:%{#wid}" /> <a href="${urleval}">Eval</a> -  <% } %>

1 0

r1225 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services
by bpoussin＠users.nuiton.org Aug. 31, 2011

Aug. 31, 2011

Author: bpoussin Date: 2011-08-31 16:21:51 +0200 (Wed, 31 Aug 2011) New Revision: 1225 Url: http://nuiton.org/repositories/revision/wikitty/1225 Log: Anomalie #1727: NPE if bad id in security field Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurity.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurity.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurity.java 2011-08-30 16:32:20 UTC (rev 1224) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceSecurity.java 2011-08-31 14:21:51 UTC (rev 1225) @@ -505,10 +505,14 @@ boolean result = true; String userId = getUserId(securityToken); Wikitty wikitty = WikittyServiceEnhanced.restore(getDelegate(), securityToken, wikittyId); - for (String extName : wikitty.getExtensionNames()) { - result = result && isReader(securityToken, userId, wikitty, extName); - if (!result) { - break; + if (wikitty == null) { + result = false; + } else { + for (String extName : wikitty.getExtensionNames()) { + result = result && isReader(securityToken, userId, wikitty, extName); + if (!result) { + break; + } } } return result; @@ -744,7 +748,9 @@ if (parentId != null) { Wikitty parent = WikittyServiceEnhanced.restore( getDelegate(), securityToken, parentId); - isMember = isMember(securityToken, userId, parent, fqFieldName); + if (parent != null) { + isMember = isMember(securityToken, userId, parent, fqFieldName); + } } } return isMember; @@ -803,7 +809,8 @@ // dans lequel il faut cherche le user Wikitty groupWikitty = WikittyServiceEnhanced.restore( getDelegate(), securityToken, id); - if (WikittyGroupHelper.hasExtension(groupWikitty)) { + if (groupWikitty != null && + WikittyGroupHelper.hasExtension(groupWikitty)) { Set<String> members = WikittyGroupHelper.getMembers(groupWikitty); return isMember(securityToken, userId, members);

1 0

r1224 - in trunk: . wikitty-api wikitty-dto wikitty-generators wikitty-hessian-client wikitty-hessian-server wikitty-jdbc wikitty-perf-test wikitty-publication wikitty-publication-ui wikitty-solr wp-maven-plugin
by maven-release＠users.nuiton.org Aug. 30, 2011

Aug. 30, 2011

Author: maven-release Date: 2011-08-30 18:32:20 +0200 (Tue, 30 Aug 2011) New Revision: 1224 Url: http://nuiton.org/repositories/revision/wikitty/1224 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-dto/pom.xml trunk/wikitty-generators/pom.xml trunk/wikitty-hessian-client/pom.xml trunk/wikitty-hessian-server/pom.xml trunk/wikitty-jdbc/pom.xml trunk/wikitty-perf-test/pom.xml trunk/wikitty-publication-ui/pom.xml trunk/wikitty-publication/pom.xml trunk/wikitty-solr/pom.xml trunk/wp-maven-plugin/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-30 16:32:19 UTC (rev 1223) +++ trunk/pom.xml 2011-08-30 16:32:20 UTC (rev 1224) @@ -15,7 +15,7 @@ <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2</version> + <version>3.3-SNAPSHOT</version> <modules> @@ -729,10 +729,10 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.2</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.2 + <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/wikitty/tags/wikitty-3.2</url> + <url>http://www.nuiton.org/repositories/browse/wikitty/trunk</url> </scm>  Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2011-08-30 16:32:19 UTC (rev 1223) +++ trunk/wikitty-api/pom.xml 2011-08-30 16:32:20 UTC (rev 1224) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2</version> + <version>3.3-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-dto/pom.xml =================================================================== --- trunk/wikitty-dto/pom.xml 2011-08-30 16:32:19 UTC (rev 1223) +++ trunk/wikitty-dto/pom.xml 2011-08-30 16:32:20 UTC (rev 1224) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2</version> + <version>3.3-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-generators/pom.xml =================================================================== --- trunk/wikitty-generators/pom.xml 2011-08-30 16:32:19 UTC (rev 1223) +++ trunk/wikitty-generators/pom.xml 2011-08-30 16:32:20 UTC (rev 1224) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2</version> + <version>3.3-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-hessian-client/pom.xml =================================================================== --- trunk/wikitty-hessian-client/pom.xml 2011-08-30 16:32:19 UTC (rev 1223) +++ trunk/wikitty-hessian-client/pom.xml 2011-08-30 16:32:20 UTC (rev 1224) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2</version> + <version>3.3-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-hessian-server/pom.xml =================================================================== --- trunk/wikitty-hessian-server/pom.xml 2011-08-30 16:32:19 UTC (rev 1223) +++ trunk/wikitty-hessian-server/pom.xml 2011-08-30 16:32:20 UTC (rev 1224) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2</version> + <version>3.3-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-jdbc/pom.xml =================================================================== --- trunk/wikitty-jdbc/pom.xml 2011-08-30 16:32:19 UTC (rev 1223) +++ trunk/wikitty-jdbc/pom.xml 2011-08-30 16:32:20 UTC (rev 1224) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2</version> + <version>3.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-perf-test/pom.xml =================================================================== --- trunk/wikitty-perf-test/pom.xml 2011-08-30 16:32:19 UTC (rev 1223) +++ trunk/wikitty-perf-test/pom.xml 2011-08-30 16:32:20 UTC (rev 1224) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2</version> + <version>3.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-publication/pom.xml =================================================================== --- trunk/wikitty-publication/pom.xml 2011-08-30 16:32:19 UTC (rev 1223) +++ trunk/wikitty-publication/pom.xml 2011-08-30 16:32:20 UTC (rev 1224) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2</version> + <version>3.3-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-publication-ui/pom.xml =================================================================== --- trunk/wikitty-publication-ui/pom.xml 2011-08-30 16:32:19 UTC (rev 1223) +++ trunk/wikitty-publication-ui/pom.xml 2011-08-30 16:32:20 UTC (rev 1224) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2</version> + <version>3.3-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-solr/pom.xml =================================================================== --- trunk/wikitty-solr/pom.xml 2011-08-30 16:32:19 UTC (rev 1223) +++ trunk/wikitty-solr/pom.xml 2011-08-30 16:32:20 UTC (rev 1224) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2</version> + <version>3.3-SNAPSHOT</version> </parent>  Modified: trunk/wp-maven-plugin/pom.xml =================================================================== --- trunk/wp-maven-plugin/pom.xml 2011-08-30 16:32:19 UTC (rev 1223) +++ trunk/wp-maven-plugin/pom.xml 2011-08-30 16:32:20 UTC (rev 1224) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2</version> + <version>3.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId>

1 0

r1223 - in tags: . wikitty-3.2
by maven-release＠users.nuiton.org Aug. 30, 2011

Aug. 30, 2011

Author: maven-release Date: 2011-08-30 18:32:19 +0200 (Tue, 30 Aug 2011) New Revision: 1223 Url: http://nuiton.org/repositories/revision/wikitty/1223 Log: [maven-release-plugin] copy for tag wikitty-3.2 Added: tags/wikitty-3.2/ Property changes on: tags/wikitty-3.2 ___________________________________________________________________ Added: svn:ignore + .settings .project target *.iml *.ipr *.iws Added: svn:mergeinfo + /branches/2.0-eugene2:164-179

1 0

r1222 - in trunk: . wikitty-api wikitty-dto wikitty-generators wikitty-hessian-client wikitty-hessian-server wikitty-jdbc wikitty-perf-test wikitty-publication wikitty-publication-ui wikitty-solr wp-maven-plugin
by maven-release＠users.nuiton.org Aug. 30, 2011

Aug. 30, 2011

Author: maven-release Date: 2011-08-30 18:32:18 +0200 (Tue, 30 Aug 2011) New Revision: 1222 Url: http://nuiton.org/repositories/revision/wikitty/1222 Log: [maven-release-plugin] prepare release wikitty-3.2 Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-dto/pom.xml trunk/wikitty-generators/pom.xml trunk/wikitty-hessian-client/pom.xml trunk/wikitty-hessian-server/pom.xml trunk/wikitty-jdbc/pom.xml trunk/wikitty-perf-test/pom.xml trunk/wikitty-publication-ui/pom.xml trunk/wikitty-publication/pom.xml trunk/wikitty-solr/pom.xml trunk/wp-maven-plugin/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-08-30 16:30:11 UTC (rev 1221) +++ trunk/pom.xml 2011-08-30 16:32:18 UTC (rev 1222) @@ -1,7 +1,5 @@ <?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"> +<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"> <modelVersion>4.0.0</modelVersion> @@ -17,7 +15,7 @@ <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.2</version> <modules> @@ -731,10 +729,10 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk + <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.2</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.2 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/wikitty/trunk</url> + <url>http://www.nuiton.org/repositories/browse/wikitty/tags/wikitty-3.2</url> </scm>  Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2011-08-30 16:30:11 UTC (rev 1221) +++ trunk/wikitty-api/pom.xml 2011-08-30 16:32:18 UTC (rev 1222) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.2</version> </parent>  Modified: trunk/wikitty-dto/pom.xml =================================================================== --- trunk/wikitty-dto/pom.xml 2011-08-30 16:30:11 UTC (rev 1221) +++ trunk/wikitty-dto/pom.xml 2011-08-30 16:32:18 UTC (rev 1222) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.2</version> </parent>  Modified: trunk/wikitty-generators/pom.xml =================================================================== --- trunk/wikitty-generators/pom.xml 2011-08-30 16:30:11 UTC (rev 1221) +++ trunk/wikitty-generators/pom.xml 2011-08-30 16:32:18 UTC (rev 1222) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.2</version> </parent>  Modified: trunk/wikitty-hessian-client/pom.xml =================================================================== --- trunk/wikitty-hessian-client/pom.xml 2011-08-30 16:30:11 UTC (rev 1221) +++ trunk/wikitty-hessian-client/pom.xml 2011-08-30 16:32:18 UTC (rev 1222) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.2</version> </parent>  Modified: trunk/wikitty-hessian-server/pom.xml =================================================================== --- trunk/wikitty-hessian-server/pom.xml 2011-08-30 16:30:11 UTC (rev 1221) +++ trunk/wikitty-hessian-server/pom.xml 2011-08-30 16:32:18 UTC (rev 1222) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.2</version> </parent>  Modified: trunk/wikitty-jdbc/pom.xml =================================================================== --- trunk/wikitty-jdbc/pom.xml 2011-08-30 16:30:11 UTC (rev 1221) +++ trunk/wikitty-jdbc/pom.xml 2011-08-30 16:32:18 UTC (rev 1222) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.2</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-perf-test/pom.xml =================================================================== --- trunk/wikitty-perf-test/pom.xml 2011-08-30 16:30:11 UTC (rev 1221) +++ trunk/wikitty-perf-test/pom.xml 2011-08-30 16:32:18 UTC (rev 1222) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.2</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-publication/pom.xml =================================================================== --- trunk/wikitty-publication/pom.xml 2011-08-30 16:30:11 UTC (rev 1221) +++ trunk/wikitty-publication/pom.xml 2011-08-30 16:32:18 UTC (rev 1222) @@ -1,14 +1,12 @@ <?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"> +<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"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.2</version> </parent>  Modified: trunk/wikitty-publication-ui/pom.xml =================================================================== --- trunk/wikitty-publication-ui/pom.xml 2011-08-30 16:30:11 UTC (rev 1221) +++ trunk/wikitty-publication-ui/pom.xml 2011-08-30 16:32:18 UTC (rev 1222) @@ -1,14 +1,12 @@ <?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"> +<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"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.2</version> </parent>  Modified: trunk/wikitty-solr/pom.xml =================================================================== --- trunk/wikitty-solr/pom.xml 2011-08-30 16:30:11 UTC (rev 1221) +++ trunk/wikitty-solr/pom.xml 2011-08-30 16:32:18 UTC (rev 1222) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.2</version> </parent>  Modified: trunk/wp-maven-plugin/pom.xml =================================================================== --- trunk/wp-maven-plugin/pom.xml 2011-08-30 16:30:11 UTC (rev 1221) +++ trunk/wp-maven-plugin/pom.xml 2011-08-30 16:32:18 UTC (rev 1222) @@ -24,9 +24,7 @@ #L% --> -<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"> +<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"> <modelVersion>4.0.0</modelVersion> @@ -36,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.2-SNAPSHOT</version> + <version>3.2</version> </parent> <groupId>org.nuiton.wikitty</groupId>

1 0

r1221 - trunk/wikitty-solr/src/license
by maven-release＠users.nuiton.org Aug. 30, 2011

Aug. 30, 2011

Author: maven-release Date: 2011-08-30 18:30:11 +0200 (Tue, 30 Aug 2011) New Revision: 1221 Url: http://nuiton.org/repositories/revision/wikitty/1221 Log: optimize thrid-parties Modified: trunk/wikitty-solr/src/license/THIRD-PARTY.properties Modified: trunk/wikitty-solr/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-solr/src/license/THIRD-PARTY.properties 2011-08-30 16:26:39 UTC (rev 1220) +++ trunk/wikitty-solr/src/license/THIRD-PARTY.properties 2011-08-30 16:30:11 UTC (rev 1221) @@ -21,12 +21,13 @@ # Please fill the missing licenses for dependencies : # # -#Tue Aug 30 14:05:53 CEST 2011 +#Tue Aug 30 14:22:53 CEST 2011 antlr--antlr--2.7.2=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 concurrent--concurrent--1.0=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. dom4j--dom4j--1.1=BSD License jakarta-regexp--jakarta-regexp--1.4=The Apache Software License, Version 2.0 +javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 org.apache.zookeeper--zookeeper--3.3.1=The Apache Software License, Version 2.0 oro--oro--2.0.8=The Apache Software License, Version 2.0

1 0

r1220 - trunk/wikitty-publication/src/site/doc
by mfortun＠users.nuiton.org Aug. 30, 2011

Aug. 30, 2011

Author: mfortun Date: 2011-08-30 18:26:39 +0200 (Tue, 30 Aug 2011) New Revision: 1220 Url: http://nuiton.org/repositories/revision/wikitty/1220 Log: correct doc Modified: trunk/wikitty-publication/src/site/doc/Faire_une_application_publication.rst Modified: trunk/wikitty-publication/src/site/doc/Faire_une_application_publication.rst =================================================================== --- trunk/wikitty-publication/src/site/doc/Faire_une_application_publication.rst 2011-08-30 16:10:04 UTC (rev 1219) +++ trunk/wikitty-publication/src/site/doc/Faire_une_application_publication.rst 2011-08-30 16:26:39 UTC (rev 1220) @@ -79,7 +79,7 @@ Interface d'édition: - * /[contextData]/edit/.action (avec contextData est ce qu'on veut, voir la + * /[contextData]/edit/[mandatory_args].action (avec contextData est ce qu'on veut, voir la partie sur le war pour savoir à quoi cela correspond) Quoi mettre dans les WikittyPubTex ? @@ -119,11 +119,11 @@ Par défaut il y a un certain nombre d'objets disponible en binding: - * wpEval, correspond à l'instance de la classe java qui évalue couramment le WikittyPub, permet d'évaluer - * wpSubContext, correspond à l'instance de collection contenant - * wpPage, nom de la page + * wpEval, objet qui permet d'évaluer d'autre wikitty + * wpSubContext + * wpPage, string correspondant au mandatoy args * wpWikitty, wikitty en cours d'évaluation - * wpContext, correspond à l'instance de la classe java du context (voir interface) + * wpContext, context d'évaluation Interface de wpContext:: @@ -194,7 +194,7 @@ * <img src='<%=wpContext.makeUrl("/raw/wikittypubuml")%>'/> -Intégre le résultat de l'évaluation de Test entre les balises <p> +Intégre le résultat de l'évaluation du wikittyPubText qui possède le nom Test * <p><%=wpEval.doAction(wpContext, "Test")%></p>

1 0

r1219 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty wikitty-publication/src/main/resources/filters-properties wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action
by mfortun＠users.nuiton.org Aug. 30, 2011

Aug. 30, 2011

Author: mfortun Date: 2011-08-30 18:10:04 +0200 (Tue, 30 Aug 2011) New Revision: 1219 Url: http://nuiton.org/repositories/revision/wikitty/1219 Log: *correct doc *correct criteria for contextapps Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/ScriptEvaluator.java trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEval.java trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationBaseAction.java trunk/wikitty-publication/src/main/resources/filters-properties/README.txt trunk/wikitty-publication/src/main/resources/filters-properties/filters-default.properties Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/ScriptEvaluator.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/ScriptEvaluator.java 2011-08-30 15:26:02 UTC (rev 1218) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/ScriptEvaluator.java 2011-08-30 16:10:04 UTC (rev 1219) @@ -61,7 +61,7 @@ static public ScriptEngineManager getScriptEnginManager(ClassLoader classLoader) { ScriptEngineManager result; if (classLoader != null) { - result = new ScriptEngineManager(); + result = new ScriptEngineManager(classLoader); } else { if (scriptEnginManager == null) { // create default ScriptEngineManager @@ -84,6 +84,7 @@ String name, String mimetype) { ScriptEngineManager scriptEnginManager = getScriptEnginManager(classLoader); ScriptEngine scriptEngin = scriptEnginManager.getEngineByMimeType(mimetype); + if (scriptEngin == null) { List<ScriptEngineFactory> factories = scriptEnginManager.getEngineFactories(); Modified: trunk/wikitty-publication/src/main/resources/filters-properties/README.txt =================================================================== --- trunk/wikitty-publication/src/main/resources/filters-properties/README.txt 2011-08-30 15:26:02 UTC (rev 1218) +++ trunk/wikitty-publication/src/main/resources/filters-properties/README.txt 2011-08-30 16:10:04 UTC (rev 1219) @@ -16,11 +16,9 @@ ClosingWriterChar: string after write string and before String delim OpeningWriterChar: string after string delim, before ending car ClosingTemplate: string that close the template -MimeType: the mime type of the wikittyPubText after decoration Key: mimetype special usualy originMime.targetMime for example html.javascript -this is linked to mimetype properties -ContentType: content type set for the result of the evaluation of this -wikitty pub text +this is linked to mimetype properties. Pattern [xxx.yyy] + Example : @@ -33,7 +31,7 @@ </html> with template: -wpContext.setContentType("[ContentType]")[EndingCar] +wpContext.setContentType("text/[xxx]")[EndingCar] [OpeningTemplate]<html>[StringDelim][ClosingWriterChar][EndingCar] [WriteString][OpeningWriterChar][StringDelim]bob[StringDelim][ClosingWriterChar][EndingCar] @@ -41,7 +39,7 @@ [WriteString][OpeningWriterChar][StringDelim]</html>[StringDelim][ClosingWriterChar][EndingCar][ClosingTemplate] This filters will be enable when try to evaluate wikittyPubText with mime type: -text/[Key], the mime type of the wikittyPubText after will be: [MimeType] +text/[xxx.yyy], the mime type of the wikittyPubText after will be: text/[yyy] If using the default filters: @@ -68,6 +66,5 @@ ClosingWriterChar= OpeningWriterChar= ClosingTemplate= -MimeType= Key= -ContentType= + Modified: trunk/wikitty-publication/src/main/resources/filters-properties/filters-default.properties =================================================================== --- trunk/wikitty-publication/src/main/resources/filters-properties/filters-default.properties 2011-08-30 15:26:02 UTC (rev 1218) +++ trunk/wikitty-publication/src/main/resources/filters-properties/filters-default.properties 2011-08-30 16:10:04 UTC (rev 1219) @@ -30,6 +30,4 @@ ClosingWriterChar= OpeningWriterChar=+= ClosingTemplate="; -MimeType=application\/javascript Key=html.javascript -ContentType=text\/html; charset=UTF-8 \ No newline at end of file Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEval.java =================================================================== --- trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEval.java 2011-08-30 15:26:02 UTC (rev 1218) +++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEval.java 2011-08-30 16:10:04 UTC (rev 1219) @@ -253,7 +253,7 @@ * wikitty is wikitty pub data do the same as raw action */ - if (w.hasExtension(WikittyPubData.EXT_WIKITTYPUBDATA)) { + if (w != null && w.hasExtension(WikittyPubData.EXT_WIKITTYPUBDATA)) { contentType = WikittyPubDataHelper.getMimeType(w); Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationBaseAction.java =================================================================== --- trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationBaseAction.java 2011-08-30 15:26:02 UTC (rev 1218) +++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationBaseAction.java 2011-08-30 16:10:04 UTC (rev 1219) @@ -132,19 +132,22 @@ // WikittyPubText.name et WikittyPubData.name if (contextApps != null){ + + Search mainRequest = Search.query(); + Search subRoqu = mainRequest.or(); + subRoqu.eq(WikittyPubText.FQ_FIELD_WIKITTYPUBTEXT_NAME, + searchString) + .eq(WikittyPubData.FQ_FIELD_WIKITTYPUBDATA_NAME, + searchString).criteria(searchString); + + // Search for wikitty pubdata or pub text with the name // and their - result = Search - .query() + result = mainRequest .exteq(WikittyLabel.EXT_WIKITTYLABEL) .sw(WikittyLabel.FQ_FIELD_WIKITTYLABEL_LABELS, - contextApps) - .or() - .eq(WikittyPubText.FQ_FIELD_WIKITTYPUBTEXT_NAME, - searchString) - .eq(WikittyPubData.FQ_FIELD_WIKITTYPUBDATA_NAME, - searchString).criteria(searchString); + contextApps).criteria(); }else{

1 0

r1218 - in trunk: wikitty-publication/src/main/java/org/nuiton/wikitty/publication wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize wikitty-publication/src/main/resources/filters-properties wikitty-publication/src/site/doc wikitty-publication-ui/src/main/webapp/WEB-INF wikitty-publication-ui/src/main/webapp/WEB-INF/decorators wikitty-publication-ui/src/main/webapp/WEB-INF/jsp
by mfortun＠users.nuiton.org Aug. 30, 2011

Aug. 30, 2011

Author: mfortun Date: 2011-08-30 17:26:02 +0200 (Tue, 30 Aug 2011) New Revision: 1218 Url: http://nuiton.org/repositories/revision/wikitty/1218 Log: *correct header/footer *correct filters option Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators.xml trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators/sitemesh.jsp trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/edit.jsp trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/footer.jsp trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/header.jsp trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/login.jsp trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/register.jsp trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/view.jsp trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/wikittyInfo.jsp trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeDecorator.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/FilterOption.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/MimeTypePubHelper.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConstant.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java trunk/wikitty-publication/src/main/resources/filters-properties/filters-java.properties trunk/wikitty-publication/src/site/doc/Rajouter_des_langages.rst Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeDecorator.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeDecorator.java 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/CodeDecorator.java 2011-08-30 15:26:02 UTC (rev 1218) @@ -81,6 +81,10 @@ protected Map<String, FilterOption> filtersOptions; + /** + * Mime type helper used to transform mime + */ + static protected FilterOption defaultFilterOption; static { @@ -119,17 +123,14 @@ .getProperty(FilterOption.OPENING_WRITER_CHAR)); defaultFilterOption.setClosingTemplate(mimeProps .getProperty(FilterOption.CLOSING_TEMPLATE)); - defaultFilterOption.setMimeType(mimeProps - .getProperty(FilterOption.MIME_TYPE)); defaultFilterOption.setKey(mimeProps.getProperty(FilterOption.KEY)); - defaultFilterOption.setContentType(mimeProps - .getProperty(FilterOption.CONTENT_TYPE)); + } public CodeDecorator() { filtersOptions = new HashMap<String, FilterOption>(); - + // add basic value js and htmlp filtersOptions.put(defaultFilterOption.getKey(), defaultFilterOption); try { @@ -159,10 +160,7 @@ .getProperty(FilterOption.OPENING_WRITER_CHAR)); option.setClosingTemplate(props .getProperty(FilterOption.CLOSING_TEMPLATE)); - option.setMimeType(props.getProperty(FilterOption.MIME_TYPE)); option.setKey(props.getProperty(FilterOption.KEY)); - option.setContentType(props - .getProperty(FilterOption.CONTENT_TYPE)); // addfilters options filtersOptions.put(option.getKey(), option); @@ -189,6 +187,10 @@ String mime = WikittyPubTextHelper.getMimeType(wikitty); String initialVersion = wikitty.getVersion(); + + MimeTypePubHelper helper = new MimeTypePubHelper(); + String mimeAfterTransformation = helper.pubUiMimeToTargetMime(mime); + String contentType = helper.uiMimeContentType(mime); /* * changement de mime type changement de @@ -217,7 +219,7 @@ // set default content result (override if wikitty content define it) decoredContent += WikittyPublicationConstant.CONTEXT_VAR - + ".setContentType(\"" + foption.getContentType() + "\")" + + ".setContentType(\"" +contentType + "\")" + foption.getEndingCar(); Processor proc = new Processor(); @@ -238,7 +240,7 @@ // set the content WikittyPubTextHelper.setContent(wikitty, decoredContent); // get associated mimeType and set it - WikittyPubTextHelper.setMimeType(wikitty, foption.getMimeType()); + WikittyPubTextHelper.setMimeType(wikitty, mimeAfterTransformation); // restore version wikitty.setVersion(initialVersion); @@ -260,7 +262,7 @@ public boolean isMimeTypeUi(String mime) { MimeTypePubHelper helper = new MimeTypePubHelper(); - String mimeKeyOption = helper.pubUiMimeToConverterOption(mime); + String mimeKeyOption = helper.uiMimeToFilterOptionKey(mime); return filtersOptions.containsKey(mimeKeyOption); } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/FilterOption.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/FilterOption.java 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/FilterOption.java 2011-08-30 15:26:02 UTC (rev 1218) @@ -42,13 +42,9 @@ public static String CLOSING_WRITER_CHAR = "ClosingWriterChar"; public static String OPENING_WRITER_CHAR = "OpeningWriterChar"; public static String CLOSING_TEMPLATE = "ClosingTemplate"; - public static String MIME_TYPE = "MimeType"; public static String KEY = "Key"; - public static String CONTENT_TYPE = "ContentType"; - - protected String writeString; protected String stringDelim; protected String concatChar; @@ -56,28 +52,14 @@ protected String openingTemplate; protected String closingWriterChar; protected String closingTemplate; - protected String mimeType; - protected String contentType; protected String key; - public String getContentType() { - return contentType; - } - public void setContentType(String contentType) { - this.contentType = contentType; - } public String getKey() { return key; } public void setKey(String key) { this.key = key; } - public String getMimeType() { - return mimeType; - } - public void setMimeType(String mimeType) { - this.mimeType = mimeType; - } public String getOpeningTemplate() { return openingTemplate; } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/MimeTypePubHelper.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/MimeTypePubHelper.java 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/MimeTypePubHelper.java 2011-08-30 15:26:02 UTC (rev 1218) @@ -62,8 +62,8 @@ // change this to a handler to have specific langage compiler as jython etc protected ScriptEngineManager manager; - protected CodeDecorator decorator; + static public String COMMON_MIME_SEP = "/"; static public String PUBLICATION_MIME_SEP = "."; @@ -84,7 +84,7 @@ public static String DEFAULT_MIME_TYPE = "application/octet-stream"; public MimeTypePubHelper() { - decorator = new CodeDecorator(); + bidiMap = new DualHashBidiMap(); manager = ScriptEvaluator.getScriptEnginManager(null); @@ -166,7 +166,7 @@ // check if mimetype startwith the PUbtext prefix result = mimeType.startsWith(PREFIX_MIME_PUB_TEXT); - + CodeDecorator decorator = new CodeDecorator(); // if mimetype match the regex for wikitty pub text that must be // decorate by uidecorator, if (mimeType.matches(REGEX_PUB_TEXT_TRANSFORM)) { @@ -194,13 +194,23 @@ * @param mime * @return */ - public String pubUiMimeToConverterOption(String mime) { + public String uiMimeToFilterOptionKey(String mime) { String result = mime; if (mime.matches(REGEX_PUB_TEXT_TRANSFORM)) { result = StringUtil.split(mime, COMMON_MIME_SEP)[1]; } return result; } + + public String uiMimeContentType(String mime) { + String result = mime; + if (mime.matches(REGEX_PUB_TEXT_TRANSFORM)) { + result = StringUtil.split(mime, COMMON_MIME_SEP)[0]; + } + return result; + } + + /** * Used to convert uiMime to the mimeType after content decoration @@ -252,4 +262,7 @@ this.manager = manager; } + + + } Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConstant.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConstant.java 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/WikittyPublicationConstant.java 2011-08-30 15:26:02 UTC (rev 1218) @@ -23,7 +23,11 @@ * #L% */ package org.nuiton.wikitty.publication; - +/** + * Wikitty Publication Constant use inside wikitty Publication. + * @author mfortun + * + */ public class WikittyPublicationConstant { /* Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/externalize/WikittyPublicationExternalize.java 2011-08-30 15:26:02 UTC (rev 1218) @@ -192,10 +192,10 @@ */ static public File externalize(ApplicationConfig conf, Criteria crit, File TargetDir, String jarName) throws ArgumentsParserException, IOException { - + MimeTypePubHelper mimeHelper = new MimeTypePubHelper(); CodeDecorator decorator = new CodeDecorator(); - MimeTypePubHelper mimeHelper = new MimeTypePubHelper(); + WikittyProxy proxy = new WikittyProxy( WikittyServiceFactory.buildWikittyService(conf)); Modified: trunk/wikitty-publication/src/main/resources/filters-properties/filters-java.properties =================================================================== --- trunk/wikitty-publication/src/main/resources/filters-properties/filters-java.properties 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication/src/main/resources/filters-properties/filters-java.properties 2011-08-30 15:26:02 UTC (rev 1218) @@ -30,6 +30,4 @@ ClosingWriterChar= OpeningWriterChar=+= ClosingTemplate="; return wp_result; -MimeType=text\/java Key=html.java -ContentType=text\/html; charset=UTF-8 \ No newline at end of file Modified: trunk/wikitty-publication/src/site/doc/Rajouter_des_langages.rst =================================================================== --- trunk/wikitty-publication/src/site/doc/Rajouter_des_langages.rst 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication/src/site/doc/Rajouter_des_langages.rst 2011-08-30 15:26:02 UTC (rev 1218) @@ -73,9 +73,7 @@ * ClosingWriterChar: chaine qui se place avant le caractère de fin et le délimiteur de chaine * OpeningWriterChar: chaine qui se place juste après l'instruction d'écriture et avant le délimiteur de chaine * ClosingTemplate: chaine de fermeture du template - * MimeType: mime type après application du template - * Key: clé du mime type, définition des langages utilisé langageAutourBalise.LangageEntreBalise si le mime type du wikitty pub fini par la clé, ce template sera appliqué. - * ContentType: content type qui sera mit pour le retour de la page + * Key: clé du mime type, définition des langages utilisé langageAutourBalise.LangageEntreBalise si le mime type du wikitty pub fini par la clé, ce template sera appliqué. Key sous forme [xxx.yyy] Un exemple de fonctionnement @@ -90,7 +88,7 @@ Règle de remplacement avec le template:: - wpContext.setContentType("[ContentType]")[EndingCar] + wpContext.setContentType("text/[yyy]")[EndingCar] [OpeningTemplate]<html>[StringDelim][ClosingWriterChar][EndingCar] @@ -102,7 +100,7 @@ [WriteString][OpeningWriterChar][StringDelim]</html>[StringDelim][ClosingWriterChar][EndingCar][ClosingTemplate] ce filtre sera actif quand on le mime type du wikittyPubText sera : -text/[Key], après transformation par le filtre le mimetype sera [MimeType] +text/[xxx.yyy], après transformation par le filtre le mimetype sera text/[xxx] Si on avait utilisé le filtre de base:: Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators/sitemesh.jsp =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators/sitemesh.jsp 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators/sitemesh.jsp 2011-08-30 15:26:02 UTC (rev 1218) @@ -36,7 +36,7 @@ xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:decorator="http://www.opensymphony.com/sitemesh/decorator"> <head> - <title>Wikitty Publication : <decorator:title default="Bow" /></title> + <title>Wikitty Publication : <decorator:title default="" /></title> <decorator:head /> <meta http-equiv="content-type" content="text/html; charset=UTF-8" /> <meta name="description" content="Bookmarks on the web" /> Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators.xml =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators.xml 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/decorators.xml 2011-08-30 15:26:02 UTC (rev 1218) @@ -31,7 +31,7 @@  <excludes> <pattern>/nodecorate/*</pattern> - <pattern>index.jsp</pattern> + <pattern>*/eval/*</pattern> </excludes> Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/edit.jsp =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/edit.jsp 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/edit.jsp 2011-08-30 15:26:02 UTC (rev 1218) @@ -1,4 +1,4 @@ - + --%> <%-- Document : edit Created on : 6 dï¿½c. 2010, 18:32:18 @@ -225,5 +225,4 @@ <input type="submit" name="store" value="<%=action.getText("publication.edit.save") %>" /> <input type="submit" name="delete" value="<%=action.getText("publication.edit.delete") %>" /> - </form> \ No newline at end of file Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/footer.jsp =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/footer.jsp 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/footer.jsp 2011-08-30 15:26:02 UTC (rev 1218) @@ -1,4 +1,4 @@ - + --%> <%-- Document : footer Created on : 6 dï¿½c. 2010, 19:21:22 Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/header.jsp =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/header.jsp 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/header.jsp 2011-08-30 15:26:02 UTC (rev 1218) @@ -1,4 +1,4 @@ - + --%> <%-- Document : header Created on : 6 déc. 2010, 19:21:06 Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/login.jsp =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/login.jsp 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/login.jsp 2011-08-30 15:26:02 UTC (rev 1218) @@ -25,7 +25,8 @@ <%@page import="org.nuiton.wikitty.publication.action.ui.PublicationActionLogin"%> -<%@ taglib prefix="s" uri="/struts-tags"%> +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> +<%@taglib prefix="s" uri="/struts-tags" %> <% String successValue = request.getParameter("success"); Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/register.jsp =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/register.jsp 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/register.jsp 2011-08-30 15:26:02 UTC (rev 1218) @@ -23,7 +23,9 @@ #L% --%> -<%@taglib prefix="s" uri="/struts-tags"%> +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> +<%@taglib prefix="s" uri="/struts-tags" %> + <div id="content"> <div id="formFrame" class="fond"> <h1> Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/view.jsp =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/view.jsp 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/view.jsp 2011-08-30 15:26:02 UTC (rev 1218) @@ -24,7 +24,7 @@ --> <%-- Document : view - Created on : 7 d�c. 2010, 04:18:13 + Created on : 7 dï¿½c. 2010, 04:18:13 Author : poussin --%> @@ -43,7 +43,8 @@ import="org.nuiton.wikitty.publication.ui.WikittyPublicationSession"%> <%@page import="org.nuiton.wikitty.search.PagedResult"%> <%@page import="org.nuiton.wikitty.entities.Wikitty"%> -<%@taglib prefix="s" uri="/struts-tags"%> +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> +<%@taglib prefix="s" uri="/struts-tags" %> <%@taglib prefix="sj" uri="/struts-jquery-tags"%> <sj:head jquerytheme="default"/> Modified: trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/wikittyInfo.jsp =================================================================== --- trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/wikittyInfo.jsp 2011-08-30 15:01:07 UTC (rev 1217) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/wikittyInfo.jsp 2011-08-30 15:26:02 UTC (rev 1218) @@ -26,7 +26,8 @@ <%@page import="org.nuiton.wikitty.entities.Wikitty"%> <%@page import="org.nuiton.wikitty.publication.ui.action.PublicationActionRestoreWikitty"%> -<%@taglib prefix="s" uri="/struts-tags"%> +<%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> +<%@taglib prefix="s" uri="/struts-tags" %> <% PublicationActionRestoreWikitty action = PublicationActionRestoreWikitty

1 0

r1217 - trunk/wikitty-publication/src/site/rst
by bpoussin＠users.nuiton.org Aug. 30, 2011

Aug. 30, 2011

Author: bpoussin Date: 2011-08-30 17:01:07 +0200 (Tue, 30 Aug 2011) New Revision: 1217 Url: http://nuiton.org/repositories/revision/wikitty/1217 Log: document expliquant le modele de donnees Added: trunk/wikitty-publication/src/site/rst/wp-model.rst Added: trunk/wikitty-publication/src/site/rst/wp-model.rst =================================================================== --- trunk/wikitty-publication/src/site/rst/wp-model.rst (rev 0) +++ trunk/wikitty-publication/src/site/rst/wp-model.rst 2011-08-30 15:01:07 UTC (rev 1217) @@ -0,0 +1,41 @@ +==================================== +Modèle de données WikittyPublication +==================================== + +WikittyLabel +============ + +Tous les types WikittyPubText et WikittyPubData peuvent avoir en plus cette +extension, cela permet d'indiquer à quelle application l'objet appartient. + +Un objet peut faire parti de plusieurs applications en même temps, par +exemple: une librairie binaire en version N, cela évite d'avoir N fois le binaire +de la même librairie dans le Storage. + +WikittyPubText +============== + +Représentation un contenu textuel qui peut-être évalué + +:name: le nom de l'élément +:mimeType: le type du contenu, ce type est utilisé lors d'un eval pour + retourner au navigateur le type de réponse +:content: le contenu textuel + + +WikittyPubTextCompiled +====================== + +Permet de stocker le résultat de la compilation d'un WikittyPubText, cet +objet est toujours associé à un WikittyPubText. + +WikittyPubData +============== + +Représentation un contenu binaire qui ne peut-être pas évalué + +:name: le nom de l'élément +:mimeType: le type du contenu, ce type est utilisé lors d'un eval/raw pour + retourner au navigateur le type de réponse +:content: le contenu binaire +

1 0