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

r251 - trunk
by echatellier＠users.nuiton.org March 18, 2013

March 18, 2013

Author: echatellier Date: 2013-03-18 10:34:18 +0100 (Mon, 18 Mar 2013) New Revision: 251 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/251 Log: fixes #2606: Update to struts 2.3.12 fixes #2607: Update to slf4j 1.7.3 fixes #2608: Update to topia 2.7.1 fixes #2609: Update to nuiton-utils 2.6.11 fixes #2610: Update to eugene 2.6.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-03-14 15:29:53 UTC (rev 250) +++ trunk/pom.xml 2013-03-18 09:34:18 UTC (rev 251) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.7</version> + <version>3.4.8</version> </parent> <groupId>org.nuiton.web</groupId> @@ -261,21 +261,21 @@ <projectId>nuiton-web</projectId> <nuitonI18nVersion>2.5</nuitonI18nVersion> - <nuitonUtilsVersion>2.6.3</nuitonUtilsVersion> + <nuitonUtilsVersion>2.6.11</nuitonUtilsVersion> <nuitonI18nPluginVersion>${nuitonI18nVersion}</nuitonI18nPluginVersion> - <topiaVersion>2.7</topiaVersion> + <topiaVersion>2.7.1</topiaVersion>  <tapestryVersion>5.2.4</tapestryVersion> - <slf4jVersion>1.6.4</slf4jVersion> + <slf4jVersion>1.7.3</slf4jVersion>  <gwtVersion>2.2.0</gwtVersion> <gwtPluginVersion>2.2.0</gwtPluginVersion>  - <struts2Version>2.3.4.1</struts2Version> + <struts2Version>2.3.12</struts2Version> <shiroVersion>1.2.1</shiroVersion> <servletApiVersion>2.5</servletApiVersion> @@ -321,7 +321,7 @@ <plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>eugene-maven-plugin</artifactId> - <version>2.5</version> + <version>2.6.1</version> </plugin> </plugins> </pluginManagement>

1 0

r250 - trunk/nuiton-web/src/main/java/org/nuiton/web/filter
by bleny＠users.nuiton.org March 14, 2013

March 14, 2013

Author: bleny Date: 2013-03-14 16:29:53 +0100 (Thu, 14 Mar 2013) New Revision: 250 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/250 Log: file header for JpaTransactionFilter Modified: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/JpaTransactionFilter.java 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-03-14 15:26:30 UTC (rev 249) +++ trunk/nuiton-web/src/main/java/org/nuiton/web/filter/JpaTransactionFilter.java 2013-03-14 15:29:53 UTC (rev 250) @@ -1,11 +1,12 @@ +package org.nuiton.web.filter; + /* * #%L * Nuiton Web :: Nuiton Web - * - * $Id: TopiaTransactionFilter.java 187 2012-02-20 11:49:09Z tchemit $ - * $HeadURL: http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.12-beta-2/nuiton-web… $ + * $Id:$ + * $HeadURL:$ * %% - * Copyright (C) 2011 CodeLutin + * Copyright (C) 2011 - 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 @@ -22,7 +23,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -package org.nuiton.web.filter; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log;

1 0

r249 - in trunk: . nuiton-web nuiton-web/src/main/java/org/nuiton/web/filter
by bleny＠users.nuiton.org March 14, 2013

March 14, 2013

Author: bleny Date: 2013-03-14 16:26:30 +0100 (Thu, 14 Mar 2013) New Revision: 249 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/249 Log: fixes #2593: Introduce JpaTransactionFilter Added: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/JpaTransactionFilter.java Modified: trunk/nuiton-web/pom.xml trunk/pom.xml Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2013-03-14 15:06:26 UTC (rev 248) +++ trunk/nuiton-web/pom.xml 2013-03-14 15:26:30 UTC (rev 249) @@ -45,6 +45,11 @@ </dependency> <dependency> + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.0-api</artifactId> + </dependency> + + <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> Added: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/JpaTransactionFilter.java =================================================================== --- trunk/nuiton-web/src/main/java/org/nuiton/web/filter/JpaTransactionFilter.java (rev 0) +++ trunk/nuiton-web/src/main/java/org/nuiton/web/filter/JpaTransactionFilter.java 2013-03-14 15:26:30 UTC (rev 249) @@ -0,0 +1,383 @@ +/* + * #%L + * Nuiton Web :: Nuiton Web + * + * $Id: TopiaTransactionFilter.java 187 2012-02-20 11:49:09Z tchemit $ + * $HeadURL: http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.12-beta-2/nuiton-web… $ + * %% + * Copyright (C) 2011 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% + */ +package org.nuiton.web.filter; + +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import javax.persistence.EntityManager; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import java.io.IOException; +import java.lang.reflect.InvocationHandler; +import java.lang.reflect.Method; +import java.lang.reflect.Proxy; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + +/** + * <h2>Purpose of this filter</h2> + * This filter purpose is to inject in the request a entityManager from + * {@link EntityManager} and deal with the complete lifecycle of a JPA + * entityManager while a request. + * <p/> + * The injected JPA entityManager will be closed (if was really opened) at the end of + * the request. + * <h2>Configuration of the filter</h2> + * The filter accepts two configuration parameters: + * <ul> + * <li>{@code excludeMethods}: This parameters configure a set of method names + * which should never be called on the proxied entityManager. + * When a such method is called on the entityManager then the filter will pass in + * the hook {@link #onExcludeMethod(Object, Method, Object[])}. + * <p/> + * Default implementation of this hook is to throw an exception. + * </li> + * <li>{@code unusedMethods}: This parameters configure a set of method names + * which should be by-pass when the proxied entityManager was not still open + * (via a {@link EntityManager#}. + * When a such method is called on the entityManager then the filter will pass in + * the hook {@link #onUnusedMethod(Object, Method, Object[])}. + * <p/> + * Default implementation of this hook is to not return null values. + * </li> + * </ul> + * <h2>Obtain the entityManager</h2> + * The (proxied) entityManager is pushed as an attribute in the servlet request. + * <p/> + * The attribute name is defined by field {@link #requestAttributeName} + * (default value is {@link #JPA_TRANSACTION_REQUEST_ATTRIBUTE}) and can be + * changed. + * <p/> + * A convience method is created here to obtain the entityManager {@link #getTransaction(ServletRequest)} : + * <pre> + * EntityManager em = JpaTransactionFilter.getTransaction(ServletRequest); + * </pre> + * <p/> + * If you prefer to not use this nice method, you can also do this: + * <pre> + * EntityManager em = (EntityManager) request.getAttribute(JpaTransactionFilter#JPA_TRANSACTION_REQUEST_ATTRIBUTE); + * </pre> + * <p/> + * Or + * <pre> + * EntityManager em = (EntityManager) request.getAttribute(modifiedAttributeName); + * </pre> + * + * @author tchemit, bleny + * @since 1.13 + */ +public abstract class JpaTransactionFilter implements Filter { + + public static final String JPA_TRANSACTION_REQUEST_ATTRIBUTE = + "jpaTransaction"; + + public static final String[] DEFAULT_EXCLUDE_METHODS = { + "close" + }; + + public static final String[] DEFAULT_UNUSED_METHODS = { + "toString", + "isOpen", + "clear", + "equals", + "hashCode", + "finalize", + "getClass" + }; + + /** Logger. */ + private static final Log log = + LogFactory.getLog(JpaTransactionFilter.class); + + /** names of methods to forbid access while using proxy. */ + protected Set<String> excludeMethods; + + /** names of methods to by-pass if no entityManager opened on proxy. */ + protected Set<String> unusedMethods; + + /** + * Name of the request attribute where to push the entityManager. + * <p/> + * By default will use value of + * {@link #JPA_TRANSACTION_REQUEST_ATTRIBUTE}. + */ + protected String requestAttributeName = JPA_TRANSACTION_REQUEST_ATTRIBUTE; + + public Set<String> getExcludeMethods() { + return excludeMethods; + } + + public Set<String> getUnusedMethods() { + return unusedMethods; + } + + /** + * to change the {@link #requestAttributeName}. + * + * @param requestAttributeName new name of the request attribute + * where to push the entityManager. + */ + public void setRequestAttributeName(String requestAttributeName) { + this.requestAttributeName = requestAttributeName; + } + + public static EntityManager getTransaction(ServletRequest request) { + EntityManager entityManager = (EntityManager) + request.getAttribute(JPA_TRANSACTION_REQUEST_ATTRIBUTE); + return entityManager; + } + + /** + * Method to open a new entityManager. + * + * @param request incoming request + * @return the new freshly opened entityManager + */ + protected abstract EntityManager createEntityManager(ServletRequest request); + + @Override + public void destroy() { + } + + @Override + public void init(FilterConfig filterConfig) throws ServletException { + String methodsFromConfig; + + methodsFromConfig = filterConfig.getInitParameter("excludeMethods"); + String[] methods; + if (StringUtils.isNotEmpty(methodsFromConfig)) { + methods = methodsFromConfig.split(","); + } else { + methods = DEFAULT_EXCLUDE_METHODS; + } + excludeMethods = new HashSet<String>(Arrays.asList(methods)); + + methodsFromConfig = filterConfig.getInitParameter("unusedMethods"); + if (StringUtils.isNotEmpty(methodsFromConfig)) { + methods = methodsFromConfig.split(","); + } else { + methods = DEFAULT_UNUSED_METHODS; + } + unusedMethods = new HashSet<String>(Arrays.asList(methods)); + } + + @Override + public void doFilter(ServletRequest request, + ServletResponse response, + FilterChain chain) throws IOException, ServletException { + + // creates a proxy of a lazy entityManager + + JpaTransactionProxyInvocationHandler proxyInvocationHandler = + new JpaTransactionProxyInvocationHandler(request); + + EntityManager proxy = (EntityManager) Proxy.newProxyInstance( + getClass().getClassLoader(), + new Class<?>[]{EntityManager.class}, + proxyInvocationHandler + ); + + // push it in request as an attribute + request.setAttribute(requestAttributeName, proxy); + try { + + // chain to next filter + chain.doFilter(request, response); + } finally { + + // close the real entityManager + onCloseTransaction(proxyInvocationHandler.entityManager); + } + } + + /** + * Hook method called when a method with his name in + * {@link #excludeMethods} was invoked on the proxied entityManager. + * + * @param proxy proxied entityManager + * @param method method invoked + * @param args arguments of the invoked method + * @return the return code of the method + * @throws Throwable if any error to do. + */ + protected Object onExcludeMethod(Object proxy, + Method method, + Object[] args) throws Throwable { + + // not authorized + throw new IllegalAccessException( + "Not allowed to access method " + method.getName() + " on " + + proxy); + } + + /** + * Hook method to close the topia entityManager of the request at the end of + * the request when all filter has been consumed. + * + * @param entityManager the entityManager to close (can be null if entityManager + * was not required while the current request) + */ + protected void onCloseTransaction(EntityManager entityManager) { + if (entityManager == null) { + if (log.isTraceEnabled()) { + log.trace("no entityManager to close"); + } + } else if ( ! entityManager.isOpen()) { + if (log.isTraceEnabled()) { + log.trace("entityManager " + entityManager + " is already closed"); + } + } else { + if (log.isDebugEnabled()) { + log.debug("closing entityManager " + entityManager); + } + entityManager.close(); + } + } + + /** + * Hook method called when a method with his name in + * {@link #unusedMethods} was invoked on the proxied entityManager + * while the underlying entityManager is still not opened. + * + * @param proxy the proxy itself + * @param method method invoked + * @param args arguments of the invoked method + * @return the return code of the method + * @throws Throwable if any error to do. + */ + protected Object onUnusedMethod(Object proxy, + Method method, + Object[] args) throws Throwable { + + // by-pass method since no entityManager found + + String methodName = method.getName(); + if (log.isDebugEnabled()) { + log.debug("Skip execution of method " + methodName + + " since no entityManager is created"); + } + + Set<String> methods = getUnusedMethods(); + if (methods.contains("toString")) { + + return "No entityManager opened yet for this proxy"; + } + + if (methods.contains("isOpen")) { + + return true; + } + + if (methods.contains("equals")) { + + return false; + } + + if (methods.contains("hashCode")) { + + return 0; + } + + if (methods.contains("getClass")) { + + return EntityManager.class; + } + + return null; + } + + /** + * Handler of a proxy on a {@link EntityManager}. + * + * @see #excludeMethods + */ + public class JpaTransactionProxyInvocationHandler implements InvocationHandler { + + /** Incoming request that creates this handler. */ + protected final ServletRequest request; + + /** Target to use for the proxy. */ + protected EntityManager entityManager; + + protected JpaTransactionProxyInvocationHandler(ServletRequest request) { + this.request = request; + } + + @Override + public Object invoke(Object proxy, + Method method, + Object[] args) throws Throwable { + + String methodName = method.getName(); + + if (getExcludeMethods().contains(methodName)) { + + Object result = onExcludeMethod(proxy, method, args); + return result; + } + + if (entityManager == null) { + + if (log.isTraceEnabled()) { + log.trace("entityManager started due to a call to " + methodName); + } + + if (getUnusedMethods().contains(methodName)) { + + Object result = onUnusedMethod(proxy, method, args); + return result; + } + + // first time entityManager is required, create its + entityManager = createEntityManager(request); + + entityManager.getTransaction().begin(); + + if (log.isDebugEnabled()) { + log.debug("created entityManager " + entityManager); + } + } + + // can invoke the method on the entityManager + try { + Object result = method.invoke(entityManager, args); + return result; + } catch (Exception eee) { + if (log.isErrorEnabled()) { + log.error("Could not execute method " + method.getName(), eee); + } + throw eee; + } + } + } + +} Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-03-14 15:06:26 UTC (rev 248) +++ trunk/pom.xml 2013-03-14 15:26:30 UTC (rev 249) @@ -146,6 +146,13 @@ <scope>provided</scope> </dependency> + <dependency> + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.0-api</artifactId> + <version>1.0.1.Final</version> + <scope>provided</scope> + </dependency> +  <dependency> <groupId>com.google.gwt</groupId>

1 0

r248 - trunk/nuiton-web/src/main/java/org/nuiton/web/filter
by bleny＠users.nuiton.org March 14, 2013

March 14, 2013

Author: bleny Date: 2013-03-14 16:06:26 +0100 (Thu, 14 Mar 2013) New Revision: 248 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/248 Log: fixes #2594 excluded and unused methods parameter value is ignored in TopiaTransactionFilter Modified: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java Modified: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java =================================================================== --- trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java 2013-03-11 12:08:35 UTC (rev 247) +++ trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java 2013-03-14 15:06:26 UTC (rev 248) @@ -182,8 +182,7 @@ public void init(FilterConfig filterConfig) throws ServletException { String methodsFromConfig; - methodsFromConfig = filterConfig.getInitParameter("execludeMethods"); - + methodsFromConfig = filterConfig.getInitParameter("excludeMethods"); String[] methods; if (StringUtils.isNotEmpty(methodsFromConfig)) { methods = methodsFromConfig.split(","); @@ -192,9 +191,7 @@ } excludeMethods = new HashSet<String>(Arrays.asList(methods)); - methodsFromConfig = - filterConfig.getInitParameter("unusedMethods "); - + methodsFromConfig = filterConfig.getInitParameter("unusedMethods"); if (StringUtils.isNotEmpty(methodsFromConfig)) { methods = methodsFromConfig.split(","); } else {

1 0

r247 - trunk/nuiton-security/src/main/resources/WEB-INF/security
by echatellier＠users.nuiton.org March 11, 2013

March 11, 2013

Author: echatellier Date: 2013-03-11 13:08:35 +0100 (Mon, 11 Mar 2013) New Revision: 247 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/247 Log: Fix test Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp Modified: trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp =================================================================== --- trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp 2012-12-29 11:29:30 UTC (rev 246) +++ trunk/nuiton-security/src/main/resources/WEB-INF/security/user.jsp 2013-03-11 12:08:35 UTC (rev 247) @@ -34,7 +34,7 @@ <div class="security-div"> <h1>Sécurité</h1> - <s:if test='%{role.topiaId != null}'> + <s:if test='%{user.topiaId != null}'> <h2>Modification d'un utilisateur</h2> </s:if> <s:else>

1 0

r246 - trunk
by tchemit＠users.nuiton.org Dec. 29, 2012

Dec. 29, 2012

Author: tchemit Date: 2012-12-29 12:29:30 +0100 (Sat, 29 Dec 2012) New Revision: 246 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/246 Log: Update mavenpom4redmineAndCentral to 3.4.7. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-12-19 13:04:58 UTC (rev 245) +++ trunk/pom.xml 2012-12-29 11:29:30 UTC (rev 246) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.4.4</version> + <version>3.4.7</version> </parent> <groupId>org.nuiton.web</groupId>

1 0

r245 - in trunk: . nuiton-gwt nuiton-rss nuiton-security nuiton-struts2 nuiton-tapestry nuiton-web
by echatellier＠users.nuiton.org Dec. 19, 2012

Dec. 19, 2012

Author: echatellier Date: 2012-12-19 14:04:58 +0100 (Wed, 19 Dec 2012) New Revision: 245 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/245 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-12-19 13:04:56 UTC (rev 244) +++ trunk/nuiton-gwt/pom.xml 2012-12-19 13:04:58 UTC (rev 245) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-beta-2</version> + <version>1.12-SNAPSHOT</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2012-12-19 13:04:56 UTC (rev 244) +++ trunk/nuiton-rss/pom.xml 2012-12-19 13:04:58 UTC (rev 245) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-beta-2</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-12-19 13:04:56 UTC (rev 244) +++ trunk/nuiton-struts2/pom.xml 2012-12-19 13:04:58 UTC (rev 245) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-beta-2</version> + <version>1.12-SNAPSHOT</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2012-12-19 13:04:56 UTC (rev 244) +++ trunk/nuiton-tapestry/pom.xml 2012-12-19 13:04:58 UTC (rev 245) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-beta-2</version> + <version>1.12-SNAPSHOT</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2012-12-19 13:04:56 UTC (rev 244) +++ trunk/nuiton-web/pom.xml 2012-12-19 13:04:58 UTC (rev 245) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-beta-2</version> + <version>1.12-SNAPSHOT</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-12-19 13:04:56 UTC (rev 244) +++ trunk/pom.xml 2012-12-19 13:04:58 UTC (rev 245) @@ -15,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-beta-2</version> + <version>1.12-SNAPSHOT</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-2</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-2 + 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

r244 - in tags: . nuiton-web-1.12-beta-2
by echatellier＠users.nuiton.org Dec. 19, 2012

Dec. 19, 2012

Author: echatellier Date: 2012-12-19 14:04:56 +0100 (Wed, 19 Dec 2012) New Revision: 244 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/244 Log: [maven-release-plugin] copy for tag nuiton-web-1.12-beta-2 Added: tags/nuiton-web-1.12-beta-2/ Property changes on: tags/nuiton-web-1.12-beta-2 ___________________________________________________________________ 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

r243 - in trunk: . nuiton-gwt nuiton-rss nuiton-security nuiton-struts2 nuiton-tapestry nuiton-web
by echatellier＠users.nuiton.org Dec. 19, 2012

Dec. 19, 2012

Author: echatellier Date: 2012-12-19 14:04:53 +0100 (Wed, 19 Dec 2012) New Revision: 243 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/243 Log: [maven-release-plugin] prepare release nuiton-web-1.12-beta-2 Modified: trunk/nuiton-gwt/pom.xml trunk/nuiton-rss/pom.xml trunk/nuiton-security/pom.xml trunk/nuiton-struts2/pom.xml trunk/nuiton-tapestry/pom.xml trunk/nuiton-web/pom.xml trunk/pom.xml Modified: trunk/nuiton-gwt/pom.xml =================================================================== --- trunk/nuiton-gwt/pom.xml 2012-12-05 14:26:56 UTC (rev 242) +++ trunk/nuiton-gwt/pom.xml 2012-12-19 13:04:53 UTC (rev 243) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-SNAPSHOT</version> + <version>1.12-beta-2</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2012-12-05 14:26:56 UTC (rev 242) +++ trunk/nuiton-rss/pom.xml 2012-12-19 13:04:53 UTC (rev 243) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-SNAPSHOT</version> + <version>1.12-beta-2</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-12-05 14:26:56 UTC (rev 242) +++ trunk/nuiton-struts2/pom.xml 2012-12-19 13:04:53 UTC (rev 243) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-SNAPSHOT</version> + <version>1.12-beta-2</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2012-12-05 14:26:56 UTC (rev 242) +++ trunk/nuiton-tapestry/pom.xml 2012-12-19 13:04:53 UTC (rev 243) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-SNAPSHOT</version> + <version>1.12-beta-2</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2012-12-05 14:26:56 UTC (rev 242) +++ trunk/nuiton-web/pom.xml 2012-12-19 13:04:53 UTC (rev 243) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-SNAPSHOT</version> + <version>1.12-beta-2</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-12-05 14:26:56 UTC (rev 242) +++ trunk/pom.xml 2012-12-19 13:04:53 UTC (rev 243) @@ -15,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.12-SNAPSHOT</version> + <version>1.12-beta-2</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-2</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-2 </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

r242 - trunk/nuiton-security/src/main/java/org/nuiton/web/security
by echatellier＠users.nuiton.org Dec. 5, 2012

Dec. 5, 2012

Author: echatellier Date: 2012-12-05 15:26:56 +0100 (Wed, 05 Dec 2012) New Revision: 242 Url: http://nuiton.org/projects/nuiton-web/repository/revisions/242 Log: Fix page refresh to get real user rights content Modified: trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.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-26 15:27:14 UTC (rev 241) +++ trunk/nuiton-security/src/main/java/org/nuiton/web/security/SecurityShiroFilter.java 2012-12-05 14:26:56 UTC (rev 242) @@ -26,6 +26,7 @@ import java.io.IOException; import java.util.Properties; +import java.util.concurrent.Callable; import javax.servlet.FilterChain; import javax.servlet.ServletException; @@ -122,7 +123,7 @@ @Override protected void doFilterInternal(ServletRequest servletRequest, - ServletResponse servletResponse, FilterChain chain) + ServletResponse servletResponse, final FilterChain chain) throws ServletException, IOException { // get subject @@ -149,7 +150,21 @@ if (log.isDebugEnabled()) { log.debug("User is permitted to access " + perm); } - super.doFilterInternal(servletRequest, servletResponse, chain); + + // on devrait appeler simplement super.doFilterInternal(servletRequest, servletResponse, chain); + // mais on ne peut pas car il recreer un nouveau Subject + // et n'utilise pas le notre :( + final ServletRequest request = prepareServletRequest(servletRequest, servletResponse, chain); + final ServletResponse response = prepareServletResponse(request, servletResponse, chain); + //noinspection unchecked + subjectUser.execute(new Callable() { + public Object call() throws Exception { + updateSessionLastAccessTime(request, response); + executeChain(request, response, chain); + return null; + } + }); + } else { if (log.isDebugEnabled()) { log.debug("User is NOT permitted to access " + perm);

1 0