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

Build failed in Jenkins: nuiton-web » Nuiton Web :: Nuiton Struts 2 #4
by admin+ci-nuiton.org＠codelutin.com 05 Feb '14

05 Feb '14

See <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-struts…> Changes: [maven-release] [maven-release-plugin] prepare for next development iteration [maven-release] [maven-release-plugin] prepare release nuiton-web-1.15-alpha-3 [athimel] SVN properties and file headers ------------------------------------------ [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Nuiton Web :: Nuiton Struts 2 1.15-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ nuiton-struts2 --- [INFO] Deleting <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-struts…> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ nuiton-struts2 --- [INFO] [INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ nuiton-struts2 --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 7 resources [INFO] [INFO] --- maven-compiler-plugin:3.1:compile (default-compile) @ nuiton-struts2 --- [INFO] Compiling 11 source files to <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-struts…> [INFO] ------------------------------------------------------------- [WARNING] COMPILATION WARNING : [INFO] ------------------------------------------------------------- [WARNING] bootstrap class path not set in conjunction with -source 1.6 [INFO] 1 warning [INFO] ------------------------------------------------------------- [INFO] ------------------------------------------------------------- [ERROR] COMPILATION ERROR : [INFO] ------------------------------------------------------------- [ERROR] <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-struts…>:[3,1] class, interface, or enum expected [ERROR] <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-struts…>:[3,1] class, interface, or enum expected [INFO] 2 errors [INFO] ------------------------------------------------------------- [JENKINS] Archiving disabled

1 2

[ANN] - Nuiton Web 1.15-alpha-3 released
by nuiton.org Release Notification 04 Feb '14

04 Feb '14

The Nuiton Web team is pleased to announce the nuiton-web-parent-1.15-alpha-3 release! Common ressources for web applications Documentation of the project can be found here: http://maven-site.nuiton.org/nuiton-web/ Changes ------- Changes in this version include: Changes: o Updates mavenpom to 4.7 Issue: 3067. Thanks to Arnaud Thimel. Resolved by athimel. o Updates topia to 3.0-alpha-10 Issue: 3066. Thanks to Arnaud Thimel. Resolved by athimel. o Updates nuiton-config to 3.0-alpha-2 Issue: 3065. Thanks to Arnaud Thimel. Resolved by athimel. o Updates nuiton-i18n to 3.0 Issue: 3064. Thanks to Arnaud Thimel. Resolved by athimel. o Updates Eugene to 2.7.4 Issue: 3063. Thanks to Arnaud Thimel. Resolved by athimel. o Updates nuiton-utils to 3.0-rc-2 Issue: 3062. Thanks to Arnaud Thimel. Resolved by athimel. Downloads --------- For a manual installation, you can download files here: https://nuiton.org/projects/nuiton-web/files * nuiton-rss-1.15-alpha-3-deps.zip - https://nuiton.org/attachments/download/1002 * nuiton-rss-1.15-alpha-3-full.zip - https://nuiton.org/attachments/download/1003 * nuiton-web-1.15-alpha-3-deps.zip - https://nuiton.org/attachments/download/1004 * nuiton-web-1.15-alpha-3-full.zip - https://nuiton.org/attachments/download/1005 Maven artifacts --------------- Artifacts are deployed in Maven Central Repository http://repo1.maven.org/maven2/ Find us at * http://search.maven.org/#artifactdetails|org.nuiton.web|nuiton-web-parent|1… Have fun! -Nuiton Web team

1 0

r309 - in trunk: . nuiton-gwt nuiton-rss nuiton-security nuiton-struts2 nuiton-tapestry nuiton-web
by maven-release＠users.nuiton.org 04 Feb '14

04 Feb '14

Author: maven-release Date: 2014-02-04 19:11:04 +0100 (Tue, 04 Feb 2014) New Revision: 309 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/309 Log: [maven-release-plugin] prepare for next development iteration 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-02-04 18:10:59 UTC (rev 308) +++ trunk/nuiton-gwt/pom.xml 2014-02-04 18:11:04 UTC (rev 309) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-alpha-3</version> + <version>1.15-SNAPSHOT</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2014-02-04 18:10:59 UTC (rev 308) +++ trunk/nuiton-rss/pom.xml 2014-02-04 18:11:04 UTC (rev 309) @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-alpha-3</version> + <version>1.15-SNAPSHOT</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-security/pom.xml =================================================================== --- trunk/nuiton-security/pom.xml 2014-02-04 18:10:59 UTC (rev 308) +++ trunk/nuiton-security/pom.xml 2014-02-04 18:11:04 UTC (rev 309) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-alpha-3</version> + <version>1.15-SNAPSHOT</version> </parent> <artifactId>nuiton-security</artifactId> Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2014-02-04 18:10:59 UTC (rev 308) +++ trunk/nuiton-struts2/pom.xml 2014-02-04 18:11:04 UTC (rev 309) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-alpha-3</version> + <version>1.15-SNAPSHOT</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2014-02-04 18:10:59 UTC (rev 308) +++ trunk/nuiton-tapestry/pom.xml 2014-02-04 18:11:04 UTC (rev 309) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-alpha-3</version> + <version>1.15-SNAPSHOT</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2014-02-04 18:10:59 UTC (rev 308) +++ trunk/nuiton-web/pom.xml 2014-02-04 18:11:04 UTC (rev 309) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-alpha-3</version> + <version>1.15-SNAPSHOT</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-02-04 18:10:59 UTC (rev 308) +++ trunk/pom.xml 2014-02-04 18:11:04 UTC (rev 309) @@ -10,7 +10,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-alpha-3</version> + <version>1.15-SNAPSHOT</version> <packaging>pom</packaging> <name>Nuiton Web</name> @@ -71,11 +71,11 @@ </modules> <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.15-alpha-3</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-1.15-alpha-3 + scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk </developerConnection> - <url>http://nuiton.org/projects/nuiton-web/repository/show/tags/nuiton-web-1.15-…</url> + <url>http://nuiton.org/projects/nuiton-web/repository/show/trunk</url> </scm> <distributionManagement> <site>

1 0

r308 - in tags: . nuiton-web-1.15-alpha-3
by maven-release＠users.nuiton.org 04 Feb '14

04 Feb '14

Author: maven-release Date: 2014-02-04 19:10:59 +0100 (Tue, 04 Feb 2014) New Revision: 308 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/308 Log: [maven-release-plugin] copy for tag nuiton-web-1.15-alpha-3 Added: tags/nuiton-web-1.15-alpha-3/ Property changes on: tags/nuiton-web-1.15-alpha-3 ___________________________________________________________________ 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

r307 - in trunk: . nuiton-gwt nuiton-rss nuiton-security nuiton-struts2 nuiton-tapestry nuiton-web
by maven-release＠users.nuiton.org 04 Feb '14

04 Feb '14

Author: maven-release Date: 2014-02-04 19:10:55 +0100 (Tue, 04 Feb 2014) New Revision: 307 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/307 Log: [maven-release-plugin] prepare release nuiton-web-1.15-alpha-3 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-02-04 18:09:20 UTC (rev 306) +++ trunk/nuiton-gwt/pom.xml 2014-02-04 18:10:55 UTC (rev 307) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-SNAPSHOT</version> + <version>1.15-alpha-3</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2014-02-04 18:09:20 UTC (rev 306) +++ trunk/nuiton-rss/pom.xml 2014-02-04 18:10:55 UTC (rev 307) @@ -28,7 +28,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-SNAPSHOT</version> + <version>1.15-alpha-3</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-security/pom.xml =================================================================== --- trunk/nuiton-security/pom.xml 2014-02-04 18:09:20 UTC (rev 306) +++ trunk/nuiton-security/pom.xml 2014-02-04 18:10:55 UTC (rev 307) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-SNAPSHOT</version> + <version>1.15-alpha-3</version> </parent> <artifactId>nuiton-security</artifactId> Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2014-02-04 18:09:20 UTC (rev 306) +++ trunk/nuiton-struts2/pom.xml 2014-02-04 18:10:55 UTC (rev 307) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-SNAPSHOT</version> + <version>1.15-alpha-3</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2014-02-04 18:09:20 UTC (rev 306) +++ trunk/nuiton-tapestry/pom.xml 2014-02-04 18:10:55 UTC (rev 307) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-SNAPSHOT</version> + <version>1.15-alpha-3</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2014-02-04 18:09:20 UTC (rev 306) +++ trunk/nuiton-web/pom.xml 2014-02-04 18:10:55 UTC (rev 307) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-SNAPSHOT</version> + <version>1.15-alpha-3</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-02-04 18:09:20 UTC (rev 306) +++ trunk/pom.xml 2014-02-04 18:10:55 UTC (rev 307) @@ -10,7 +10,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.15-SNAPSHOT</version> + <version>1.15-alpha-3</version> <packaging>pom</packaging> <name>Nuiton Web</name> @@ -71,11 +71,11 @@ </modules> <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-1.15-alpha-3</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.15-alpha-3 </developerConnection> - <url>http://nuiton.org/projects/nuiton-web/repository/show/trunk</url> + <url>http://nuiton.org/projects/nuiton-web/repository/show/tags/nuiton-web-1.15-…</url> </scm> <distributionManagement> <site>

1 0

r306 - in trunk/nuiton-struts2/src: main/java/org/nuiton/web/struts2/converters test/java/org/nuiton/web/struts2/converters
by athimel＠users.nuiton.org 04 Feb '14

04 Feb '14

Author: athimel Date: 2014-02-04 19:09:20 +0100 (Tue, 04 Feb 2014) New Revision: 306 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/306 Log: SVN properties and file headers Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/HundredthLocalNumberConverter.java trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/converters/LocalNumberConverterTest.java Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/HundredthLocalNumberConverter.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/HundredthLocalNumberConverter.java 2014-02-04 18:06:52 UTC (rev 305) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/HundredthLocalNumberConverter.java 2014-02-04 18:09:20 UTC (rev 306) @@ -1,5 +1,29 @@ package org.nuiton.web.struts2.converters; +/* + * #%L + * Nuiton Web :: Nuiton Struts 2 + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2014 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% + */ + /** * Same as of {@link LocalNumberConverter} but always use 2 decimals: it's * a suitable default for money, etc. Property changes on: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/HundredthLocalNumberConverter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java 2014-02-04 18:06:52 UTC (rev 305) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java 2014-02-04 18:09:20 UTC (rev 306) @@ -1,5 +1,29 @@ package org.nuiton.web.struts2.converters; +/* + * #%L + * Nuiton Web :: Nuiton Struts 2 + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2014 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% + */ + import com.opensymphony.xwork2.conversion.TypeConversionException; import com.opensymphony.xwork2.conversion.impl.NumberConverter; import org.apache.commons.lang3.StringUtils; Property changes on: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/LocalNumberConverter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native 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-04 18:06:52 UTC (rev 305) +++ trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/converters/LocalNumberConverterTest.java 2014-02-04 18:09:20 UTC (rev 306) @@ -1,5 +1,29 @@ package org.nuiton.web.struts2.converters; +/* + * #%L + * Nuiton Web :: Nuiton Struts 2 + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2014 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% + */ + import org.junit.Assert; import org.junit.Test; Property changes on: trunk/nuiton-struts2/src/test/java/org/nuiton/web/struts2/converters/LocalNumberConverterTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

Build failed in Jenkins: nuiton-web » Nuiton Web :: Nuiton Security #3
by admin+ci-nuiton.org＠codelutin.com 04 Feb '14

04 Feb '14

See <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-securi…> Changes: [athimel] fixes #3062 Updates nuiton-utils to 3.0-rc-2 fixes #3063 Updates Eugene to 2.7.4 fixes #3064 Updates nuiton-i18n to 3.0 fixes #3065 Updates nuiton-config to 3.0-alpha-2 fixes #3066 Updates topia to 3.0-alpha-10 fixes #3067 Updates mavenpom to 4.7 ------------------------------------------ [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Nuiton Web :: Nuiton Security 1.15-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ nuiton-security --- [INFO] Deleting <http://ci-ng.nuiton.org/jenkins/job/nuiton-web/org.nuiton.web$nuiton-securi…> [INFO] [INFO] --- maven-enforcer-plugin:1.3.1:enforce (check-project-files) @ nuiton-security --- [INFO] [INFO] --- eugene-maven-plugin:2.7.4:generate (eugene-generation) @ nuiton-security --- [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui… (5 KB at 109.3 KB/sec) [INFO] Downloading: http://repo.maven.apache.org/maven2/org/nuiton/topia/topia-templates/3.0-al… [INFO] Downloading: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui… [INFO] Downloaded: http://nexus.nuiton.org/nexus/content/repositories/central-releases/org/nui… (98 KB at 1170.4 KB/sec) [INFO] Downloading: http://repo.maven.apache.org/maven2/org/nuiton/topia/topia-templates/3.0-al… [WARNING] Failed to getClass for org.nuiton.eugene.plugin.GenerateMojo [JENKINS] Archiving disabled

1 0

r305 - in trunk: . nuiton-security/src/main/java/org/nuiton/web/security/actions nuiton-struts2/src/main/java/org/nuiton/web/struts2
by athimel＠users.nuiton.org 04 Feb '14

04 Feb '14

Author: athimel Date: 2014-02-04 19:06:52 +0100 (Tue, 04 Feb 2014) New Revision: 305 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/305 Log: fixes #3062 Updates nuiton-utils to 3.0-rc-2 fixes #3063 Updates Eugene to 2.7.4 fixes #3064 Updates nuiton-i18n to 3.0 fixes #3065 Updates nuiton-config to 3.0-alpha-2 fixes #3066 Updates topia to 3.0-alpha-10 fixes #3067 Updates mavenpom to 4.7 Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/LoginAction.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserAction.java trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/I18nTextProvider.java trunk/pom.xml Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/LoginAction.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/LoginAction.java 2014-01-27 10:44:45 UTC (rev 304) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/LoginAction.java 2014-02-04 18:06:52 UTC (rev 305) @@ -24,8 +24,6 @@ package org.nuiton.web.security.actions; -import static org.nuiton.i18n.I18n._; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.shiro.SecurityUtils; @@ -37,6 +35,7 @@ import org.apache.shiro.authc.UsernamePasswordToken; import org.apache.shiro.session.Session; import org.apache.shiro.subject.Subject; +import org.nuiton.i18n.I18n; import org.nuiton.web.security.SecurityShiroFilter; public class LoginAction extends AbstractAction { @@ -86,19 +85,19 @@ result = SUCCESS; } } catch (UnknownAccountException ex) { - addActionError(_("Identifiant ou mot de passe invalide !")); + addActionError(I18n.t("Identifiant ou mot de passe invalide !")); log.warn("Unknow user account", ex); result = input(); } catch (IncorrectCredentialsException ex) { - addActionError(_("Identifiant ou mot de passe invalide !")); + addActionError(I18n.t("Identifiant ou mot de passe invalide !")); log.warn("Invalid password", ex); result = input(); } catch (LockedAccountException ex) { - addActionError(_("Compte bloqué. Contacter un administrateur")); + addActionError(I18n.t("Compte bloqué. Contacter un administrateur")); log.error("Account locked error", ex); result = input(); } catch (ExcessiveAttemptsException ex) { - addActionError(_("Nombre de tentatives dépassé")); + addActionError(I18n.t("Nombre de tentatives dépassé")); log.error("Excessive attemps error", ex); result = input(); } catch (AuthenticationException ex) { Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserAction.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserAction.java 2014-01-27 10:44:45 UTC (rev 304) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserAction.java 2014-02-04 18:06:52 UTC (rev 305) @@ -27,14 +27,13 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.i18n.I18n; import org.nuiton.util.StringUtil; import org.nuiton.web.SecurityTopiaPersistenceContext; import org.nuiton.web.security.SecurityUser; import org.nuiton.web.security.SecurityUserImpl; import org.nuiton.web.security.SecurityUserTopiaDao; -import static org.nuiton.i18n.I18n._; - public class UserAction extends AbstractAction { /** serialVersionUID. */ @@ -97,7 +96,7 @@ public void validate() { if (StringUtils.isNotBlank(password)) { if (!password.equals(confirm)) { - addActionError(_("Les mots de passes ne sont pas identiques !")); + addActionError(I18n.t("Les mots de passes ne sont pas identiques !")); } } } 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 2014-01-27 10:44:45 UTC (rev 304) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/I18nTextProvider.java 2014-02-04 18:06:52 UTC (rev 305) @@ -90,7 +90,7 @@ protected String getTextFromLocale(String key, String defaultValue) { Locale locale = localeProvider.getLocale(); - String result = I18n.l_(locale, key); + String result = I18n.l(locale, key); if (result == null) { result = defaultValue; } @@ -100,7 +100,7 @@ protected String getTextFromLocale(String key, String defaultValue, Object ... args) { Locale locale = localeProvider.getLocale(); - String result = I18n.l_(locale, key, args); + String result = I18n.l(locale, key, args); if (result == null) { result = defaultValue; } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-01-27 10:44:45 UTC (rev 304) +++ trunk/pom.xml 2014-02-04 18:06:52 UTC (rev 305) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>4.5</version> + <version>4.7</version> </parent> <groupId>org.nuiton.web</groupId> @@ -89,14 +89,14 @@  <projectId>nuiton-web</projectId> - <eugeneVersion>2.7.3</eugeneVersion> + <eugeneVersion>2.7.4</eugeneVersion> - <nuitonI18nVersion>2.5.2</nuitonI18nVersion> - <nuitonUtilsVersion>3.0-alpha-1</nuitonUtilsVersion> - <nuitonConfigVersion>3.0-alpha-1</nuitonConfigVersion> + <nuitonConfigVersion>3.0-alpha-2</nuitonConfigVersion> + <nuitonI18nVersion>3.0</nuitonI18nVersion> + <nuitonUtilsVersion>3.0-rc-2</nuitonUtilsVersion> <nuitonI18nPluginVersion>${nuitonI18nVersion}</nuitonI18nPluginVersion> - <topiaVersion>3.0-alpha-8</topiaVersion> + <topiaVersion>3.0-alpha-10</topiaVersion>  <tapestryVersion>5.2.4</tapestryVersion>

1 0