Author: tchemit Date: 2012-02-20 23:35:10 +0100 (Mon, 20 Feb 2012) New Revision: 327 Url: http://forge.codelutin.com/repositories/revision/echobase/327 Log: updates topia and nuiton-web Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseTopiaTransactionFilter.java trunk/pom.xml Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseTopiaTransactionFilter.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseTopiaTransactionFilter.java 2012-02-20 22:17:44 UTC (rev 326) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseTopiaTransactionFilter.java 2012-02-20 22:35:10 UTC (rev 327) @@ -31,6 +31,8 @@ import org.nuiton.topia.TopiaRuntimeException; import org.nuiton.web.filter.TopiaTransactionFilter; +import javax.servlet.ServletRequest; + /** * EchoBase implementation of the {@link TopiaTransactionFilter}. * @@ -44,7 +46,7 @@ LogFactory.getLog(EchoBaseTopiaTransactionFilter.class); @Override - protected TopiaContext beginTransaction() throws TopiaRuntimeException { + protected TopiaContext beginTransaction(ServletRequest request) throws TopiaRuntimeException { EchoBaseApplicationContext applicationContext = EchoBaseActionSupport.getEchoBaseApplicationContext(); Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-02-20 22:17:44 UTC (rev 326) +++ trunk/pom.xml 2012-02-20 22:35:10 UTC (rev 327) @@ -124,10 +124,10 @@ <!-- libraries version --> <eugenePluginVersion>2.4.2</eugenePluginVersion> - <topiaVersion>2.6.6</topiaVersion> + <topiaVersion>2.6.7</topiaVersion> <nuitonUtilsVersion>2.4.4</nuitonUtilsVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> - <nuitonWebVersion>1.9.2</nuitonWebVersion> + <nuitonWebVersion>1.10</nuitonWebVersion> <msaccessImporterVersion>1.4.1</msaccessImporterVersion> <struts2Version>2.3.1.2</struts2Version> <jqueryPluginVersion>3.2.1</jqueryPluginVersion>