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

r132 - in trunk: nuiton-struts2/src/main/java/org/nuiton/web/struts2/filter nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor nuiton-web nuiton-web/src/main/java/org/nuiton/web nuiton-web/src/main/java/org/nuiton/web/filter
by tchemit＠users.nuiton.org 09 Nov '11

09 Nov '11

Author: tchemit Date: 2011-11-09 16:54:16 +0100 (Wed, 09 Nov 2011) New Revision: 132 Url: http://nuiton.org/repositories/revision/nuiton-web/132 Log: Evolution #1800: Introduce a new neutral TopiaTransactionFilter Added: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/ trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/filter/CloseTopiaTransactionFilter.java trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/OpenTopiaTransactionInterceptor.java trunk/nuiton-web/pom.xml Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/filter/CloseTopiaTransactionFilter.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/filter/CloseTopiaTransactionFilter.java 2011-10-31 10:39:08 UTC (rev 131) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/filter/CloseTopiaTransactionFilter.java 2011-11-09 15:54:16 UTC (rev 132) @@ -49,7 +49,9 @@ * * @since 1.5 * @author bleny + * @deprecated since 1.6, prefer use the neutral filter org.nuiton.web.filter.TopiaTransactionFilter from nuiton-web module */ +@Deprecated public class CloseTopiaTransactionFilter implements Filter { /** Logger. */ Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/OpenTopiaTransactionInterceptor.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/OpenTopiaTransactionInterceptor.java 2011-10-31 10:39:08 UTC (rev 131) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/OpenTopiaTransactionInterceptor.java 2011-11-09 15:54:16 UTC (rev 132) @@ -86,7 +86,9 @@ * @author tchemit <chemit(a)codelutin.com> * @author bleny <leny(a)codelutin.com> * @since 1.5 + * @deprecated since 1.6, prefer use the neutral filter org.nuiton.web.filter.TopiaTransactionFilter from nuiton-web module */ +@Deprecated public abstract class OpenTopiaTransactionInterceptor extends AbstractInterceptor { /** Logger. */ Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2011-10-31 10:39:08 UTC (rev 131) +++ trunk/nuiton-web/pom.xml 2011-11-09 15:54:16 UTC (rev 132) @@ -32,6 +32,12 @@ <scope>provided</scope> </dependency> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> Added: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java =================================================================== --- trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java (rev 0) +++ trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java 2011-11-09 15:54:16 UTC (rev 132) @@ -0,0 +1,349 @@ +/* + * #%L + * Nuiton Web :: Nuiton Web + * + * $Id$ + * $HeadURL$ + * %% + * 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.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.TopiaRuntimeException; +import org.nuiton.topia.framework.TopiaContextImplementor; + +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 transaction from + * {@link TopiaContext} and deal with the complete lifecycle of a topia + * transaction while a request. + * <p/> + * The injected transaction 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 transaction. + * When a such method is called on the transaction 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 transaction was not still open (via a {@link TopiaContext#beginTransaction()}. + * When a such method is called on the transaction 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 transaction</h2> + * The (proxied) transaction is pushed as an attribute in the servlet request. + * <p/> + * The attribute name is {@link #TOPIA_TRANSACTION_REQUEST_ATTRIBUTE}. + * <p/> + * A convience method is created here to obtain the transaction {@link #getTransaction(ServletRequest)} : + * <pre> + * TopiaContext tx = TopiaTransactionFilter.getTransaction(ServletRequest); + * </pre> + * <p/> + * If you prefer to not use this nice method, you can also do this: + * <pre> + * TopiaContext tx = (TopiaContext) request.getAttribute(TopiaTransactionFilter#TOPIA_TRANSACTION_REQUEST_ATTRIBUTE); + * </pre> + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.6 + */ +public abstract class TopiaTransactionFilter implements Filter { + + public static final String TOPIA_TRANSACTION_REQUEST_ATTRIBUTE = + "topiaTransaction"; + + public static final String[] DEFAULT_EXCLUDE_METHODS = { + "beginTransaction", + "closeContext", + "clear" + }; + + public static final String[] DEFAULT_UNUSED_METHODS = { + "toString", + "isClosed", + "closeContext", + "clear", + "equals", + "hashCode", + "finalize", + "getClass" + }; + + /** Logger. */ + private static final Log log = + LogFactory.getLog(TopiaTransactionFilter.class); + + /** names of methods to forbid access while using proxy. */ + protected Set<String> excludeMethods; + + /** names of methods to by-pass if no transaction opened on proxy. */ + protected Set<String> unusedMethods; + + public Set<String> getExcludeMethods() { + return excludeMethods; + } + + public Set<String> getUnusedMethods() { + return unusedMethods; + } + + public static TopiaContext getTransaction(ServletRequest request) { + TopiaContext topiaContext = (TopiaContext) + request.getAttribute(TOPIA_TRANSACTION_REQUEST_ATTRIBUTE); + return topiaContext; + } + + /** + * Method to open a new transaction. + * + * @return the new freshly opened transaction + * @throws TopiaRuntimeException if any problem while opening a new transaction + */ + protected abstract TopiaContext beginTransaction() throws TopiaRuntimeException; + + @Override + public void destroy() { + } + + @Override + public void init(FilterConfig filterConfig) throws ServletException { + String methodsFromConfig; + + methodsFromConfig = filterConfig.getInitParameter("execludeMethods"); + + 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 transaction + + TopiaTransactionProxyInvocationHandler proxyInvocationHandler = + new TopiaTransactionProxyInvocationHandler(); + + TopiaContext proxy = (TopiaContext) Proxy.newProxyInstance( + getClass().getClassLoader(), + new Class<?>[]{TopiaContext.class, + TopiaContextImplementor.class}, + proxyInvocationHandler + ); + request.setAttribute(TOPIA_TRANSACTION_REQUEST_ATTRIBUTE, proxy); + try { + chain.doFilter(request, response); + } finally { + proxyInvocationHandler.closeTransaction(); + } + } + + /** + * Hook method called when a method with his name in + * {@link #excludeMethods} was invoked on the proxied transaction. + * + * @param proxy proxied transaction + * @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 called when a method with his name in + * {@link #unusedMethods} was invoked on the proxied transaction + * while the underlying transaction is still not opened. + * + * @param proxy proxied transaction + * @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 transaction found + + String methodName = method.getName(); + if (log.isDebugEnabled()) { + log.debug("Skip execution of method " + methodName + + " since no transaction is instanciated."); + } + + Set<String> methods = getUnusedMethods(); + if (methods.contains("toString")) { + + return "No transaction opened for proxy " + proxy; + } + + if (methods.contains("isClosed")) { + + return false; + } + + if (methods.contains("equals")) { + + return false; + } + + if (methods.contains("hashCode")) { + + return 0; + } + + if (methods.contains("getClass")) { + + return TopiaContext.class; + } + + return null; + } + + /** + * Handler of a proxy on a {@link TopiaContext}. + * + * @see #excludeMethods + */ + public class TopiaTransactionProxyInvocationHandler implements InvocationHandler { + + /** Target to use for the proxy. */ + protected TopiaContext transaction; + + @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 (transaction == null) { + + if (log.isTraceEnabled()) { + log.trace("transaction started due to a call to " + methodName); + } + + if (getUnusedMethods().contains(methodName)) { + + Object result = onUnusedMethod(proxy, method, args); + return result; + } + + // first time transaction is required, create its + transaction = beginTransaction(); + + if (log.isDebugEnabled()) { + log.debug("Open transaction " + transaction); + } + } + + // can invoke the method on the transaction + try { + Object result = method.invoke(transaction, args); + return result; + } catch (Exception eee) { + if (log.isErrorEnabled()) { + log.error("Could not execute method " + method.getName(), eee); + } + throw eee; + } + } + + protected void closeTransaction() { + if (transaction == null) { + if (log.isTraceEnabled()) { + log.trace("no transaction to close"); + } + } else if (transaction.isClosed()) { + if (log.isTraceEnabled()) { + log.trace("transaction " + transaction + " is already closed"); + } + } else { + if (log.isDebugEnabled()) { + log.debug("closing transaction " + transaction); + } + try { + transaction.closeContext(); + } catch (TopiaException e) { + throw new TopiaRuntimeException(e); + } + } + } + } + +} Property changes on: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r131 - trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor
by tchemit＠users.nuiton.org 31 Oct '11

31 Oct '11

Author: tchemit Date: 2011-10-31 11:39:08 +0100 (Mon, 31 Oct 2011) New Revision: 131 Url: http://nuiton.org/repositories/revision/nuiton-web/131 Log: Evolution #1792: Remove TopiaTransactionInterceptor Removed: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java Deleted: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java 2011-10-31 10:00:35 UTC (rev 130) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java 2011-10-31 10:39:08 UTC (rev 131) @@ -1,173 +0,0 @@ -/* - * #%L - * Nuiton Web :: Nuiton Struts 2 - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2010 - 2011 CodeLutin, Tony Chemit - * %% - * 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.struts2.interceptor; - -import com.opensymphony.xwork2.ActionInvocation; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaContext; -import org.nuiton.topia.TopiaException; -import org.nuiton.topia.framework.TopiaContextImplementor; -import org.nuiton.topia.framework.TopiaTransactionAware; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; - - -/** - * Same interceptor as {@link OpenTopiaTransactionInterceptor} but close - * the transaction after action is called. The transaction will be commited - * (unless asked otherwise) and closed. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.2 - * @deprecated since 1.5, will be removed soon - */ -@Deprecated -public abstract class TopiaTransactionInterceptor extends OpenTopiaTransactionInterceptor { - - /** To specify on your action or method that you never want any commit. */ - @Retention(RetentionPolicy.RUNTIME) - @Target({ElementType.TYPE, ElementType.METHOD}) - public @interface NoCommit { - } - - private static final long serialVersionUID = 1L; - - /** Logger. */ - private static final Log log = - LogFactory.getLog(TopiaTransactionInterceptor.class); - - @Override - public String intercept(ActionInvocation invocation) throws Exception { - - TopiaTransactionAware transactionAware = null; - - Object action = invocation.getProxy().getAction(); - - if (action instanceof TopiaTransactionAware) { - transactionAware = (TopiaTransactionAware) action; - } - - if (transactionAware == null) { - - // not a transaction aware action, direct skip this interceptor - return invocation.invoke(); - } - - // creates a proxy of a lazy transaction - - TopiaTransactionProxyInvocationHandler proxyInvocationHandler = - new TopiaTransactionProxyInvocationHandler(); - - TopiaContext proxy = (TopiaContext) Proxy.newProxyInstance( - getClass().getClassLoader(), - new Class<?>[]{TopiaContext.class, - TopiaContextImplementor.class}, - proxyInvocationHandler - ); - - // set the transaction in the action - transactionAware.setTransaction(proxy); - - try { - - return invocation.invoke(); - - } finally { - - closeTransaction(proxyInvocationHandler.getTransaction(), action, invocation); - - } - } - - protected void closeTransaction(TopiaContext transaction, Object action, - ActionInvocation invocation) throws TopiaException { - - boolean commitNeeded = isCommitNeeded(action, invocation); - - if (transaction != null && ! transaction.isClosed()) { - try { - if (commitNeeded) { - - // commit the opened transaction - if (log.isDebugEnabled()) { - log.debug("Commit transaction " + transaction); - } - transaction.commitTransaction(); - } - } finally { - - // close the opened transaction - if (log.isDebugEnabled()) { - log.debug("Close transaction " + transaction); - } - transaction.closeContext(); - } - } - } - - protected boolean isCommitNeeded(Object action, - ActionInvocation invocation) { - Class<?> actionType = action.getClass(); - boolean noCommit = actionType.isAnnotationPresent(NoCommit.class); - if (noCommit) { - - // a no commit annotation was found on the top of action - if (log.isDebugEnabled()) { - log.debug("NoCommit annotation found on action " + - actionType.getName()); - } - return false; - } - - // try to look on the methodName - String methodName = invocation.getProxy().getMethod(); - if (methodName == null) { - - // no methodName specify, means the execute one - methodName = "execute"; - } - Method method; - try { - method = actionType.getMethod(methodName); - } catch (NoSuchMethodException e) { - throw new RuntimeException(e); - } - noCommit = method.isAnnotationPresent(NoCommit.class); - if (noCommit) { - if (log.isDebugEnabled()) { - log.debug("NoCommit annotation found on action methodName " + - actionType.getName() + "#" + methodName); - } - } - return !noCommit; - } - -} \ No newline at end of file

1 0

r130 - in trunk: . nuiton-gwt nuiton-rss nuiton-struts2 nuiton-tapestry nuiton-web
by maven-release＠users.nuiton.org 31 Oct '11

31 Oct '11

Author: maven-release Date: 2011-10-31 11:00:35 +0100 (Mon, 31 Oct 2011) New Revision: 130 Url: http://nuiton.org/repositories/revision/nuiton-web/130 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/nuiton-gwt/pom.xml trunk/nuiton-rss/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 2011-10-31 10:00:34 UTC (rev 129) +++ trunk/nuiton-gwt/pom.xml 2011-10-31 10:00:35 UTC (rev 130) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.5</version> + <version>1.6-SNAPSHOT</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2011-10-31 10:00:34 UTC (rev 129) +++ trunk/nuiton-rss/pom.xml 2011-10-31 10:00:35 UTC (rev 130) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.5</version> + <version>1.6-SNAPSHOT</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2011-10-31 10:00:34 UTC (rev 129) +++ trunk/nuiton-struts2/pom.xml 2011-10-31 10:00:35 UTC (rev 130) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.5</version> + <version>1.6-SNAPSHOT</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2011-10-31 10:00:34 UTC (rev 129) +++ trunk/nuiton-tapestry/pom.xml 2011-10-31 10:00:35 UTC (rev 130) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.5</version> + <version>1.6-SNAPSHOT</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2011-10-31 10:00:34 UTC (rev 129) +++ trunk/nuiton-web/pom.xml 2011-10-31 10:00:35 UTC (rev 130) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.5</version> + <version>1.6-SNAPSHOT</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-10-31 10:00:34 UTC (rev 129) +++ trunk/pom.xml 2011-10-31 10:00:35 UTC (rev 130) @@ -15,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.5</version> + <version>1.6-SNAPSHOT</version> <modules> <module>nuiton-web</module> @@ -308,11 +308,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-parent-1.5</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-parent-1.5 + scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-web/tags/nuiton-web-parent…</url> + <url>http://www.nuiton.org/repositories/browse/nuiton-web/trunk</url> </scm> <distributionManagement>

1 0

r129 - tags
by maven-release＠users.nuiton.org 31 Oct '11

31 Oct '11

Author: maven-release Date: 2011-10-31 11:00:34 +0100 (Mon, 31 Oct 2011) New Revision: 129 Url: http://nuiton.org/repositories/revision/nuiton-web/129 Log: [maven-release-plugin] copy for tag nuiton-web-parent-1.5 Added: tags/nuiton-web-parent-1.5/

1 0

r128 - in trunk: . nuiton-gwt nuiton-rss nuiton-struts2 nuiton-tapestry nuiton-web
by maven-release＠users.nuiton.org 31 Oct '11

31 Oct '11

Author: maven-release Date: 2011-10-31 11:00:33 +0100 (Mon, 31 Oct 2011) New Revision: 128 Url: http://nuiton.org/repositories/revision/nuiton-web/128 Log: [maven-release-plugin] prepare release nuiton-web-parent-1.5 Modified: trunk/nuiton-gwt/pom.xml trunk/nuiton-rss/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 2011-10-31 09:58:02 UTC (rev 127) +++ trunk/nuiton-gwt/pom.xml 2011-10-31 10:00:33 UTC (rev 128) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.5</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2011-10-31 09:58:02 UTC (rev 127) +++ trunk/nuiton-rss/pom.xml 2011-10-31 10:00:33 UTC (rev 128) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.5</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2011-10-31 09:58:02 UTC (rev 127) +++ trunk/nuiton-struts2/pom.xml 2011-10-31 10:00:33 UTC (rev 128) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.5</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2011-10-31 09:58:02 UTC (rev 127) +++ trunk/nuiton-tapestry/pom.xml 2011-10-31 10:00:33 UTC (rev 128) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.5</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2011-10-31 09:58:02 UTC (rev 127) +++ trunk/nuiton-web/pom.xml 2011-10-31 10:00:33 UTC (rev 128) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.5</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-10-31 09:58:02 UTC (rev 127) +++ trunk/pom.xml 2011-10-31 10:00:33 UTC (rev 128) @@ -15,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.5-SNAPSHOT</version> + <version>1.5</version> <modules> <module>nuiton-web</module> @@ -308,11 +308,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-parent-1.5</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk + scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-parent-1.5 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-web/trunk</url> + <url>http://www.nuiton.org/repositories/browse/nuiton-web/tags/nuiton-web-parent…</url> </scm> <distributionManagement>

1 0

r127 - in trunk: nuiton-struts2/src/main/java/org/nuiton/web/struts2/filter nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor nuiton-struts2/src/main/resources/template/css_xhtml nuiton-struts2/src/main/resources/template/simple nuiton-web/src/license
by tchemit＠users.nuiton.org 31 Oct '11

31 Oct '11

Author: tchemit Date: 2011-10-31 10:58:02 +0100 (Mon, 31 Oct 2011) New Revision: 127 Url: http://nuiton.org/repositories/revision/nuiton-web/127 Log: prepare for release (svn properties, file headers, third parties...) Removed: trunk/nuiton-web/src/license/THIRD-PARTY.properties Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/filter/CloseTopiaTransactionFilter.java trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/OpenTopiaTransactionInterceptor.java trunk/nuiton-struts2/src/main/resources/template/css_xhtml/mycheckboxlist.ftl trunk/nuiton-struts2/src/main/resources/template/simple/mycheckboxlist.ftl Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/filter/CloseTopiaTransactionFilter.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/filter/CloseTopiaTransactionFilter.java 2011-10-28 21:25:41 UTC (rev 126) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/filter/CloseTopiaTransactionFilter.java 2011-10-31 09:58:02 UTC (rev 127) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Web :: Nuiton Struts 2 + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 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.struts2.filter; Property changes on: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/filter/CloseTopiaTransactionFilter.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/interceptor/OpenTopiaTransactionInterceptor.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/OpenTopiaTransactionInterceptor.java 2011-10-28 21:25:41 UTC (rev 126) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/OpenTopiaTransactionInterceptor.java 2011-10-31 09:58:02 UTC (rev 127) @@ -1,3 +1,27 @@ +/* + * #%L + * Nuiton Web :: Nuiton Struts 2 + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 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.struts2.interceptor; import com.opensymphony.xwork2.ActionInvocation; Property changes on: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/OpenTopiaTransactionInterceptor.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/nuiton-struts2/src/main/resources/template/css_xhtml/mycheckboxlist.ftl =================================================================== --- trunk/nuiton-struts2/src/main/resources/template/css_xhtml/mycheckboxlist.ftl 2011-10-28 21:25:41 UTC (rev 126) +++ trunk/nuiton-struts2/src/main/resources/template/css_xhtml/mycheckboxlist.ftl 2011-10-31 09:58:02 UTC (rev 127) @@ -1,3 +1,27 @@ +<#-- + #%L + Nuiton Web :: Nuiton Struts 2 + + $Id$ + $HeadURL$ + %% + Copyright (C) 2010 - 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% +--> <#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" /> <#include "/${parameters.templateDir}/simple/mycheckboxlist.ftl" /> Modified: trunk/nuiton-struts2/src/main/resources/template/simple/mycheckboxlist.ftl =================================================================== --- trunk/nuiton-struts2/src/main/resources/template/simple/mycheckboxlist.ftl 2011-10-28 21:25:41 UTC (rev 126) +++ trunk/nuiton-struts2/src/main/resources/template/simple/mycheckboxlist.ftl 2011-10-31 09:58:02 UTC (rev 127) @@ -1,3 +1,27 @@ +<#-- + #%L + Nuiton Web :: Nuiton Struts 2 + + $Id$ + $HeadURL$ + %% + Copyright (C) 2010 - 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% +--> <#assign itemCount = 0/> <#if parameters.list??> <@s.iterator value="parameters.list"> Deleted: trunk/nuiton-web/src/license/THIRD-PARTY.properties =================================================================== --- trunk/nuiton-web/src/license/THIRD-PARTY.properties 2011-10-28 21:25:41 UTC (rev 126) +++ trunk/nuiton-web/src/license/THIRD-PARTY.properties 2011-10-31 09:58:02 UTC (rev 127) @@ -1,20 +0,0 @@ -# Generated by org.codehaus.mojo.license.AddThirdPartyMojo -#------------------------------------------------------------------------------- -# Already used licenses in project : -# - Apache Software License - Version 2.0 -# - BSD License -# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -# - Eclipse Public License - Version 1.0 -# - GNU Lesser General Public License version 2.1 -# - Indiana University Extreme! Lab Software License, vesion 1.1.1 -# - Lesser General Public License (LPGL) -# - Lesser General Public License (LPGL) v 2.1 -# - MIT License -# - 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 : -# -# -#Thu Aug 18 07:24:12 CEST 2011 -javax.servlet--servlet-api--2.5=Sun Microsystems, Inc. Binary Code License Agreement for the JDK 5.0

1 0

r126 - trunk
by maven-release＠users.nuiton.org 28 Oct '11

28 Oct '11

Author: maven-release Date: 2011-10-28 23:25:41 +0200 (Fri, 28 Oct 2011) New Revision: 126 Url: http://nuiton.org/repositories/revision/nuiton-web/126 Log: Update mavenpom4redmineAndCentral to 3.0.5. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-10-28 20:54:21 UTC (rev 125) +++ trunk/pom.xml 2011-10-28 21:25:41 UTC (rev 126) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.0.4</version> + <version>3.0.5</version> </parent> <groupId>org.nuiton.web</groupId>

1 0

r125 - trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor
by tchemit＠users.nuiton.org 28 Oct '11

28 Oct '11

Author: tchemit Date: 2011-10-28 22:54:21 +0200 (Fri, 28 Oct 2011) New Revision: 125 Url: http://nuiton.org/repositories/revision/nuiton-web/125 Log: Evolution #1790: Add OpenTopiaTransactionInterceptor Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/OpenTopiaTransactionInterceptor.java trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/OpenTopiaTransactionInterceptor.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/OpenTopiaTransactionInterceptor.java 2011-10-28 17:05:28 UTC (rev 124) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/OpenTopiaTransactionInterceptor.java 2011-10-28 20:54:21 UTC (rev 125) @@ -10,11 +10,8 @@ import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.framework.TopiaTransactionAware; +import org.nuiton.web.struts2.filter.CloseTopiaTransactionFilter; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; @@ -40,7 +37,7 @@ * <p/> * Note also that the transaction is <strong>not</strong> commited nor closed. * If you want the transaction to be closed, you may use - * {@link org.nuiton.web.struts2.filter.CloseTopiaTransactionFilter} by adding + * {@link CloseTopiaTransactionFilter} by adding * it to your web.xml file. * <p/> * This interceptor, as it provides connection to database should be in the @@ -63,16 +60,11 @@ *  * * @author tchemit <chemit(a)codelutin.com> + * @author bleny <leny(a)codelutin.com> * @since 1.5 */ public abstract class OpenTopiaTransactionInterceptor extends AbstractInterceptor { - /** To specify on your action that you never want any commit. */ - @Retention(RetentionPolicy.RUNTIME) - @Target({ElementType.TYPE, ElementType.METHOD}) - public @interface NoCommit { - } - /** Logger. */ private static final Log log = LogFactory.getLog(OpenTopiaTransactionInterceptor.class); @@ -103,7 +95,7 @@ * Method to open a new transaction. * * @return the new freshly opened transaction - * @throws org.nuiton.topia.TopiaException if any problem while opening a new transaction + * @throws TopiaException if any problem while opening a new transaction */ protected abstract TopiaContext beginTransaction() throws TopiaException; @@ -120,15 +112,6 @@ } } - /** - * @deprecated to be removed in the same time as TopiaTransactionInterceptor - */ - @Deprecated - protected void closeTransaction(TopiaContext transaction, Object action, - ActionInvocation invocation) throws TopiaException { - // do nothing by contract - } - @Override public String intercept(ActionInvocation invocation) throws Exception { @@ -161,15 +144,7 @@ // set the transaction in the action transactionAware.setTransaction(proxy); - try { - - return invocation.invoke(); - - } finally { - - closeTransaction(proxyInvocationHandler.getTransaction(), action, invocation); - - } + return invocation.invoke(); } /** Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java 2011-10-28 17:05:28 UTC (rev 124) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java 2011-10-28 20:54:21 UTC (rev 125) @@ -29,24 +29,84 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaContextImplementor; +import org.nuiton.topia.framework.TopiaTransactionAware; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; import java.lang.reflect.Method; +import java.lang.reflect.Proxy; -/** Same interceptor as {@link OpenTopiaTransactionInterceptor} but close +/** + * Same interceptor as {@link OpenTopiaTransactionInterceptor} but close * the transaction after action is called. The transaction will be commited * (unless asked otherwise) and closed. * * @author tchemit <chemit(a)codelutin.com> * @since 1.2 + * @deprecated since 1.5, will be removed soon */ @Deprecated public abstract class TopiaTransactionInterceptor extends OpenTopiaTransactionInterceptor { + /** To specify on your action or method that you never want any commit. */ + @Retention(RetentionPolicy.RUNTIME) + @Target({ElementType.TYPE, ElementType.METHOD}) + public @interface NoCommit { + } + + private static final long serialVersionUID = 1L; + /** Logger. */ - private static final Log log = LogFactory.getLog(TopiaTransactionInterceptor.class); + private static final Log log = + LogFactory.getLog(TopiaTransactionInterceptor.class); @Override + public String intercept(ActionInvocation invocation) throws Exception { + + TopiaTransactionAware transactionAware = null; + + Object action = invocation.getProxy().getAction(); + + if (action instanceof TopiaTransactionAware) { + transactionAware = (TopiaTransactionAware) action; + } + + if (transactionAware == null) { + + // not a transaction aware action, direct skip this interceptor + return invocation.invoke(); + } + + // creates a proxy of a lazy transaction + + TopiaTransactionProxyInvocationHandler proxyInvocationHandler = + new TopiaTransactionProxyInvocationHandler(); + + TopiaContext proxy = (TopiaContext) Proxy.newProxyInstance( + getClass().getClassLoader(), + new Class<?>[]{TopiaContext.class, + TopiaContextImplementor.class}, + proxyInvocationHandler + ); + + // set the transaction in the action + transactionAware.setTransaction(proxy); + + try { + + return invocation.invoke(); + + } finally { + + closeTransaction(proxyInvocationHandler.getTransaction(), action, invocation); + + } + } + protected void closeTransaction(TopiaContext transaction, Object action, ActionInvocation invocation) throws TopiaException {

1 0

r124 - trunk/nuiton-struts2/src/license
by tchemit＠users.nuiton.org 28 Oct '11

28 Oct '11

Author: tchemit Date: 2011-10-28 19:05:28 +0200 (Fri, 28 Oct 2011) New Revision: 124 Url: http://nuiton.org/repositories/revision/nuiton-web/124 Log: fix third parties Modified: trunk/nuiton-struts2/src/license/THIRD-PARTY.properties Modified: trunk/nuiton-struts2/src/license/THIRD-PARTY.properties =================================================================== --- trunk/nuiton-struts2/src/license/THIRD-PARTY.properties 2011-10-28 17:03:35 UTC (rev 123) +++ trunk/nuiton-struts2/src/license/THIRD-PARTY.properties 2011-10-28 17:05:28 UTC (rev 124) @@ -25,5 +25,6 @@ asm--asm-tree--3.1=http\://asm.ow2.org/license.html commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License +javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 ognl--ognl--3.0.1=The Apache Software License, Version 2.0

1 0

r123 - in trunk: . nuiton-struts2/src/license
by tchemit＠users.nuiton.org 28 Oct '11

28 Oct '11

Author: tchemit Date: 2011-10-28 19:03:35 +0200 (Fri, 28 Oct 2011) New Revision: 123 Url: http://nuiton.org/repositories/revision/nuiton-web/123 Log: - T?\195?\162che #1793: Updates to ToPIA 2.6.3 - fix third parties Modified: trunk/nuiton-struts2/src/license/THIRD-PARTY.properties trunk/pom.xml Modified: trunk/nuiton-struts2/src/license/THIRD-PARTY.properties =================================================================== --- trunk/nuiton-struts2/src/license/THIRD-PARTY.properties 2011-10-28 16:03:25 UTC (rev 122) +++ trunk/nuiton-struts2/src/license/THIRD-PARTY.properties 2011-10-28 17:03:35 UTC (rev 123) @@ -2,6 +2,7 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - BSD License +# - BSD style # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 @@ -17,7 +18,7 @@ # Please fill the missing licenses for dependencies : # # -#Thu Aug 18 07:24:14 CEST 2011 +#Fri Oct 28 18:52:41 CEST 2011 antlr--antlr--2.7.6=BSD License asm--asm--3.1=http\://asm.ow2.org/license.html asm--asm-commons--3.1=http\://asm.ow2.org/license.html Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-10-28 16:03:25 UTC (rev 122) +++ trunk/pom.xml 2011-10-28 17:03:35 UTC (rev 123) @@ -234,7 +234,7 @@ <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <nuitonI18nPluginVersion>${nuitonI18nVersion}</nuitonI18nPluginVersion> - <topiaVersion>2.6.2</topiaVersion> + <topiaVersion>2.6.3</topiaVersion>  <tapestryVersion>5.2.4</tapestryVersion>

1 0