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

r241 - in trunk/nuiton-security/src/main/java/org/nuiton/web/security: . actions
by echatellier＠users.nuiton.org 26 Nov '12

26 Nov '12

Author: echatellier Date: 2012-11-26 16:27:14 +0100 (Mon, 26 Nov 2012) New Revision: 241 Url: http://nuiton.org/repositories/revision/nuiton-web/241 Log: Take care of context path in uri Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.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/RoleAction.java 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 2012-11-23 12:34:40 UTC (rev 240) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java 2012-11-26 15:27:14 UTC (rev 241) @@ -136,8 +136,13 @@ subjectUser.login(new UsernamePasswordToken(ANON_LOGIN, "")); } - // get permission - String uri = ((HttpServletRequest)servletRequest).getRequestURI(); + // get permission from requested uri without context path + HttpServletRequest httpServletRequest = ((HttpServletRequest)servletRequest); + String contextPath = httpServletRequest.getContextPath(); + String uri = httpServletRequest.getRequestURI(); + if (uri.startsWith(contextPath)) { + uri = uri.substring(contextPath.length()); + } String perm = SecurityUtil.convertToShiroPerm(uri, config.getOption("topia.security.separators")); if (subjectUser.isPermitted("url" + perm)) { @@ -156,13 +161,13 @@ } // save request and redirect to login Session session = subjectUser.getSession(); - HttpServletRequest httpServletRequest = (HttpServletRequest)servletRequest; StringBuffer requestURL = new StringBuffer(httpServletRequest.getRequestURL()); if (httpServletRequest.getQueryString() != null) { requestURL.append('?').append(httpServletRequest.getQueryString()); } session.setAttribute(SESSION_SAVED_URL, requestURL.toString()); - ((HttpServletResponse)servletResponse).sendRedirect(config.getOption("topia.security.loginurl")); + String redirect = contextPath + config.getOption("topia.security.loginurl"); + ((HttpServletResponse)servletResponse).sendRedirect(redirect); } else { ((HttpServletResponse)servletResponse).sendError(401, "Not authorized to access " + uri); } Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/AbstractAction.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/AbstractAction.java 2012-11-23 12:34:40 UTC (rev 240) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/AbstractAction.java 2012-11-26 15:27:14 UTC (rev 241) @@ -36,7 +36,6 @@ import com.opensymphony.xwork2.ActionSupport; - public class AbstractAction extends ActionSupport implements ServletContextAware, ParameterAware { /** serialVersionUID. */ Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RoleAction.java =================================================================== --- trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RoleAction.java 2012-11-23 12:34:40 UTC (rev 240) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/actions/RoleAction.java 2012-11-26 15:27:14 UTC (rev 241) @@ -22,7 +22,6 @@ * #L% */ - package org.nuiton.web.security.actions; import org.apache.commons.lang3.StringUtils;

1 0

r240 - trunk/nuiton-security/src/main/resources/WEB-INF/security
by echatellier＠users.nuiton.org 23 Nov '12

23 Nov '12

Author: echatellier Date: 2012-11-23 13:34:40 +0100 (Fri, 23 Nov 2012) New Revision: 240 Url: http://nuiton.org/repositories/revision/nuiton-web/240 Log: Correction des class/cssClass Modified: 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.jsp 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 2012-11-16 16:13:41 UTC (rev 239) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp 2012-11-23 12:34:40 UTC (rev 240) @@ -37,7 +37,7 @@ <h2>Permissions des rôles</h2> - <form action="<s:url action="role-permissions" namespace="/security" />" method="post" class="security-form"> + <form action="<s:url action="role-permissions" namespace="/security" />" method="post" cssClass="security-form"> <s:iterator value="roles"> <input type="hidden" name="roleIds" value="<s:property value="topiaId" />" /> </s:iterator> Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/role.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/role.jsp 2012-11-16 16:13:41 UTC (rev 239) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/role.jsp 2012-11-23 12:34:40 UTC (rev 240) @@ -41,20 +41,19 @@ <h2>Nouveau rôle</h2> </s:else> - <s:form action="role" namespace="/security" class="security-form"> + <s:form action="role" namespace="/security" cssClass="security-form"> <s:actionerror /> <s:hidden name="roleId" value="%{role.topiaId}" /> <s:textfield label="Nom" name="role.name" value="%{role.name}"/> <s:submit label="Valider" /> </s:form> + + <s:if test='%{role.topiaId != null}'> + <s:a action="role!delete" namespace="/security" cssClass="delete"> + <s:param name="roleId"><s:property value="role.topiaId" /></s:param> + Supprimer + </s:a> + </s:if> </div> - - <s:if test='%{role.topiaId != null}'> - <s:a action="role!delete" namespace="/security" class="delete"> - <s:param name="roleId"><s:property value="role.topiaId" /></s:param> - Supprimer - </s:a> - </s:if> - </body> </html> Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp 2012-11-16 16:13:41 UTC (rev 239) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp 2012-11-23 12:34:40 UTC (rev 240) @@ -41,7 +41,7 @@ <h2>Nouveau utilisateur</h2> </s:else> - <s:form action="user" namespace="/security" class="security-form"> + <s:form action="user" namespace="/security" cssClass="security-form"> <s:actionerror /> <s:hidden name="userId" value="%{user.topiaId}" /> <s:textfield label="Identifiant" name="user.login" value="%{user.login}"/> @@ -51,7 +51,7 @@ </s:form> <s:if test='%{user.topiaId != null}'> - <s:a action="user!delete" namespace="/security" class="delete"> + <s:a action="user!delete" namespace="/security" cssClass="delete"> <s:param name="userId"><s:property value="user.topiaId" /></s:param> Supprimer </s:a>

1 0

r239 - trunk
by tchemit＠users.nuiton.org 16 Nov '12

16 Nov '12

Author: tchemit Date: 2012-11-16 17:13:41 +0100 (Fri, 16 Nov 2012) New Revision: 239 Url: http://nuiton.org/repositories/revision/nuiton-web/239 Log: fix scm url Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-11-16 15:34:51 UTC (rev 238) +++ trunk/pom.xml 2012-11-16 16:13:41 UTC (rev 239) @@ -341,7 +341,7 @@ <developerConnection> scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-web/trunk</url> + <url>http://www.nuiton.org/projects/nuiton-web/repository/show/trunk</url> </scm> <distributionManagement>

1 0

r238 - trunk
by tchemit＠users.nuiton.org 16 Nov '12

16 Nov '12

Author: tchemit Date: 2012-11-16 16:34:51 +0100 (Fri, 16 Nov 2012) New Revision: 238 Url: http://nuiton.org/repositories/revision/nuiton-web/238 Log: Update mavenpom4redmineAndCentral to 3.4.4. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-31 08:58:23 UTC (rev 237) +++ trunk/pom.xml 2012-11-16 15:34:51 UTC (rev 238) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.3</version> + <version>3.4.4</version> </parent> <groupId>org.nuiton.web</groupId>

1 0

r237 - in trunk: . nuiton-gwt nuiton-rss nuiton-security nuiton-struts2 nuiton-tapestry nuiton-web
by echatellier＠users.nuiton.org 31 Oct '12

31 Oct '12

Author: echatellier Date: 2012-10-31 09:58:23 +0100 (Wed, 31 Oct 2012) New Revision: 237 Url: http://nuiton.org/repositories/revision/nuiton-web/237 Log: Oops, wrong version name 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 2012-10-30 16:26:37 UTC (rev 236) +++ trunk/nuiton-gwt/pom.xml 2012-10-31 08:58:23 UTC (rev 237) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12</version> + <version>1.12-SNAPSHOT</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2012-10-30 16:26:37 UTC (rev 236) +++ trunk/nuiton-rss/pom.xml 2012-10-31 08:58:23 UTC (rev 237) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12</version> + <version>1.12-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 2012-10-30 16:26:37 UTC (rev 236) +++ trunk/nuiton-struts2/pom.xml 2012-10-31 08:58:23 UTC (rev 237) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12</version> + <version>1.12-SNAPSHOT</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2012-10-30 16:26:37 UTC (rev 236) +++ trunk/nuiton-tapestry/pom.xml 2012-10-31 08:58:23 UTC (rev 237) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12</version> + <version>1.12-SNAPSHOT</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2012-10-30 16:26:37 UTC (rev 236) +++ trunk/nuiton-web/pom.xml 2012-10-31 08:58:23 UTC (rev 237) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12</version> + <version>1.12-SNAPSHOT</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-30 16:26:37 UTC (rev 236) +++ trunk/pom.xml 2012-10-31 08:58:23 UTC (rev 237) @@ -15,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12</version> + <version>1.12-SNAPSHOT</version> <modules> <module>nuiton-web</module>

1 0

r236 - in trunk: . nuiton-gwt nuiton-rss nuiton-security nuiton-struts2 nuiton-tapestry nuiton-web
by echatellier＠users.nuiton.org 30 Oct '12

30 Oct '12

Author: echatellier Date: 2012-10-30 17:26:37 +0100 (Tue, 30 Oct 2012) New Revision: 236 Url: http://nuiton.org/repositories/revision/nuiton-web/236 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 2012-10-30 16:26:34 UTC (rev 235) +++ trunk/nuiton-gwt/pom.xml 2012-10-30 16:26:37 UTC (rev 236) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-beta-1</version> + <version>1.12</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2012-10-30 16:26:34 UTC (rev 235) +++ trunk/nuiton-rss/pom.xml 2012-10-30 16:26:37 UTC (rev 236) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-beta-1</version> + <version>1.12</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 2012-10-30 16:26:34 UTC (rev 235) +++ trunk/nuiton-struts2/pom.xml 2012-10-30 16:26:37 UTC (rev 236) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-beta-1</version> + <version>1.12</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2012-10-30 16:26:34 UTC (rev 235) +++ trunk/nuiton-tapestry/pom.xml 2012-10-30 16:26:37 UTC (rev 236) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-beta-1</version> + <version>1.12</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2012-10-30 16:26:34 UTC (rev 235) +++ trunk/nuiton-web/pom.xml 2012-10-30 16:26:37 UTC (rev 236) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-beta-1</version> + <version>1.12</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-30 16:26:34 UTC (rev 235) +++ trunk/pom.xml 2012-10-30 16:26:37 UTC (rev 236) @@ -15,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-beta-1</version> + <version>1.12</version> <modules> <module>nuiton-web</module> @@ -337,11 +337,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.12-beta-1</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.12-beta-1 + scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-web/tags/nuiton-web-1.12-b…</url> + <url>http://www.nuiton.org/repositories/browse/nuiton-web/trunk</url> </scm> <distributionManagement>

1 0

r235 - in tags: . nuiton-web-1.12-beta-1
by echatellier＠users.nuiton.org 30 Oct '12

30 Oct '12

Author: echatellier Date: 2012-10-30 17:26:34 +0100 (Tue, 30 Oct 2012) New Revision: 235 Url: http://nuiton.org/repositories/revision/nuiton-web/235 Log: [maven-release-plugin] copy for tag nuiton-web-1.12-beta-1 Added: tags/nuiton-web-1.12-beta-1/ Property changes on: tags/nuiton-web-1.12-beta-1 ___________________________________________________________________ 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

r234 - in trunk: . nuiton-gwt nuiton-rss nuiton-security nuiton-struts2 nuiton-tapestry nuiton-web
by echatellier＠users.nuiton.org 30 Oct '12

30 Oct '12

Author: echatellier Date: 2012-10-30 17:26:31 +0100 (Tue, 30 Oct 2012) New Revision: 234 Url: http://nuiton.org/repositories/revision/nuiton-web/234 Log: [maven-release-plugin] prepare release nuiton-web-1.12-beta-1 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 2012-10-30 16:12:15 UTC (rev 233) +++ trunk/nuiton-gwt/pom.xml 2012-10-30 16:26:31 UTC (rev 234) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-SNAPSHOT</version> + <version>1.12-beta-1</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2012-10-30 16:12:15 UTC (rev 233) +++ trunk/nuiton-rss/pom.xml 2012-10-30 16:26:31 UTC (rev 234) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-SNAPSHOT</version> + <version>1.12-beta-1</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 2012-10-30 16:12:15 UTC (rev 233) +++ trunk/nuiton-struts2/pom.xml 2012-10-30 16:26:31 UTC (rev 234) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-SNAPSHOT</version> + <version>1.12-beta-1</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2012-10-30 16:12:15 UTC (rev 233) +++ trunk/nuiton-tapestry/pom.xml 2012-10-30 16:26:31 UTC (rev 234) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-SNAPSHOT</version> + <version>1.12-beta-1</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2012-10-30 16:12:15 UTC (rev 233) +++ trunk/nuiton-web/pom.xml 2012-10-30 16:26:31 UTC (rev 234) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-SNAPSHOT</version> + <version>1.12-beta-1</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-30 16:12:15 UTC (rev 233) +++ trunk/pom.xml 2012-10-30 16:26:31 UTC (rev 234) @@ -15,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-SNAPSHOT</version> + <version>1.12-beta-1</version> <modules> <module>nuiton-web</module> @@ -337,11 +337,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.12-beta-1</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.12-beta-1 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-web/trunk</url> + <url>http://www.nuiton.org/repositories/browse/nuiton-web/tags/nuiton-web-1.12-b…</url> </scm> <distributionManagement>

1 0

r233 - in trunk: nuiton-rss/src/license nuiton-security/src/main/resources/WEB-INF/security
by echatellier＠users.nuiton.org 30 Oct '12

30 Oct '12

Author: echatellier Date: 2012-10-30 17:12:15 +0100 (Tue, 30 Oct 2012) New Revision: 233 Url: http://nuiton.org/repositories/revision/nuiton-web/233 Log: Fix headers Modified: trunk/nuiton-rss/src/license/THIRD-PARTY.properties 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 Modified: trunk/nuiton-rss/src/license/THIRD-PARTY.properties =================================================================== --- trunk/nuiton-rss/src/license/THIRD-PARTY.properties 2012-10-30 07:44:27 UTC (rev 232) +++ trunk/nuiton-rss/src/license/THIRD-PARTY.properties 2012-10-30 16:12:15 UTC (rev 233) @@ -1,7 +1,6 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - Apache Software License Like # - BSD License # - BSD style # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 @@ -11,13 +10,13 @@ # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - MIT License +# - Similar to Apache License but with the acknowledgment clause removed # - Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 # - The Apache Software License, Version 2.0 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Sun Feb 19 12:50:29 CET 2012 +#Wed Oct 24 14:20:44 CEST 2012 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 javax.servlet--servlet-api--2.5=Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0 -org.jdom--jdom--1.1=Apache Software License Like Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/login.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/login.jsp 2012-10-30 07:44:27 UTC (rev 232) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/login.jsp 2012-10-30 16:12:15 UTC (rev 233) @@ -1,12 +1,24 @@ <%-- #%L - SGQ :: Web + Nuiton Web :: Nuiton Security $Id:$ $HeadURL:$ %% - Copyright (C) 2012 Herboristerie Cailleau + Copyright (C) 2012 CodeLutin, Chatellier Eric %% - Herboristerie Cailleau - Tous droits réservés + 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% --%> <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> @@ -32,4 +44,4 @@ </s:form> </div> </body> -</html> \ No newline at end of file +</html> 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 2012-10-30 07:44:27 UTC (rev 232) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/role-permissions.jsp 2012-10-30 16:12:15 UTC (rev 233) @@ -1,12 +1,24 @@ <%-- #%L - SGQ :: Web + Nuiton Web :: Nuiton Security $Id:$ $HeadURL:$ %% - Copyright (C) 2012 Herboristerie Cailleau + Copyright (C) 2012 CodeLutin, Chatellier Eric %% - Herboristerie Cailleau - Tous droits réservés + 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% --%> <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> @@ -77,4 +89,4 @@ </div> </body> -</html> \ No newline at end of file +</html> Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/role.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/role.jsp 2012-10-30 07:44:27 UTC (rev 232) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/role.jsp 2012-10-30 16:12:15 UTC (rev 233) @@ -1,12 +1,24 @@ <%-- #%L - SGQ :: Web + Nuiton Web :: Nuiton Security $Id:$ $HeadURL:$ %% - Copyright (C) 2012 Herboristerie Cailleau + Copyright (C) 2012 CodeLutin, Chatellier Eric %% - Herboristerie Cailleau - Tous droits réservés + 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% --%> <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> @@ -45,4 +57,4 @@ </s:if> </body> -</html> \ No newline at end of file +</html> 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 2012-10-30 07:44:27 UTC (rev 232) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/user-roles.jsp 2012-10-30 16:12:15 UTC (rev 233) @@ -1,12 +1,24 @@ <%-- #%L - SGQ :: Web + Nuiton Web :: Nuiton Security $Id:$ $HeadURL:$ %% - Copyright (C) 2012 Herboristerie Cailleau + Copyright (C) 2012 CodeLutin, Chatellier Eric %% - Herboristerie Cailleau - Tous droits réservés + 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% --%> <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> @@ -91,4 +103,4 @@ </div> </div> </body> -</html> \ No newline at end of file +</html> Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp 2012-10-30 07:44:27 UTC (rev 232) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp 2012-10-30 16:12:15 UTC (rev 233) @@ -1,12 +1,24 @@ <%-- #%L - SGQ :: Web + Nuiton Web :: Nuiton Security $Id:$ $HeadURL:$ %% - Copyright (C) 2012 Herboristerie Cailleau + Copyright (C) 2012 CodeLutin, Chatellier Eric %% - Herboristerie Cailleau - Tous droits réservés + 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% --%> <%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> @@ -46,4 +58,4 @@ </s:if> </div> </body> -</html> \ No newline at end of file +</html>

1 0

r232 - trunk
by tchemit＠users.nuiton.org 30 Oct '12

30 Oct '12

Author: tchemit Date: 2012-10-30 08:44:27 +0100 (Tue, 30 Oct 2012) New Revision: 232 Url: http://nuiton.org/repositories/revision/nuiton-web/232 Log: Update mavenpom4redmineAndCentral to 3.4.3. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-10-26 11:43:59 UTC (rev 231) +++ trunk/pom.xml 2012-10-30 07:44:27 UTC (rev 232) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.2</version> + <version>3.4.3</version> </parent> <groupId>org.nuiton.web</groupId>

1 0