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

r71 - trunk
by tchemit＠users.nuiton.org May 14, 2011

May 14, 2011

Author: tchemit Date: 2011-05-14 13:45:06 +0200 (Sat, 14 May 2011) New Revision: 71 Url: http://nuiton.org/repositories/revision/nuiton-web/71 Log: Update mavenpom4redmineAndCentral to 2.5.4. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-11 10:20:20 UTC (rev 70) +++ trunk/pom.xml 2011-05-14 11:45:06 UTC (rev 71) @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -12,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.5.3</version> + <version>2.5.4</version> </parent> <groupId>org.nuiton.web</groupId>

1 0

r70 - trunk/nuiton-struts2
by tchemit＠users.nuiton.org May 11, 2011

May 11, 2011

Author: tchemit Date: 2011-05-11 12:20:20 +0200 (Wed, 11 May 2011) New Revision: 70 Url: http://nuiton.org/repositories/revision/nuiton-web/70 Log: optimize dependencies Modified: trunk/nuiton-struts2/pom.xml Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2011-05-11 08:07:46 UTC (rev 69) +++ trunk/nuiton-struts2/pom.xml 2011-05-11 10:20:20 UTC (rev 70) @@ -30,6 +30,11 @@ </dependency> <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency>

1 0

r69 - in trunk: . nuiton-struts2/src/license nuiton-struts2/src/main/java/org/nuiton/web/struts2
by tchemit＠users.nuiton.org May 11, 2011

May 11, 2011

Author: tchemit Date: 2011-05-11 10:07:46 +0200 (Wed, 11 May 2011) New Revision: 69 Url: http://nuiton.org/repositories/revision/nuiton-web/69 Log: fix plugin version updates to struts2 2.2.3 Modified: trunk/nuiton-struts2/src/license/THIRD-PARTY.properties trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/BaseAction.java trunk/pom.xml Modified: trunk/nuiton-struts2/src/license/THIRD-PARTY.properties =================================================================== --- trunk/nuiton-struts2/src/license/THIRD-PARTY.properties 2011-05-10 21:36:26 UTC (rev 68) +++ trunk/nuiton-struts2/src/license/THIRD-PARTY.properties 2011-05-11 08:07:46 UTC (rev 69) @@ -2,13 +2,16 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License -# - BSD-style license # - Common Public License Version 1.0 -# - MIT License # - The Apache Software License, Version 2.0 +# - http://asm.ow2.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Tue May 10 16:16:41 CEST 2011 -ognl--ognl--3.0--jar=The Apache Software License, Version 2.0 +#Wed May 11 10:01:56 CEST 2011 +asm--asm--3.1--jar=http\://asm.ow2.org/license.html +asm--asm-commons--3.1--jar=http\://asm.ow2.org/license.html +asm--asm-tree--3.1--jar=http\://asm.ow2.org/license.html +javassist--javassist--3.11.0.GA--jar=Lesser General Public License (LGPL) v 2.1 +ognl--ognl--3.0.1--jar=The Apache Software License, Version 2.0 Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/BaseAction.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/BaseAction.java 2011-05-10 21:36:26 UTC (rev 68) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/BaseAction.java 2011-05-11 08:07:46 UTC (rev 69) @@ -26,7 +26,7 @@ import com.opensymphony.xwork2.ActionSupport; import com.opensymphony.xwork2.util.ValueStack; -import org.apache.commons.lang.xwork.StringUtils; +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -76,7 +76,7 @@ } @Override - public String getText(String aTextName, List<Object> args) { + public String getText(String aTextName, List<?> args) { String value = super.getText(aTextName, args); return getSafeText(aTextName, value); } @@ -88,7 +88,7 @@ } @Override - public String getText(String aTextName, String defaultValue, List<Object> args) { + public String getText(String aTextName, String defaultValue, List<?> args) { String value = super.getText(aTextName, defaultValue, args); return getSafeText(aTextName, value); } @@ -100,7 +100,7 @@ } @Override - public String getText(String key, String defaultValue, List<Object> args, ValueStack stack) { + public String getText(String key, String defaultValue, List<?> args, ValueStack stack) { String value = super.getText(key, defaultValue, args, stack); return getSafeText(key, value); } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-10 21:36:26 UTC (rev 68) +++ trunk/pom.xml 2011-05-11 08:07:46 UTC (rev 69) @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -42,8 +44,8 @@ <artifactId>jetty-webapp</artifactId> <version>7.1.0.v20100505</version> </dependency> - -  + +  <dependency> <groupId>org.apache.tapestry</groupId> <artifactId>tapestry-core</artifactId> @@ -81,7 +83,7 @@ <scope>runtime</scope> </dependency> -  +  <dependency> <groupId>org.jdom</groupId> <artifactId>jdom</artifactId> @@ -107,7 +109,7 @@ <version>2.5</version> <scope>provided</scope> </dependency> - +  <dependency> <groupId>com.google.gwt</groupId> @@ -205,6 +207,8 @@  <projectId>nuiton-web</projectId> + <nuitonI18nPluginVersion>2.4-SNAPSHOT</nuitonI18nPluginVersion> +  <tapestryVersion>5.2.4</tapestryVersion> <slf4jVersion>1.6.1</slf4jVersion> @@ -214,7 +218,7 @@ <gwtPluginVersion>2.1.0-1</gwtPluginVersion>  - <struts2Version>2.2.1.1</struts2Version> + <struts2Version>2.2.3</struts2Version>  <siteLocales>en,fr</siteLocales> @@ -230,7 +234,7 @@ <url>${our.site.repository}/${projectId}</url> </site> </distributionManagement> - + <build> <pluginManagement> @@ -246,6 +250,19 @@ </dependency> </dependencies> </plugin> + + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>${nuitonI18nPluginVersion}</version> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>gwt-maven-plugin</artifactId> + <version>${gwtPluginVersion}</version> + </plugin> + </plugins> </pluginManagement>

1 0

r68 - trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor
by tchemit＠users.nuiton.org May 10, 2011

May 10, 2011

Author: tchemit Date: 2011-05-10 23:36:26 +0200 (Tue, 10 May 2011) New Revision: 68 Url: http://nuiton.org/repositories/revision/nuiton-web/68 Log: remove unused interceptor Removed: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/DownloadInterceptor.java Deleted: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/DownloadInterceptor.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/DownloadInterceptor.java 2011-05-10 14:34:24 UTC (rev 67) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/DownloadInterceptor.java 2011-05-10 21:36:26 UTC (rev 68) @@ -1,109 +0,0 @@ -/* - * #%L - * Nuiton Web :: Nuiton Struts 2 - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2010 - 2011 CodeLutin, Tony Chemit - * %% - * 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.struts2.interceptor; - -import com.opensymphony.xwork2.ActionInvocation; -import com.opensymphony.xwork2.interceptor.AbstractInterceptor; -import com.opensymphony.xwork2.util.reflection.ReflectionProvider; -import com.opensymphony.xwork2.util.reflection.ReflectionProviderFactory; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import java.io.InputStream; -import java.lang.reflect.Method; - -/** - * A interceptor to download a stream. - * <p/> - * The main purpose of this one is to clean nicely the incoming stream. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.1 - */ -public class DownloadInterceptor extends AbstractInterceptor { - - /** Logger. */ - private static final Log log = LogFactory.getLog(DownloadInterceptor.class); - - private static final long serialVersionUID = 1L; - - /** - * Name of the field containing the stream in the action. - * <p/> - * By default, use as in result of type stream the value - * {@code inputStream}. - */ - protected String inputName = "inputStream"; - - public void setInputName(String inputName) { - this.inputName = inputName; - } - - @Override - public void init() { - super.init(); - if (log.isInfoEnabled()) { - log.info("Init interceptor..."); - } - } - - @Override - public String intercept(ActionInvocation invocation) throws Exception { - - Object action = invocation.getAction(); - - ReflectionProvider reflectionProvider = - ReflectionProviderFactory.getInstance(); - - Method getMethod; - - try { - getMethod = reflectionProvider.getGetMethod(action.getClass(), inputName); - } catch (Exception e) { - throw new IllegalStateException("Could not find field accessor for property name " + inputName + " in action " + action.getClass()); - } - - if (!InputStream.class.isAssignableFrom(getMethod.getReturnType())) { - throw new IllegalStateException("field for property name " + inputName + " in action " + action.getClass() + " is not a InputStream, but " + getMethod.getReturnType().getName()); - } - - try { - // let's invoke action and rest of interceptors - String invoke = invocation.invoke(); - return invoke; - } finally { - - InputStream inputStream = (InputStream) getMethod.invoke(action); - - if (log.isDebugEnabled()) { - log.debug("Will close inputStream " + inputStream); - } - // do close the input stream... - inputStream.close(); - } - - } -}

1 0

r67 - in trunk: . nuiton-struts2 nuiton-struts2/src nuiton-struts2/src/license nuiton-struts2/src/main nuiton-struts2/src/main/java nuiton-struts2/src/main/java/org nuiton-struts2/src/main/java/org/nuiton nuiton-struts2/src/main/java/org/nuiton/web nuiton-struts2/src/main/java/org/nuiton/web/struts2 nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor
by tchemit＠users.nuiton.org May 10, 2011

May 10, 2011

Author: tchemit Date: 2011-05-10 16:34:24 +0200 (Tue, 10 May 2011) New Revision: 67 Url: http://nuiton.org/repositories/revision/nuiton-web/67 Log: Evolution #1430: Add a struts2 module Added: trunk/nuiton-struts2/ trunk/nuiton-struts2/LICENSE.txt trunk/nuiton-struts2/README.txt trunk/nuiton-struts2/changelog.txt trunk/nuiton-struts2/pom.xml trunk/nuiton-struts2/src/ trunk/nuiton-struts2/src/license/ trunk/nuiton-struts2/src/license/THIRD-PARTY.properties trunk/nuiton-struts2/src/main/ trunk/nuiton-struts2/src/main/java/ trunk/nuiton-struts2/src/main/java/org/ trunk/nuiton-struts2/src/main/java/org/nuiton/ trunk/nuiton-struts2/src/main/java/org/nuiton/web/ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/BaseAction.java trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/DownloadInterceptor.java trunk/nuiton-struts2/src/main/resources/ Modified: trunk/pom.xml Property changes on: trunk/nuiton-struts2 ___________________________________________________________________ Added: svn:ignore + target *.ipr *.iws *.iml .project .classpath .settings *.log nbactions.xml Added: trunk/nuiton-struts2/LICENSE.txt =================================================================== --- trunk/nuiton-struts2/LICENSE.txt (rev 0) +++ trunk/nuiton-struts2/LICENSE.txt 2011-05-10 14:34:24 UTC (rev 67) @@ -0,0 +1,166 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. + Property changes on: trunk/nuiton-struts2/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-struts2/README.txt =================================================================== --- trunk/nuiton-struts2/README.txt (rev 0) +++ trunk/nuiton-struts2/README.txt 2011-05-10 14:34:24 UTC (rev 67) @@ -0,0 +1 @@ + Property changes on: trunk/nuiton-struts2/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-struts2/changelog.txt =================================================================== --- trunk/nuiton-struts2/changelog.txt (rev 0) +++ trunk/nuiton-struts2/changelog.txt 2011-05-10 14:34:24 UTC (rev 67) @@ -0,0 +1,2 @@ +Please refer to the release note : + http://maven-site.nuiton.org/nuiton-tapestry/changes-report.html \ No newline at end of file Property changes on: trunk/nuiton-struts2/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml (rev 0) +++ trunk/nuiton-struts2/pom.xml 2011-05-10 14:34:24 UTC (rev 67) @@ -0,0 +1,64 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + + <parent> + <groupId>org.nuiton.web</groupId> + <artifactId>nuiton-web-parent</artifactId> + <version>1.1-SNAPSHOT</version> + </parent> + + <artifactId>nuiton-struts2</artifactId> + + <dependencies> + +  + + <dependency> + <groupId>org.apache.struts.xwork</groupId> + <artifactId>xwork-core</artifactId> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + + </dependencies> + +  +  +  + + <name>Nuiton Web :: Nuiton Struts 2</name> + <description>Extra classes for Struts 2 based applications</description> + +  +  +  + + <packaging>jar</packaging> + + + <build> + <plugins> + + </plugins> + </build> + +</project> Property changes on: trunk/nuiton-struts2/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-struts2/src/license/THIRD-PARTY.properties =================================================================== --- trunk/nuiton-struts2/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/nuiton-struts2/src/license/THIRD-PARTY.properties 2011-05-10 14:34:24 UTC (rev 67) @@ -0,0 +1,14 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - BSD License +# - BSD-style license +# - Common Public License Version 1.0 +# - MIT License +# - The Apache Software License, Version 2.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Tue May 10 16:16:41 CEST 2011 +ognl--ognl--3.0--jar=The Apache Software License, Version 2.0 Property changes on: trunk/nuiton-struts2/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/BaseAction.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/BaseAction.java (rev 0) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/BaseAction.java 2011-05-10 14:34:24 UTC (rev 67) @@ -0,0 +1,124 @@ +/* + * #%L + * Nuiton Web :: Nuiton Struts 2 + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 CodeLutin, Tony Chemit + * %% + * 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.struts2; + +import com.opensymphony.xwork2.ActionSupport; +import com.opensymphony.xwork2.util.ValueStack; +import org.apache.commons.lang.xwork.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.util.Arrays; +import java.util.List; + +/** + * Base action to use for a better usage of I18n. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.1 + */ +public class BaseAction extends ActionSupport { + + private static final long serialVersionUID = 1L; + + public static final String UNTRANSLATED_MARKER = "???"; + + private static final Log log = LogFactory.getLog(BaseAction.class); + + public String _(String aTextName) { + String value = getText(aTextName); + return value; + } + + public String _(String key, Object... args) { + String value = getText(key, Arrays.asList(args)); + return value; + } + + @Override + public String getText(String aTextName) { + String value = super.getText(aTextName); + return getSafeText(aTextName, value); + } + + @Override + public String getText(String aTextName, String defaultValue) { + String value = super.getText(aTextName, defaultValue); + return getSafeText(aTextName, value); + } + + @Override + public String getText(String aTextName, String defaultValue, String obj) { + String value = super.getText(aTextName, defaultValue, obj); + return getSafeText(aTextName, value); + } + + @Override + public String getText(String aTextName, List<Object> args) { + String value = super.getText(aTextName, args); + return getSafeText(aTextName, value); + } + + @Override + public String getText(String key, String[] args) { + String value = super.getText(key, args); + return getSafeText(key, value); + } + + @Override + public String getText(String aTextName, String defaultValue, List<Object> args) { + String value = super.getText(aTextName, defaultValue, args); + return getSafeText(aTextName, value); + } + + @Override + public String getText(String key, String defaultValue, String[] args) { + String value = super.getText(key, defaultValue, args); + return getSafeText(key, value); + } + + @Override + public String getText(String key, String defaultValue, List<Object> args, ValueStack stack) { + String value = super.getText(key, defaultValue, args, stack); + return getSafeText(key, value); + } + + @Override + public String getText(String key, String defaultValue, String[] args, ValueStack stack) { + String value = super.getText(key, defaultValue, args, stack); + return getSafeText(key, value); + } + + protected String getSafeText(String key, String value) { + if (StringUtils.isEmpty(value)) { + if (log.isWarnEnabled()) { + log.warn("Key [" + key + "] is not translated"); + } + return UNTRANSLATED_MARKER + key + UNTRANSLATED_MARKER; + } + return value; + } + +} Property changes on: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/BaseAction.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/DownloadInterceptor.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/DownloadInterceptor.java (rev 0) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/DownloadInterceptor.java 2011-05-10 14:34:24 UTC (rev 67) @@ -0,0 +1,109 @@ +/* + * #%L + * Nuiton Web :: Nuiton Struts 2 + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 CodeLutin, Tony Chemit + * %% + * 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.struts2.interceptor; + +import com.opensymphony.xwork2.ActionInvocation; +import com.opensymphony.xwork2.interceptor.AbstractInterceptor; +import com.opensymphony.xwork2.util.reflection.ReflectionProvider; +import com.opensymphony.xwork2.util.reflection.ReflectionProviderFactory; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.io.InputStream; +import java.lang.reflect.Method; + +/** + * A interceptor to download a stream. + * <p/> + * The main purpose of this one is to clean nicely the incoming stream. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.1 + */ +public class DownloadInterceptor extends AbstractInterceptor { + + /** Logger. */ + private static final Log log = LogFactory.getLog(DownloadInterceptor.class); + + private static final long serialVersionUID = 1L; + + /** + * Name of the field containing the stream in the action. + * <p/> + * By default, use as in result of type stream the value + * {@code inputStream}. + */ + protected String inputName = "inputStream"; + + public void setInputName(String inputName) { + this.inputName = inputName; + } + + @Override + public void init() { + super.init(); + if (log.isInfoEnabled()) { + log.info("Init interceptor..."); + } + } + + @Override + public String intercept(ActionInvocation invocation) throws Exception { + + Object action = invocation.getAction(); + + ReflectionProvider reflectionProvider = + ReflectionProviderFactory.getInstance(); + + Method getMethod; + + try { + getMethod = reflectionProvider.getGetMethod(action.getClass(), inputName); + } catch (Exception e) { + throw new IllegalStateException("Could not find field accessor for property name " + inputName + " in action " + action.getClass()); + } + + if (!InputStream.class.isAssignableFrom(getMethod.getReturnType())) { + throw new IllegalStateException("field for property name " + inputName + " in action " + action.getClass() + " is not a InputStream, but " + getMethod.getReturnType().getName()); + } + + try { + // let's invoke action and rest of interceptors + String invoke = invocation.invoke(); + return invoke; + } finally { + + InputStream inputStream = (InputStream) getMethod.invoke(action); + + if (log.isDebugEnabled()) { + log.debug("Will close inputStream " + inputStream); + } + // do close the input stream... + inputStream.close(); + } + + } +} Property changes on: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/DownloadInterceptor.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-11 08:46:27 UTC (rev 66) +++ trunk/pom.xml 2011-05-10 14:34:24 UTC (rev 67) @@ -19,6 +19,7 @@ <modules> <module>nuiton-web</module> + <module>nuiton-struts2</module> <module>nuiton-tapestry</module> <module>nuiton-rss</module> <module>nuiton-gwt</module> @@ -115,6 +116,37 @@ <scope>provided</scope> </dependency> +  + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-core</artifactId> + <version>${struts2Version}</version> + </dependency> + + <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-dojo-plugin</artifactId> + <version>${struts2Version}</version> + </dependency> + + <dependency> + <groupId>com.jgeppert.struts2.jquery</groupId> + <artifactId>struts2-jquery-plugin</artifactId> + <version>2.5.0</version> + </dependency> + + <dependency> + <groupId>org.apache.struts.xwork</groupId> + <artifactId>xwork-core</artifactId> + <version>${struts2Version}</version> + <exclusions> + <exclusion> + <groupId>org.springframework</groupId> + <artifactId>spring-test</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> </dependencyManagement> @@ -181,6 +213,9 @@ <gwtVersion>2.1.0</gwtVersion> <gwtPluginVersion>2.1.0-1</gwtPluginVersion> +  + <struts2Version>2.2.1.1</struts2Version> +  <siteLocales>en,fr</siteLocales>

1 0

r66 - trunk
by tchemit＠users.nuiton.org April 11, 2011

April 11, 2011

Author: tchemit Date: 2011-04-11 10:46:27 +0200 (Mon, 11 Apr 2011) New Revision: 66 Url: http://nuiton.org/repositories/revision/nuiton-web/66 Log: Update mavenpom4redmineAndCentral to 2.5.3. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-03-23 12:03:49 UTC (rev 65) +++ trunk/pom.xml 2011-04-11 08:46:27 UTC (rev 66) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.5.2</version> + <version>2.5.3</version> </parent> <groupId>org.nuiton.web</groupId>

1 0

r65 - trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table
by jcouteau＠users.nuiton.org March 23, 2011

March 23, 2011

Author: jcouteau Date: 2011-03-23 13:03:49 +0100 (Wed, 23 Mar 2011) New Revision: 65 Url: http://nuiton.org/repositories/revision/nuiton-web/65 Log: Evolution #1418: Allow to put HTML strings in tables Modified: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/FlexTableWithModel.java trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/SortableFlexTableWithModel.java Modified: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/FlexTableWithModel.java =================================================================== --- trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/FlexTableWithModel.java 2011-03-22 15:50:33 UTC (rev 64) +++ trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/FlexTableWithModel.java 2011-03-23 12:03:49 UTC (rev 65) @@ -108,9 +108,9 @@ if (value instanceof Widget) { setWidget(row+1, col, (Widget) value); } else if (value == null) { - setText(row+1, col, ""); + setHTML(row+1, col, ""); } else { - setText(row+1, col, value.toString()); + setHTML(row+1, col, value.toString()); } } Modified: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/SortableFlexTableWithModel.java =================================================================== --- trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/SortableFlexTableWithModel.java 2011-03-22 15:50:33 UTC (rev 64) +++ trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/SortableFlexTableWithModel.java 2011-03-23 12:03:49 UTC (rev 65) @@ -114,9 +114,9 @@ if (value instanceof Widget) { setWidget(row + 1, col, (Widget) value); } else if (value == null) { - setText(row + 1, col, ""); + setHTML(row + 1, col, ""); } else { - setText(row + 1, col, value.toString()); + setHTML(row + 1, col, value.toString()); } }

1 0

r64 - trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table
by jcouteau＠users.nuiton.org March 22, 2011

March 22, 2011

Author: jcouteau Date: 2011-03-22 16:50:33 +0100 (Tue, 22 Mar 2011) New Revision: 64 Url: http://nuiton.org/repositories/revision/nuiton-web/64 Log: Anomalie #1412: SortableFlexTable does not display last column Modified: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/SortableFlexTableWithModel.java Modified: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/SortableFlexTableWithModel.java =================================================================== --- trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/SortableFlexTableWithModel.java 2011-03-12 14:21:48 UTC (rev 63) +++ trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/table/SortableFlexTableWithModel.java 2011-03-22 15:50:33 UTC (rev 64) @@ -91,7 +91,7 @@ } } } else { - for (int i = firstColumn; i < lastColumn; i++) { + for (int i = firstColumn; i <= lastColumn; i++) { if (firstRow == lastRow) { Object value = model.getValueAt(i, firstRow);

1 0

r63 - trunk
by tchemit＠users.nuiton.org March 12, 2011

March 12, 2011

Author: tchemit Date: 2011-03-12 15:21:48 +0100 (Sat, 12 Mar 2011) New Revision: 63 Url: http://nuiton.org/repositories/revision/nuiton-web/63 Log: Update mavenpom4redmineAndCentral to 2.5.2. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-03-10 09:38:54 UTC (rev 62) +++ trunk/pom.xml 2011-03-12 14:21:48 UTC (rev 63) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.5.1</version> + <version>2.5.2</version> </parent> <groupId>org.nuiton.web</groupId>

1 0

r62 - in trunk/nuiton-gwt/src/main: java/org/nuiton/web/gwt/messages resources/i18n
by jcouteau＠users.nuiton.org March 10, 2011

March 10, 2011

Author: jcouteau Date: 2011-03-10 10:38:54 +0100 (Thu, 10 Mar 2011) New Revision: 62 Url: http://nuiton.org/repositories/revision/nuiton-web/62 Log: Fix old i18n key Modified: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/messages/UIMessages.java trunk/nuiton-gwt/src/main/resources/i18n/nuiton-gwt_en_GB.properties trunk/nuiton-gwt/src/main/resources/i18n/nuiton-gwt_fr_FR.properties Modified: trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/messages/UIMessages.java =================================================================== --- trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/messages/UIMessages.java 2011-03-09 11:08:06 UTC (rev 61) +++ trunk/nuiton-gwt/src/main/java/org/nuiton/web/gwt/messages/UIMessages.java 2011-03-10 09:38:54 UTC (rev 62) @@ -29,6 +29,6 @@ */ public interface UIMessages extends Messages { - @Key("refcomp.loading") + @Key("nuiton.gwt.loading") String loading(); } \ No newline at end of file Modified: trunk/nuiton-gwt/src/main/resources/i18n/nuiton-gwt_en_GB.properties =================================================================== --- trunk/nuiton-gwt/src/main/resources/i18n/nuiton-gwt_en_GB.properties 2011-03-09 11:08:06 UTC (rev 61) +++ trunk/nuiton-gwt/src/main/resources/i18n/nuiton-gwt_en_GB.properties 2011-03-10 09:38:54 UTC (rev 62) @@ -1 +1 @@ -refcomp.loading=Loading, please wait +nuiton.gwt.loading=Loading, please wait Modified: trunk/nuiton-gwt/src/main/resources/i18n/nuiton-gwt_fr_FR.properties =================================================================== --- trunk/nuiton-gwt/src/main/resources/i18n/nuiton-gwt_fr_FR.properties 2011-03-09 11:08:06 UTC (rev 61) +++ trunk/nuiton-gwt/src/main/resources/i18n/nuiton-gwt_fr_FR.properties 2011-03-10 09:38:54 UTC (rev 62) @@ -1 +1 @@ -refcomp.loading=Chargement, veuillez patienter +nuiton.gwt.loading=Chargement, veuillez patienter

1 0