Author: tchemit Date: 2010-01-31 22:42:16 +0000 (Sun, 31 Jan 2010) New Revision: 298 Modified: trunk/pom.xml trunk/suiviobsmer-business/pom.xml trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerRunnerImpl.java trunk/suiviobsmer-business/src/main/xmi/suiviobsmer.zargo trunk/suiviobsmer-ui/src/main/resources/log4j.properties Log: Use topia migration service + pass model version to 0.4 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-31 21:18:32 UTC (rev 297) +++ trunk/pom.xml 2010-01-31 22:42:16 UTC (rev 298) @@ -64,6 +64,11 @@ <version>${topia.version}</version> </dependency> <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-service-migration</artifactId> + <version>${topia.version}</version> + </dependency> + <dependency> <groupId>org.apache.tapestry</groupId> <artifactId>tapestry-core</artifactId> <version>${tapestry.version}</version> Modified: trunk/suiviobsmer-business/pom.xml =================================================================== --- trunk/suiviobsmer-business/pom.xml 2010-01-31 21:18:32 UTC (rev 297) +++ trunk/suiviobsmer-business/pom.xml 2010-01-31 22:42:16 UTC (rev 298) @@ -55,8 +55,13 @@ <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> </dependency> - <!-- base h2 --> <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-service-migration</artifactId> + </dependency> + + <!-- base h2 --> + <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> </dependency> @@ -65,7 +70,7 @@ <artifactId>postgresql</artifactId> </dependency> - <!-- base postgres --> + <!-- base postgres --> <!--dependency> <groupId>postgresql</groupId> <artifactId>postgresql</artifactId> @@ -104,6 +109,14 @@ <include>SuiviObsmer.properties</include> </includes> </resource> + <resource> + <directory>src/main/resources</directory> + <filtering>false</filtering> + <includes> + <include>**/*</include> + </includes> + </resource> + </resources> <plugins> <plugin> @@ -111,6 +124,7 @@ <artifactId>maven-eugene-plugin</artifactId> <executions> <execution> + <id>generate-entities</id> <phase>generate-sources</phase> <!-- By default, generation from ObjectModel --> <configuration> @@ -129,6 +143,20 @@ <goal>smart-generate</goal> </goals> </execution> + <execution> + <phase>generate-sources</phase> + <id>copy-version-files</id> + <configuration> + <includes>**/suiviobsmer.objectmodel</includes> + <copyVersionDir>${basedir}/src/main/resources/oldmappings/%MODELNAME% + </copyVersionDir> + <copyVersionFiles>**/*.hbm.xml</copyVersionFiles> + <overwrite>true</overwrite> + </configuration> + <goals> + <goal>copyVersionFiles</goal> + </goals> + </execution> </executions> </plugin> </plugins> @@ -136,8 +164,6 @@ <scm> <url>http://labs.libre-entreprise.org/scm/viewvc.php/trunk/suiviobsmer-business/?root=suiviobsmer</url> - <connection>scm:svn:svn://anonymous at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/suiviobsmer-business</connection> - <developerConnection>scm:svn:svn+ssh://fdesbois at labs.libre-entreprise.org/svnroot/suiviobsmer/trunk/suiviobsmer-business</developerConnection> </scm> </project> Modified: trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerRunnerImpl.java =================================================================== --- trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerRunnerImpl.java 2010-01-31 21:18:32 UTC (rev 297) +++ trunk/suiviobsmer-business/src/main/java/fr/ifremer/suiviobsmer/SuiviObsmerRunnerImpl.java 2010-01-31 22:42:16 UTC (rev 298) @@ -22,7 +22,11 @@ package fr.ifremer.suiviobsmer; import java.util.Date; +import java.util.Locale; + +import org.nuiton.i18n.I18n; import org.nuiton.topia.TopiaException; +import org.nuiton.topia.migration.ManualMigrationEngine; import org.nuiton.util.ApplicationConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -53,8 +57,17 @@ _configuration.parse(new String[]{}); _configuration.setOption("topia.persistence.classes", SuiviObsmerModelDAOHelper.getImplementationClassesAsString()); - + + // migration configuration + _configuration.setOption(ManualMigrationEngine.MIGRATION_APPLICATION_VERSION, SuiviObsmerModelDAOHelper.getModelVersion()); + _configuration.setOption(ManualMigrationEngine.MIGRATION_MAPPING_DIRECTORY, "oldmappings"); + _configuration.setOption(ManualMigrationEngine.MIGRATION_MODEL_NAME, "SuiviObsmerModel"); + _configuration.setOption("topia.service.migration", ManualMigrationEngine.class.getName()); + _configuration.setOption(ManualMigrationEngine.MIGRATION_CALLBACK, SuiviObsmerMigrationCallBack.class.getName()); + _configuration.printConfig(); + + I18n.init(Locale.FRANCE); // Use the context to set the runner for default environment. SuiviObsmerContext.setRunner(this); // Create the default admin in database Modified: trunk/suiviobsmer-business/src/main/xmi/suiviobsmer.zargo =================================================================== (Binary files differ) Modified: trunk/suiviobsmer-ui/src/main/resources/log4j.properties =================================================================== --- trunk/suiviobsmer-ui/src/main/resources/log4j.properties 2010-01-31 21:18:32 UTC (rev 297) +++ trunk/suiviobsmer-ui/src/main/resources/log4j.properties 2010-01-31 22:42:16 UTC (rev 298) @@ -22,3 +22,4 @@ log4j.logger.fr.ifremer.suiviobsmer=DEBUG log4j.logger.org.nuiton.util=DEBUG +log4j.logger.org.nuiton.topia=INFO