Author: tchemit Date: 2012-01-25 11:53:18 +0100 (Wed, 25 Jan 2012) New Revision: 291 Url: http://forge.codelutin.com/repositories/revision/echobase/291 Log: update struts2 version, add pom name + update svn properties + usage of rename EchoBaseTopiaRootContextFactory Modified: trunk/ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/AbstractToolTest.java trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/TestHelper.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticData-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticRegionData-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesData-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesIndividualData-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesReference-validation.xml trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataFromTransect-validation.xml trunk/pom.xml Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - target *.ipr *.iws *.iml *.log + target *.ipr *.iws *.iml *.log .idea Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/AbstractToolTest.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/AbstractToolTest.java 2012-01-25 10:51:42 UTC (rev 290) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/AbstractToolTest.java 2012-01-25 10:53:18 UTC (rev 291) @@ -25,9 +25,8 @@ import com.google.common.base.Supplier; import fr.ifremer.echobase.EchoBaseConfiguration; -import fr.ifremer.echobase.EchoBaseTopiaRootContextSupplierFactory; +import fr.ifremer.echobase.EchoBaseTopiaRootContextFactory; import fr.ifremer.echobase.entities.EchoBaseDAOHelper; -import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import fr.ifremer.echobase.entities.meta.DbMeta; import fr.ifremer.echobase.services.EchoBaseService; import fr.ifremer.echobase.services.EchoBaseServiceContext; @@ -89,8 +88,8 @@ log.debug("Test directory = " + testdir); } - EchoBaseTopiaRootContextSupplierFactory factory = - new EchoBaseTopiaRootContextSupplierFactory(); + EchoBaseTopiaRootContextFactory factory = + new EchoBaseTopiaRootContextFactory(); topiaContextSupplier = factory.newEmbeddedDatabase(testdir); Modified: trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/TestHelper.java =================================================================== --- trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/TestHelper.java 2012-01-25 10:51:42 UTC (rev 290) +++ trunk/echobase-tools/src/test/java/fr/ifremer/echobase/tools/TestHelper.java 2012-01-25 10:53:18 UTC (rev 291) @@ -24,7 +24,7 @@ package fr.ifremer.echobase.tools; import com.google.common.base.Supplier; -import fr.ifremer.echobase.EchoBaseTopiaRootContextSupplierFactory; +import fr.ifremer.echobase.EchoBaseTopiaRootContextFactory; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; @@ -96,8 +96,8 @@ } public static TopiaContext getRootContext(File dbDir) { - EchoBaseTopiaRootContextSupplierFactory factory = - new EchoBaseTopiaRootContextSupplierFactory(); + EchoBaseTopiaRootContextFactory factory = + new EchoBaseTopiaRootContextFactory(); Supplier<TopiaContext> topiaContextSupplier = factory.newEmbeddedDatabase(dbDir); Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java 2012-01-25 10:51:42 UTC (rev 290) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationListener.java 2012-01-25 10:53:18 UTC (rev 291) @@ -26,7 +26,7 @@ import com.google.common.base.Supplier; import fr.ifremer.echobase.EchoBaseConfiguration; import fr.ifremer.echobase.EchoBaseTechnicalException; -import fr.ifremer.echobase.EchoBaseTopiaRootContextSupplierFactory; +import fr.ifremer.echobase.EchoBaseTopiaRootContextFactory; import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.entities.EchoBaseUserImpl; import fr.ifremer.echobase.entities.meta.DbMeta; @@ -98,8 +98,8 @@ if (log.isInfoEnabled()) { log.info("Initializing RootContextSupplier..."); } - EchoBaseTopiaRootContextSupplierFactory factory = - new EchoBaseTopiaRootContextSupplierFactory(); + EchoBaseTopiaRootContextFactory factory = + new EchoBaseTopiaRootContextFactory(); rootContextSupplier = factory.newDatabaseFromConfig(configuration); applicationContext.setRootContextSupplier(rootContextSupplier); DbMeta dbMeta = DbMeta.newDbMeta(); @@ -161,8 +161,8 @@ dbConf.put("hibernate.hbm2ddl.auto", isCreated?"update": "create"); - EchoBaseTopiaRootContextSupplierFactory factory = - new EchoBaseTopiaRootContextSupplierFactory(); + EchoBaseTopiaRootContextFactory factory = + new EchoBaseTopiaRootContextFactory(); Supplier<TopiaContext> topiaContextSupplier = factory.newDatabaseFromProperties(dbConf); Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticData-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticData-validation.xml 2012-01-25 10:51:42 UTC (rev 290) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticData-validation.xml 2012-01-25 10:53:18 UTC (rev 291) @@ -2,8 +2,8 @@ #%L EchoBase :: UI - $Id: ConfigureFiles-validation.xml 136 2011-11-27 10:09:45Z tchemit $ - $HeadURL: http://svn.forge.codelutin.com/svn/echobase/trunk/echobase-ui/src/main/resou... $ + $Id$ + $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Property changes on: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticData-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticRegionData-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticRegionData-validation.xml 2012-01-25 10:51:42 UTC (rev 290) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticRegionData-validation.xml 2012-01-25 10:53:18 UTC (rev 291) @@ -2,8 +2,8 @@ #%L EchoBase :: UI - $Id: ConfigureFiles-validation.xml 136 2011-11-27 10:09:45Z tchemit $ - $HeadURL: http://svn.forge.codelutin.com/svn/echobase/trunk/echobase-ui/src/main/resou... $ + $Id$ + $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Property changes on: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureAccousticRegionData-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesData-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesData-validation.xml 2012-01-25 10:51:42 UTC (rev 290) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesData-validation.xml 2012-01-25 10:53:18 UTC (rev 291) @@ -2,8 +2,8 @@ #%L EchoBase :: UI - $Id: ConfigureFiles-validation.xml 136 2011-11-27 10:09:45Z tchemit $ - $HeadURL: http://svn.forge.codelutin.com/svn/echobase/trunk/echobase-ui/src/main/resou... $ + $Id$ + $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Property changes on: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesData-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesIndividualData-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesIndividualData-validation.xml 2012-01-25 10:51:42 UTC (rev 290) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesIndividualData-validation.xml 2012-01-25 10:53:18 UTC (rev 291) @@ -2,8 +2,8 @@ #%L EchoBase :: UI - $Id: ConfigureFiles-validation.xml 136 2011-11-27 10:09:45Z tchemit $ - $HeadURL: http://svn.forge.codelutin.com/svn/echobase/trunk/echobase-ui/src/main/resou... $ + $Id$ + $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Property changes on: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesIndividualData-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesReference-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesReference-validation.xml 2012-01-25 10:51:42 UTC (rev 290) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesReference-validation.xml 2012-01-25 10:53:18 UTC (rev 291) @@ -2,8 +2,8 @@ #%L EchoBase :: UI - $Id: ConfigureFiles-validation.xml 136 2011-11-27 10:09:45Z tchemit $ - $HeadURL: http://svn.forge.codelutin.com/svn/echobase/trunk/echobase-ui/src/main/resou... $ + $Id$ + $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Property changes on: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCatchesReference-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataFromTransect-validation.xml =================================================================== --- trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataFromTransect-validation.xml 2012-01-25 10:51:42 UTC (rev 290) +++ trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataFromTransect-validation.xml 2012-01-25 10:53:18 UTC (rev 291) @@ -2,8 +2,8 @@ #%L EchoBase :: UI - $Id: ConfigureFiles-validation.xml 136 2011-11-27 10:09:45Z tchemit $ - $HeadURL: http://svn.forge.codelutin.com/svn/echobase/trunk/echobase-ui/src/main/resou... $ + $Id$ + $HeadURL$ %% Copyright (C) 2011 Ifremer, Codelutin %% Property changes on: trunk/echobase-ui/src/main/resources/fr/ifremer/echobase/ui/actions/importData/ConfigureCommonDataFromTransect-validation.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-25 10:51:42 UTC (rev 290) +++ trunk/pom.xml 2012-01-25 10:53:18 UTC (rev 291) @@ -28,6 +28,7 @@ <!-- *** Project Information ************************************* --> <!-- ************************************************************* --> + <name>EchoBase</name> <description>Projet EchoBase</description> <inceptionYear>2011</inceptionYear> <url>http://maven-site.forge.codelutin.com/echobase</url> @@ -113,7 +114,7 @@ <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <nuitonWebVersion>1.9.1</nuitonWebVersion> <msaccessImporterVersion>1.4.1</msaccessImporterVersion> - <struts2Version>2.3.1.1</struts2Version> + <struts2Version>2.3.1.2</struts2Version> <jqueryPluginVersion>3.2.1</jqueryPluginVersion> <seleniumVersion>2.16.1</seleniumVersion> <h2Version>1.3.163</h2Version>