renamed updaters for version 2.5

diff --git a/.gitattributes b/.gitattributes
index 4b2603929dda1fb2565931439cc40021a77f468d..7d42fa15817ba777a1cdb8fa5ec6b4057d3f3794 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -2260,13 +2260,13 @@ cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/ISchemaUpdater
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/ITermUpdater.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/SchemaUpdaterBase.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/SchemaUpdaterStepBase.java -text
-cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/SchemaUpdater_3_0.java -text
+cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/SchemaUpdater_24_25.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/SimpleSchemaUpdaterStep.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/SingleTermUpdater.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/SortIndexUpdater.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/TableNameChanger.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/TermUpdaterBase.java -text
-cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/TermUpdater_3_0.java -text
+cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/TermUpdater_24_25.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/AbstractBeanInitializer.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/AutoPropertyInitializer.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/BeanInitializer.java -text

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/testUpdate/EricaceaeTestUpdateActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/testUpdate/EricaceaeTestUpdateActivator.java
index b4404725e5465f9d1bf5c75bf29cc9ccd15bf1d7..c8e0d74d4c2a32625cacd5f508fa3bf5770f021e 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/testUpdate/EricaceaeTestUpdateActivator.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/testUpdate/EricaceaeTestUpdateActivator.java
@@ -45,10 +45,10 @@ public class EricaceaeTestUpdateActivator {
        static final String source = EfloraSources.ericacea_local();\r
 \r
        \r
-       static final ICdmDataSource cdmDestination = CdmDestinations.cdm_test_andreasM2();\r
+//     static final ICdmDataSource cdmDestination = CdmDestinations.cdm_test_andreasM2();\r
 //     static final ICdmDataSource cdmDestination = CdmDestinations.cdm_flora_central_africa_preview();\r
 //     static final ICdmDataSource cdmDestination = CdmDestinations.cdm_flora_central_africa_production();\r
-//     static final ICdmDataSource cdmDestination = CdmDestinations.localH2();\r
+       static final ICdmDataSource cdmDestination = CdmDestinations.localH2();\r
 //     static final ICdmDataSource cdmDestination = CdmDestinations.cdm_local_postgres_CdmTest();\r
        \r
 \r

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/CdmUpdater.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/CdmUpdater.java
index c20fc5e0f7c7ce24ddbb1b0eae7fce72e4f86090..a0061740dc73258ad7725a6f46e8c87fa0b3263e 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/CdmUpdater.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/CdmUpdater.java
@@ -53,7 +53,7 @@ public class CdmUpdater {
        }\r
        \r
        private ITermUpdater getCurrentTermUpdater() {\r
-               return TermUpdater_3_0.NewInstance();\r
+               return TermUpdater_24_25.NewInstance();\r
        }\r
 \r
        /**\r
@@ -61,7 +61,7 @@ public class CdmUpdater {
         * @return\r
         */\r
        private ISchemaUpdater getCurrentSchemaUpdater() {\r
-               return SchemaUpdater_3_0.NewInstance();\r
+               return SchemaUpdater_24_25.NewInstance();\r
        }\r
 \r
 \r
@@ -70,7 +70,7 @@ public class CdmUpdater {
         * @param args\r
         */\r
        public static void main(String[] args) {\r
-               logger.warn("main method not yet implemented");\r
+               logger.warn("main method not yet fully implemented");\r
                //TODO\r
                CdmUpdater myUpdater = new CdmUpdater();\r
 //             myUpdater.updateToCurrentVersion(datasource, monitor);\r

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/SchemaUpdater_3_0.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/SchemaUpdater_24_25.java
similarity index 91%
rename from cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/SchemaUpdater_3_0.java
rename to cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/SchemaUpdater_24_25.java
index ec90fb4f4031570bcfa67490e442a547285ce020..58ea90147d8a8f044c5c91b71cfbb21d5a345d07 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/SchemaUpdater_3_0.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/SchemaUpdater_24_25.java
@@ -19,22 +19,22 @@ import org.apache.log4j.Logger;
  * @date 10.09.2010\r
  *\r
  */\r
-public class SchemaUpdater_3_0 extends SchemaUpdaterBase implements ISchemaUpdater {\r
+public class SchemaUpdater_24_25 extends SchemaUpdaterBase implements ISchemaUpdater {\r
        @SuppressWarnings("unused")\r
-       private static final Logger logger = Logger.getLogger(SchemaUpdater_3_0.class);\r
+       private static final Logger logger = Logger.getLogger(SchemaUpdater_24_25.class);\r
        private static final String startSchemaVersion = "2.4.1.2.201004231015";\r
        private static final String endSchemaVersion = "3.0.0.0.201009201255";\r
        \r
 // ********************** FACTORY METHOD *******************************************\r
        \r
-       public static SchemaUpdater_3_0 NewInstance(){\r
-               return new SchemaUpdater_3_0();\r
+       public static SchemaUpdater_24_25 NewInstance(){\r
+               return new SchemaUpdater_24_25();\r
        }\r
 \r
        \r
 // ********************** CONSTRUCTOR *******************************************/\r
        \r
-       private SchemaUpdater_3_0(){\r
+       private SchemaUpdater_24_25(){\r
                super(startSchemaVersion, endSchemaVersion);\r
        }\r
        \r

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/TermUpdater_3_0.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/TermUpdater_24_25.java
similarity index 90%
rename from cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/TermUpdater_3_0.java
rename to cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/TermUpdater_24_25.java
index fdca65e42d1bf45a07eb09b864d0850eaa6489d5..d62500540d54959a9dba200a9248e19386623e11 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/TermUpdater_3_0.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/TermUpdater_24_25.java
@@ -24,22 +24,22 @@ import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;
  * @date 10.09.2010\r
  *\r
  */\r
-public class TermUpdater_3_0 extends TermUpdaterBase implements ITermUpdater {\r
+public class TermUpdater_24_25 extends TermUpdaterBase implements ITermUpdater {\r
        @SuppressWarnings("unused")\r
-       private static final Logger logger = Logger.getLogger(TermUpdater_3_0.class);\r
+       private static final Logger logger = Logger.getLogger(TermUpdater_24_25.class);\r
        \r
        public static final String startTermVersion = "2.4.2.2.201006011715";\r
        private static final String endTermVersion = "3.0.0.0.201009201255";\r
        \r
 // *************************** FACTORY **************************************/\r
        \r
-       public static TermUpdater_3_0 NewInstance(){\r
-               return new TermUpdater_3_0(startTermVersion, endTermVersion);\r
+       public static TermUpdater_24_25 NewInstance(){\r
+               return new TermUpdater_24_25(startTermVersion, endTermVersion);\r
        }\r
        \r
 // *************************** CONSTRUCTOR ***********************************/        \r
 \r
-       protected TermUpdater_3_0(String startTermVersion, String endTermVersion) {\r
+       protected TermUpdater_24_25(String startTermVersion, String endTermVersion) {\r
                super(startTermVersion, endTermVersion);\r
        }\r
        \r