Author: chatellier Date: 2011-03-17 14:31:00 +0000 (Thu, 17 Mar 2011) New Revision: 3176 Log: Back to standalone topia migration service configuration Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/entity/TopiaDAOTest.java isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java 2011-03-17 10:35:55 UTC (rev 3175) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/DataStorage.java 2011-03-17 14:31:00 UTC (rev 3176) @@ -202,28 +202,15 @@ /** * Returns the storage. * - * Storage is auto configured to perform shema migration. - * * @return Returns the storage. */ public TopiaContext getStorage() { - TopiaContext topiaContext = getStorage(true); - return topiaContext; - } - - /** - * Returns the storage. - * - * @param performMigration if {@code true} perform migration - * @return Returns the storage. - */ - public TopiaContext getStorage(boolean performMigration) { if (storage == null || storage.isClosed()) { log.info("Create new storage for " + getName()); try { // creation des proprietes pour creer le TopiaContext Properties config = new Properties(); - IsisH2Config.addDatabaseConfig(config, getDirectory(), performMigration); + IsisH2Config.addDatabaseConfig(config, getDirectory()); IsisH2Config.addHibernateMapping(config); // instanciation du TopiaContext @@ -301,7 +288,7 @@ // creation des proprietes pour creer le TopiaContext Properties config = new Properties(); // false = don't perform, schema is empty - IsisH2Config.addDatabaseConfig(config, rootDirDest, false); + IsisH2Config.addDatabaseConfig(config, rootDirDest); IsisH2Config.addHibernateMapping(config); // instanciation du TopiaContext Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java 2011-03-17 10:35:55 UTC (rev 3175) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/IsisH2Config.java 2011-03-17 14:31:00 UTC (rev 3176) @@ -140,10 +140,9 @@ * * @param config l'objet properties dans lequel il faut ajouter les informations * @param directory le repertoire dans lequel la base de données doit se trouver - * @param performMigration if {@code true} perform migration * @return l'objet config passe en parametre */ - public static Properties addDatabaseConfig(Properties config, File directory, boolean performMigration) { + public static Properties addDatabaseConfig(Properties config, File directory) { File databasePath = getStorageDataDirectory(directory); databasePath.mkdirs(); @@ -160,9 +159,9 @@ // migration configuration, seulement pour les fichiers, pas pour les bases memoires config.put(TopiaMigrationService.TOPIA_SERVICE_NAME, TopiaMigrationEngine.class.getName()); config.put(TopiaMigrationService.MIGRATION_CALLBACK, databaseMigrationClass.getName()); - if (!performMigration) { + /*if (!performMigration) { config.put(TopiaMigrationService.MIGRATION_MIGRATE_ON_INIT, databaseMigrationClass.getName()); - } + }*/ return config; } Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2011-03-17 10:35:55 UTC (rev 3175) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/RegionStorage.java 2011-03-17 14:31:00 UTC (rev 3176) @@ -202,7 +202,7 @@ if (region != null) { File file = region.getDataBackupFile(); if (file.exists()) { - TopiaContext tx = region.getStorage(false).beginTransaction(); + TopiaContext tx = region.getStorage().beginTransaction(); tx.restore(file); tx.commitTransaction(); tx.closeContext(); @@ -280,7 +280,7 @@ RegionStorage result = new RegionStorage(directory, name); try { - TopiaContext context = result.getStorage(false).beginTransaction(); + TopiaContext context = result.getStorage().beginTransaction(); context.createSchema(); FisheryRegionDAO regionDAO = IsisFishDAOHelper .getFisheryRegionDAO(context); @@ -436,7 +436,7 @@ if (result != null) { File data = result.getDataBackupFile(); if (file.exists()) { - TopiaContext tx = result.getStorage(false).beginTransaction(); + TopiaContext tx = result.getStorage().beginTransaction(); tx.restore(data); if (newName != null) { FisheryRegion region = getFisheryRegion(tx); Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2011-03-17 10:35:55 UTC (rev 3175) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/datastore/SimulationStorage.java 2011-03-17 14:31:00 UTC (rev 3176) @@ -597,7 +597,7 @@ checkout(IsisFish.config.getDatabaseDirectory(), SIMULATION_PATH + "/" + name); SimulationStorage sim = getSimulation(name); File file = sim.getDataBackupFile(); - TopiaContext tx = sim.getStorage(false).beginTransaction(); + TopiaContext tx = sim.getStorage().beginTransaction(); tx.restore(file); tx.commitTransaction(); tx.closeContext(); @@ -686,7 +686,7 @@ File data = result.getDataBackupFile(); // FIXME was file.exists() ? if (data.exists()) { - TopiaContext tx = result.getStorage(false).beginTransaction(); + TopiaContext tx = result.getStorage().beginTransaction(); tx.restore(data); tx.commitTransaction(); tx.closeContext(); Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/entity/TopiaDAOTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/entity/TopiaDAOTest.java 2011-03-17 10:35:55 UTC (rev 3175) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/entity/TopiaDAOTest.java 2011-03-17 14:31:00 UTC (rev 3176) @@ -66,7 +66,7 @@ SimulationParameter parameters = new SimulationParameterImpl(); SimulationStorage simulation = SimulationStorage.create("testdao", parameters); - TopiaContext rootContext = simulation.getStorage(false); + TopiaContext rootContext = simulation.getStorage(); TopiaContext context = rootContext.beginTransaction(); context.createSchema(); Modified: isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java =================================================================== --- isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java 2011-03-17 10:35:55 UTC (rev 3175) +++ isis-fish/branches/3.3.1/src/test/java/fr/ifremer/isisfish/simulator/SimulationPreScriptTest.java 2011-03-17 14:31:00 UTC (rev 3176) @@ -125,7 +125,7 @@ SimulationContext context = SimulationContext.get(); SimulationParameter params = new SimulationParameterImpl(); SimulationStorage simulation = SimulationStorage.create("test_1_int", params); - TopiaContext storageContext = simulation.getStorage(false); + TopiaContext storageContext = simulation.getStorage(); storageContext.createSchema(); TopiaContext childStorageContext = storageContext.beginTransaction(); VesselTypeDAO vesselTypeDAO = IsisFishDAOHelper.getVesselTypeDAO(childStorageContext); @@ -225,7 +225,7 @@ SimulationContext context = SimulationContext.get(); SimulationParameter params = new SimulationParameterImpl(); SimulationStorage simulation = SimulationStorage.create("test_2_matrix", params); - TopiaContext storageContext = simulation.getStorage(false); + TopiaContext storageContext = simulation.getStorage(); storageContext.createSchema(); TopiaContext childStorageContext = storageContext.beginTransaction(); PopulationSeasonInfoDAO populationSeasonInfoDAO = IsisFishDAOHelper.getPopulationSeasonInfoDAO(childStorageContext);