November 2011 - Nuiton-web-commits - mailman.cloud.codelutin.com

r148 - trunk
by maven-release＠users.nuiton.org 28 Nov '11

28 Nov '11

Author: maven-release Date: 2011-11-28 23:21:46 +0100 (Mon, 28 Nov 2011) New Revision: 148 Url: http://nuiton.org/repositories/revision/nuiton-web/148 Log: Update mavenpom4redmineAndCentral to 3.0.6. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-18 14:29:19 UTC (rev 147) +++ trunk/pom.xml 2011-11-28 22:21:46 UTC (rev 148) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.0.5</version> + <version>3.0.6</version> </parent> <groupId>org.nuiton.web</groupId>

1 0

r147 - in trunk: . nuiton-gwt nuiton-rss nuiton-struts2 nuiton-tapestry nuiton-web
by maven-release＠users.nuiton.org 18 Nov '11

18 Nov '11

Author: maven-release Date: 2011-11-18 15:29:19 +0100 (Fri, 18 Nov 2011) New Revision: 147 Url: http://nuiton.org/repositories/revision/nuiton-web/147 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/nuiton-gwt/pom.xml trunk/nuiton-rss/pom.xml trunk/nuiton-struts2/pom.xml trunk/nuiton-tapestry/pom.xml trunk/nuiton-web/pom.xml trunk/pom.xml Modified: trunk/nuiton-gwt/pom.xml =================================================================== --- trunk/nuiton-gwt/pom.xml 2011-11-18 14:29:18 UTC (rev 146) +++ trunk/nuiton-gwt/pom.xml 2011-11-18 14:29:19 UTC (rev 147) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.7</version> + <version>1.8-SNAPSHOT</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2011-11-18 14:29:18 UTC (rev 146) +++ trunk/nuiton-rss/pom.xml 2011-11-18 14:29:19 UTC (rev 147) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.7</version> + <version>1.8-SNAPSHOT</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2011-11-18 14:29:18 UTC (rev 146) +++ trunk/nuiton-struts2/pom.xml 2011-11-18 14:29:19 UTC (rev 147) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.7</version> + <version>1.8-SNAPSHOT</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2011-11-18 14:29:18 UTC (rev 146) +++ trunk/nuiton-tapestry/pom.xml 2011-11-18 14:29:19 UTC (rev 147) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.7</version> + <version>1.8-SNAPSHOT</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2011-11-18 14:29:18 UTC (rev 146) +++ trunk/nuiton-web/pom.xml 2011-11-18 14:29:19 UTC (rev 147) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.7</version> + <version>1.8-SNAPSHOT</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-18 14:29:18 UTC (rev 146) +++ trunk/pom.xml 2011-11-18 14:29:19 UTC (rev 147) @@ -15,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.7</version> + <version>1.8-SNAPSHOT</version> <modules> <module>nuiton-web</module> @@ -315,11 +315,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-parent-1.7</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-parent-1.7 + scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-web/tags/nuiton-web-parent…</url> + <url>http://www.nuiton.org/repositories/browse/nuiton-web/trunk</url> </scm> <distributionManagement>

1 0

r146 - tags
by maven-release＠users.nuiton.org 18 Nov '11

18 Nov '11

Author: maven-release Date: 2011-11-18 15:29:18 +0100 (Fri, 18 Nov 2011) New Revision: 146 Url: http://nuiton.org/repositories/revision/nuiton-web/146 Log: [maven-release-plugin] copy for tag nuiton-web-parent-1.7 Added: tags/nuiton-web-parent-1.7/

1 0

r145 - in trunk: . nuiton-gwt nuiton-rss nuiton-struts2 nuiton-tapestry nuiton-web
by maven-release＠users.nuiton.org 18 Nov '11

18 Nov '11

Author: maven-release Date: 2011-11-18 15:29:17 +0100 (Fri, 18 Nov 2011) New Revision: 145 Url: http://nuiton.org/repositories/revision/nuiton-web/145 Log: [maven-release-plugin] prepare release nuiton-web-parent-1.7 Modified: trunk/nuiton-gwt/pom.xml trunk/nuiton-rss/pom.xml trunk/nuiton-struts2/pom.xml trunk/nuiton-tapestry/pom.xml trunk/nuiton-web/pom.xml trunk/pom.xml Modified: trunk/nuiton-gwt/pom.xml =================================================================== --- trunk/nuiton-gwt/pom.xml 2011-11-16 15:07:34 UTC (rev 144) +++ trunk/nuiton-gwt/pom.xml 2011-11-18 14:29:17 UTC (rev 145) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.7-SNAPSHOT</version> + <version>1.7</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2011-11-16 15:07:34 UTC (rev 144) +++ trunk/nuiton-rss/pom.xml 2011-11-18 14:29:17 UTC (rev 145) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.7-SNAPSHOT</version> + <version>1.7</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2011-11-16 15:07:34 UTC (rev 144) +++ trunk/nuiton-struts2/pom.xml 2011-11-18 14:29:17 UTC (rev 145) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.7-SNAPSHOT</version> + <version>1.7</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2011-11-16 15:07:34 UTC (rev 144) +++ trunk/nuiton-tapestry/pom.xml 2011-11-18 14:29:17 UTC (rev 145) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.7-SNAPSHOT</version> + <version>1.7</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2011-11-16 15:07:34 UTC (rev 144) +++ trunk/nuiton-web/pom.xml 2011-11-18 14:29:17 UTC (rev 145) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.7-SNAPSHOT</version> + <version>1.7</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-16 15:07:34 UTC (rev 144) +++ trunk/pom.xml 2011-11-18 14:29:17 UTC (rev 145) @@ -15,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.7-SNAPSHOT</version> + <version>1.7</version> <modules> <module>nuiton-web</module> @@ -315,11 +315,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-parent-1.7</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-parent-1.7 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-web/trunk</url> + <url>http://www.nuiton.org/repositories/browse/nuiton-web/tags/nuiton-web-parent…</url> </scm> <distributionManagement>

1 0

r144 - in trunk/nuiton-struts2/src/main: java/org/nuiton/web/struts2/taglib resources/META-INF/tld resources/template/css_xhtml
by bleny＠users.nuiton.org 16 Nov '11

16 Nov '11

Author: bleny Date: 2011-11-16 16:07:34 +0100 (Wed, 16 Nov 2011) New Revision: 144 Url: http://nuiton.org/repositories/revision/nuiton-web/144 Log: #1808 Add a nuiton struts taglib. help tag has better support for some type of fields Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/HelpBean.java trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/HelpTag.java trunk/nuiton-struts2/src/main/resources/META-INF/tld/nuiton-tags.tld trunk/nuiton-struts2/src/main/resources/template/css_xhtml/help.ftl Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/HelpBean.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/HelpBean.java 2011-11-14 15:29:07 UTC (rev 143) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/HelpBean.java 2011-11-16 15:07:34 UTC (rev 144) @@ -11,7 +11,7 @@ @StrutsTag( name="help", tldTagClass="org.nuiton.web.struts2.taglib.HelpTag", - description="TODO", + description="display an help message for the fields inside this tag", allowDynamicAttributes=false) public class HelpBean extends ClosingUIBean { @@ -19,12 +19,16 @@ protected static final String TEMPLATE_CLOSE = "help-close"; + protected static final String DEFAULT_HELP_ZONE = "helpZone"; + + protected String helpKey; + + protected String helpZone; + public HelpBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) { super(stack, req, res); } - protected String helpKey; - @Override public String getDefaultOpenTemplate() { return TEMPLATE; @@ -37,14 +41,17 @@ @Override protected void evaluateExtraParams() { - if (helpKey != null) { - addParameter("helpKey", helpKey); - } - + addParameter("helpKey", helpKey); + addParameter("helpZone", helpZone == null ? DEFAULT_HELP_ZONE : helpZone); } - @StrutsTagAttribute(description="TODO" ,required = true) + @StrutsTagAttribute(description="the key used to get the help message body", required = true) public void setHelpKey(String helpKey) { this.helpKey = helpKey; } + + @StrutsTagAttribute(description="the id of the element where the help message will be pushed") + public void setHelpZone(String helpZone) { + this.helpZone = helpZone; + } } Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/HelpTag.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/HelpTag.java 2011-11-14 15:29:07 UTC (rev 143) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/HelpTag.java 2011-11-16 15:07:34 UTC (rev 144) @@ -15,6 +15,8 @@ protected String helpKey; + protected String helpZone; + public HelpBean getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) { return new HelpBean(stack, req, res); } @@ -23,9 +25,14 @@ this.helpKey = helpKey; } + public void setHelpZone(String helpZone) { + this.helpZone = helpZone; + } + @Override protected void populateParams() { HelpBean helpBean = (HelpBean) component; helpBean.setHelpKey(helpKey); + helpBean.setHelpZone(helpZone); } } Modified: trunk/nuiton-struts2/src/main/resources/META-INF/tld/nuiton-tags.tld =================================================================== --- trunk/nuiton-struts2/src/main/resources/META-INF/tld/nuiton-tags.tld 2011-11-14 15:29:07 UTC (rev 143) +++ trunk/nuiton-struts2/src/main/resources/META-INF/tld/nuiton-tags.tld 2011-11-16 15:07:34 UTC (rev 144) @@ -15,11 +15,17 @@ <tag-class>org.nuiton.web.struts2.taglib.HelpTag</tag-class> <body-content>JSP</body-content> <attribute> - <description><![CDATA[Date or DateTime format pattern]]></description> + <description><![CDATA[the key used to get the help message body]]></description> <name>helpKey</name> <required>true</required> <rtexprvalue>true</rtexprvalue> </attribute> + <attribute> + <description><![CDATA[the id of the element where the help message will be pushed]]></description> + <name>helpZone</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> <dynamic-attributes>false</dynamic-attributes> </tag> </taglib> Modified: trunk/nuiton-struts2/src/main/resources/template/css_xhtml/help.ftl =================================================================== --- trunk/nuiton-struts2/src/main/resources/template/css_xhtml/help.ftl 2011-11-14 15:29:07 UTC (rev 143) +++ trunk/nuiton-struts2/src/main/resources/template/css_xhtml/help.ftl 2011-11-16 15:07:34 UTC (rev 144) @@ -1,13 +1,40 @@ <div id="idHelpKey${parameters.helpKey}"> <script type="text/javascript"> $(document).ready( function() { - function printHelp() { - alert('aide pour le champs'); + var helpZone = $('#${parameters.helpZone}'); + var initialHtml; + function showHelp() { + initialHtml = helpZone.html(); + helpZone.html(getHelpAsHtml("${parameters.helpKey}")); } + function hideHelp() { + helpZone.html(initialHtml); + } + + /* select, text, text areas and password fields */ $('#idHelpKey${parameters.helpKey} input').focus( function() { - printHelp(); + showHelp(); } ); + $('#idHelpKey${parameters.helpKey} input').blur( + function() { + hideHelp(); + } + ); + + /* radio buttons, check-boxes */ + var fieldsNeedingHelpWhenMouseOver = + $('#idHelpKey${parameters.helpKey} input[type=radio], #idHelpKey${parameters.helpKey} input[type=checkbox], #idHelpKey${parameters.helpKey} input[type=submit], #idHelpKey${parameters.helpKey} label'); + fieldsNeedingHelpWhenMouseOver.mouseover( + function() { + showHelp(); + } + ); + fieldsNeedingHelpWhenMouseOver.mouseout( + function() { + hideHelp(); + } + ); }); </script> \ No newline at end of file

1 0

r143 - trunk
by bleny＠users.nuiton.org 14 Nov '11

14 Nov '11

Author: bleny Date: 2011-11-14 16:29:07 +0100 (Mon, 14 Nov 2011) New Revision: 143 Url: http://nuiton.org/repositories/revision/nuiton-web/143 Log: #1808 Add a nuiton struts taglib. forgotten parent pom Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-14 15:26:09 UTC (rev 142) +++ trunk/pom.xml 2011-11-14 15:29:07 UTC (rev 143) @@ -108,6 +108,13 @@ <scope>provided</scope> </dependency> + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <version>2.2</version> + <scope>provided</scope> + </dependency> +  <dependency> <groupId>org.nuiton.i18n</groupId>

1 0

r142 - in trunk/nuiton-struts2: . src/main/java/org/nuiton/web/struts2 src/main/java/org/nuiton/web/struts2/taglib src/main/resources src/main/resources/META-INF src/main/resources/META-INF/tld src/main/resources/template/css_xhtml
by bleny＠users.nuiton.org 14 Nov '11

14 Nov '11

Author: bleny Date: 2011-11-14 16:26:09 +0100 (Mon, 14 Nov 2011) New Revision: 142 Url: http://nuiton.org/repositories/revision/nuiton-web/142 Log: #1808 Add a nuiton struts taglib . boilerplate code Added: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/HelpBean.java trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/HelpTag.java trunk/nuiton-struts2/src/main/resources/META-INF/ trunk/nuiton-struts2/src/main/resources/META-INF/tld/ trunk/nuiton-struts2/src/main/resources/META-INF/tld/nuiton-tags.tld trunk/nuiton-struts2/src/main/resources/template/css_xhtml/help-close.ftl trunk/nuiton-struts2/src/main/resources/template/css_xhtml/help.ftl Modified: trunk/nuiton-struts2/pom.xml Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2011-11-13 16:30:18 UTC (rev 141) +++ trunk/nuiton-struts2/pom.xml 2011-11-14 15:26:09 UTC (rev 142) @@ -56,6 +56,11 @@ </dependency> <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + </dependency> + + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> Added: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/HelpBean.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/HelpBean.java (rev 0) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/HelpBean.java 2011-11-14 15:26:09 UTC (rev 142) @@ -0,0 +1,50 @@ +package org.nuiton.web.struts2.taglib; + +import com.opensymphony.xwork2.util.ValueStack; +import org.apache.struts2.components.ClosingUIBean; +import org.apache.struts2.views.annotations.StrutsTag; +import org.apache.struts2.views.annotations.StrutsTagAttribute; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +@StrutsTag( + name="help", + tldTagClass="org.nuiton.web.struts2.taglib.HelpTag", + description="TODO", + allowDynamicAttributes=false) +public class HelpBean extends ClosingUIBean { + + protected static final String TEMPLATE = "help"; + + protected static final String TEMPLATE_CLOSE = "help-close"; + + public HelpBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) { + super(stack, req, res); + } + + protected String helpKey; + + @Override + public String getDefaultOpenTemplate() { + return TEMPLATE; + } + + @Override + protected String getDefaultTemplate() { + return TEMPLATE_CLOSE; + } + + @Override + protected void evaluateExtraParams() { + if (helpKey != null) { + addParameter("helpKey", helpKey); + } + + } + + @StrutsTagAttribute(description="TODO" ,required = true) + public void setHelpKey(String helpKey) { + this.helpKey = helpKey; + } +} Added: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/HelpTag.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/HelpTag.java (rev 0) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/HelpTag.java 2011-11-14 15:26:09 UTC (rev 142) @@ -0,0 +1,31 @@ +package org.nuiton.web.struts2.taglib; + +import com.opensymphony.xwork2.util.ValueStack; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.struts2.views.jsp.ui.AbstractClosingTag; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +public class HelpTag extends AbstractClosingTag { + + /** Logger. */ + private static final Log log = LogFactory.getLog(HelpTag.class); + + protected String helpKey; + + public HelpBean getBean(ValueStack stack, HttpServletRequest req, HttpServletResponse res) { + return new HelpBean(stack, req, res); + } + + public void setHelpKey(String helpKey) { + this.helpKey = helpKey; + } + + @Override + protected void populateParams() { + HelpBean helpBean = (HelpBean) component; + helpBean.setHelpKey(helpKey); + } +} Added: trunk/nuiton-struts2/src/main/resources/META-INF/tld/nuiton-tags.tld =================================================================== --- trunk/nuiton-struts2/src/main/resources/META-INF/tld/nuiton-tags.tld (rev 0) +++ trunk/nuiton-struts2/src/main/resources/META-INF/tld/nuiton-tags.tld 2011-11-14 15:26:09 UTC (rev 142) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<taglib xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.0" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"> + <description><![CDATA["To make it easier to access dynamic data; + the Apache Struts framework includes a library of custom tags. + The tags interact with the framework's validation and internationalization features; + to ensure that input is correct and output is localized. + The Struts Tags can be used with JSP FreeMarker or Velocity."]]></description> + <display-name>"Nuiton Struts Tags"</display-name> + <tlib-version>2.2</tlib-version> + <short-name>ns</short-name> + <uri>/nuiton-tags</uri> + <tag> + <description><![CDATA[Add a help message on a form field]]></description> + <name>help</name> + <tag-class>org.nuiton.web.struts2.taglib.HelpTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description><![CDATA[Date or DateTime format pattern]]></description> + <name>helpKey</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <dynamic-attributes>false</dynamic-attributes> + </tag> +</taglib> Added: trunk/nuiton-struts2/src/main/resources/template/css_xhtml/help-close.ftl =================================================================== --- trunk/nuiton-struts2/src/main/resources/template/css_xhtml/help-close.ftl (rev 0) +++ trunk/nuiton-struts2/src/main/resources/template/css_xhtml/help-close.ftl 2011-11-14 15:26:09 UTC (rev 142) @@ -0,0 +1 @@ +</div> \ No newline at end of file Added: trunk/nuiton-struts2/src/main/resources/template/css_xhtml/help.ftl =================================================================== --- trunk/nuiton-struts2/src/main/resources/template/css_xhtml/help.ftl (rev 0) +++ trunk/nuiton-struts2/src/main/resources/template/css_xhtml/help.ftl 2011-11-14 15:26:09 UTC (rev 142) @@ -0,0 +1,13 @@ +<div id="idHelpKey${parameters.helpKey}"> + <script type="text/javascript"> + $(document).ready( function() { + function printHelp() { + alert('aide pour le champs'); + } + $('#idHelpKey${parameters.helpKey} input').focus( + function() { + printHelp(); + } + ); + }); + </script> \ No newline at end of file

1 0

r141 - in trunk: . nuiton-gwt nuiton-rss nuiton-struts2 nuiton-tapestry nuiton-web
by maven-release＠users.nuiton.org 13 Nov '11

13 Nov '11

Author: maven-release Date: 2011-11-13 17:30:18 +0100 (Sun, 13 Nov 2011) New Revision: 141 Url: http://nuiton.org/repositories/revision/nuiton-web/141 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/nuiton-gwt/pom.xml trunk/nuiton-rss/pom.xml trunk/nuiton-struts2/pom.xml trunk/nuiton-tapestry/pom.xml trunk/nuiton-web/pom.xml trunk/pom.xml Modified: trunk/nuiton-gwt/pom.xml =================================================================== --- trunk/nuiton-gwt/pom.xml 2011-11-13 16:30:17 UTC (rev 140) +++ trunk/nuiton-gwt/pom.xml 2011-11-13 16:30:18 UTC (rev 141) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.6</version> + <version>1.7-SNAPSHOT</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2011-11-13 16:30:17 UTC (rev 140) +++ trunk/nuiton-rss/pom.xml 2011-11-13 16:30:18 UTC (rev 141) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.6</version> + <version>1.7-SNAPSHOT</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2011-11-13 16:30:17 UTC (rev 140) +++ trunk/nuiton-struts2/pom.xml 2011-11-13 16:30:18 UTC (rev 141) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.6</version> + <version>1.7-SNAPSHOT</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2011-11-13 16:30:17 UTC (rev 140) +++ trunk/nuiton-tapestry/pom.xml 2011-11-13 16:30:18 UTC (rev 141) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.6</version> + <version>1.7-SNAPSHOT</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2011-11-13 16:30:17 UTC (rev 140) +++ trunk/nuiton-web/pom.xml 2011-11-13 16:30:18 UTC (rev 141) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.6</version> + <version>1.7-SNAPSHOT</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-13 16:30:17 UTC (rev 140) +++ trunk/pom.xml 2011-11-13 16:30:18 UTC (rev 141) @@ -15,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.6</version> + <version>1.7-SNAPSHOT</version> <modules> <module>nuiton-web</module> @@ -308,11 +308,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-parent-1.6</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-parent-1.6 + scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-web/tags/nuiton-web-parent…</url> + <url>http://www.nuiton.org/repositories/browse/nuiton-web/trunk</url> </scm> <distributionManagement>

1 0

r140 - tags
by maven-release＠users.nuiton.org 13 Nov '11

13 Nov '11

Author: maven-release Date: 2011-11-13 17:30:17 +0100 (Sun, 13 Nov 2011) New Revision: 140 Url: http://nuiton.org/repositories/revision/nuiton-web/140 Log: [maven-release-plugin] copy for tag nuiton-web-parent-1.6 Added: tags/nuiton-web-parent-1.6/

1 0

r139 - in trunk: . nuiton-gwt nuiton-rss nuiton-struts2 nuiton-tapestry nuiton-web
by maven-release＠users.nuiton.org 13 Nov '11

13 Nov '11

Author: maven-release Date: 2011-11-13 17:30:16 +0100 (Sun, 13 Nov 2011) New Revision: 139 Url: http://nuiton.org/repositories/revision/nuiton-web/139 Log: [maven-release-plugin] prepare release nuiton-web-parent-1.6 Modified: trunk/nuiton-gwt/pom.xml trunk/nuiton-rss/pom.xml trunk/nuiton-struts2/pom.xml trunk/nuiton-tapestry/pom.xml trunk/nuiton-web/pom.xml trunk/pom.xml Modified: trunk/nuiton-gwt/pom.xml =================================================================== --- trunk/nuiton-gwt/pom.xml 2011-11-13 16:23:35 UTC (rev 138) +++ trunk/nuiton-gwt/pom.xml 2011-11-13 16:30:16 UTC (rev 139) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.6</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2011-11-13 16:23:35 UTC (rev 138) +++ trunk/nuiton-rss/pom.xml 2011-11-13 16:30:16 UTC (rev 139) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.6</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2011-11-13 16:23:35 UTC (rev 138) +++ trunk/nuiton-struts2/pom.xml 2011-11-13 16:30:16 UTC (rev 139) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.6</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2011-11-13 16:23:35 UTC (rev 138) +++ trunk/nuiton-tapestry/pom.xml 2011-11-13 16:30:16 UTC (rev 139) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.6</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2011-11-13 16:23:35 UTC (rev 138) +++ trunk/nuiton-web/pom.xml 2011-11-13 16:30:16 UTC (rev 139) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.6</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-13 16:23:35 UTC (rev 138) +++ trunk/pom.xml 2011-11-13 16:30:16 UTC (rev 139) @@ -15,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.6-SNAPSHOT</version> + <version>1.6</version> <modules> <module>nuiton-web</module> @@ -308,11 +308,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-parent-1.6</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-parent-1.6 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-web/trunk</url> + <url>http://www.nuiton.org/repositories/browse/nuiton-web/tags/nuiton-web-parent…</url> </scm> <distributionManagement>

1 0

r138 - trunk
by tchemit＠users.nuiton.org 13 Nov '11

13 Nov '11

Author: tchemit Date: 2011-11-13 17:23:35 +0100 (Sun, 13 Nov 2011) New Revision: 138 Url: http://nuiton.org/repositories/revision/nuiton-web/138 Log: T?\195?\162che #1805: Updates to topia 2.6.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-13 15:59:36 UTC (rev 137) +++ trunk/pom.xml 2011-11-13 16:23:35 UTC (rev 138) @@ -234,7 +234,7 @@ <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <nuitonI18nPluginVersion>${nuitonI18nVersion}</nuitonI18nPluginVersion> - <topiaVersion>2.6.3</topiaVersion> + <topiaVersion>2.6.4</topiaVersion>  <tapestryVersion>5.2.4</tapestryVersion>

1 0

r137 - in trunk: nuiton-struts2 nuiton-tapestry nuiton-web
by tchemit＠users.nuiton.org 13 Nov '11

13 Nov '11

Author: tchemit Date: 2011-11-13 16:59:36 +0100 (Sun, 13 Nov 2011) New Revision: 137 Url: http://nuiton.org/repositories/revision/nuiton-web/137 Log: Evolution #1803: Pass org.apache.commons.lang3 after commons-lang ! Modified: trunk/nuiton-struts2/pom.xml trunk/nuiton-tapestry/pom.xml trunk/nuiton-web/pom.xml Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2011-11-13 15:50:12 UTC (rev 136) +++ trunk/nuiton-struts2/pom.xml 2011-11-13 15:59:36 UTC (rev 137) @@ -41,8 +41,8 @@ </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> <dependency> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2011-11-13 15:50:12 UTC (rev 136) +++ trunk/nuiton-tapestry/pom.xml 2011-11-13 15:59:36 UTC (rev 137) @@ -18,8 +18,8 @@ <dependencies> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> <dependency> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2011-11-13 15:50:12 UTC (rev 136) +++ trunk/nuiton-web/pom.xml 2011-11-13 15:59:36 UTC (rev 137) @@ -38,6 +38,16 @@ <scope>provided</scope> </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + </dependencies>

1 0

r136 - trunk/nuiton-web/src/license
by tchemit＠users.nuiton.org 13 Nov '11

13 Nov '11

Author: tchemit Date: 2011-11-13 16:50:12 +0100 (Sun, 13 Nov 2011) New Revision: 136 Url: http://nuiton.org/repositories/revision/nuiton-web/136 Log: optimize thrid-parties Added: trunk/nuiton-web/src/license/THIRD-PARTY.properties Added: trunk/nuiton-web/src/license/THIRD-PARTY.properties =================================================================== --- trunk/nuiton-web/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/nuiton-web/src/license/THIRD-PARTY.properties 2011-11-13 15:50:12 UTC (rev 136) @@ -0,0 +1,25 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache Software License - Version 2.0 +# - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Eclipse Public License - Version 1.0 +# - GNU Lesser General Public License version 2.1 +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - MPL 1.1 +# - The Apache Software License, Version 2.0 +# - license.txt +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Sun Nov 13 16:49:07 CET 2011 +antlr--antlr--2.7.6=BSD License +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1=BSD License +javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 Property changes on: trunk/nuiton-web/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r135 - in trunk: nuiton-struts2 nuiton-tapestry nuiton-web
by maven-release＠users.nuiton.org 13 Nov '11

13 Nov '11

Author: maven-release Date: 2011-11-13 16:47:51 +0100 (Sun, 13 Nov 2011) New Revision: 135 Url: http://nuiton.org/repositories/revision/nuiton-web/135 Log: [maven-release-plugin] rollback the release of nuiton-web-parent-1.6 Modified: trunk/nuiton-struts2/pom.xml trunk/nuiton-tapestry/pom.xml trunk/nuiton-web/pom.xml Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2011-11-13 15:46:48 UTC (rev 134) +++ trunk/nuiton-struts2/pom.xml 2011-11-13 15:47:51 UTC (rev 135) @@ -41,8 +41,8 @@ </dependency> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> </dependency> <dependency> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2011-11-13 15:46:48 UTC (rev 134) +++ trunk/nuiton-tapestry/pom.xml 2011-11-13 15:47:51 UTC (rev 135) @@ -18,8 +18,8 @@ <dependencies> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> </dependency> <dependency> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2011-11-13 15:46:48 UTC (rev 134) +++ trunk/nuiton-web/pom.xml 2011-11-13 15:47:51 UTC (rev 135) @@ -38,16 +38,6 @@ <scope>provided</scope> </dependency> - <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> - - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - </dependencies>

1 0

r134 - in trunk: nuiton-struts2 nuiton-struts2/src/main/java/org/nuiton/web/struts2 nuiton-tapestry nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins nuiton-web nuiton-web/src/main/java/org/nuiton/web/filter
by tchemit＠users.nuiton.org 13 Nov '11

13 Nov '11

Author: tchemit Date: 2011-11-13 16:46:48 +0100 (Sun, 13 Nov 2011) New Revision: 134 Url: http://nuiton.org/repositories/revision/nuiton-web/134 Log: Evolution #1803: Pass org.apache.commons.lang3 after commons-lang Modified: trunk/nuiton-struts2/pom.xml trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/I18nTextProvider.java trunk/nuiton-tapestry/pom.xml trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins/ZoneUpdater.java trunk/nuiton-web/pom.xml trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2011-11-13 15:34:52 UTC (rev 133) +++ trunk/nuiton-struts2/pom.xml 2011-11-13 15:46:48 UTC (rev 134) @@ -41,8 +41,8 @@ </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> <dependency> Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/I18nTextProvider.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/I18nTextProvider.java 2011-11-13 15:34:52 UTC (rev 133) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/I18nTextProvider.java 2011-11-13 15:46:48 UTC (rev 134) @@ -27,7 +27,7 @@ import com.opensymphony.xwork2.LocaleProvider; import com.opensymphony.xwork2.ResourceBundleTextProvider; import com.opensymphony.xwork2.util.ValueStack; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.I18n; Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2011-11-13 15:34:52 UTC (rev 133) +++ trunk/nuiton-tapestry/pom.xml 2011-11-13 15:46:48 UTC (rev 134) @@ -18,8 +18,8 @@ <dependencies> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> <dependency> Modified: trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins/ZoneUpdater.java =================================================================== --- trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins/ZoneUpdater.java 2011-11-13 15:34:52 UTC (rev 133) +++ trunk/nuiton-tapestry/src/main/java/org/nuiton/web/tapestry5/mixins/ZoneUpdater.java 2011-11-13 15:46:48 UTC (rev 134) @@ -44,7 +44,7 @@ */ package org.nuiton.web.tapestry5.mixins; -import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; import org.apache.tapestry5.BindingConstants; import org.apache.tapestry5.ClientElement; import org.apache.tapestry5.ComponentResources; Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2011-11-13 15:34:52 UTC (rev 133) +++ trunk/nuiton-web/pom.xml 2011-11-13 15:46:48 UTC (rev 134) @@ -38,6 +38,16 @@ <scope>provided</scope> </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + </dependencies> Modified: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java =================================================================== --- trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java 2011-11-13 15:34:52 UTC (rev 133) +++ trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java 2011-11-13 15:46:48 UTC (rev 134) @@ -24,7 +24,7 @@ */ package org.nuiton.web.filter; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext;

1 0

r133 - in trunk/nuiton-web/src/site: . apt
by tchemit＠users.nuiton.org 13 Nov '11

13 Nov '11

Author: tchemit Date: 2011-11-13 16:34:52 +0100 (Sun, 13 Nov 2011) New Revision: 133 Url: http://nuiton.org/repositories/revision/nuiton-web/133 Log: add documentation for TopiaFilter Added: trunk/nuiton-web/src/site/apt/TopiaFilter.apt.vm Modified: trunk/nuiton-web/src/site/site_fr.xml Added: trunk/nuiton-web/src/site/apt/TopiaFilter.apt.vm =================================================================== --- trunk/nuiton-web/src/site/apt/TopiaFilter.apt.vm (rev 0) +++ trunk/nuiton-web/src/site/apt/TopiaFilter.apt.vm 2011-11-13 15:34:52 UTC (rev 133) @@ -0,0 +1,72 @@ + +Topia Filter + +* Abstract + + The topia filter permits to manage the topia transaction inside a http servlet + request. + +* Usage + + * Implements the abstract filter. + +------------------------------------------------ +package fr.ifremer.echobase.ui; + +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.TopiaRuntimeException; +import org.nuiton.web.filter.TopiaTransactionFilter; + +/** + * EchoBase implementation of the {@link TopiaTransactionFilter}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 0.1 + */ +public class EchoBaseTopiaTransactionFilter extends TopiaTransactionFilter { + + @Override + protected TopiaContext beginTransaction() throws TopiaRuntimeException { + + TopiaContext rootContext = ... // obtain your root context; + TopiaContext transaction = null; + try { + transaction = rootContext.beginTransaction(); + } catch (TopiaException eee) { + throw new TopiaRuntimeException("Could not start transaction", eee); + } + return transaction; + } +} +------------------------------------------------ + + * Adds it in our <<web.xml>> : + +------------------------------------------------ + +<filter> + <filter-name>topiaTransaction</filter-name> + <filter-class>fr.ifremer.echobase.ui.EchoBaseTopiaTransactionFilter</filter-class> +</filter> + +... + +<filter-mapping> + <filter-name>topiaTransaction</filter-name> + <url-pattern>/*</url-pattern> +</filter-mapping> + + +------------------------------------------------ + + * Obtain transaction from the http requeststored in the attribute name given + by <<topiaTransaction>>. + There is also a usefull method to obtain it from TopiaTransactionFilter : + +------------------------------------------------ + + HttpServletRequest request = ...; + transaction = TopiaTransactionFilter.getTransaction(request); + +------------------------------------------------ \ No newline at end of file Property changes on: trunk/nuiton-web/src/site/apt/TopiaFilter.apt.vm ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-web/src/site/site_fr.xml =================================================================== --- trunk/nuiton-web/src/site/site_fr.xml 2011-11-09 15:54:16 UTC (rev 132) +++ trunk/nuiton-web/src/site/site_fr.xml 2011-11-13 15:34:52 UTC (rev 133) @@ -41,6 +41,7 @@ <menu name="Utilisateur"> <item name="Accueil" href="index.html"/> + <item name="Topia Filter" href="/TopiaFilter.html"/> <item name="War launcher" href="/Warlauncher.html"/> </menu>

1 0

r132 - in trunk: nuiton-struts2/src/main/java/org/nuiton/web/struts2/filter nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor nuiton-web nuiton-web/src/main/java/org/nuiton/web nuiton-web/src/main/java/org/nuiton/web/filter
by tchemit＠users.nuiton.org 09 Nov '11

09 Nov '11

Author: tchemit Date: 2011-11-09 16:54:16 +0100 (Wed, 09 Nov 2011) New Revision: 132 Url: http://nuiton.org/repositories/revision/nuiton-web/132 Log: Evolution #1800: Introduce a new neutral TopiaTransactionFilter Added: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/ trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/filter/CloseTopiaTransactionFilter.java trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/OpenTopiaTransactionInterceptor.java trunk/nuiton-web/pom.xml Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/filter/CloseTopiaTransactionFilter.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/filter/CloseTopiaTransactionFilter.java 2011-10-31 10:39:08 UTC (rev 131) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/filter/CloseTopiaTransactionFilter.java 2011-11-09 15:54:16 UTC (rev 132) @@ -49,7 +49,9 @@ * * @since 1.5 * @author bleny + * @deprecated since 1.6, prefer use the neutral filter org.nuiton.web.filter.TopiaTransactionFilter from nuiton-web module */ +@Deprecated public class CloseTopiaTransactionFilter implements Filter { /** Logger. */ Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/OpenTopiaTransactionInterceptor.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/OpenTopiaTransactionInterceptor.java 2011-10-31 10:39:08 UTC (rev 131) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/OpenTopiaTransactionInterceptor.java 2011-11-09 15:54:16 UTC (rev 132) @@ -86,7 +86,9 @@ * @author tchemit <chemit(a)codelutin.com> * @author bleny <leny(a)codelutin.com> * @since 1.5 + * @deprecated since 1.6, prefer use the neutral filter org.nuiton.web.filter.TopiaTransactionFilter from nuiton-web module */ +@Deprecated public abstract class OpenTopiaTransactionInterceptor extends AbstractInterceptor { /** Logger. */ Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2011-10-31 10:39:08 UTC (rev 131) +++ trunk/nuiton-web/pom.xml 2011-11-09 15:54:16 UTC (rev 132) @@ -32,6 +32,12 @@ <scope>provided</scope> </dependency> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> Added: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java =================================================================== --- trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java (rev 0) +++ trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java 2011-11-09 15:54:16 UTC (rev 132) @@ -0,0 +1,349 @@ +/* + * #%L + * Nuiton Web :: Nuiton Web + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.web.filter; + +import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.TopiaRuntimeException; +import org.nuiton.topia.framework.TopiaContextImplementor; + +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import java.io.IOException; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + +/** + * <h2>Purpose of this filter</h2> + * This filter purpose is to inject in the request a transaction from + * {@link TopiaContext} and deal with the complete lifecycle of a topia + * transaction while a request. + * <p/> + * The injected transaction will be closed (if was really opened) at the end of + * the request. + * <h2>Configuration of the filter</h2> + * The filter accepts two configuration parameters: + * <ul> + * <li>{@code excludeMethods}: This parameters configure a set of method names + * which should never be called on the proxied transaction. + * When a such method is called on the transaction then the filter will pass in + * the hook {@link #onExcludeMethod(Object, Method, Object[])}. + * <p/> + * Default implementation of this hook is to throw an exception. + * </li> + * <li>{@code unusedMethods}: This parameters configure a set of method names + * which should be by-pass when the proxied transaction was not still open (via a {@link TopiaContext#beginTransaction()}. + * When a such method is called on the transaction then the filter will pass in + * the hook {@link #onUnusedMethod(Object, Method, Object[])}. + * <p/> + * Default implementation of this hook is to not return null values. + * </li> + * </ul> + * <h2>Obtain the transaction</h2> + * The (proxied) transaction is pushed as an attribute in the servlet request. + * <p/> + * The attribute name is {@link #TOPIA_TRANSACTION_REQUEST_ATTRIBUTE}. + * <p/> + * A convience method is created here to obtain the transaction {@link #getTransaction(ServletRequest)} : + * <pre> + * TopiaContext tx = TopiaTransactionFilter.getTransaction(ServletRequest); + * </pre> + * <p/> + * If you prefer to not use this nice method, you can also do this: + * <pre> + * TopiaContext tx = (TopiaContext) request.getAttribute(TopiaTransactionFilter#TOPIA_TRANSACTION_REQUEST_ATTRIBUTE); + * </pre> + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.6 + */ +public abstract class TopiaTransactionFilter implements Filter { + + public static final String TOPIA_TRANSACTION_REQUEST_ATTRIBUTE = + "topiaTransaction"; + + public static final String[] DEFAULT_EXCLUDE_METHODS = { + "beginTransaction", + "closeContext", + "clear" + }; + + public static final String[] DEFAULT_UNUSED_METHODS = { + "toString", + "isClosed", + "closeContext", + "clear", + "equals", + "hashCode", + "finalize", + "getClass" + }; + + /** Logger. */ + private static final Log log = + LogFactory.getLog(TopiaTransactionFilter.class); + + /** names of methods to forbid access while using proxy. */ + protected Set<String> excludeMethods; + + /** names of methods to by-pass if no transaction opened on proxy. */ + protected Set<String> unusedMethods; + + public Set<String> getExcludeMethods() { + return excludeMethods; + } + + public Set<String> getUnusedMethods() { + return unusedMethods; + } + + public static TopiaContext getTransaction(ServletRequest request) { + TopiaContext topiaContext = (TopiaContext) + request.getAttribute(TOPIA_TRANSACTION_REQUEST_ATTRIBUTE); + return topiaContext; + } + + /** + * Method to open a new transaction. + * + * @return the new freshly opened transaction + * @throws TopiaRuntimeException if any problem while opening a new transaction + */ + protected abstract TopiaContext beginTransaction() throws TopiaRuntimeException; + + @Override + public void destroy() { + } + + @Override + public void init(FilterConfig filterConfig) throws ServletException { + String methodsFromConfig; + + methodsFromConfig = filterConfig.getInitParameter("execludeMethods"); + + String[] methods; + if (StringUtils.isNotEmpty(methodsFromConfig)) { + methods = methodsFromConfig.split(","); + } else { + methods = DEFAULT_EXCLUDE_METHODS; + } + excludeMethods = new HashSet<String>(Arrays.asList(methods)); + + methodsFromConfig = + filterConfig.getInitParameter("unusedMethods "); + + if (StringUtils.isNotEmpty(methodsFromConfig)) { + methods = methodsFromConfig.split(","); + } else { + methods = DEFAULT_UNUSED_METHODS; + } + unusedMethods = new HashSet<String>(Arrays.asList(methods)); + } + + @Override + public void doFilter(ServletRequest request, + ServletResponse response, + FilterChain chain) throws IOException, ServletException { + + // creates a proxy of a lazy transaction + + TopiaTransactionProxyInvocationHandler proxyInvocationHandler = + new TopiaTransactionProxyInvocationHandler(); + + TopiaContext proxy = (TopiaContext) Proxy.newProxyInstance( + getClass().getClassLoader(), + new Class<?>[]{TopiaContext.class, + TopiaContextImplementor.class}, + proxyInvocationHandler + ); + request.setAttribute(TOPIA_TRANSACTION_REQUEST_ATTRIBUTE, proxy); + try { + chain.doFilter(request, response); + } finally { + proxyInvocationHandler.closeTransaction(); + } + } + + /** + * Hook method called when a method with his name in + * {@link #excludeMethods} was invoked on the proxied transaction. + * + * @param proxy proxied transaction + * @param method method invoked + * @param args arguments of the invoked method + * @return the return code of the method + * @throws Throwable if any error to do. + */ + protected Object onExcludeMethod(Object proxy, + Method method, + Object[] args) throws Throwable { + + // not authorized + throw new IllegalAccessException( + "Not allowed to access method " + method.getName() + " on " + + proxy); + } + + /** + * Hook method called when a method with his name in + * {@link #unusedMethods} was invoked on the proxied transaction + * while the underlying transaction is still not opened. + * + * @param proxy proxied transaction + * @param method method invoked + * @param args arguments of the invoked method + * @return the return code of the method + * @throws Throwable if any error to do. + */ + protected Object onUnusedMethod(Object proxy, + Method method, + Object[] args) throws Throwable { + + // by-pass method since no transaction found + + String methodName = method.getName(); + if (log.isDebugEnabled()) { + log.debug("Skip execution of method " + methodName + + " since no transaction is instanciated."); + } + + Set<String> methods = getUnusedMethods(); + if (methods.contains("toString")) { + + return "No transaction opened for proxy " + proxy; + } + + if (methods.contains("isClosed")) { + + return false; + } + + if (methods.contains("equals")) { + + return false; + } + + if (methods.contains("hashCode")) { + + return 0; + } + + if (methods.contains("getClass")) { + + return TopiaContext.class; + } + + return null; + } + + /** + * Handler of a proxy on a {@link TopiaContext}. + * + * @see #excludeMethods + */ + public class TopiaTransactionProxyInvocationHandler implements InvocationHandler { + + /** Target to use for the proxy. */ + protected TopiaContext transaction; + + @Override + public Object invoke(Object proxy, + Method method, + Object[] args) throws Throwable { + + String methodName = method.getName(); + + if (getExcludeMethods().contains(methodName)) { + + Object result = onExcludeMethod(proxy, method, args); + return result; + } + + if (transaction == null) { + + if (log.isTraceEnabled()) { + log.trace("transaction started due to a call to " + methodName); + } + + if (getUnusedMethods().contains(methodName)) { + + Object result = onUnusedMethod(proxy, method, args); + return result; + } + + // first time transaction is required, create its + transaction = beginTransaction(); + + if (log.isDebugEnabled()) { + log.debug("Open transaction " + transaction); + } + } + + // can invoke the method on the transaction + try { + Object result = method.invoke(transaction, args); + return result; + } catch (Exception eee) { + if (log.isErrorEnabled()) { + log.error("Could not execute method " + method.getName(), eee); + } + throw eee; + } + } + + protected void closeTransaction() { + if (transaction == null) { + if (log.isTraceEnabled()) { + log.trace("no transaction to close"); + } + } else if (transaction.isClosed()) { + if (log.isTraceEnabled()) { + log.trace("transaction " + transaction + " is already closed"); + } + } else { + if (log.isDebugEnabled()) { + log.debug("closing transaction " + transaction); + } + try { + transaction.closeContext(); + } catch (TopiaException e) { + throw new TopiaRuntimeException(e); + } + } + } + } + +} Property changes on: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0