Author: bpoussin Date: 2008-08-06 13:13:15 +0000 (Wed, 06 Aug 2008) New Revision: 1031 Added: trunk/topia-service/src/resources/ Modified: trunk/topia-service/src/java/org/codelutin/topia/migration/MigrationServiceImpl.java trunk/topia-service/src/java/org/codelutin/topia/migration/callback/MigrationCallbackHandler.java Log: Passage de DatabaseManager dans le callback pour reellement le rendre utilisable si on souhaite faire la migration soit meme, il faut disposer d'une connexion a la base. Modified: trunk/topia-service/src/java/org/codelutin/topia/migration/MigrationServiceImpl.java =================================================================== --- trunk/topia-service/src/java/org/codelutin/topia/migration/MigrationServiceImpl.java 2008-08-05 17:54:54 UTC (rev 1030) +++ trunk/topia-service/src/java/org/codelutin/topia/migration/MigrationServiceImpl.java 2008-08-06 13:13:15 UTC (rev 1031) @@ -266,7 +266,7 @@ bMigrationNeeded = true; // ask handler for migration - bMigrationWanted = askHandlerForMigration(vdbVersion.getVersion(),currentApplicationVersion.getVersion()); + bMigrationWanted = askHandlerForMigration(dbManager, vdbVersion.getVersion(),currentApplicationVersion.getVersion()); logger.info("Handler choose : " + bMigrationWanted); } @@ -430,13 +430,15 @@ * * @return <tt>true</tt> or <tt>false</tt> */ - protected MigrationChoice askHandlerForMigration(String databaseVersion, String applicationVersion) { + protected MigrationChoice askHandlerForMigration(DatabaseManager dbManager, + String databaseVersion, String applicationVersion) { // true par defaut, s'il n'y a pas de handlers MigrationChoice result = MigrationChoice.MIGRATION; for(MigrationCallbackHandler callback : migrationCallBackHandlers) { - MigrationChoice thiscallbackResult = callback.doMigration(databaseVersion, applicationVersion); + MigrationChoice thiscallbackResult = callback.doMigration(dbManager, + databaseVersion, applicationVersion); // hack , si un des callback repond CUSTOM_MIGRATION // ca sera CUSTOM_MIGRATION Modified: trunk/topia-service/src/java/org/codelutin/topia/migration/callback/MigrationCallbackHandler.java =================================================================== --- trunk/topia-service/src/java/org/codelutin/topia/migration/callback/MigrationCallbackHandler.java 2008-08-05 17:54:54 UTC (rev 1030) +++ trunk/topia-service/src/java/org/codelutin/topia/migration/callback/MigrationCallbackHandler.java 2008-08-06 13:13:15 UTC (rev 1031) @@ -18,6 +18,8 @@ package org.codelutin.topia.migration.callback; +import org.codelutin.topia.migration.DatabaseManager; + /** * MigrationCallBackHandler * @@ -44,9 +46,10 @@ /** * Ask for migration * + * @param un objet permettant d'ouvrir des connexions sur la base * @param databaseVersion database version * @param applicationVersion application version * @return migration aggrement */ - public MigrationChoice doMigration(String databaseVersion, String applicationVersion); + public MigrationChoice doMigration(DatabaseManager dbManager, String databaseVersion, String applicationVersion); }