Author: bleny Date: 2011-03-24 18:03:24 +0000 (Thu, 24 Mar 2011) New Revision: 1094 Log: downgrading version to create intermediate version ; split migration Modified: trunk/pom.xml trunk/src/site/rst/import/contacts.rst trunk/wao-business/pom.xml trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java trunk/wao-business/src/main/xmi/wao.zargo trunk/wao-ui/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-03-24 17:52:31 UTC (rev 1093) +++ trunk/pom.xml 2011-03-24 18:03:24 UTC (rev 1094) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.0-SNAPSHOT</version> + <version>2.1.1-SNAPSHOT</version> <modules> <module>wao-ui</module> Modified: trunk/src/site/rst/import/contacts.rst =================================================================== --- trunk/src/site/rst/import/contacts.rst 2011-03-24 17:52:31 UTC (rev 1093) +++ trunk/src/site/rst/import/contacts.rst 2011-03-24 18:03:24 UTC (rev 1094) @@ -54,12 +54,14 @@ - PLAN_CODE : la ligne du plan associée au contact (ignoré à l'import) Pour ObsMer : + - CONTACT_QUALITE_DONNEE - CONTACT_OBSERVATION_MAMMIFERE - CONTACT_CAPTURE_ACCIDENTELLE Pour ObsVente : -- CONTACT_LIEU_TYPE : Port ou Criée + +- CONTACT_LIEU_TYPE : "Port" ou "Criée" - CONTACT_LIEU_CODE : Code du lieu - CONTACT_ECHANTILLONNAGE_COMPLET: Échantillonnage comple - CONTACT_LIEU_DESCRIPTION : Description du lieu, ignoré à l'import Modified: trunk/wao-business/pom.xml =================================================================== --- trunk/wao-business/pom.xml 2011-03-24 17:52:31 UTC (rev 1093) +++ trunk/wao-business/pom.xml 2011-03-24 18:03:24 UTC (rev 1094) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.0-SNAPSHOT</version> + <version>2.1.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId> Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2011-03-24 17:52:31 UTC (rev 1093) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/PostgresMigrationCallback.java 2011-03-24 18:03:24 UTC (rev 1094) @@ -793,7 +793,7 @@ } @Override - protected void addCreationDateToContacts_3_0(List<String> queries) { + protected void addCreationDateToContacts_2_1_1(List<String> queries) { queries.add("ALTER TABLE Contact ADD creationDate TIMESTAMP WITHOUT TIME ZONE"); queries.add("UPDATE Contact SET creationDate=topiaCreateDate"); } Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2011-03-24 17:52:31 UTC (rev 1093) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/WaoMigrationCallBack.java 2011-03-24 18:03:24 UTC (rev 1094) @@ -131,14 +131,14 @@ protected abstract void correctFishingZoneReferential_2_1(List<String> queries); + protected abstract void addCreationDateToContacts_2_1_1(List<String> queries); + protected abstract void addTerrestrialDivisions_3_0(List<String> queries); protected abstract void addObsDebToSampleRows_3_0(List<String> queries); protected abstract void addAdminRolesToAdmin_3_0(TopiaContextImplementor tx, List<String> queries) throws TopiaException; - protected abstract void addCreationDateToContacts_3_0(List<String> queries); - protected static final Version[] VERSIONS = new Version[] { VersionUtil.valueOf("1.0"), VersionUtil.valueOf("1.1"), @@ -149,6 +149,7 @@ VersionUtil.valueOf("1.6"), VersionUtil.valueOf("2.0"), VersionUtil.valueOf("2.1"), + VersionUtil.valueOf("2.1.1"), VersionUtil.valueOf("3.0") }; @@ -472,14 +473,24 @@ } + public void migrateTo_2_1_1(TopiaContextImplementor tx, + boolean showSql, + boolean showProgression) throws TopiaException { + + List<String> queries = new LinkedList<String>(); + + addCreationDateToContacts_2_1_1(queries); + + String[] strings = queries.toArray(new String[queries.size()]); + executeSQL(tx, showSql, showProgression, strings); + } + public void migrateTo_3_0(TopiaContextImplementor tx, boolean showSql, boolean showProgression) throws TopiaException { List<String> queries = new LinkedList<String>(); - addCreationDateToContacts_3_0(queries); - addAdminRolesToAdmin_3_0(tx, queries); addTerrestrialDivisions_3_0(queries); Modified: trunk/wao-business/src/main/xmi/wao.zargo =================================================================== (Binary files differ) Modified: trunk/wao-ui/pom.xml =================================================================== --- trunk/wao-ui/pom.xml 2011-03-24 17:52:31 UTC (rev 1093) +++ trunk/wao-ui/pom.xml 2011-03-24 18:03:24 UTC (rev 1094) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>wao</artifactId> - <version>3.0-SNAPSHOT</version> + <version>2.1.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.wao</groupId>