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

r171 - trunk/nuiton-struts2/src/license
by tchemit＠users.nuiton.org 04 Jan '12

04 Jan '12

Author: tchemit Date: 2012-01-04 23:44:45 +0100 (Wed, 04 Jan 2012) New Revision: 171 Url: http://nuiton.org/repositories/revision/nuiton-web/171 Log: optimize 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 2012-01-04 22:27:22 UTC (rev 170) +++ trunk/nuiton-struts2/src/license/THIRD-PARTY.properties 2012-01-04 22:44:45 UTC (rev 171) @@ -3,6 +3,8 @@ # Already used licenses in project : # - BSD License # - BSD style +# - BSD-style license +# - CDDL + GPLv2 with classpath exception # - 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 @@ -12,19 +14,14 @@ # - MIT License # - 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 : # # -#Fri Oct 28 18:52:41 CEST 2011 +#Wed Jan 04 23:41:33 CET 2012 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 -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

r170 - trunk
by tchemit＠users.nuiton.org 04 Jan '12

04 Jan '12

Author: tchemit Date: 2012-01-04 23:27:22 +0100 (Wed, 04 Jan 2012) New Revision: 170 Url: http://nuiton.org/repositories/revision/nuiton-web/170 Log: remove unused deps Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-04 22:23:28 UTC (rev 169) +++ trunk/pom.xml 2012-01-04 22:27:22 UTC (rev 170) @@ -154,18 +154,6 @@ </dependency> <dependency> - <groupId>org.apache.struts</groupId> - <artifactId>struts2-dojo-plugin</artifactId> - <version>${struts2Version}</version> - </dependency> - - <dependency> - <groupId>com.jgeppert.struts2.jquery</groupId> - <artifactId>struts2-jquery-plugin</artifactId> - <version>3.1.0</version> - </dependency> - - <dependency> <groupId>org.apache.struts.xwork</groupId> <artifactId>xwork-core</artifactId> <version>${struts2Version}</version>

1 0

r169 - trunk
by tchemit＠users.nuiton.org 04 Jan '12

04 Jan '12

Author: tchemit Date: 2012-01-04 23:23:28 +0100 (Wed, 04 Jan 2012) New Revision: 169 Url: http://nuiton.org/repositories/revision/nuiton-web/169 Log: T?\195?\162che #1880: Updates slf4j to 1.6.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-04 22:22:04 UTC (rev 168) +++ trunk/pom.xml 2012-01-04 22:23:28 UTC (rev 169) @@ -252,7 +252,7 @@  <tapestryVersion>5.2.4</tapestryVersion> - <slf4jVersion>1.6.1</slf4jVersion> + <slf4jVersion>1.6.4</slf4jVersion>  <gwtVersion>2.2.0</gwtVersion>

1 0

r168 - trunk
by tchemit＠users.nuiton.org 04 Jan '12

04 Jan '12

Author: tchemit Date: 2012-01-04 23:22:04 +0100 (Wed, 04 Jan 2012) New Revision: 168 Url: http://nuiton.org/repositories/revision/nuiton-web/168 Log: T?\195?\162che #1879: Updates to struts 2.3.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-04 22:21:01 UTC (rev 167) +++ trunk/pom.xml 2012-01-04 22:22:04 UTC (rev 168) @@ -259,7 +259,7 @@ <gwtPluginVersion>2.2.0</gwtPluginVersion>  - <struts2Version>2.3.1</struts2Version> + <struts2Version>2.3.1.1</struts2Version> <servletApiVersion>2.5</servletApiVersion> <jettyVersion>8.0.1.v20110908</jettyVersion>

1 0

r167 - trunk
by tchemit＠users.nuiton.org 04 Jan '12

04 Jan '12

Author: tchemit Date: 2012-01-04 23:21:01 +0100 (Wed, 04 Jan 2012) New Revision: 167 Url: http://nuiton.org/repositories/revision/nuiton-web/167 Log: T?\195?\162che #1879: Updates to struts 2.3.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-04 18:07:51 UTC (rev 166) +++ trunk/pom.xml 2012-01-04 22:21:01 UTC (rev 167) @@ -259,7 +259,7 @@ <gwtPluginVersion>2.2.0</gwtPluginVersion>  - <struts2Version>2.2.3.1</struts2Version> + <struts2Version>2.3.1</struts2Version> <servletApiVersion>2.5</servletApiVersion> <jettyVersion>8.0.1.v20110908</jettyVersion>

1 0

r166 - in trunk: . nuiton-web
by tchemit＠users.nuiton.org 04 Jan '12

04 Jan '12

Author: tchemit Date: 2012-01-04 19:07:51 +0100 (Wed, 04 Jan 2012) New Revision: 166 Url: http://nuiton.org/repositories/revision/nuiton-web/166 Log: optimize dependencies Modified: trunk/nuiton-web/pom.xml trunk/pom.xml Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2012-01-04 17:45:59 UTC (rev 165) +++ trunk/nuiton-web/pom.xml 2012-01-04 18:07:51 UTC (rev 166) @@ -39,6 +39,12 @@ </dependency> <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-04 17:45:59 UTC (rev 165) +++ trunk/pom.xml 2012-01-04 18:07:51 UTC (rev 166) @@ -115,7 +115,7 @@ <scope>provided</scope> </dependency> -  +  <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> @@ -131,6 +131,13 @@ <scope>provided</scope> </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>3.6.8.Final</version> + <scope>provided</scope> + </dependency> +  <dependency> <groupId>com.google.gwt</groupId>

1 0

r165 - in trunk: . nuiton-web/src/main/java/org/nuiton/web/filter
by tchemit＠users.nuiton.org 04 Jan '12

04 Jan '12

Author: tchemit Date: 2012-01-04 18:45:59 +0100 (Wed, 04 Jan 2012) New Revision: 165 Url: http://nuiton.org/repositories/revision/nuiton-web/165 Log: Anomalie #1876: When closing topia context, the transaction can stay in bad state T?\195?\162che #1877: Updates to topia 2.6.5 Modified: trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java trunk/pom.xml 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 2012-01-04 17:19:13 UTC (rev 164) +++ trunk/nuiton-web/src/main/java/org/nuiton/web/filter/TopiaTransactionFilter.java 2012-01-04 17:45:59 UTC (rev 165) @@ -27,6 +27,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.hibernate.Transaction; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaRuntimeException; @@ -186,14 +187,20 @@ TopiaContext proxy = (TopiaContext) Proxy.newProxyInstance( getClass().getClassLoader(), new Class<?>[]{TopiaContext.class, - TopiaContextImplementor.class}, + TopiaContextImplementor.class}, proxyInvocationHandler ); + + // push it in request as an attribute request.setAttribute(TOPIA_TRANSACTION_REQUEST_ATTRIBUTE, proxy); try { + + // chain to next filter chain.doFilter(request, response); } finally { - proxyInvocationHandler.closeTransaction(); + + // close the real transaction + onCloseTransaction(proxyInvocationHandler.transaction); } } @@ -214,10 +221,49 @@ // not authorized throw new IllegalAccessException( "Not allowed to access method " + method.getName() + " on " + - proxy); + proxy); } /** + * Hook method to close the topia transaction of the request at the end of + * the request when all filter has been consumed. + * + * @param transaction the transaction to close (can be null if transaction + * was not required while the current request) + * @since 1.9.1 + */ + protected void onCloseTransaction(TopiaContext transaction) { + 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 { + // let's rollback transaction if the transaction was not rollbacked nor committed + // as the topia context close context does not affect hibernate transaction + // so if something bad happen then we will always have a + Transaction tx = ((TopiaContextImplementor) transaction).getHibernate().getTransaction(); + if (!tx.wasCommitted() && !tx.wasRolledBack()) { + if (log.isDebugEnabled()) { + log.debug("rollback transaction!"); + } + tx.rollback(); + } + transaction.closeContext(); + } catch (TopiaException e) { + throw new TopiaRuntimeException(e); + } + } + } + + /** * 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. @@ -237,7 +283,7 @@ String methodName = method.getName(); if (log.isDebugEnabled()) { log.debug("Skip execution of method " + methodName + - " since no transaction is instanciated."); + " since no transaction is instanciated."); } Set<String> methods = getUnusedMethods(); @@ -323,27 +369,6 @@ 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); - } - } - } } } Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-04 17:19:13 UTC (rev 164) +++ trunk/pom.xml 2012-01-04 17:45:59 UTC (rev 165) @@ -241,7 +241,7 @@ <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <nuitonI18nPluginVersion>${nuitonI18nVersion}</nuitonI18nPluginVersion> - <topiaVersion>2.6.4</topiaVersion> + <topiaVersion>2.6.5</topiaVersion>  <tapestryVersion>5.2.4</tapestryVersion>

1 0

r164 - trunk
by maven-release＠users.nuiton.org 04 Jan '12

04 Jan '12

Author: maven-release Date: 2012-01-04 18:19:13 +0100 (Wed, 04 Jan 2012) New Revision: 164 Url: http://nuiton.org/repositories/revision/nuiton-web/164 Log: Update mavenpom4redmineAndCentral to 3.0.7. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-12-15 10:07:42 UTC (rev 163) +++ trunk/pom.xml 2012-01-04 17:19:13 UTC (rev 164) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.0.6</version> + <version>3.0.7</version> </parent> <groupId>org.nuiton.web</groupId>

1 0

r163 - in trunk: . nuiton-gwt nuiton-rss nuiton-struts2 nuiton-tapestry nuiton-web
by maven-release＠users.nuiton.org 15 Dec '11

15 Dec '11

Author: maven-release Date: 2011-12-15 11:07:42 +0100 (Thu, 15 Dec 2011) New Revision: 163 Url: http://nuiton.org/repositories/revision/nuiton-web/163 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-12-15 10:07:41 UTC (rev 162) +++ trunk/nuiton-gwt/pom.xml 2011-12-15 10:07:42 UTC (rev 163) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.9</version> + <version>1.10-SNAPSHOT</version> </parent> <artifactId>nuiton-gwt</artifactId> Modified: trunk/nuiton-rss/pom.xml =================================================================== --- trunk/nuiton-rss/pom.xml 2011-12-15 10:07:41 UTC (rev 162) +++ trunk/nuiton-rss/pom.xml 2011-12-15 10:07:42 UTC (rev 163) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.9</version> + <version>1.10-SNAPSHOT</version> </parent> <artifactId>nuiton-rss</artifactId> Modified: trunk/nuiton-struts2/pom.xml =================================================================== --- trunk/nuiton-struts2/pom.xml 2011-12-15 10:07:41 UTC (rev 162) +++ trunk/nuiton-struts2/pom.xml 2011-12-15 10:07:42 UTC (rev 163) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.9</version> + <version>1.10-SNAPSHOT</version> </parent> <artifactId>nuiton-struts2</artifactId> Modified: trunk/nuiton-tapestry/pom.xml =================================================================== --- trunk/nuiton-tapestry/pom.xml 2011-12-15 10:07:41 UTC (rev 162) +++ trunk/nuiton-tapestry/pom.xml 2011-12-15 10:07:42 UTC (rev 163) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.9</version> + <version>1.10-SNAPSHOT</version> </parent> <artifactId>nuiton-tapestry</artifactId> Modified: trunk/nuiton-web/pom.xml =================================================================== --- trunk/nuiton-web/pom.xml 2011-12-15 10:07:41 UTC (rev 162) +++ trunk/nuiton-web/pom.xml 2011-12-15 10:07:42 UTC (rev 163) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.9</version> + <version>1.10-SNAPSHOT</version> </parent> <artifactId>nuiton-web</artifactId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-12-15 10:07:41 UTC (rev 162) +++ trunk/pom.xml 2011-12-15 10:07:42 UTC (rev 163) @@ -15,7 +15,7 @@ <groupId>org.nuiton.web</groupId> <artifactId>nuiton-web-parent</artifactId> - <version>1.9</version> + <version>1.10-SNAPSHOT</version> <modules> <module>nuiton-web</module> @@ -315,11 +315,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-web/tags/nuiton-web-1.9</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.9 + scm:svn:http://svn.nuiton.org/svn/nuiton-web/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-web/tags/nuiton-web-1.9</url> + <url>http://www.nuiton.org/repositories/browse/nuiton-web/trunk</url> </scm> <distributionManagement>

1 0

r162 - tags
by maven-release＠users.nuiton.org 15 Dec '11

15 Dec '11

Author: maven-release Date: 2011-12-15 11:07:41 +0100 (Thu, 15 Dec 2011) New Revision: 162 Url: http://nuiton.org/repositories/revision/nuiton-web/162 Log: [maven-release-plugin] copy for tag nuiton-web-1.9 Added: tags/nuiton-web-1.9/

1 0