fixing endSchemaVersion & basic main method for CmdUpdater

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 a0061740dc73258ad7725a6f46e8c87fa0b3263e..8c6d942030bb5bca9b4945124d33823b601cc3be 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
@@ -13,6 +13,7 @@ import org.apache.log4j.Logger;
 \r
 import eu.etaxonomy.cdm.common.DefaultProgressMonitor;\r
 import eu.etaxonomy.cdm.common.IProgressMonitor;\r
+import eu.etaxonomy.cdm.database.CdmDataSource;\r
 import eu.etaxonomy.cdm.database.ICdmDataSource;\r
 \r
 /**\r
@@ -23,8 +24,10 @@ import eu.etaxonomy.cdm.database.ICdmDataSource;
 public class CdmUpdater {\r
        private static final Logger logger = Logger.getLogger(CdmUpdater.class);\r
        \r
+\r
        /**\r
-        * \r
+        * @param datasource\r
+        * @param monitor may be <code>null</code>\r
         * @return\r
         */\r
        public boolean updateToCurrentVersion(ICdmDataSource datasource, IProgressMonitor monitor){\r
@@ -70,10 +73,19 @@ public class CdmUpdater {
         * @param args\r
         */\r
        public static void main(String[] args) {\r
-               logger.warn("main method not yet fully implemented");\r
-               //TODO\r
+               logger.warn("main method not yet fully implemented (only works with mysql!!!)");\r
+               if(args.length < 2){\r
+                       logger.error("Arguments missing: server database [username [password]]");\r
+               }\r
+               //TODO better implementation\r
                CdmUpdater myUpdater = new CdmUpdater();\r
-//             myUpdater.updateToCurrentVersion(datasource, monitor);\r
+               String server = args[0];\r
+               String database  = args[1];\r
+               String username = args.length > 2 ? args[2] : null;\r
+               String password  = args.length > 3 ? args[3] : null;\r
+               \r
+               ICdmDataSource dataSource = CdmDataSource.NewMySqlInstance(server, database, username, password);\r
+               myUpdater.updateToCurrentVersion(dataSource, null);\r
        }\r
 \r
 }\r

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/SchemaUpdater_24_25.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/SchemaUpdater_24_25.java
index 58ea90147d8a8f044c5c91b71cfbb21d5a345d07..548f41e910118288fbe9608683116aec503b2ada 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/SchemaUpdater_24_25.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/SchemaUpdater_24_25.java
@@ -23,7 +23,7 @@ public class SchemaUpdater_24_25 extends SchemaUpdaterBase implements ISchemaUpd
        @SuppressWarnings("unused")\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
+       private static final String endSchemaVersion = "2.5.0.0.201009211255";\r
        \r
 // ********************** FACTORY METHOD *******************************************\r
        \r