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

r1232 - trunk
by maven-release＠users.nuiton.org 22 Sep '11

22 Sep '11

Author: maven-release Date: 2011-09-22 19:31:03 +0200 (Thu, 22 Sep 2011) New Revision: 1232 Url: http://nuiton.org/repositories/revision/wikitty/1232 Log: Update mavenpom4redmine to 3.0.4. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-09 16:09:05 UTC (rev 1231) +++ trunk/pom.xml 2011-09-22 17:31:03 UTC (rev 1232) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.0.3</version> + <version>3.0.4</version> </parent>

1 0

r1231 - trunk
by tchemit＠users.nuiton.org 09 Sep '11

09 Sep '11

Author: tchemit Date: 2011-09-09 18:09:05 +0200 (Fri, 09 Sep 2011) New Revision: 1231 Url: http://nuiton.org/repositories/revision/wikitty/1231 Log: use new site deployment configuration Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-09 16:07:07 UTC (rev 1230) +++ trunk/pom.xml 2011-09-09 16:09:05 UTC (rev 1231) @@ -735,6 +735,13 @@ <url>http://www.nuiton.org/repositories/browse/wikitty/trunk</url> </scm> + <distributionManagement> + <site> + <id>${platform}</id> + <url>${our.site.repository}/${projectId}</url> + </site> + </distributionManagement> +

1 0

r1230 - trunk
by tchemit＠users.nuiton.org 09 Sep '11

09 Sep '11

Author: tchemit Date: 2011-09-09 18:07:07 +0200 (Fri, 09 Sep 2011) New Revision: 1230 Url: http://nuiton.org/repositories/revision/wikitty/1230 Log: Update mavenpom4redmine to 3.0.3. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-06 09:19:25 UTC (rev 1229) +++ trunk/pom.xml 2011-09-09 16:07:07 UTC (rev 1230) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.0.2</version> + <version>3.0.3</version> </parent>

1 0

r1229 - trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui
by mfortun＠users.nuiton.org 06 Sep '11

06 Sep '11

Author: mfortun Date: 2011-09-06 11:19:25 +0200 (Tue, 06 Sep 2011) New Revision: 1229 Url: http://nuiton.org/repositories/revision/wikitty/1229 Log: correct NPE Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationSession.java Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationSession.java =================================================================== --- trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationSession.java 2011-09-02 14:11:39 UTC (rev 1228) +++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/WikittyPublicationSession.java 2011-09-06 09:19:25 UTC (rev 1229) @@ -112,7 +112,9 @@ WikittyPublicationSession result = (WikittyPublicationSession) httpSession .getAttribute(WIKITTY_PUBLICATION_SESSION_KEY + WIKITTY_PUBLICATION_SESSION_SEP + contextData); - if (result == null || !result.getContext().equals(contextData)) { + if (result == null + || (result.getContext() != null && !result.getContext().equals( + contextData))) { result = new WikittyPublicationSession(contextData); httpSession.setAttribute(WIKITTY_PUBLICATION_SESSION_KEY + WIKITTY_PUBLICATION_SESSION_SEP + contextData, result); @@ -140,7 +142,9 @@ WikittyPublicationSession result = (WikittyPublicationSession) session .get(WIKITTY_PUBLICATION_SESSION_KEY + WIKITTY_PUBLICATION_SESSION_SEP + contextData); - if (result == null || !result.getContext().equals(contextData)) { + if (result == null + || (result.getContext() != null && !result.getContext().equals( + contextData))) { result = new WikittyPublicationSession(contextData); session.put(WIKITTY_PUBLICATION_SESSION_KEY + WIKITTY_PUBLICATION_SESSION_SEP + contextData, result);

1 0

r1228 - trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action
by bpoussin＠users.nuiton.org 02 Sep '11

02 Sep '11

Author: bpoussin Date: 2011-09-02 16:11:39 +0200 (Fri, 02 Sep 2011) New Revision: 1228 Url: http://nuiton.org/repositories/revision/wikitty/1228 Log: restore thread class loader after action Modified: trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEval.java 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-09-01 17:27:18 UTC (rev 1227) +++ trunk/wikitty-publication-ui/src/main/java/org/nuiton/wikitty/publication/ui/action/PublicationActionEval.java 2011-09-02 14:11:39 UTC (rev 1228) @@ -125,10 +125,16 @@ classloader = new WikittyPublicationClassLoader(urls); // REALLY IMPORTANT put the classloader with the jarloaded + // keep class loader + ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader(); + // change class loader for action Thread.currentThread().setContextClassLoader(classloader); doAction(this, getMandatoryArguments()); + // restore class loader + Thread.currentThread().setContextClassLoader(oldClassLoader); + return SUCCESS; }

1 0

r1227 - in trunk: wikitty-publication/src/site/doc wikitty-publication-ui/src/main/webapp/WEB-INF/jsp
by mfortun＠users.nuiton.org 01 Sep '11

01 Sep '11

Author: mfortun Date: 2011-09-01 19:27:18 +0200 (Thu, 01 Sep 2011) New Revision: 1227 Url: http://nuiton.org/repositories/revision/wikitty/1227 Log: replace tab by 4spaces Modified: 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/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/site/doc/Faire_une_application_publication.rst trunk/wikitty-publication/src/site/doc/Outils_publication.rst trunk/wikitty-publication/src/site/doc/Rajouter_des_langages.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-09-01 17:05:35 UTC (rev 1226) +++ trunk/wikitty-publication/src/site/doc/Faire_une_application_publication.rst 2011-09-01 17:27:18 UTC (rev 1227) @@ -107,7 +107,7 @@ Import d'une classe (avec le script engine javascript) : - * importPackage(org.nuiton.wikitty.entities); + * importPackage(org.nuiton.wikitty.entities); Instanciation: @@ -118,7 +118,7 @@ * resource.setName(wpContext.getArgument("nom")); Par défaut il y a un certain nombre d'objets disponible en binding: - + * wpEval, objet qui permet d'évaluer d'autre wikitty * wpSubContext * wpPage, string correspondant au mandatoy args @@ -127,64 +127,64 @@ Interface de wpContext:: - public interface PublicationContext { + public interface PublicationContext { - HttpServletRequest getRequest(); + HttpServletRequest getRequest(); - HttpServletResponse getResponse(); + HttpServletResponse getResponse(); - /** - * the current wikitty proxy - * @return - */ - WikittyProxy getWikittyProxy(); + /** + * the current wikitty proxy + * @return + */ + WikittyProxy getWikittyProxy(); - /** - * add context to the url and parameter if necessary - * @param url - * @return - */ - String makeUrl(String url); + /** + * add context to the url and parameter if necessary + * @param url + * @return + */ + String makeUrl(String url); - /** - * the current wikitty service - * @return - */ - WikittyService getWikittyService(); + /** + * the current wikitty service + * @return + */ + WikittyService getWikittyService(); - List<String> getMandatoryArguments(); + List<String> getMandatoryArguments(); - String getArgument(String name); + String getArgument(String name); - /** - * Get - * @param name - * @param defaultValue - * @return - */ - String getArgument(String name, String defaultValue); + /** + * Get + * @param name + * @param defaultValue + * @return + */ + String getArgument(String name, String defaultValue); - /** - * return the actual return content tye for the page - * @return - */ - String getContentType(); + /** + * return the actual return content tye for the page + * @return + */ + String getContentType(); - /** - * Set the content type for the return page - * @param contentType - */ - void setContentType(String contentType); + /** + * Set the content type for the return page + * @param contentType + */ + void setContentType(String contentType); - String toString(); + String toString(); - /** - * the map of the arguments in the context - * @return - */ - Map<String,String> getArguments(); + /** + * the map of the arguments in the context + * @return + */ + Map<String,String> getArguments(); - } + } Par exemple @@ -207,19 +207,19 @@ Le projet resourceEntity: - resourceEntity/ - |-- changelog.txt - |-- LICENSE.tx - |-- LICENSE.txt - |-- pom.xml - |-- README.txt - `-- src - `-- main - |-- java - |-- resources - `-- xmi - |-- wp-resource.properties - |-- wp-resource.zargo + resourceEntity/ + |-- changelog.txt + |-- LICENSE.tx + |-- LICENSE.txt + |-- pom.xml + |-- README.txt + `-- src + `-- main + |-- java + |-- resources + `-- xmi + |-- wp-resource.properties + |-- wp-resource.zargo ResourceEntity est un mini projet d'utilisation de Wikitty et création d'entity @@ -229,23 +229,23 @@ Le projet resourceAppli: - resourceAppli/ - |-- pom.xml - `-- src - `-- main - |-- resources - | |-- images - | | `-- wikittypubuml.png - | `-- jar - `-- wp - |-- clearProxy.java - |-- dummy.htmljs - |-- Javahtml.htmlja - |-- JavaView.java - |-- resources.htmljs - |-- SelfModify.htmljs - |-- Test.java - `-- view.htmljs + resourceAppli/ + |-- pom.xml + `-- src + `-- main + |-- resources + | |-- images + | | `-- wikittypubuml.png + | `-- jar + `-- wp + |-- clearProxy.java + |-- dummy.htmljs + |-- Javahtml.htmlja + |-- JavaView.java + |-- resources.htmljs + |-- SelfModify.htmljs + |-- Test.java + `-- view.htmljs Ce projet est le "parfait" exemple d'utilisation, l'architecture à été initialisé avec la commande wp:init. Pour le faire fonctionner, il faut rajouter le jar Modified: trunk/wikitty-publication/src/site/doc/Outils_publication.rst =================================================================== --- trunk/wikitty-publication/src/site/doc/Outils_publication.rst 2011-09-01 17:05:35 UTC (rev 1226) +++ trunk/wikitty-publication/src/site/doc/Outils_publication.rst 2011-09-01 17:27:18 UTC (rev 1227) @@ -101,31 +101,31 @@ Pom élémentaire *************** - <?xml version="1.0" encoding="UTF-8"?> - <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <modelVersion>4.0.0</modelVersion> - <groupId>[groupID]</groupId> - <artifactId>[artifactId]</artifactId> - <version>[version]</version> - <description>[description]</description> - <build> - <plugins> - <plugin> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wp-maven-plugin</artifactId> - <version>3.2-SNAPSHOT</version> - <configuration> - <applicationName>[applicationName]</applicationName> - <wikittyServiceUrl>[wikittyServiceUrl]</wikittyServiceUrl> - <serveurID>[serveurID]</serveurID> - <uploadUrl>[uploadUrl]</uploadUrl> - <publicationVersion>[publicationVersion]</publicationVersion> - </configuration> - </plugin> - </plugins> - </build> - </project> + <?xml version="1.0" encoding="UTF-8"?> + <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <modelVersion>4.0.0</modelVersion> + <groupId>[groupID]</groupId> + <artifactId>[artifactId]</artifactId> + <version>[version]</version> + <description>[description]</description> + <build> + <plugins> + <plugin> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wp-maven-plugin</artifactId> + <version>3.2-SNAPSHOT</version> + <configuration> + <applicationName>[applicationName]</applicationName> + <wikittyServiceUrl>[wikittyServiceUrl]</wikittyServiceUrl> + <serveurID>[serveurID]</serveurID> + <uploadUrl>[uploadUrl]</uploadUrl> + <publicationVersion>[publicationVersion]</publicationVersion> + </configuration> + </plugin> + </plugins> + </build> + </project> Les valeurs [groupID], [artifactId], [version], [description] se remplissent selon l'application développée. @@ -142,13 +142,13 @@ De plus si l'on déclare des dépendances dans ce pom, de façon "classique" par exemple: - <dependencies> - <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - <version>1.2.2</version> - </dependency> - </dependencies> + <dependencies> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + <version>1.2.2</version> + </dependency> + </dependencies> Les dépendances seront automatiquement téléchargées et ajoutées dans le dossier adéquat. Modified: trunk/wikitty-publication/src/site/doc/Rajouter_des_langages.rst =================================================================== --- trunk/wikitty-publication/src/site/doc/Rajouter_des_langages.rst 2011-09-01 17:05:35 UTC (rev 1226) +++ trunk/wikitty-publication/src/site/doc/Rajouter_des_langages.rst 2011-09-01 17:27:18 UTC (rev 1227) @@ -65,51 +65,51 @@ Les Options de fitre: ********************* - * OpeningTemplate: chaine d'ouverture du template - * WriteString: instruction d'écriture - * StringDelim: délimiteur de chaine exemple " - * ConcatChar: caractère de concaténation - * EndingCar: caractère de fin d'instruction - * 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 - * 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] + * OpeningTemplate: chaine d'ouverture du template + * WriteString: instruction d'écriture + * StringDelim: délimiteur de chaine exemple " + * ConcatChar: caractère de concaténation + * EndingCar: caractère de fin d'instruction + * 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 + * 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 **************************** Contenu d'un wikitty pub text:: - - <html> - <%var name="bob"%> - <h1>Hello World <%=name%>!</h1> - </html> + + <html> + <%var name="bob"%> + <h1>Hello World <%=name%>!</h1> + </html> Règle de remplacement avec le template:: - wpContext.setContentType("text/[yyy]")[EndingCar] - - [OpeningTemplate]<html>[StringDelim][ClosingWriterChar][EndingCar] + wpContext.setContentType("text/[yyy]")[EndingCar] + + [OpeningTemplate]<html>[StringDelim][ClosingWriterChar][EndingCar] - [WriteString][OpeningWriterChar][StringDelim]bob[StringDelim][ClosingWriterChar][EndingCar] + [WriteString][OpeningWriterChar][StringDelim]bob[StringDelim][ClosingWriterChar][EndingCar] - [WriteString][OpeningWriterChar][StringDelim]<h1>Hello World [StringDelim] - [ConcatChar]name[ConcatChar][StringDelim]!</h1>[StringDelim][ClosingWriterChar][EndingCar] + [WriteString][OpeningWriterChar][StringDelim]<h1>Hello World [StringDelim] + [ConcatChar]name[ConcatChar][StringDelim]!</h1>[StringDelim][ClosingWriterChar][EndingCar] - [WriteString][OpeningWriterChar][StringDelim]</html>[StringDelim][ClosingWriterChar][EndingCar][ClosingTemplate] + [WriteString][OpeningWriterChar][StringDelim]</html>[StringDelim][ClosingWriterChar][EndingCar][ClosingTemplate] ce filtre sera actif quand on le mime type du wikittyPubText sera : text/[xxx.yyy], après transformation par le filtre le mimetype sera text/[xxx] Si on avait utilisé le filtre de base:: - wpContext.setContentType("text/html; charset=UTF-8"); - - var wp_result="<html>"; - var name= bob; - wp_result+="<h1>Hello World "+name+"!</h1>"; - wp_result+="</html>"; + wpContext.setContentType("text/html; charset=UTF-8"); + + var wp_result="<html>"; + var name= bob; + wp_result+="<h1>Hello World "+name+"!</h1>"; + wp_result+="</html>"; ce filtre sera actif quand on le mime type du wikittyPubText sera : 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-09-01 17:05:35 UTC (rev 1226) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/edit.jsp 2011-09-01 17:27:18 UTC (rev 1227) @@ -75,11 +75,11 @@ <h1>Edit <%=wikitty.getId()%></h1> <p> - <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/" /> - <a href="${urledit}">New Wikitty</a> + <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/" /> + <a href="${urledit}">New Wikitty</a> </p> <pre><%=StringEscapeUtils.escapeHtml(String.valueOf(wikitty))%></pre> @@ -89,8 +89,8 @@ var uiCodeMiror=""; function changeModeBy(select){ - uiCodeMiror.mirror.setOption("mode",select.value); - uiCodeMiror.reindent(); + uiCodeMiror.mirror.setOption("mode",select.value); + uiCodeMiror.reindent(); } //--> @@ -126,7 +126,7 @@ } %> - <input type="submit" name="addExtension" value="<%=action.getText("publication.edit.addExtension")%>" /> + <input type="submit" name="addExtension" value="<%=action.getText("publication.edit.addExtension")%>" /> </fieldset> <% 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-09-01 17:05:35 UTC (rev 1226) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/footer.jsp 2011-09-01 17:27:18 UTC (rev 1227) @@ -33,6 +33,6 @@ xmlns:s="http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd" xmlns:jsp="http://java.sun.com/JSP/Page"> - <div id="copyright"> Copyright Code Lutin 2010, AGPLv3 </div> + <div id="copyright"> Copyright Code Lutin 2010, AGPLv3 </div> </div> 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-09-01 17:05:35 UTC (rev 1226) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/login.jsp 2011-09-01 17:27:18 UTC (rev 1227) @@ -22,8 +22,7 @@ <http://www.gnu.org/licenses/lgpl-3.0.html>. #L% --%> -<%@page - import="org.nuiton.wikitty.publication.action.ui.PublicationActionLogin"%> +<%@page import="org.nuiton.wikitty.publication.action.ui.PublicationActionLogin"%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> <%@taglib prefix="s" uri="/struts-tags" %> @@ -46,28 +45,28 @@ } %> - <s:url var="urlLogin" action="login" namespace="/%{contextData}" /> + <s:url var="urlLogin" action="login" namespace="/%{contextData}" /> <s:form action="%{urlLogin}"> - <p> - <s:set id="publication.login.login"> - <s:text name="publication.login.login" /> - </s:set> - <s:set id="publication.login.password"> - <s:text name="publication.login.password" /> - </s:set> - <s:set id="publication.login.submit"> - <s:text name="publication.login.submit" /> - </s:set> + <p> + <s:set id="publication.login.login"> + <s:text name="publication.login.login" /> + </s:set> + <s:set id="publication.login.password"> + <s:text name="publication.login.password" /> + </s:set> + <s:set id="publication.login.submit"> + <s:text name="publication.login.submit" /> + </s:set> - <input type="hidden" name="success" value="<%=successValue%>" /> <input - type="hidden" name="error" value="<%=errorValue%>" /> - <s:textfield key="login" name="login" labelposition="top" - labelSeparator=" :" label="%{publication.login.login}" /> - <br /> <br /> - <s:password key="password" name="password" labelposition="top" - labelSeparator=" :" label="%{publication.login.password}" /> - <br /> <br /> - <s:submit key="publication.login.submit" name="submit" - value="%{publication.login.submit}" /> - </p> + <input type="hidden" name="success" value="<%=successValue%>" /> <input + type="hidden" name="error" value="<%=errorValue%>" /> + <s:textfield key="login" name="login" labelposition="top" + labelSeparator=" :" label="%{publication.login.login}" /> + <br /> <br /> + <s:password key="password" name="password" labelposition="top" + labelSeparator=" :" label="%{publication.login.password}" /> + <br /> <br /> + <s:submit key="publication.login.submit" name="submit" + value="%{publication.login.submit}" /> + </p> </s:form> \ No newline at end of file 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-09-01 17:05:35 UTC (rev 1226) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/register.jsp 2011-09-01 17:27:18 UTC (rev 1227) @@ -27,44 +27,44 @@ <%@taglib prefix="s" uri="/struts-tags" %> <div id="content"> - <div id="formFrame" class="fond"> - <h1> - <s:text name="Register" /> - </h1> - <s:url var="urlRegister" action="register" namespace="/%{contextData}" /> - - <s:form action="%{urlRegister}"> - <s:actionerror /> - <p> - <s:set id="publication.login.login"> - <s:text name="publication.login.login" /> - </s:set> - <s:set id="publication.login.password"> - <s:text name="publication.login.password" /> - </s:set> - <s:set id="publication.login.repeatPassword"> - <s:text name="publication.login.repeatPassword" /> - </s:set> - <s:set id="publication.register.submit"> - <s:text name="publication.register.submit" /> - </s:set> + <div id="formFrame" class="fond"> + <h1> + <s:text name="Register" /> + </h1> + <s:url var="urlRegister" action="register" namespace="/%{contextData}" /> + + <s:form action="%{urlRegister}"> + <s:actionerror /> + <p> + <s:set id="publication.login.login"> + <s:text name="publication.login.login" /> + </s:set> + <s:set id="publication.login.password"> + <s:text name="publication.login.password" /> + </s:set> + <s:set id="publication.login.repeatPassword"> + <s:text name="publication.login.repeatPassword" /> + </s:set> + <s:set id="publication.register.submit"> + <s:text name="publication.register.submit" /> + </s:set> - <s:textfield key="publication.login.login" name="login" - label="%{publication.login.login}" labelposition="top" - labelSeparator=" :" /> - <s:password key="publication.login.password" name="password" - label="%{publication.login.password}" labelposition="top" - labelSeparator=" :" /> - <s:password key="publication.login.repeatPassword" - label="%{publication.login.repeatPassword}" name="repeatPassword" - labelposition="top" labelSeparator=" :" /> - <s:submit key="publication.register.submit" name="submit" - value="%{publication.register.submit}" /> - </p> - </s:form> - <s:a action="login_input" id="loginLink"> - <s:text name="login" /> - </s:a> - </div> + <s:textfield key="publication.login.login" name="login" + label="%{publication.login.login}" labelposition="top" + labelSeparator=" :" /> + <s:password key="publication.login.password" name="password" + label="%{publication.login.password}" labelposition="top" + labelSeparator=" :" /> + <s:password key="publication.login.repeatPassword" + label="%{publication.login.repeatPassword}" name="repeatPassword" + labelposition="top" labelSeparator=" :" /> + <s:submit key="publication.register.submit" name="submit" + value="%{publication.register.submit}" /> + </p> + </s:form> + <s:a action="login_input" id="loginLink"> + <s:text name="login" /> + </s:a> + </div> </div> \ No newline at end of file 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-09-01 17:05:35 UTC (rev 1226) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/view.jsp 2011-09-01 17:27:18 UTC (rev 1227) @@ -35,12 +35,12 @@ <%@page import="org.nuiton.wikitty.publication.entities.WikittyPubText"%> <%@page import="org.apache.commons.lang.StringEscapeUtils"%> <%@page - import="org.nuiton.wikitty.publication.ui.action.PublicationActionView"%> + import="org.nuiton.wikitty.publication.ui.action.PublicationActionView"%> <%@page import="org.nuiton.util.StringUtil"%> <%@page import="org.nuiton.wikitty.search.Criteria"%> <%@page import="org.nuiton.wikitty.search.Search"%> <%@page - import="org.nuiton.wikitty.publication.ui.WikittyPublicationSession"%> + import="org.nuiton.wikitty.publication.ui.WikittyPublicationSession"%> <%@page import="org.nuiton.wikitty.search.PagedResult"%> <%@page import="org.nuiton.wikitty.entities.Wikitty"%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> @@ -69,108 +69,108 @@ %> <p> - <s:set var="contextData"><%=action.getContextData()%></s:set> <s:url - var="urledit" action="%{#contextData}/edit/" /> - <a href="${urledit}">New wikitty</a> + <s:set var="contextData"><%=action.getContextData()%></s:set> <s:url + var="urledit" action="%{#contextData}/edit/" /> + <a href="${urledit}">New wikitty</a> </p> <div id="wikittyInfo"> - <img src="/img/indicator.gif" - alt="Loading..." style="display: none" /> + <img src="/img/indicator.gif" + alt="Loading..." style="display: none" /> </div> <form action="view.action" method="post"> - <div> - <textarea title="Search" name="searchRequest"><%=action.getSearchRequest()%></textarea> - </div> - <s:textfield label="First" key="first" name="first" /> - <s:textfield label="End" key="end" name="end" /> - <input type="submit" name="search" value="<%=action.getText("publication.view.search")%>" /> - - <pre> <%=action.getText("publication.view.founds")%>: <%=action.getPagedResult().getNumFound()%></pre> - - <br/> + <div> + <textarea title="Search" name="searchRequest"><%=action.getSearchRequest()%></textarea> + </div> + <s:textfield label="First" key="first" name="first" /> + <s:textfield label="End" key="end" name="end" /> + <input type="submit" name="search" value="<%=action.getText("publication.view.search")%>" /> + + <pre> <%=action.getText("publication.view.founds")%>: <%=action.getPagedResult().getNumFound()%></pre> + + <br/> - <table border="1"> - <tr> - <td></td> - <td>Wikitty Id</td> - <td>Version</td> - <td>Extensions</td> - <td>WikittyPub* Name</td> - </tr> + <table border="1"> + <tr> + <td></td> + <td>Wikitty Id</td> + <td>Version</td> + <td>Extensions</td> + <td>WikittyPub* Name</td> + </tr> - <% - int i = 0; - for (Wikitty w : action.getPagedResult().getAll()) { - %> - <tr> - <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:url> - - - <sj:a targets="wikittyInfo" href="%{#urlFragment}"> view</sj:a> - - <% - if (w.hasExtension(WikittyPubText.EXT_WIKITTYPUBTEXT) - || w.hasExtension(WikittyPubData.EXT_WIKITTYPUBDATA)) { - %> - <a - href="${urlraw}">Raw</a> <s:url var="urleval" - action="%{#contextData}/eval/elt_id:%{#wid}" /> <a - href="${urleval}">Eval</a> - <% - } - %> + <% + int i = 0; + for (Wikitty w : action.getPagedResult().getAll()) { + %> + <tr> + <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:url> + + + <sj:a targets="wikittyInfo" href="%{#urlFragment}"> view</sj:a> + + <% + if (w.hasExtension(WikittyPubText.EXT_WIKITTYPUBTEXT) + || w.hasExtension(WikittyPubData.EXT_WIKITTYPUBDATA)) { + %> + <a + href="${urlraw}">Raw</a> <s:url var="urleval" + action="%{#contextData}/eval/elt_id:%{#wid}" /> <a + href="${urleval}">Eval</a> + <% + } + %> - </td> - <td><%=w.getId()%></td> - <td><%=w.getVersion()%></td> - <td><%=w.getExtensionNames()%></td> - <td> - <% - String currentWikittyName = StringUtils.EMPTY; - if (w.hasExtension(WikittyPubText.EXT_WIKITTYPUBTEXT)) { - currentWikittyName = WikittyPubTextHelper - .getName(w); - } else if (w - .hasExtension(WikittyPubData.EXT_WIKITTYPUBDATA)) { - currentWikittyName = WikittyPubDataHelper - .getName(w); - } - %> - <%=currentWikittyName%> - </td> - </tr> - <% - i++; - } - %> + </td> + <td><%=w.getId()%></td> + <td><%=w.getVersion()%></td> + <td><%=w.getExtensionNames()%></td> + <td> + <% + String currentWikittyName = StringUtils.EMPTY; + if (w.hasExtension(WikittyPubText.EXT_WIKITTYPUBTEXT)) { + currentWikittyName = WikittyPubTextHelper + .getName(w); + } else if (w + .hasExtension(WikittyPubData.EXT_WIKITTYPUBDATA)) { + currentWikittyName = WikittyPubDataHelper + .getName(w); + } + %> + <%=currentWikittyName%> + </td> + </tr> + <% + i++; + } + %> - </table> - <input type="submit" name="previous" value=" - <%=action.getText("publication.view.previous")%>" /> <input - type="submit" name="next" value="<%=action.getText("publication.view.next")%>" /> + </table> + <input type="submit" name="previous" value=" + <%=action.getText("publication.view.previous")%>" /> <input + type="submit" name="next" value="<%=action.getText("publication.view.next")%>" /> </form> - - \ No newline at end of file + + \ No newline at end of file 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-09-01 17:05:35 UTC (rev 1226) +++ trunk/wikitty-publication-ui/src/main/webapp/WEB-INF/jsp/wikittyInfo.jsp 2011-09-01 17:27:18 UTC (rev 1227) @@ -24,8 +24,7 @@ --%> <%@page import="org.apache.commons.lang.StringEscapeUtils"%> <%@page import="org.nuiton.wikitty.entities.Wikitty"%> -<%@page - import="org.nuiton.wikitty.publication.ui.action.PublicationActionRestoreWikitty"%> +<%@page import="org.nuiton.wikitty.publication.ui.action.PublicationActionRestoreWikitty"%> <%@page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> <%@taglib prefix="s" uri="/struts-tags" %>

1 0

r1226 - in trunk/wikitty-publication-ui/src/main: java/org/nuiton/wikitty/publication/ui/action webapp/WEB-INF/jsp
by mfortun＠users.nuiton.org 01 Sep '11

01 Sep '11

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