cleanup some production destinations

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/common/CdmDestinations.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/common/CdmDestinations.java
index eb07f1987c3876e5aeca2ad3cff66898c7b3b83c..635b39a2073ee4cce529c1a22b16af577ce2f7fe 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/common/CdmDestinations.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/common/CdmDestinations.java
@@ -78,6 +78,14 @@ public class CdmDestinations {
         return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null);
     }
 
+    public static ICdmDataSource cdm_local_cdmtest_mysql(){
+        DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL;
+        String cdmServer = "127.0.0.1";
+        String cdmDB = "cdm_test";
+        String cdmUserName = "root";
+        return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null);
+    }
+
        public static ICdmDataSource cdm_local_redlist_gefaesspflanzen(){
                DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL;
                String cdmServer = "127.0.0.1";
@@ -357,15 +365,6 @@ public class CdmDestinations {
                return makeDestination(dbType, cdmServer, cdmDB, port, cdmUserName, null);
        }
 
-//     public static ICdmDataSource cdm_cyprus_dev_tunnel(){
-//             DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL;
-//             String cdmServer = "127.0.0.1";
-//             int port = 13306;
-//             String cdmDB = "cdm_cyprus";
-//             String cdmUserName = "edit";
-//             return makeDestination(dbType, cdmServer, cdmDB, port, cdmUserName, null);
-//     }
-
        public static ICdmDataSource cdm_production_campanulaceae(){
                DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL;
                String cdmServer = "160.45.63.171";

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/cyprus/CyprusActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/cyprus/CyprusActivator.java
index 3c27a0896316a3c79e606f70566cc6172dd5f04c..1ac86175cad8d03ccd480110e40d2e1b763e110d 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/cyprus/CyprusActivator.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/cyprus/CyprusActivator.java
@@ -49,7 +49,7 @@ public class CyprusActivator {
        static final ICdmDataSource cdmDestination = CdmDestinations.localH2();
 //     static final ICdmDataSource cdmDestination = CdmDestinations.cdm_local_postgres_CdmTest();
 //     static final ICdmDataSource cdmDestination = CdmDestinations.cdm_test_local_mysql();
-//     static final ICdmDataSource cdmDestination = CdmDestinations.cdm_cyprus_dev();
+//     static final ICdmDataSource cdmDestination = CdmDestinations.cdm_test_cyprus();
 //     static final ICdmDataSource cdmDestination = CdmDestinations.cdm_cyprus_production();
 
 

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/cyprus/CyprusAltitudeActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/cyprus/CyprusAltitudeActivator.java
index ca5ef69add18cde561f1775933f3094bb3548fd5..33a40a610e1360c6cc2dd0069ba41286928b1fde 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/cyprus/CyprusAltitudeActivator.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/cyprus/CyprusAltitudeActivator.java
@@ -58,7 +58,7 @@ public class CyprusAltitudeActivator {
 \r
        static final ICdmDataSource cdmDestination = CdmDestinations.localH2();\r
 //     static final ICdmDataSource cdmDestination = CdmDestinations.cdm_test_local_mysql_test();\r
-//     static final ICdmDataSource cdmDestination = CdmDestinations.cdm_cyprus_dev();\r
+//     static final ICdmDataSource cdmDestination = CdmDestinations.cdm_test_cyprus();\r
 //     static final ICdmDataSource cdmDestination = CdmDestinations.cdm_cyprus_production();\r
 \r
 \r

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/cyprus/CyprusImagesActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/cyprus/CyprusImagesActivator.java
index e523e65bd4d554576fa94495a267b4a96e4c38cb..7c7d1685566a2f75415dd4b23e24846e2f4af092 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/cyprus/CyprusImagesActivator.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/cyprus/CyprusImagesActivator.java
@@ -73,7 +73,7 @@ public class CyprusImagesActivator {
        private static final Logger logger = Logger.getLogger(CyprusImagesActivator.class);
 
 
-       static final ICdmDataSource cdmDestination = CdmDestinations.cdm_cyprus_dev();
+       static final ICdmDataSource cdmDestination = CdmDestinations.cdm_test_cyprus();
 //     static final ICdmDataSource cdmDestination = CdmDestinations.cdm_production_cyprus();
 
        static boolean testOnly = false;

diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/cyprus/CyprusSpecimenActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/cyprus/CyprusSpecimenActivator.java
index 8d09707d100945d3b5b999db99d05d2b57363135..0b75b16b2f1eb8848085253e3d857b781305dc66 100644 (file)
--- a/app-import/src/main/java/eu/etaxonomy/cdm/app/cyprus/CyprusSpecimenActivator.java
+++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/cyprus/CyprusSpecimenActivator.java
@@ -40,7 +40,7 @@ public class CyprusSpecimenActivator {
 //     static final ICdmDataSource cdmDestination = CdmDestinations.localH2();\r
 //     static final ICdmDataSource cdmDestination = CdmDestinations.cdm_test_local_mysql();\r
        static final ICdmDataSource cdmDestination = CdmDestinations.cdm_test_cyprus();\r
-//     static final ICdmDataSource cdmDestination = CdmDestinations.cdm_cyprus_production();\r
+//     static final ICdmDataSource cdmDestination = CdmDestinations.cdm_production_cyprus();\r
 \r
 \r
        //check - import\r