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

r271 - trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters
by echatellier＠users.nuiton.org July 2, 2013

July 2, 2013

Author: echatellier Date: 2013-07-02 16:31:28 +0200 (Tue, 02 Jul 2013) New Revision: 271 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/271 Log: Remove guava dependency Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/DoubleConverter.java Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/DoubleConverter.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/DoubleConverter.java 2013-06-19 14:05:02 UTC (rev 270) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/DoubleConverter.java 2013-07-02 14:31:28 UTC (rev 271) @@ -30,7 +30,6 @@ import org.apache.commons.lang3.StringUtils; import org.apache.struts2.util.StrutsTypeConverter; -import com.google.common.base.Strings; import com.opensymphony.xwork2.conversion.TypeConversionException; /** @@ -53,7 +52,7 @@ string = string.replace(",", "."); Double parsedValue; - if (Strings.isNullOrEmpty(string)) { + if (string == null || string.isEmpty()) { if (double.class.equals(aClass)) { parsedValue = 0.; } else {

1 0

r270 - in trunk: nuiton-security nuiton-struts2/src/main/java/org/nuiton/web/struts2 nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters
by athimel＠users.nuiton.org June 19, 2013

June 19, 2013

Author: athimel Date: 2013-06-19 16:05:02 +0200 (Wed, 19 Jun 2013) New Revision: 270 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/270 Log: fixes #2721 Add 'double' converter in nuiton-struts2 Added: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/DoubleConverter.java Modified: trunk/nuiton-security/ Property changes on: trunk/nuiton-security ___________________________________________________________________ Modified: svn:ignore - target .classpath .project .settings + target .classpath .project .settings *.iml Added: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/DoubleConverter.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/DoubleConverter.java (rev 0) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/DoubleConverter.java 2013-06-19 14:05:02 UTC (rev 270) @@ -0,0 +1,85 @@ +package org.nuiton.web.struts2.converters; + +/* + * #%L + * Nuiton Web :: Nuiton Struts 2 + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2013 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 java.util.Arrays; +import java.util.Map; + +import org.apache.commons.lang3.StringUtils; +import org.apache.struts2.util.StrutsTypeConverter; + +import com.google.common.base.Strings; +import com.opensymphony.xwork2.conversion.TypeConversionException; + +/** + * Let user input either "0.1" or "0,1" as a double value. To use this converter, add the following lines in your + * <code>classpath:xwork-conversion.properties</code> file : + * + * <pre> + * java.lang.Double=org.nuiton.web.struts2.converters.DoubleConverter + * double=org.nuiton.web.struts2.converters.DoubleConverter + * </pre> + * + * @author Arnaud Thimel <thimel(a)codelutin.com> + */ +public class DoubleConverter extends StrutsTypeConverter { + + @Override + public Object convertFromString(Map map, String[] strings, Class aClass) { + if (strings.length == 1) { + String string = strings[0]; + string = string.replace(",", "."); + + Double parsedValue; + if (Strings.isNullOrEmpty(string)) { + if (double.class.equals(aClass)) { + parsedValue = 0.; + } else { + parsedValue = null; + } + } else { + parsedValue = Double.parseDouble(string); + } + return parsedValue; + } else { + throw new TypeConversionException("strings=" + Arrays.toString(strings)); + } + } + + @Override + public String convertToString(Map map, Object o) { + Double d = (Double) o; + + String string; + if (d == null) { + string = StringUtils.EMPTY; + } else { + string = d.toString(); + } + + return string; + } + +} Property changes on: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/converters/DoubleConverter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r269 - trunk
by tchemit＠users.nuiton.org May 26, 2013

May 26, 2013

Author: tchemit Date: 2013-05-26 08:53:22 +0200 (Sun, 26 May 2013) New Revision: 269 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/269 Log: updates mavenpom to 3.4.11 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-30 09:05:57 UTC (rev 268) +++ trunk/pom.xml 2013-05-26 06:53:22 UTC (rev 269) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.10</version> + <version>3.4.11</version> </parent> <groupId>org.nuiton.web</groupId>

1 0

r268 - in trunk: . nuiton-gwt nuiton-rss nuiton-security nuiton-struts2 nuiton-tapestry nuiton-web
by maven-release＠users.nuiton.org April 30, 2013

April 30, 2013

Author: maven-release Date: 2013-04-30 11:05:57 +0200 (Tue, 30 Apr 2013) New Revision: 268 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/268 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 2013-04-30 09:05:55 UTC (rev 267) +++ trunk/nuiton-gwt/pom.xml 2013-04-30 09:05:57 UTC (rev 268) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.13</version> + <version>1.14-SNAPSHOT</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2013-04-30 09:05:55 UTC (rev 267) +++ trunk/nuiton-rss/pom.xml 2013-04-30 09:05:57 UTC (rev 268) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.13</version> + <version>1.14-SNAPSHOT</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-security/pom.xml =================================================================== (Binary files differ) Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2013-04-30 09:05:55 UTC (rev 267) +++ trunk/nuiton-struts2/pom.xml 2013-04-30 09:05:57 UTC (rev 268) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.13</version> + <version>1.14-SNAPSHOT</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2013-04-30 09:05:55 UTC (rev 267) +++ trunk/nuiton-tapestry/pom.xml 2013-04-30 09:05:57 UTC (rev 268) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.13</version> + <version>1.14-SNAPSHOT</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2013-04-30 09:05:55 UTC (rev 267) +++ trunk/nuiton-web/pom.xml 2013-04-30 09:05:57 UTC (rev 268) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.13</version> + <version>1.14-SNAPSHOT</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-30 09:05:55 UTC (rev 267) +++ trunk/pom.xml 2013-04-30 09:05:57 UTC (rev 268) @@ -15,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.13</version> + <version>1.14-SNAPSHOT</version> <modules> <module>nuiton-web</module> @@ -349,11 +349,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.13</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.13 + scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk </developerConnection> - <url>http://www.nuiton.org/projects/nuiton-web/repository/show/tags/nuiton-web-1…</url> + <url>http://www.nuiton.org/projects/nuiton-web/repository/show/trunk</url> </scm> <distributionManagement>

1 0

r267 - in tags: . nuiton-web-1.13
by maven-release＠users.nuiton.org April 30, 2013

April 30, 2013

Author: maven-release Date: 2013-04-30 11:05:55 +0200 (Tue, 30 Apr 2013) New Revision: 267 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/267 Log: [maven-release-plugin] copy for tag nuiton-web-1.13 Added: tags/nuiton-web-1.13/ Property changes on: tags/nuiton-web-1.13 ___________________________________________________________________ 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

r266 - in trunk: . nuiton-gwt nuiton-rss nuiton-security nuiton-struts2 nuiton-tapestry nuiton-web
by maven-release＠users.nuiton.org April 30, 2013

April 30, 2013

Author: maven-release Date: 2013-04-30 11:05:53 +0200 (Tue, 30 Apr 2013) New Revision: 266 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/266 Log: [maven-release-plugin] prepare release nuiton-web-1.13 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 2013-04-30 09:03:49 UTC (rev 265) +++ trunk/nuiton-gwt/pom.xml 2013-04-30 09:05:53 UTC (rev 266) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.13-SNAPSHOT</version> + <version>1.13</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2013-04-30 09:03:49 UTC (rev 265) +++ trunk/nuiton-rss/pom.xml 2013-04-30 09:05:53 UTC (rev 266) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.13-SNAPSHOT</version> + <version>1.13</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-security/pom.xml =================================================================== (Binary files differ) Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2013-04-30 09:03:49 UTC (rev 265) +++ trunk/nuiton-struts2/pom.xml 2013-04-30 09:05:53 UTC (rev 266) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.13-SNAPSHOT</version> + <version>1.13</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2013-04-30 09:03:49 UTC (rev 265) +++ trunk/nuiton-tapestry/pom.xml 2013-04-30 09:05:53 UTC (rev 266) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.13-SNAPSHOT</version> + <version>1.13</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2013-04-30 09:03:49 UTC (rev 265) +++ trunk/nuiton-web/pom.xml 2013-04-30 09:05:53 UTC (rev 266) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.13-SNAPSHOT</version> + <version>1.13</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-30 09:03:49 UTC (rev 265) +++ trunk/pom.xml 2013-04-30 09:05:53 UTC (rev 266) @@ -15,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.13-SNAPSHOT</version> + <version>1.13</version> <modules> <module>nuiton-web</module> @@ -349,11 +349,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.13</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.13 </developerConnection> - <url>http://www.nuiton.org/projects/nuiton-web/repository/show/trunk</url> + <url>http://www.nuiton.org/projects/nuiton-web/repository/show/tags/nuiton-web-1…</url> </scm> <distributionManagement>

1 0

r265 - in trunk: nuiton-security nuiton-security/src/license nuiton-security/src/main/java/org/nuiton/web/security nuiton-security/src/main/java/org/nuiton/web/security/actions nuiton-security/src/main/resources nuiton-security/src/main/resources/WEB-INF/security nuiton-security/src/main/resources/i18n nuiton-security/src/main/xmi nuiton-security/src/site nuiton-security/src/site/apt nuiton-security/src/site/resources/img nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib nuiton
by tchemit＠users.nuiton.org April 30, 2013

April 30, 2013

Author: tchemit Date: 2013-04-30 11:03:49 +0200 (Tue, 30 Apr 2013) New Revision: 265 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/265 Log: - add missing svn properties - fix license headers Modified: trunk/nuiton-security/LICENSE.txt trunk/nuiton-security/README.txt trunk/nuiton-security/changelog.txt trunk/nuiton-security/pom.xml trunk/nuiton-security/src/license/THIRD-PARTY.properties trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecuritySubjectFactory.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityUtil.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaWebSubject.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/AbstractAction.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/LoginAction.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/LogoutAction.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RoleAction.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RolePermissionsAction.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserAction.java trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserRolesAction.java trunk/nuiton-security/src/main/resources/WEB-INF/security/login.jsp trunk/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp trunk/nuiton-security/src/main/resources/WEB-INF/security/role.jsp trunk/nuiton-security/src/main/resources/WEB-INF/security/user-roles.jsp trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp trunk/nuiton-security/src/main/resources/i18n/nuiton-security_en_GB.properties trunk/nuiton-security/src/main/resources/i18n/nuiton-security_fr_FR.properties trunk/nuiton-security/src/main/resources/struts.xml trunk/nuiton-security/src/main/xmi/security.properties trunk/nuiton-security/src/main/xmi/security.zargo trunk/nuiton-security/src/site/apt/index.apt trunk/nuiton-security/src/site/resources/img/permissions.png trunk/nuiton-security/src/site/resources/img/roles.png trunk/nuiton-security/src/site/site.xml trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/FieldError2.java trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/FieldError2Tag.java trunk/nuiton-web/src/main/java/org/nuiton/web/filter/JpaTransactionFilter.java Property changes on: trunk/nuiton-security/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/nuiton-security/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/nuiton-security/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/nuiton-security/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-security/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java 2013-04-30 08:53:32 UTC (rev 264) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java 2013-04-30 09:03:49 UTC (rev 265) @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2012, 2013 CodeLutin, Chatellier Eric + * Copyright (C) 2012 - 2013 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as Property changes on: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecuritySubjectFactory.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecuritySubjectFactory.java 2013-04-30 08:53:32 UTC (rev 264) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecuritySubjectFactory.java 2013-04-30 09:03:49 UTC (rev 265) @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2012, 2013 CodeLutin, Chatellier Eric + * Copyright (C) 2012 - 2013 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as Property changes on: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecuritySubjectFactory.java ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityUtil.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityUtil.java 2013-04-30 08:53:32 UTC (rev 264) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityUtil.java 2013-04-30 09:03:49 UTC (rev 265) @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2012, 2013 CodeLutin, Chatellier Eric + * Copyright (C) 2012 - 2013 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as Property changes on: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityUtil.java ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java 2013-04-30 08:53:32 UTC (rev 264) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java 2013-04-30 09:03:49 UTC (rev 265) @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2012, 2013 CodeLutin, Chatellier Eric + * Copyright (C) 2012 - 2013 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as Property changes on: trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaSecurityRealm.java ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaWebSubject.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaWebSubject.java 2013-04-30 08:53:32 UTC (rev 264) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaWebSubject.java 2013-04-30 09:03:49 UTC (rev 265) @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2012, 2013 CodeLutin, Chatellier Eric + * Copyright (C) 2012 - 2013 CodeLutin, Chatellier Eric * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as Property changes on: trunk/nuiton-security/src/main/java/org/nuiton/web/security/TopiaWebSubject.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/AbstractAction.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/LoginAction.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/LogoutAction.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RoleAction.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RolePermissionsAction.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserAction.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/UserRolesAction.java ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/login.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/login.jsp 2013-04-30 08:53:32 UTC (rev 264) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/login.jsp 2013-04-30 09:03:49 UTC (rev 265) @@ -1,10 +1,10 @@ <%-- #%L Nuiton Web :: Nuiton Security - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% - Copyright (C) 2012, 2013 CodeLutin, Chatellier Eric + Copyright (C) 2012 - 2013 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as Property changes on: trunk/nuiton-security/src/main/resources/WEB-INF/security/login.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp 2013-04-30 08:53:32 UTC (rev 264) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp 2013-04-30 09:03:49 UTC (rev 265) @@ -1,10 +1,10 @@ <%-- #%L Nuiton Web :: Nuiton Security - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% - Copyright (C) 2012, 2013 CodeLutin, Chatellier Eric + Copyright (C) 2012 - 2013 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as Property changes on: trunk/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/role.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/role.jsp 2013-04-30 08:53:32 UTC (rev 264) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/role.jsp 2013-04-30 09:03:49 UTC (rev 265) @@ -1,10 +1,10 @@ <%-- #%L Nuiton Web :: Nuiton Security - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% - Copyright (C) 2012, 2013 CodeLutin, Chatellier Eric + Copyright (C) 2012 - 2013 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as Property changes on: trunk/nuiton-security/src/main/resources/WEB-INF/security/role.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/user-roles.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/user-roles.jsp 2013-04-30 08:53:32 UTC (rev 264) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/user-roles.jsp 2013-04-30 09:03:49 UTC (rev 265) @@ -1,10 +1,10 @@ <%-- #%L Nuiton Web :: Nuiton Security - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% - Copyright (C) 2012, 2013 CodeLutin, Chatellier Eric + Copyright (C) 2012 - 2013 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as Property changes on: trunk/nuiton-security/src/main/resources/WEB-INF/security/user-roles.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp 2013-04-30 08:53:32 UTC (rev 264) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp 2013-04-30 09:03:49 UTC (rev 265) @@ -1,10 +1,10 @@ <%-- #%L Nuiton Web :: Nuiton Security - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% - Copyright (C) 2012, 2013 CodeLutin, Chatellier Eric + Copyright (C) 2012 - 2013 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as Property changes on: trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/nuiton-security/src/main/resources/i18n/nuiton-security_en_GB.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/nuiton-security/src/main/resources/i18n/nuiton-security_fr_FR.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-security/src/main/resources/struts.xml =================================================================== --- trunk/nuiton-security/src/main/resources/struts.xml 2013-04-30 08:53:32 UTC (rev 264) +++ trunk/nuiton-security/src/main/resources/struts.xml 2013-04-30 09:03:49 UTC (rev 265) @@ -1,10 +1,10 @@ <!-- #%L Nuiton Web :: Nuiton Security - $Id:$ - $HeadURL:$ + $Id$ + $HeadURL$ %% - Copyright (C) 2012, 2013 CodeLutin, Chatellier Eric + Copyright (C) 2012 - 2013 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as Property changes on: trunk/nuiton-security/src/main/resources/struts.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-security/src/main/xmi/security.properties =================================================================== --- trunk/nuiton-security/src/main/xmi/security.properties 2013-04-30 08:53:32 UTC (rev 264) +++ trunk/nuiton-security/src/main/xmi/security.properties 2013-04-30 09:03:49 UTC (rev 265) @@ -1,8 +1,8 @@ ### # #%L # Nuiton Web :: Nuiton Security -# $Id:$ -# $HeadURL:$ +# $Id$ +# $HeadURL$ # %% # Copyright (C) 2012 CodeLutin, Chatellier Eric # %% Property changes on: trunk/nuiton-security/src/main/xmi/security.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/nuiton-security/src/main/xmi/security.zargo ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-security/src/site/apt/index.apt =================================================================== --- trunk/nuiton-security/src/site/apt/index.apt 2013-04-30 08:53:32 UTC (rev 264) +++ trunk/nuiton-security/src/site/apt/index.apt 2013-04-30 09:03:49 UTC (rev 265) @@ -2,8 +2,8 @@ ~~ #%L ~~ Nuiton Web :: Nuiton Security ~~ -~~ $Id: index.apt 152 2011-12-01 17:16:59Z athimel $ -~~ $HeadURL: http://svn.nuiton.org/svn/nuiton-web/trunk/nuiton-struts2/src/site/apt/inde… $ +~~ $Id$ +~~ $HeadURL$ ~~ %% ~~ Copyright (C) 2012 CodeLutin, Chatellier Eric ~~ %% Property changes on: trunk/nuiton-security/src/site/apt/index.apt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/nuiton-security/src/site/resources/img/permissions.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/nuiton-security/src/site/resources/img/roles.png ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-security/src/site/site.xml =================================================================== (Binary files differ) Property changes on: trunk/nuiton-security/src/site/site.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/FieldError2.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/FieldError2.java 2013-04-30 08:53:32 UTC (rev 264) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/FieldError2.java 2013-04-30 09:03:49 UTC (rev 265) @@ -23,7 +23,7 @@ * #L% */ /* - * $Id: FieldError.java 805635 2009-08-19 00:18:54Z musachy $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file Property changes on: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/FieldError2.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/taglib/FieldError2Tag.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/FieldError2Tag.java 2013-04-30 08:53:32 UTC (rev 264) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/FieldError2Tag.java 2013-04-30 09:03:49 UTC (rev 265) @@ -23,7 +23,7 @@ * #L% */ /* - * $Id: FieldErrorTag.java 805635 2009-08-19 00:18:54Z musachy $ + * $Id$ * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file Property changes on: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/taglib/FieldError2Tag.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/JpaTransactionFilter.java =================================================================== --- trunk/nuiton-web/src/main/java/org/nuiton/web/filter/JpaTransactionFilter.java 2013-04-30 08:53:32 UTC (rev 264) +++ trunk/nuiton-web/src/main/java/org/nuiton/web/filter/JpaTransactionFilter.java 2013-04-30 09:03:49 UTC (rev 265) @@ -3,8 +3,8 @@ /* * #%L * Nuiton Web :: Nuiton Web - * $Id:$ - * $HeadURL:$ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2011 - 2013 CodeLutin * %% Property changes on: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/JpaTransactionFilter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r264 - in trunk: . nuiton-web/src/site/apt
by tchemit＠users.nuiton.org April 30, 2013

April 30, 2013

Author: tchemit Date: 2013-04-30 10:53:32 +0200 (Tue, 30 Apr 2013) New Revision: 264 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/264 Log: fixes #2680: Updates struts2 to 2.3.14 refs #2675: Customize JettyLauncher port and contextPath Modified: trunk/nuiton-web/src/site/apt/Warlauncher.apt.vm trunk/pom.xml Modified: trunk/nuiton-web/src/site/apt/Warlauncher.apt.vm =================================================================== --- trunk/nuiton-web/src/site/apt/Warlauncher.apt.vm 2013-04-29 18:54:33 UTC (rev 263) +++ trunk/nuiton-web/src/site/apt/Warlauncher.apt.vm 2013-04-30 08:53:32 UTC (rev 264) @@ -108,6 +108,20 @@ </plugin> -------------------------------------------------------------------- +** Extra configuration + + You can since version 1.13 configure the port and the contextPath when + starting the executable war. + + To change the port, use the <<--port>> option and to change the + contextPath use the <<--path>> option. + + In next example we change both: + +-------------------------------------------------------------------- +java -jar mywar.war --port 8889 --contextPath /mycontextPath +-------------------------------------------------------------------- + * Use Winstone war launcher ** Maven configuration Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-29 18:54:33 UTC (rev 263) +++ trunk/pom.xml 2013-04-30 08:53:32 UTC (rev 264) @@ -280,7 +280,7 @@ <gwtPluginVersion>2.2.0</gwtPluginVersion>  - <struts2Version>2.3.12</struts2Version> + <struts2Version>2.3.14</struts2Version> <shiroVersion>1.2.1</shiroVersion> <servletApiVersion>2.5</servletApiVersion>

1 0

r263 - trunk
by tchemit＠users.nuiton.org April 29, 2013

April 29, 2013

Author: tchemit Date: 2013-04-29 20:54:33 +0200 (Mon, 29 Apr 2013) New Revision: 263 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/263 Log: fixes #2676: Updates nuiton-utils to 2.6.12 fixes #2677: Updates slf4j to 1.7.5 fixes #2678: Updates ToPIA to 2.8-rc-1 fixes #2679: Updates mavenpom to 3.4.10 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-04-29 18:51:54 UTC (rev 262) +++ trunk/pom.xml 2013-04-29 18:54:33 UTC (rev 263) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.8</version> + <version>3.4.10</version> </parent> <groupId>org.nuiton.web</groupId> @@ -266,14 +266,14 @@ <projectId>nuiton-web</projectId> <nuitonI18nVersion>2.5</nuitonI18nVersion> - <nuitonUtilsVersion>2.6.11</nuitonUtilsVersion> + <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion> <nuitonI18nPluginVersion>${nuitonI18nVersion}</nuitonI18nPluginVersion> - <topiaVersion>2.7.1</topiaVersion> + <topiaVersion>2.8-rc-1</topiaVersion>  <tapestryVersion>5.2.4</tapestryVersion> - <slf4jVersion>1.7.3</slf4jVersion> + <slf4jVersion>1.7.5</slf4jVersion>  <gwtVersion>2.2.0</gwtVersion>

1 0

r262 - trunk/nuiton-web/src/main/java/org/nuiton/web/war
by tchemit＠users.nuiton.org April 29, 2013

April 29, 2013

Author: tchemit Date: 2013-04-29 20:51:54 +0200 (Mon, 29 Apr 2013) New Revision: 262 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/262 Log: fixes #2675: Customize JettyLauncher port and contextPath Modified: trunk/nuiton-web/src/main/java/org/nuiton/web/war/JettyLauncher.java Modified: trunk/nuiton-web/src/main/java/org/nuiton/web/war/JettyLauncher.java =================================================================== --- trunk/nuiton-web/src/main/java/org/nuiton/web/war/JettyLauncher.java 2013-04-29 13:05:12 UTC (rev 261) +++ trunk/nuiton-web/src/main/java/org/nuiton/web/war/JettyLauncher.java 2013-04-29 18:51:54 UTC (rev 262) @@ -57,12 +57,11 @@ /** * War main class launcher (jetty based). - * + * <p/> * To use it : - * java -jar app-xxx.war - * + * java -jar app-xxx.war + * * @author chatellier - * @version $Id$ * @since 1.0 */ public class JettyLauncher implements ActionListener, MouseListener { @@ -76,26 +75,34 @@ /** Default port. */ protected int port = 8888; + /** + * Default context path. + * + * @since 1.13 + */ + protected String contextPath = "/"; + /** Server name. */ protected String serverName; - + /** * Main method (used by war in manifest). - * + * * @param args args * @throws Exception */ - public static void main(String[] args) throws Exception { + public static void main(String... args) throws Exception { JettyLauncher launcher = new JettyLauncher(); + launcher.configure(args); launcher.readInformation(); - launcher.startServer(args); + launcher.startServer(); launcher.installSystemTray(); launcher.openBrowser(); } /** * Parse WEB-INF/web.xml file and get server display name. - * + * * @since 1.1.3 */ protected void readInformation() { @@ -120,9 +127,9 @@ /** * Read input stream as string. - * + * <p/> * Code from commons io. - * + * * @param stream stream to read * @return content as string * @since 1.1.3 @@ -142,13 +149,26 @@ return sw.toString(); } + protected void configure(String... args) throws Exception { + + for (int i = 0; i < args.length; i++) { + if ("--port".equals(args[i])) + port = Integer.parseInt(args[++i]); + else if ("--path".equals(args[i])) { + contextPath = args[++i]; + if (!contextPath.startsWith("/")) { + contextPath = "/" + contextPath; + } + } + } + } + /** * Launch servlet container. - * - * @param args args + * * @throws Exception */ - protected void startServer(String[] args) throws Exception { + protected void startServer() throws Exception { System.out.println("Starting server embedded mode..."); String fqnLauncherFile = JettyLauncher.class.getName().replaceAll("\\.", "/") + ".class"; @@ -168,10 +188,10 @@ jettyServer.setConnectors(new Connector[]{connector}); WebAppContext webappcontext = new WebAppContext(); - webappcontext.setContextPath("/"); + webappcontext.setContextPath(contextPath); webappcontext.setWar(me.getAbsolutePath()); - HandlerCollection handlers= new HandlerCollection(); + HandlerCollection handlers = new HandlerCollection(); handlers.setHandlers(new Handler[]{webappcontext, new DefaultHandler()}); jettyServer.setHandler(handlers); @@ -179,15 +199,13 @@ // build server uri try { - serverUri = new URI("http://localhost:" + port); + serverUri = new URI("http://localhost:" + port + contextPath); } catch (URISyntaxException e) { e.printStackTrace(); } } - /** - * Shutdown server. - */ + /** Shutdown server. */ protected void stopServer() { if (jettyServer != null) { try { @@ -199,9 +217,7 @@ } } - /** - * Install system tray to stop server. - */ + /** Install system tray to stop server. */ protected void installSystemTray() { if (SystemTray.isSupported()) { // build menu @@ -251,8 +267,8 @@ /** * Open browser. - * - * @throws IOException + * + * @throws IOException */ protected void openBrowser() { if (Desktop.isDesktopSupported() && serverUri != null) {

1 0