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

r319 - in tags/nuiton-web-1.2: . trunk
by tchemit＠users.nuiton.org March 17, 2014

March 17, 2014

Author: tchemit Date: 2014-03-17 17:17:14 +0100 (Mon, 17 Mar 2014) New Revision: 319 Url: http://forge.nuiton.org/projects/nuiton-web/repository/revisions/319 Log: [maven-release-plugin] copy for tag nuiton-web-1.2 Added: tags/nuiton-web-1.2/trunk/ Property changes on: tags/nuiton-web-1.2/trunk ___________________________________________________________________ Added: svn:ignore + target *.ipr *.iws *.iml .project .classpath .settings *.log nbactions.xml Added: svn:mergeinfo + /branches/nuiton-web-1.11-security:210-222

1 0

r318 - in trunk: . nuiton-gwt nuiton-rss nuiton-security nuiton-struts2 nuiton-tapestry nuiton-web
by tchemit＠users.nuiton.org March 17, 2014

March 17, 2014

Author: tchemit Date: 2014-03-17 17:17:08 +0100 (Mon, 17 Mar 2014) New Revision: 318 Url: http://forge.nuiton.org/projects/nuiton-web/repository/revisions/318 Log: [maven-release-plugin] prepare release nuiton-web-1.2 Modified: trunk/nuiton-gwt/pom.xml trunk/nuiton-rss/pom.xml trunk/nuiton-security/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 2014-03-17 16:15:29 UTC (rev 317) +++ trunk/nuiton-gwt/pom.xml 2014-03-17 16:17:08 UTC (rev 318) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-SNAPSHOT</version> + <version>1.2</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2014-03-17 16:15:29 UTC (rev 317) +++ trunk/nuiton-rss/pom.xml 2014-03-17 16:17:08 UTC (rev 318) @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-SNAPSHOT</version> + <version>1.2</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-security/pom.xml =================================================================== --- trunk/nuiton-security/pom.xml 2014-03-17 16:15:29 UTC (rev 317) +++ trunk/nuiton-security/pom.xml 2014-03-17 16:17:08 UTC (rev 318) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-SNAPSHOT</version> + <version>1.2</version> </parent> <artifactId>nuiton-security</artifactId> Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2014-03-17 16:15:29 UTC (rev 317) +++ trunk/nuiton-struts2/pom.xml 2014-03-17 16:17:08 UTC (rev 318) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-SNAPSHOT</version> + <version>1.2</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2014-03-17 16:15:29 UTC (rev 317) +++ trunk/nuiton-tapestry/pom.xml 2014-03-17 16:17:08 UTC (rev 318) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-SNAPSHOT</version> + <version>1.2</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2014-03-17 16:15:29 UTC (rev 317) +++ trunk/nuiton-web/pom.xml 2014-03-17 16:17:08 UTC (rev 318) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-SNAPSHOT</version> + <version>1.2</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-03-17 16:15:29 UTC (rev 317) +++ trunk/pom.xml 2014-03-17 16:17:08 UTC (rev 318) @@ -10,7 +10,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-SNAPSHOT</version> + <version>1.2</version> <packaging>pom</packaging> <name>Nuiton Web</name> @@ -71,11 +71,11 @@ </modules> <scm> - <connection>scm:svn:https://svn.nuiton.org/nuiton-web/trunk</connection> + <connection>scm:svn:https://svn.nuiton.org/nuiton-web/tags/nuiton-web-1.2</connection> <developerConnection> - scm:svn:https://svn.nuiton.org/nuiton-web/trunk + scm:svn:https://svn.nuiton.org/nuiton-web/tags/nuiton-web-1.2 </developerConnection> - <url>https://forge.nuiton.org/projects/nuiton-web/repository/show/trunk</url> + <url>https://forge.nuiton.org/projects/nuiton-web/repository/show/tags/nuiton-we…</url> </scm> <distributionManagement> <site>

1 0

r317 - in trunk: . nuiton-gwt nuiton-rss nuiton-security nuiton-struts2 nuiton-tapestry nuiton-web
by tchemit＠users.nuiton.org March 17, 2014

March 17, 2014

Author: tchemit Date: 2014-03-17 17:15:29 +0100 (Mon, 17 Mar 2014) New Revision: 317 Url: http://forge.nuiton.org/projects/nuiton-web/repository/revisions/317 Log: fix LICENSE text Modified: trunk/LICENSE.txt trunk/nuiton-gwt/LICENSE.txt trunk/nuiton-rss/LICENSE.txt trunk/nuiton-security/LICENSE.txt trunk/nuiton-struts2/LICENSE.txt trunk/nuiton-tapestry/LICENSE.txt trunk/nuiton-web/LICENSE.txt Modified: trunk/LICENSE.txt =================================================================== --- trunk/LICENSE.txt 2014-03-17 16:14:18 UTC (rev 316) +++ trunk/LICENSE.txt 2014-03-17 16:15:29 UTC (rev 317) @@ -10,7 +10,7 @@ the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. - 0. Additional Definitions. + 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 @@ -111,7 +111,7 @@ 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. + Version. e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the @@ -163,4 +163,3 @@ apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. - Modified: trunk/nuiton-gwt/LICENSE.txt =================================================================== --- trunk/nuiton-gwt/LICENSE.txt 2014-03-17 16:14:18 UTC (rev 316) +++ trunk/nuiton-gwt/LICENSE.txt 2014-03-17 16:15:29 UTC (rev 317) @@ -10,7 +10,7 @@ the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. - 0. Additional Definitions. + 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 @@ -111,7 +111,7 @@ 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. + Version. e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the @@ -163,4 +163,3 @@ apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. - Modified: trunk/nuiton-rss/LICENSE.txt =================================================================== --- trunk/nuiton-rss/LICENSE.txt 2014-03-17 16:14:18 UTC (rev 316) +++ trunk/nuiton-rss/LICENSE.txt 2014-03-17 16:15:29 UTC (rev 317) @@ -10,7 +10,7 @@ the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. - 0. Additional Definitions. + 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 @@ -111,7 +111,7 @@ 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. + Version. e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the @@ -163,4 +163,3 @@ apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. - Modified: trunk/nuiton-security/LICENSE.txt =================================================================== --- trunk/nuiton-security/LICENSE.txt 2014-03-17 16:14:18 UTC (rev 316) +++ trunk/nuiton-security/LICENSE.txt 2014-03-17 16:15:29 UTC (rev 317) @@ -10,7 +10,7 @@ the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. - 0. Additional Definitions. + 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 @@ -111,7 +111,7 @@ 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. + Version. e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the @@ -163,4 +163,3 @@ apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. - Modified: trunk/nuiton-struts2/LICENSE.txt =================================================================== --- trunk/nuiton-struts2/LICENSE.txt 2014-03-17 16:14:18 UTC (rev 316) +++ trunk/nuiton-struts2/LICENSE.txt 2014-03-17 16:15:29 UTC (rev 317) @@ -10,7 +10,7 @@ the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. - 0. Additional Definitions. + 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 @@ -111,7 +111,7 @@ 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. + Version. e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the @@ -163,4 +163,3 @@ apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. - Modified: trunk/nuiton-tapestry/LICENSE.txt =================================================================== --- trunk/nuiton-tapestry/LICENSE.txt 2014-03-17 16:14:18 UTC (rev 316) +++ trunk/nuiton-tapestry/LICENSE.txt 2014-03-17 16:15:29 UTC (rev 317) @@ -10,7 +10,7 @@ the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. - 0. Additional Definitions. + 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 @@ -111,7 +111,7 @@ 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. + Version. e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the @@ -163,4 +163,3 @@ apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. - Modified: trunk/nuiton-web/LICENSE.txt =================================================================== --- trunk/nuiton-web/LICENSE.txt 2014-03-17 16:14:18 UTC (rev 316) +++ trunk/nuiton-web/LICENSE.txt 2014-03-17 16:15:29 UTC (rev 317) @@ -10,7 +10,7 @@ the terms and conditions of version 3 of the GNU General Public License, supplemented by the additional permissions listed below. - 0. Additional Definitions. + 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 @@ -111,7 +111,7 @@ 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. + Version. e) Provide Installation Information, but only if you would otherwise be required to provide such information under section 6 of the @@ -163,4 +163,3 @@ apply, that proxy's public statement of acceptance of any version is permanent authorization for you to choose that version for the Library. -

1 0

r316 - trunk
by tchemit＠users.nuiton.org March 17, 2014

March 17, 2014

Author: tchemit Date: 2014-03-17 17:14:18 +0100 (Mon, 17 Mar 2014) New Revision: 316 Url: http://forge.nuiton.org/projects/nuiton-web/repository/revisions/316 Log: refs #3106 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-03-03 16:34:26 UTC (rev 315) +++ trunk/pom.xml 2014-03-17 16:14:18 UTC (rev 316) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>5.0</version> + <version>5.0.1</version> </parent> <groupId>org.nuiton.web</groupId>

1 0

r315 - trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/converters
by tchemit＠users.nuiton.org March 3, 2014

March 3, 2014

Author: tchemit Date: 2014-03-03 17:34:26 +0100 (Mon, 03 Mar 2014) New Revision: 315 Url: http://forge.nuiton.org/projects/nuiton-web/repository/revisions/315 Log: fix test Modified: trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/converters/LocalNumberConverterTest.java Modified: trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/converters/LocalNumberConverterTest.java =================================================================== --- trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/converters/LocalNumberConverterTest.java 2014-02-28 17:43:31 UTC (rev 314) +++ trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/converters/LocalNumberConverterTest.java 2014-03-03 16:34:26 UTC (rev 315) @@ -25,8 +25,6 @@ */ import org.junit.Assert; -import org.junit.Assume; -import org.junit.Ignore; import org.junit.Test; import java.text.DecimalFormatSymbols; @@ -45,7 +43,7 @@ @Test public void testConvertValue() { - Assume.assumeTrue(Locale.FRANCE.equals(Locale.getDefault())); + converter = new LocalNumberConverter(); DecimalFormatSymbols symbols = new DecimalFormatSymbols(Locale.getDefault()); @@ -336,12 +334,14 @@ Assert.assertEquals(12.36, convert("12.36", Double.class)); - Assert.assertEquals(1002.36, - convert("1 002.36", double.class)); + if (Character.isSpaceChar(groupingSeparator)) { - Assert.assertEquals(1002.36, - convert("1 002.36", Double.class)); + Assert.assertEquals(1002.36, + convert("1 002.36", double.class)); + Assert.assertEquals(1002.36, + convert("1 002.36", Double.class)); + } Assert.assertEquals(1002.36, convert("1002.36", double.class));

1 0

Build failed in Jenkins: nuiton-web-ci #3
by admin+ci-nuiton.org＠codelutin.com Feb. 28, 2014

Feb. 28, 2014

See <http://ci.nuiton.org/jenkins/job/nuiton-web-ci/3/changes> Changes: [bleny] fixes #3104 introduce JsonConverter and add json-plugin as provided ------------------------------------------ Started by an SCM change Building in workspace <http://ci.nuiton.org/jenkins/job/nuiton-web-ci/ws/> Reverting <http://ci.nuiton.org/jenkins/job/nuiton-web-ci/ws/trunk> to depth infinity with ignoreExternals: false Updating https://svn.nuiton.org/nuiton-web/trunk at revision '2014-02-28T11:00:50.842 +0100' A nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/JsonConverter.java U nuiton-struts2/pom.xml At revision 310 Parsing POMs ERROR: Failed to parse POMs org.apache.maven.project.ProjectBuildingException: Some problems were encountered while processing the POMs: [ERROR] 'dependencies.dependency.version' for org.apache.struts:struts2-json-plugin:jar is missing. @ line 23, column 17 at org.apache.maven.project.DefaultProjectBuilder.build(DefaultProjectBuilder.java:364) at hudson.maven.MavenEmbedder.buildProjects(MavenEmbedder.java:361) at hudson.maven.MavenEmbedder.readProjects(MavenEmbedder.java:331) at hudson.maven.MavenModuleSetBuild$PomParser.invoke(MavenModuleSetBuild.java:1284) at hudson.maven.MavenModuleSetBuild$PomParser.invoke(MavenModuleSetBuild.java:1081) at hudson.FilePath.act(FilePath.java:914) at hudson.FilePath.act(FilePath.java:887) at hudson.maven.MavenModuleSetBuild$MavenModuleSetBuildExecution.parsePoms(MavenModuleSetBuild.java:943) at hudson.maven.MavenModuleSetBuild$MavenModuleSetBuildExecution.doRun(MavenModuleSetBuild.java:671) at hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:565) at hudson.model.Run.execute(Run.java:1670) at hudson.maven.MavenModuleSetBuild.run(MavenModuleSetBuild.java:519) at hudson.model.ResourceController.execute(ResourceController.java:88) at hudson.model.Executor.run(Executor.java:231) [trunk] $ /opt/maven3/bin/mvn -f pom.xml -s /var/local/forge/data/nuiton.org/maven/settings.xml -e clean deploy -Prelease-profile [INFO] Error stacktraces are turned on. [INFO] Scanning for projects... [ERROR] The build could not read 1 project -> [Help 1] org.apache.maven.project.ProjectBuildingException: Some problems were encountered while processing the POMs: [ERROR] 'dependencies.dependency.version' for org.apache.struts:struts2-json-plugin:jar is missing. @ line 23, column 17 at org.apache.maven.project.DefaultProjectBuilder.build(DefaultProjectBuilder.java:364) at org.apache.maven.DefaultMaven.collectProjects(DefaultMaven.java:672) at org.apache.maven.DefaultMaven.getProjectsForMavenReactor(DefaultMaven.java:663) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:250) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:155) at org.apache.maven.cli.MavenCli.execute(MavenCli.java:584) at org.apache.maven.cli.MavenCli.doMain(MavenCli.java:213) at org.apache.maven.cli.MavenCli.main(MavenCli.java:157) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.codehaus.plexus.classworlds.launcher.Launcher.launchEnhanced(Launcher.java:289) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:229) at org.codehaus.plexus.classworlds.launcher.Launcher.mainWithExitCode(Launcher.java:415) at org.codehaus.plexus.classworlds.launcher.Launcher.main(Launcher.java:356) [ERROR] [ERROR] The project org.nuiton.web:nuiton-struts2:1.15-SNAPSHOT (<http://ci.nuiton.org/jenkins/job/nuiton-web-ci/ws/trunk/nuiton-struts2/pom.…)> has 1 error [ERROR] 'dependencies.dependency.version' for org.apache.struts:struts2-json-plugin:jar is missing. @ line 23, column 17 [ERROR] [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/ProjectBuildingException Build step 'Invoke top-level Maven targets' marked build as failure

1 1

r314 - trunk/nuiton-security/src/site/apt
by tchemit＠users.nuiton.org Feb. 28, 2014

Feb. 28, 2014

Author: tchemit Date: 2014-02-28 18:43:31 +0100 (Fri, 28 Feb 2014) New Revision: 314 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/314 Log: fix doc url Modified: trunk/nuiton-security/src/site/apt/index.apt Modified: trunk/nuiton-security/src/site/apt/index.apt =================================================================== --- trunk/nuiton-security/src/site/apt/index.apt 2014-02-28 17:43:17 UTC (rev 313) +++ trunk/nuiton-security/src/site/apt/index.apt 2014-02-28 17:43:31 UTC (rev 314) @@ -35,7 +35,7 @@ Application Config - Module configuration is based on {{{http://maven-site.nuiton.org/nuiton-utils/nuiton-utils/apidocs/org/nuiton/util/ApplicationConfig.html}ApplicationConfig}} + Module configuration is based on {{{https://doc.nuiton.org/nuiton-utils/nuiton-utils/apidocs/org/nuiton/util/ApplicationConfig.html}ApplicationConfig}} class. An instance of this class must be set into ServletContext in order to security module to use it.

1 0

r313 - trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2
by tchemit＠users.nuiton.org Feb. 28, 2014

Feb. 28, 2014

Author: tchemit Date: 2014-02-28 18:43:17 +0100 (Fri, 28 Feb 2014) New Revision: 313 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/313 Log: fixes #3105: Rename _ method to t as it was done in I18n project Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/BaseAction.java 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 2014-02-28 17:42:35 UTC (rev 312) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/BaseAction.java 2014-02-28 17:43:17 UTC (rev 313) @@ -38,7 +38,7 @@ private static final long serialVersionUID = 1L; - public String _(String key, Object... args) { + public String t(String key, Object... args) { String value = getText(key, Arrays.asList(args)); return value; }

1 0

r312 - trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/converters
by tchemit＠users.nuiton.org Feb. 28, 2014

Feb. 28, 2014

Author: tchemit Date: 2014-02-28 18:42:35 +0100 (Fri, 28 Feb 2014) New Revision: 312 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/312 Log: refs #3010: Number converter with local parameters (do not test it if not in France) Modified: trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/converters/LocalNumberConverterTest.java Modified: trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/converters/LocalNumberConverterTest.java =================================================================== --- trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/converters/LocalNumberConverterTest.java 2014-02-28 17:41:30 UTC (rev 311) +++ trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/converters/LocalNumberConverterTest.java 2014-02-28 17:42:35 UTC (rev 312) @@ -25,6 +25,8 @@ */ import org.junit.Assert; +import org.junit.Assume; +import org.junit.Ignore; import org.junit.Test; import java.text.DecimalFormatSymbols; @@ -43,9 +45,10 @@ @Test public void testConvertValue() { + Assume.assumeTrue(Locale.FRANCE.equals(Locale.getDefault())); converter = new LocalNumberConverter(); - DecimalFormatSymbols symbols = new DecimalFormatSymbols(Locale.getDefault(Locale.Category.FORMAT)); + DecimalFormatSymbols symbols = new DecimalFormatSymbols(Locale.getDefault()); symbols.getCurrency(); char minusSign = symbols.getMinusSign(); @@ -58,103 +61,103 @@ convert(0, String.class)); Assert.assertEquals("0", - convert(new Integer(0), String.class)); + convert(0, String.class)); Assert.assertEquals("18", convert(18, String.class)); Assert.assertEquals("18", - convert(new Integer(18), String.class), "18"); + convert(18, String.class), "18"); Assert.assertEquals(minusSign + "18", convert(-18, String.class)); Assert.assertEquals(minusSign + "18", - convert(new Integer(-18), String.class)); + convert(-18, String.class)); Assert.assertEquals("1" + groupingSeparator + "000" + groupingSeparator + "008", convert(1000008, String.class)); Assert.assertEquals("1" + groupingSeparator + "000" + groupingSeparator + "008", - convert(new Integer(1000008), String.class)); + convert(1000008, String.class)); Assert.assertEquals(minusSign + "1" + groupingSeparator + "000" + groupingSeparator + "008", convert(-1000008, String.class)); Assert.assertEquals(minusSign + "1" + groupingSeparator + "000" + groupingSeparator + "008", - convert(new Integer(-1000008), String.class)); + convert(-1000008, String.class)); // Double to String Assert.assertEquals("0", convert(0, String.class)); Assert.assertEquals("0", - convert(new Double(0), String.class)); + convert((double) 0, String.class)); Assert.assertEquals("18", convert(18, String.class)); - Assert.assertEquals("18", convert(new Double(18), String.class)); + Assert.assertEquals("18", convert((double) 18, String.class)); Assert.assertEquals(minusSign + "18", convert(-18, String.class)); Assert.assertEquals(minusSign + "18", - convert(new Double(-18), String.class)); + convert((double) -18, String.class)); Assert.assertEquals("1" + groupingSeparator + "000" + groupingSeparator + "008", convert(1000008, String.class)); Assert.assertEquals("1" + groupingSeparator + "000" + groupingSeparator + "008", - convert(new Double(1000008), String.class)); + convert((double) 1000008, String.class)); Assert.assertEquals(minusSign + "1" + groupingSeparator + "000" + groupingSeparator + "008", convert(-1000008, String.class)); Assert.assertEquals(minusSign + "1" + groupingSeparator + "000" + groupingSeparator + "008", - convert(new Double(-1000008), String.class)); + convert((double) -1000008, String.class)); Assert.assertEquals("0" + decimalSeparator + "58", convert(0.58, String.class)); Assert.assertEquals("0" + decimalSeparator + "58", - convert(new Double(0.58), String.class)); + convert(0.58, String.class)); Assert.assertEquals("18" + decimalSeparator + "58", convert(18.58, String.class)); Assert.assertEquals("18" + decimalSeparator + "58", - convert(new Double(18.58), String.class)); + convert(18.58, String.class)); Assert.assertEquals(minusSign + "18" + decimalSeparator + "58", convert(-18.58, String.class)); Assert.assertEquals(minusSign + "18" + decimalSeparator + "58", - convert(new Double(-18.58), String.class)); + convert(-18.58, String.class)); Assert.assertEquals("1" + groupingSeparator + "000" + groupingSeparator + "008" + decimalSeparator + "58", convert(1000008.58, String.class)); Assert.assertEquals("1" + groupingSeparator + "000" + groupingSeparator + "008" + decimalSeparator + "58", - convert(new Double(1000008.58), String.class)); + convert(1000008.58, String.class)); Assert.assertEquals(minusSign + "1" + groupingSeparator + "000" + groupingSeparator + "008" + decimalSeparator + "58", convert(-1000008.58, String.class)); Assert.assertEquals(minusSign + "1" + groupingSeparator + "000" + groupingSeparator + "008" + decimalSeparator + "58", - convert(new Double(-1000008.58), String.class)); + convert(-1000008.58, String.class)); Assert.assertEquals("0" + decimalSeparator + "586", convert(0.5864, String.class)); Assert.assertEquals("0" + decimalSeparator + "586", - convert(new Double(0.5864), String.class)); + convert(0.5864, String.class)); Assert.assertEquals("0" + decimalSeparator + "587", convert(0.5867, String.class)); Assert.assertEquals("0" + decimalSeparator + "587", - convert(new Double(0.5867), String.class)); + convert(0.5867, String.class)); // String to Integer Assert.assertEquals(0, @@ -172,19 +175,19 @@ Assert.assertEquals(0, convert("0", int.class)); - Assert.assertEquals(new Integer(0), + Assert.assertEquals(0, convert("0", Integer.class)); Assert.assertEquals(12, convert("12", int.class)); - Assert.assertEquals(new Integer(12), + Assert.assertEquals(12, convert("12", Integer.class)); Assert.assertEquals(-12, convert(minusSign + "12", int.class)); - Assert.assertEquals(new Integer(-12), + Assert.assertEquals(-12, convert(minusSign + "12", Integer.class)); if (Character.isSpaceChar(groupingSeparator)) { @@ -192,26 +195,26 @@ Assert.assertEquals(1002, convert("1 002", int.class)); - Assert.assertEquals(new Integer(1002), + Assert.assertEquals(1002, convert("1 002", Integer.class)); Assert.assertEquals(-1002, convert(minusSign + "1 002", int.class)); - Assert.assertEquals(new Integer(-1002), + Assert.assertEquals(-1002, convert(minusSign + "1 002", Integer.class)); } Assert.assertEquals(1002, convert("1" + groupingSeparator + "002", int.class)); - Assert.assertEquals(new Integer(1002), + Assert.assertEquals(1002, convert("1" + groupingSeparator + "002", Integer.class)); Assert.assertEquals(-1002, convert(minusSign + "1" + groupingSeparator + "002", int.class)); - Assert.assertEquals(new Integer(-1002), + Assert.assertEquals(-1002, convert(minusSign + "1" + groupingSeparator + "002", Integer.class)); // String to Double @@ -230,19 +233,19 @@ Assert.assertEquals(0d, convert("0", double.class)); - Assert.assertEquals(new Double(0), + Assert.assertEquals((double) 0, convert("0", Double.class)); Assert.assertEquals(12d, convert("12", double.class)); - Assert.assertEquals(new Double(12), + Assert.assertEquals((double) 12, convert("12", Double.class)); Assert.assertEquals(-12d, convert(minusSign + "12", double.class)); - Assert.assertEquals(new Double(-12), + Assert.assertEquals((double) -12, convert(minusSign + "12", Double.class)); @@ -251,13 +254,13 @@ Assert.assertEquals(1002d, convert("1 002", double.class)); - Assert.assertEquals(new Double(1002), + Assert.assertEquals((double) 1002, convert("1 002", Double.class)); Assert.assertEquals(-1002d, convert(minusSign + "1 002", double.class)); - Assert.assertEquals(new Double(-1002), + Assert.assertEquals((double) -1002, convert(minusSign + "1 002", Double.class)); } @@ -265,31 +268,31 @@ Assert.assertEquals(1002d, convert("1" + groupingSeparator + "002", double.class)); - Assert.assertEquals(new Double(1002), + Assert.assertEquals((double) 1002, convert("1" + groupingSeparator + "002", Double.class)); Assert.assertEquals(-1002d, convert(minusSign + "1" + groupingSeparator + "002", double.class)); - Assert.assertEquals(new Double(-1002), + Assert.assertEquals((double) -1002, convert(minusSign + "1" + groupingSeparator + "002", Double.class)); Assert.assertEquals(0.36, convert("0" + decimalSeparator + "36", double.class)); - Assert.assertEquals(new Double(0.36), + Assert.assertEquals(0.36, convert("0" + decimalSeparator + "36", Double.class)); Assert.assertEquals(12.36, convert("12" + decimalSeparator + "36", double.class)); - Assert.assertEquals(new Double(12.36), + Assert.assertEquals(12.36, convert("12" + decimalSeparator + "36", Double.class)); Assert.assertEquals(-12.36, convert(minusSign + "12" + decimalSeparator + "36", double.class)); - Assert.assertEquals(new Double(-12.36), + Assert.assertEquals(-12.36, convert(minusSign + "12" + decimalSeparator + "36", Double.class)); @@ -298,13 +301,13 @@ Assert.assertEquals(1002.36, convert("1 002" + decimalSeparator + "36", double.class)); - Assert.assertEquals(new Double(1002.36), + Assert.assertEquals(1002.36, convert("1 002" + decimalSeparator + "36", Double.class)); Assert.assertEquals(-1002.36, convert(minusSign + "1 002" + decimalSeparator + "36", double.class)); - Assert.assertEquals(new Double(-1002.36), + Assert.assertEquals(-1002.36, convert(minusSign + "1 002" + decimalSeparator + "36", Double.class)); } @@ -312,37 +315,37 @@ Assert.assertEquals(1002.36, convert("1" + groupingSeparator + "002" + decimalSeparator + "36", double.class)); - Assert.assertEquals(new Double(1002.36), + Assert.assertEquals(1002.36, convert("1" + groupingSeparator + "002" + decimalSeparator + "36", Double.class)); Assert.assertEquals(-1002.36, convert(minusSign + "1" + groupingSeparator + "002" + decimalSeparator + "36", double.class)); - Assert.assertEquals(new Double(-1002.36), + Assert.assertEquals(-1002.36, convert(minusSign + "1" + groupingSeparator + "002" + decimalSeparator + "36", Double.class)); Assert.assertEquals(12.3669, convert("12" + decimalSeparator + "3669", double.class)); - Assert.assertEquals(new Double(12.3669), + Assert.assertEquals(12.3669, convert("12" + decimalSeparator + "3669", Double.class)); Assert.assertEquals(12.36, convert("12.36", double.class)); - Assert.assertEquals(new Double(12.36), + Assert.assertEquals(12.36, convert("12.36", Double.class)); Assert.assertEquals(1002.36, convert("1 002.36", double.class)); - Assert.assertEquals(new Double(1002.36), + Assert.assertEquals(1002.36, convert("1 002.36", Double.class)); Assert.assertEquals(1002.36, convert("1002.36", double.class)); - Assert.assertEquals(new Double(1002.36), + Assert.assertEquals(1002.36, convert("1002.36", Double.class)); }

1 0

r311 - trunk
by tchemit＠users.nuiton.org Feb. 28, 2014

Feb. 28, 2014

Author: tchemit Date: 2014-02-28 18:41:30 +0100 (Fri, 28 Feb 2014) New Revision: 311 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/311 Log: fixes #3106: Updates mavenpom to 5.0 + refs #3104: Introduce JsonConverter Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-02-28 09:54:52 UTC (rev 310) +++ trunk/pom.xml 2014-02-28 17:41:30 UTC (rev 311) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>4.7</version> + <version>5.0</version> </parent> <groupId>org.nuiton.web</groupId> @@ -15,7 +15,7 @@ <name>Nuiton Web</name> <description>Common ressources for web applications</description> - <url>http://maven-site.nuiton.org/nuiton-web/</url> + <url>https://doc.nuiton.org/nuiton-web/</url> <inceptionYear>2010</inceptionYear> <developers> @@ -24,7 +24,7 @@ <name>Florian DESBOIS</name> <email>fdesbois(a)codelutin.com</email> <organization>Code Lutin</organization> - <timezone>+2</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>Développeur</role> </roles> @@ -34,7 +34,7 @@ <name>Tony Chemit</name> <email>chemit(a)codelutin.com</email> <organization>CodeLutin</organization> - <timezone>+2</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>Développeur</role> </roles> @@ -44,7 +44,7 @@ <name>Jean Couteau</name> <email>couteau(a)codelutin.com</email> <organization>CodeLutin</organization> - <timezone>+2</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>Développeur</role> </roles> @@ -54,7 +54,7 @@ <name>Brendan Le Ny</name> <email>bleny(a)codelutin.com</email> <organization>CodeLutin</organization> - <timezone>+2</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>Développeur</role> </roles> @@ -71,15 +71,15 @@ </modules> <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk</connection> + <connection>scm:svn:https://svn.nuiton.org/nuiton-web/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk + scm:svn:https://svn.nuiton.org/nuiton-web/trunk </developerConnection> - <url>http://nuiton.org/projects/nuiton-web/repository/show/trunk</url> + <url>https://forge.nuiton.org/projects/nuiton-web/repository/show/trunk</url> </scm> <distributionManagement> <site> - <id>${platform}</id> + <id>doc.${platform}</id> <url>${our.site.repository}/${projectId}</url> </site> </distributionManagement> @@ -270,6 +270,13 @@ </dependency> <dependency> + <groupId>org.apache.struts</groupId> + <artifactId>struts2-json-plugin</artifactId> + <version>${struts2Version}</version> + <scope>provided</scope> + </dependency> + + <dependency> <groupId>org.apache.struts.xwork</groupId> <artifactId>xwork-core</artifactId> <version>${struts2Version}</version>

1 0