Author: tchemit Date: 2009-09-03 22:14:19 +0200 (Thu, 03 Sep 2009) New Revision: 1637 Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/ManualMigrationCallback.java trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/ManualMigrationEngine.java trunk/topia-service-migration/src/main/resources/i18n/topia-service-migration-en_GB.properties trunk/topia-service-migration/src/main/resources/i18n/topia-service-migration-fr_FR.properties Log: update i18n Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/ManualMigrationCallback.java =================================================================== --- trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/ManualMigrationCallback.java 2009-09-03 19:37:29 UTC (rev 1636) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/ManualMigrationCallback.java 2009-09-03 20:14:19 UTC (rev 1637) @@ -31,6 +31,7 @@ import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.util.Version; +import static org.nuiton.i18n.I18n._; /** * ManualMigrationCallback @@ -80,8 +81,6 @@ */ public MigrationChoice doMigration(TopiaContext ctxt, Version dbVersion, Version applicationVersion, List<Version> versions) { - log.info(versions); - MigrationChoice result = MigrationChoice.NO_MIGRATION; boolean doMigrate = askUser(dbVersion, applicationVersion, versions); @@ -102,7 +101,7 @@ Method m = getClass().getMethod(methodName, TopiaContextImplementor.class); m.setAccessible(true); - log.info("start migration of version " + v); + log.info(_("topia.migration.start.migrate" ,v)); if (log.isDebugEnabled()) { log.debug("launch method " + methodName); @@ -145,7 +144,9 @@ log.info(sql); PreparedStatement sta = connection.prepareStatement(sql); sta.executeUpdate(); - log.debug("done " + sql); + if(log.isDebugEnabled()) { + log.debug("done " + sql); + } sta.close(); } } Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/ManualMigrationEngine.java =================================================================== --- trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/ManualMigrationEngine.java 2009-09-03 19:37:29 UTC (rev 1636) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/ManualMigrationEngine.java 2009-09-03 20:14:19 UTC (rev 1637) @@ -379,7 +379,7 @@ public void saveVersion(Version version) { checkInit(); - if (!migrateOnInit || dbVersion == null) { + if (dbVersion == null) { detectDbVersion(); } Modified: trunk/topia-service-migration/src/main/resources/i18n/topia-service-migration-en_GB.properties =================================================================== --- trunk/topia-service-migration/src/main/resources/i18n/topia-service-migration-en_GB.properties 2009-09-03 19:37:29 UTC (rev 1636) +++ trunk/topia-service-migration/src/main/resources/i18n/topia-service-migration-en_GB.properties 2009-09-03 20:14:19 UTC (rev 1637) @@ -6,4 +6,5 @@ topia.migration.saving.db.version=Saving new database version \: %1$s topia.migration.skip.migration.db.is.up.to.date=Database is up to date, no migration needed. topia.migration.skip.migration.no.version.to.apply=No version to apply, no migration needed. +topia.migration.start.migrate=Start migration to version %1$s topia.migration.start.migration=Starting Topia Migration Service - Application version \: %1$s, Database version \: %2$s Modified: trunk/topia-service-migration/src/main/resources/i18n/topia-service-migration-fr_FR.properties =================================================================== --- trunk/topia-service-migration/src/main/resources/i18n/topia-service-migration-fr_FR.properties 2009-09-03 19:37:29 UTC (rev 1636) +++ trunk/topia-service-migration/src/main/resources/i18n/topia-service-migration-fr_FR.properties 2009-09-03 20:14:19 UTC (rev 1637) @@ -6,4 +6,5 @@ topia.migration.saving.db.version=Sauvegarde de la nouvelle version de la base \: %1$s topia.migration.skip.migration.db.is.up.to.date=La base est \u00E0 jour, aucune migration n\u00E9cessaire. topia.migration.skip.migration.no.version.to.apply=Aucune version \u00E0 appliquer, aucune migration n\u00E9cessaire. +topia.migration.start.migrate=D\u00E9marrage de la mise \u00E0 jour vers la version %1$s topia.migration.start.migration=D\u00E9marrage du service de mise \u00E0 jour - version de l'application \: %1$s, version de la base \: %2$s