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

r92 - in trunk: . nuiton-struts2/src/main/java/org/nuiton/web/struts2 nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor
by tchemit＠users.nuiton.org 07 Jul '11

07 Jul '11

Author: tchemit Date: 2011-07-07 20:02:25 +0200 (Thu, 07 Jul 2011) New Revision: 92 Url: http://nuiton.org/repositories/revision/nuiton-web/92 Log: Evolution #1627: Updates to ToPIA 2.6.1 Evolution #1624: Remove TopiaTransactionAware Evolution #1628: Improve the TopiaTransactionInterceptor Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/TopiaTransactionAware.java trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java trunk/pom.xml Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/TopiaTransactionAware.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/TopiaTransactionAware.java 2011-07-05 13:19:59 UTC (rev 91) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/TopiaTransactionAware.java 2011-07-07 18:02:25 UTC (rev 92) @@ -37,22 +37,9 @@ * * @author tchemit <chemit(a)codelutin.com> * @since 1.2 + * @deprecated since 1.4, prefer use the same class in topia project., will be remove soon */ -public interface TopiaTransactionAware { +@Deprecated +public interface TopiaTransactionAware extends org.nuiton.topia.framework.TopiaTransactionAware { - /** - * Obtains the internal transaction. - * - * If no transaction was opened, can return the {@code null} object. - * - * @return the current transaction (can be null or closed...). - */ - TopiaContext getTransaction(); - - /** - * Put in the instance, the given transaction. - * - * @param transaction the transaction to push - */ - void setTransaction(TopiaContext transaction); } 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-07-05 13:19:59 UTC (rev 91) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java 2011-07-07 18:02:25 UTC (rev 92) @@ -136,51 +136,58 @@ @Override public String intercept(ActionInvocation invocation) throws Exception { - TopiaTransactionAware transactionAware = null; + org.nuiton.topia.framework.TopiaTransactionAware transactionAware = null; Object action = invocation.getProxy().getAction(); - if (action instanceof TopiaTransactionAware) { - transactionAware = (TopiaTransactionAware) action; + if (action instanceof org.nuiton.topia.framework.TopiaTransactionAware) { + transactionAware = (org.nuiton.topia.framework.TopiaTransactionAware) action; } - TopiaContext transaction = null; - if (transactionAware != null) { + if (transactionAware == null) { - // action need a transaction - transaction = beginTransaction(); + // not a transaction aware action + return invocation.invoke(); + } - if (log.isDebugEnabled()) { - log.debug("Open transaction " + transaction); - } - // creates a proxy on the transaction to push back in action - TopiaContext proxy = (TopiaContext) Proxy.newProxyInstance( - getClass().getClassLoader(), - new Class<?>[]{TopiaContext.class, - TopiaContextImplementor.class}, - new TopiaTransactionProxyInvocationHandler(transaction) - ); + // action need a transaction + TopiaContext transaction = beginTransaction(); - // set the transaction in the action - transactionAware.setTransaction(proxy); + if (log.isDebugEnabled()) { + log.debug("Open transaction " + transaction); } + + // creates a proxy on the transaction to push back in action + TopiaContext proxy = (TopiaContext) Proxy.newProxyInstance( + getClass().getClassLoader(), + new Class<?>[]{TopiaContext.class, + TopiaContextImplementor.class}, + new TopiaTransactionProxyInvocationHandler(transaction) + ); + + // set the transaction in the action + transactionAware.setTransaction(proxy); + + boolean doCommit = true; try { return invocation.invoke(); - } finally { + } catch (Exception e) { - if (transactionAware != null) { + doCommit = false; + transaction.rollbackTransaction(); - // we are on a action with a internal topia transaction + throw e; + } finally { - if (transaction != null && !transaction.isClosed()) { + if (doCommit) { + transaction.commitTransaction(); + } - if (log.isDebugEnabled()) { - log.debug("Close transaction " + transaction); - } - // close the opened transaction - transaction.closeContext(); - } + if (log.isDebugEnabled()) { + log.debug("Close transaction " + transaction); } + // close the opened transaction + transaction.closeContext(); } } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-07-05 13:19:59 UTC (rev 91) +++ trunk/pom.xml 2011-07-07 18:02:25 UTC (rev 92) @@ -215,7 +215,7 @@ <nuitonI18nPluginVersion>2.4</nuitonI18nPluginVersion> <jredminePluginVersion>1.2</jredminePluginVersion> - <topiaVersion>2.6</topiaVersion> + <topiaVersion>2.6.1-SNAPSHOT</topiaVersion>  <tapestryVersion>5.2.4</tapestryVersion>

1 0

r90 - tags
by hudson＠users.nuiton.org 05 Jul '11

05 Jul '11

Author: hudson Date: 2011-07-05 15:19:58 +0200 (Tue, 05 Jul 2011) New Revision: 90 Url: http://nuiton.org/repositories/revision/nuiton-web/90 Log: [maven-release-plugin] copy for tag nuiton-web-1.2 Added: tags/nuiton-web-1.2/

1 0

r91 - in trunk: . nuiton-gwt nuiton-rss nuiton-struts2 nuiton-tapestry nuiton-web
by hudson＠users.nuiton.org 05 Jul '11

05 Jul '11

Author: hudson Date: 2011-07-05 15:19:59 +0200 (Tue, 05 Jul 2011) New Revision: 91 Url: http://nuiton.org/repositories/revision/nuiton-web/91 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-07-05 13:19:58 UTC (rev 90) +++ trunk/nuiton-gwt/pom.xml 2011-07-05 13:19:59 UTC (rev 91) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.2</version> + <version>1.3-SNAPSHOT</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2011-07-05 13:19:58 UTC (rev 90) +++ trunk/nuiton-rss/pom.xml 2011-07-05 13:19:59 UTC (rev 91) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.2</version> + <version>1.3-SNAPSHOT</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2011-07-05 13:19:58 UTC (rev 90) +++ trunk/nuiton-struts2/pom.xml 2011-07-05 13:19:59 UTC (rev 91) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.2</version> + <version>1.3-SNAPSHOT</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2011-07-05 13:19:58 UTC (rev 90) +++ trunk/nuiton-tapestry/pom.xml 2011-07-05 13:19:59 UTC (rev 91) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.2</version> + <version>1.3-SNAPSHOT</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2011-07-05 13:19:58 UTC (rev 90) +++ trunk/nuiton-web/pom.xml 2011-07-05 13:19:59 UTC (rev 91) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.2</version> + <version>1.3-SNAPSHOT</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-07-05 13:19:58 UTC (rev 90) +++ trunk/pom.xml 2011-07-05 13:19:59 UTC (rev 91) @@ -15,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.2</version> + <version>1.3-SNAPSHOT</version> <modules> <module>nuiton-web</module> @@ -292,11 +292,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.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.2 + scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-web/tags/nuiton-web-1.2</url> + <url>http://www.nuiton.org/repositories/browse/nuiton-web/trunk</url> </scm> </project>

1 0

r89 - in trunk: . nuiton-gwt nuiton-rss nuiton-struts2 nuiton-tapestry nuiton-web
by hudson＠users.nuiton.org 05 Jul '11

05 Jul '11

Author: hudson Date: 2011-07-05 15:19:57 +0200 (Tue, 05 Jul 2011) New Revision: 89 Url: http://nuiton.org/repositories/revision/nuiton-web/89 Log: [maven-release-plugin] prepare release nuiton-web-1.2 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-07-05 12:11:36 UTC (rev 88) +++ trunk/nuiton-gwt/pom.xml 2011-07-05 13:19:57 UTC (rev 89) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.2</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2011-07-05 12:11:36 UTC (rev 88) +++ trunk/nuiton-rss/pom.xml 2011-07-05 13:19:57 UTC (rev 89) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.2</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2011-07-05 12:11:36 UTC (rev 88) +++ trunk/nuiton-struts2/pom.xml 2011-07-05 13:19:57 UTC (rev 89) @@ -1,7 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -12,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.2</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2011-07-05 12:11:36 UTC (rev 88) +++ trunk/nuiton-tapestry/pom.xml 2011-07-05 13:19:57 UTC (rev 89) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.2</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2011-07-05 12:11:36 UTC (rev 88) +++ trunk/nuiton-web/pom.xml 2011-07-05 13:19:57 UTC (rev 89) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.2</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-07-05 12:11:36 UTC (rev 88) +++ trunk/pom.xml 2011-07-05 13:19:57 UTC (rev 89) @@ -15,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.2-SNAPSHOT</version> + <version>1.2</version> <modules> <module>nuiton-web</module> @@ -292,11 +292,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.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.2 </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.2</url> </scm> </project>

1 0

r88 - trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2
by tchemit＠users.nuiton.org 05 Jul '11

05 Jul '11

Author: tchemit Date: 2011-07-05 14:11:36 +0200 (Tue, 05 Jul 2011) New Revision: 88 Url: http://nuiton.org/repositories/revision/nuiton-web/88 Log: javadoc Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/TopiaTransactionAware.java Modified: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/TopiaTransactionAware.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/TopiaTransactionAware.java 2011-07-05 12:01:58 UTC (rev 87) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/TopiaTransactionAware.java 2011-07-05 12:11:36 UTC (rev 88) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2010 - 2011 CodeLutin + * 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 @@ -31,9 +31,12 @@ * transaction. * * The method {@link #getTransaction()} returns the internal transaction used. + * + * the method {@link #setTransaction(TopiaContext)} put the internal + * transaction. * * @author tchemit <chemit(a)codelutin.com> - * @since 1.1 + * @since 1.2 */ public interface TopiaTransactionAware { @@ -45,6 +48,11 @@ * @return the current transaction (can be null or closed...). */ TopiaContext getTransaction(); - + + /** + * Put in the instance, the given transaction. + * + * @param transaction the transaction to push + */ void setTransaction(TopiaContext transaction); }

1 0

r87 - trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor
by tchemit＠users.nuiton.org 05 Jul '11

05 Jul '11

Author: tchemit Date: 2011-07-05 14:01:58 +0200 (Tue, 05 Jul 2011) New Revision: 87 Url: http://nuiton.org/repositories/revision/nuiton-web/87 Log: add final javadoc Modified: 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/TopiaTransactionInterceptor.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java 2011-07-05 10:22:53 UTC (rev 86) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java 2011-07-05 12:01:58 UTC (rev 87) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2010 - 2011 CodeLutin + * 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 @@ -41,8 +41,48 @@ import java.util.HashSet; import java.util.Set; + /** - * To deal with topia transaction . + *  + * + * The aim of this Interceptor is to inject a freshly opened {@code transaction} + * in a action which implements {@link TopiaTransactionAware} contract and + * after result of action, to close the transaction. + * + * The interceptor is abstract and let user to implement the way how to open a + * new transaction via the method {@link #beginTransaction()}. + * + * Note that the transaction pushed in the action is in fact a proxy of the + * freshly opened transaction to forbid some method to be call on it. The list + * of method to forbid can be customized using the interceptor parameter + * {@link #excludeMethods}. + * + * Note also that the transaction is closed after all stack of interceptor + * consumed, this means that the transaction will still be opened while + * rendering the result, this is a particular interesting thing to avoid + * pre-loading of entities due to lazy strategy of hibernate for example. + * With this mecanism you can feel free to just obtain the obtain from database + * via a DAO and then really load it in the rendering result. + * + * + * This interceptor, as it provides connection to database should be in the + * interceptor stack before any other interceptor requiring access to database. + * For example, it is a common behaviour to do such calls in a prepare method, + * so make sure to place this interceptor before the {@code prepare} interceptor. + *  + * + * Interceptor parameters: + * + *  + * + * <ul> + * <li>excludeMethods (optional) - Customized method names separated by coma to + * forbid on the proxy of the transaction given to action. By default, if this + * parameter is not filled, then we will use this one : + * {@link #DEFAULT_EXCLUDE_METHODS}.</li> + * </ul> + * + *  * * @author tchemit <chemit(a)codelutin.com> * @since 1.2 @@ -61,6 +101,7 @@ "clear" }; + /** names of methods to forbid access while using proxy. */ protected Set<String> excludeMethods; public Set<String> getExcludeMethods() { @@ -71,6 +112,12 @@ this.excludeMethods = TextParseUtil.commaDelimitedStringToSet(excludeMethods); } + /** + * Method to open a new transaction. + * + * @return the new freshly opened transaction + * @throws TopiaException if any problem while opening a new transaction + */ protected abstract TopiaContext beginTransaction() throws TopiaException; @Override @@ -111,7 +158,7 @@ getClass().getClassLoader(), new Class<?>[]{TopiaContext.class, TopiaContextImplementor.class}, - new TopiaTransactionProxy(transaction) + new TopiaTransactionProxyInvocationHandler(transaction) ); // set the transaction in the action @@ -138,16 +185,16 @@ } /** - * A proxy to used only to forbids usage of some method of the transaction. + * Handler of a proxy on a {@link TopiaContext}. * * @see TopiaTransactionInterceptor#excludeMethods */ - class TopiaTransactionProxy implements InvocationHandler { + class TopiaTransactionProxyInvocationHandler implements InvocationHandler { /** Target to use for the proxy. */ protected final TopiaContext tx; - TopiaTransactionProxy(TopiaContext tx) { + TopiaTransactionProxyInvocationHandler(TopiaContext tx) { this.tx = tx; }

1 0

r86 - trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor
by tchemit＠users.nuiton.org 05 Jul '11

05 Jul '11

Author: tchemit Date: 2011-07-05 12:22:53 +0200 (Tue, 05 Jul 2011) New Revision: 86 Url: http://nuiton.org/repositories/revision/nuiton-web/86 Log: add logs in interceptor and catch errors in proxy to show errors Modified: 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/TopiaTransactionInterceptor.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java 2011-07-04 21:36:06 UTC (rev 85) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java 2011-07-05 10:22:53 UTC (rev 86) @@ -27,6 +27,8 @@ import com.opensymphony.xwork2.ActionInvocation; import com.opensymphony.xwork2.interceptor.AbstractInterceptor; import com.opensymphony.xwork2.util.TextParseUtil; +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; @@ -47,6 +49,10 @@ */ public abstract class TopiaTransactionInterceptor extends AbstractInterceptor { + /** Logger. */ + private static final Log log = + LogFactory.getLog(TopiaTransactionInterceptor.class); + private static final long serialVersionUID = 1L; public static final String[] DEFAULT_EXCLUDE_METHODS = { @@ -97,6 +103,9 @@ // action need a transaction transaction = beginTransaction(); + if (log.isDebugEnabled()) { + log.debug("Open transaction " + transaction); + } // creates a proxy on the transaction to push back in action TopiaContext proxy = (TopiaContext) Proxy.newProxyInstance( getClass().getClassLoader(), @@ -118,6 +127,9 @@ if (transaction != null && !transaction.isClosed()) { + if (log.isDebugEnabled()) { + log.debug("Close transaction " + transaction); + } // close the opened transaction transaction.closeContext(); } @@ -155,9 +167,15 @@ } // can invoke the method on the tx - Object result = method.invoke(tx, args); - - return result; + try { + Object result = method.invoke(tx, args); + return result; + } catch (Exception eee) { + if (log.isErrorEnabled()) { + log.error("Could not execute method " + method.getName(), eee); + } + throw eee; + } } }

1 0

r85 - trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor
by tchemit＠users.nuiton.org 04 Jul '11

04 Jul '11

Author: tchemit Date: 2011-07-04 23:36:06 +0200 (Mon, 04 Jul 2011) New Revision: 85 Url: http://nuiton.org/repositories/revision/nuiton-web/85 Log: remove the first topia transaction interceptor Removed: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/CloseTopiaTransactionInterceptor.java Deleted: trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/CloseTopiaTransactionInterceptor.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/CloseTopiaTransactionInterceptor.java 2011-07-04 21:35:36 UTC (rev 84) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/CloseTopiaTransactionInterceptor.java 2011-07-04 21:36:06 UTC (rev 85) @@ -1,76 +0,0 @@ -/* - * #%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; -import com.opensymphony.xwork2.interceptor.AbstractInterceptor; -import org.nuiton.topia.TopiaContext; -import org.nuiton.web.struts2.TopiaTransactionAware; - -/** - * A interceptor to close the topia transaction in the action (after the result). - * - * In that way no need to walk inside entities (for lazy problem) and no need - * also to close the opened transaction. - * - * The action must implements the contract {@link TopiaTransactionAware}. - * - * @author tchemit <chemit(a)codelutin.com> - * @see TopiaTransactionAware - * @since 1.2 - */ -public class CloseTopiaTransactionInterceptor extends AbstractInterceptor { - - private static final long serialVersionUID = 1L; - - @Override - public String intercept(ActionInvocation invocation) throws Exception { - - TopiaTransactionAware transactionAware = null; - - Object action = invocation.getProxy().getAction(); - - if (action instanceof TopiaTransactionAware) { - transactionAware = (TopiaTransactionAware) action; - } - - try { - return invocation.invoke(); - } finally { - if (transactionAware != null) { - - // we are on a action with a internal topia transaction - TopiaContext transaction = transactionAware.getTransaction(); - - if (transaction != null && !transaction.isClosed()) { - - // close the opened transaction - transaction.closeContext(); - } - } - } - - } -}

1 0

r84 - in trunk/nuiton-struts2/src: license main/java/org/nuiton/web/struts2/interceptor
by tchemit＠users.nuiton.org 04 Jul '11

04 Jul '11

Author: tchemit Date: 2011-07-04 23:35:36 +0200 (Mon, 04 Jul 2011) New Revision: 84 Url: http://nuiton.org/repositories/revision/nuiton-web/84 Log: update file header + svn properties + optimize third parties Modified: trunk/nuiton-struts2/src/license/THIRD-PARTY.properties trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java Modified: trunk/nuiton-struts2/src/license/THIRD-PARTY.properties =================================================================== --- trunk/nuiton-struts2/src/license/THIRD-PARTY.properties 2011-07-04 21:20:59 UTC (rev 83) +++ trunk/nuiton-struts2/src/license/THIRD-PARTY.properties 2011-07-04 21:35:36 UTC (rev 84) @@ -3,15 +3,23 @@ # Already used licenses in project : # - BSD License # - Common Public License Version 1.0 +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MPL 1.1 # - The Apache Software License, Version 2.0 # - http://asm.ow2.org/license.html +# - license.txt #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Wed May 11 10:01:56 CEST 2011 +#Mon Jul 04 23:33:53 CEST 2011 +antlr--antlr--2.7.6--jar=BSD License asm--asm--3.1--jar=http\://asm.ow2.org/license.html asm--asm-commons--3.1--jar=http\://asm.ow2.org/license.html asm--asm-tree--3.1--jar=http\://asm.ow2.org/license.html -javassist--javassist--3.11.0.GA--jar=Lesser General Public License (LGPL) v 2.1 +commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1--jar=BSD License +javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 ognl--ognl--3.0.1--jar=The Apache Software License, Version 2.0 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-07-04 21:20:59 UTC (rev 83) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java 2011-07-04 21:35:36 UTC (rev 84) @@ -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/TopiaTransactionInterceptor.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL

1 0

r83 - trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor
by tchemit＠users.nuiton.org 04 Jul '11

04 Jul '11

Author: tchemit Date: 2011-07-04 23:20:59 +0200 (Mon, 04 Jul 2011) New Revision: 83 Url: http://nuiton.org/repositories/revision/nuiton-web/83 Log: fix transacvtion proxy Modified: 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/TopiaTransactionInterceptor.java =================================================================== --- trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java 2011-07-04 20:54:39 UTC (rev 82) +++ trunk/nuiton-struts2/src/main/java/org/nuiton/web/struts2/interceptor/TopiaTransactionInterceptor.java 2011-07-04 21:20:59 UTC (rev 83) @@ -5,6 +5,7 @@ import com.opensymphony.xwork2.util.TextParseUtil; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.web.struts2.TopiaTransactionAware; import java.lang.reflect.InvocationHandler; @@ -72,11 +73,12 @@ // action need a transaction transaction = beginTransaction(); - // creates a proxy + // creates a proxy on the transaction to push back in action TopiaContext proxy = (TopiaContext) Proxy.newProxyInstance( getClass().getClassLoader(), - new Class<?>[]{TopiaContext.class}, - new TopiaTransaction() + new Class<?>[]{TopiaContext.class, + TopiaContextImplementor.class}, + new TopiaTransactionProxy(transaction) ); // set the transaction in the action @@ -100,11 +102,19 @@ } /** - * Un proxy pour interdire d'utiliser les méthodes définies dans - * {@link #excludeMethods}. + * A proxy to used only to forbids usage of some method of the transaction. + * + * @see TopiaTransactionInterceptor#excludeMethods */ - class TopiaTransaction implements InvocationHandler { + class TopiaTransactionProxy implements InvocationHandler { + /** Target to use for the proxy. */ + protected final TopiaContext tx; + + TopiaTransactionProxy(TopiaContext tx) { + this.tx = tx; + } + @Override public Object invoke(Object proxy, Method method, @@ -120,8 +130,8 @@ proxy); } - // any other methods are fine - Object result = method.invoke(args); + // can invoke the method on the tx + Object result = method.invoke(tx, args); return result; }

1 0