further cleanup for pesi destinations

diff --git a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/common/CdmDestinations.java b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/common/CdmDestinations.java
index 676fcbcf255ac7642b3203e56467548ef5fa50f2..1f64dedf0e93446504ce4b45fe85bc63e5b7e0f8 100644 (file)
--- a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/common/CdmDestinations.java
+++ b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/common/CdmDestinations.java
@@ -22,42 +22,7 @@ import eu.etaxonomy.cdm.database.ICdmDataSource;
 public class CdmDestinations {
        @SuppressWarnings("unused")
        private static Logger logger = Logger.getLogger(CdmDestinations.class);
-       
-       /**
-        * Intended to be used for imports
-        */
-       public static ICdmDataSource import_a(){
-               DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL;
-               String cdmServer = "localhost";
-               String cdmDB = "import_a";
-               String cdmUserName = "root";
-               return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null);
-       }
-
-       public static ICdmDataSource cdm_test_alex(){
-               DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL;
-               String cdmServer = "192.168.2.10";
-               String cdmDB = "cdm_production_palmae"; 
-               String cdmUserName = "edit";
-               return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null);
-       }
-       
 
-       public static ICdmDataSource cdm_test_useSummary(){
-               DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL;
-               String cdmServer = "localhost";
-               String cdmDB = "palmae_2011_07_17"; 
-               String cdmUserName = "edit";
-               return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null);
-       }
-       
-       public static ICdmDataSource cdm_test_jaxb(){
-               DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL;
-               String cdmServer = "192.168.2.10";
-               String cdmDB = "cdm_test_jaxb"; 
-               String cdmUserName = "edit";
-               return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null);
-       }
        
        public static ICdmDataSource cdm_test_jaxb2(){
                DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL;
@@ -66,19 +31,11 @@ public class CdmDestinations {
                String cdmUserName = "edit";
                return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null);
        }
-
-       public static ICdmDataSource cdm_test_andreasM(){
-               DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL;
-               String cdmServer = "192.168.2.10";
-               String cdmDB = "cdm_test_andreasM"; 
-               String cdmUserName = "edit";
-               return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null);
-       }
        
-       public static ICdmDataSource cdm_test_andreasM2(){
+       public static ICdmDataSource cdm_test_patricia(){
                DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL;
                String cdmServer = "192.168.2.10";
-               String cdmDB = "cdm_test_andreasM2"; 
+               String cdmDB = "cdm_test_patricia";
                String cdmUserName = "edit";
                return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null);
        }
@@ -106,149 +63,6 @@ public class CdmDestinations {
                String cdmUserName = "edit";
                return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null);
        }
-
-       
-       public static ICdmDataSource cdm_portal(){
-               DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL;
-               String cdmServer = "192.168.2.10";
-               String cdmDB = "cdm_portal";
-               String cdmUserName = "edit";
-               return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null);
-       }
-       
-       public static ICdmDataSource cdm_portal_test(){
-               DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL;
-               String cdmServer = "192.168.2.10";
-               String cdmDB = "cdm_portal_test";
-               String cdmUserName = "edit";
-               return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null);
-       }
-       
-       public static ICdmDataSource cdm_test_patricia(){
-               DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL;
-               String cdmServer = "192.168.2.10";
-               String cdmDB = "cdm_test_patricia";
-               String cdmUserName = "edit";
-               return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null);
-       }
-       
-       //
-       public static ICdmDataSource cdm_test_andreasK1(){
-               DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL;
-               String cdmServer = "192.168.2.10";
-               String cdmDB = "cdm_test_andreasK1";
-               String cdmUserName = "edit";
-               return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null);
-       }
-       
-
-       public static ICdmDataSource cdm_pesi_erms(){
-               DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL;
-               String cdmServer = "192.168.2.10";
-               String cdmDB = "cdm_pesi_erms";
-               String cdmUserName = "edit";
-               return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null);
-       }
-       
-       public static ICdmDataSource cdm_campanulaceae(){
-               DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL;
-               String cdmServer = "192.168.2.10";
-               String cdmDB = "cdm_campanulaceae";
-               String cdmUserName = "edit";
-               return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null);
-       }
-
-       public static ICdmDataSource cdm_ildis_dev(){
-               DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL;
-               String cdmServer = "160.45.63.201";
-               String cdmDB = "cdm_edit_ildis";
-               String cdmUserName = "edit";
-               return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null);
-       }
-       
-//
-//     public static ICdmDataSource cdm_ildis_production(){
-//             DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL;
-//             String cdmServer = "160.45.63.151";
-//             String cdmDB = "cdm_edit_ildis";
-//             String cdmUserName = "edit";
-//             return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null);
-//     }
-       
-       public static ICdmDataSource cdm_cyprus_dev(){
-               DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL;
-               String cdmServer = "160.45.63.201";
-               String cdmDB = "cdm_cyprus";
-               String cdmUserName = "edit";
-               return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null);
-       }
-       
-       public static ICdmDataSource cdm_cyprus_production(){
-               DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL;
-               String cdmServer = "160.45.63.151";
-               String cdmDB = "cdm_production_cyprus";
-               String cdmUserName = "edit";
-               return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null);
-       }
-
-       public static ICdmDataSource cdm_cyprus_production_tunnel(){
-               DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL;
-               String cdmServer = "127.0.0.1";
-               int port = 13306;
-               String cdmDB = "cdm_production_cyprus";
-               String cdmUserName = "edit";
-               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_campanulaceae_production(){
-               DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL;
-               String cdmServer = "160.45.63.151";
-               String cdmDB = "cdm_production_campanulaceae";
-               String cdmUserName = "edit";
-               return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null);
-       }
-       
-       public static ICdmDataSource cdm_flora_malesiana_preview(){
-               DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL;
-               String cdmServer = "160.45.63.201";
-               String cdmDB = "cdm_edit_flora_malesiana";
-               String cdmUserName = "edit";
-               return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null);
-       }
-
-       public static ICdmDataSource cdm_flora_malesiana_production(){
-               DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL;
-               String cdmServer = "160.45.63.151";
-               String cdmDB = "cdm_production_flora_malesiana";
-               String cdmUserName = "edit";
-               return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null);
-       }
-       
-       public static ICdmDataSource cdm_flora_central_africa_preview(){
-               DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL;
-               String cdmServer = "160.45.63.201";
-               String cdmDB = "cdm_edit_flora_central_africa";
-               String cdmUserName = "edit";
-               return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null);
-       }
-       
-       public static ICdmDataSource cdm_flora_central_africa_production(){
-               DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL;
-               String cdmServer = "160.45.63.151";
-               String cdmDB = "cdm_production_flora_central_africa";
-               String cdmUserName = "edit";
-               return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null);
-       }
-       
        public static ICdmDataSource cdm_portal_test_localhost(){
                DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL;
                String cdmServer = "127.0.0.1";
@@ -264,40 +78,7 @@ public class CdmDestinations {
                String cdmUserName = "edit";
                return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null);
        }
-       
-       public static ICdmDataSource cdm_local_cichorieae(){
-               DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL;
-               String cdmServer = "127.0.0.1";
-               String cdmDB = "cdm_edit_cichorieae";
-               String cdmUserName = "edit";
-               return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null);
-       }
-       
-       public static ICdmDataSource cdm_local_dipera(){
-               DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL;
-               String cdmServer = "127.0.0.1";
-               String cdmDB = "cdm_edit_diptera";
-               String cdmUserName = "edit";
-               return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null);
-       }
-       
-       public static ICdmDataSource cdm_local_palmae(){
-               DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL;
-               String cdmServer = "127.0.0.1";
-               String cdmDB = "cdm_edit_palmae";
-               String cdmUserName = "edit";
-               return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null);
-       }
-       
-       public static ICdmDataSource cdm_local_globis(){
-               DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL;
-               String cdmServer = "127.0.0.1";
-               String cdmDB = "cdm_globis";
-               String cdmUserName = "edit";
-               return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null);
-       }
 
-       
        public static ICdmDataSource cdm_local_postgres_CdmTest(){
                DatabaseTypeEnum dbType = DatabaseTypeEnum.PostgreSQL;
                String cdmServer = "127.0.0.1";
@@ -305,14 +86,6 @@ public class CdmDestinations {
                String cdmUserName = "edit";
                return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null);
        }
-
-       public static ICdmDataSource cdm_local_tdwg2010(){
-               DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL;
-               String cdmServer = "127.0.0.1";
-               String cdmDB = "cdm_tdwg2010";
-               String cdmUserName = "edit";
-               return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null);
-       }
        
        
        public static ICdmDataSource NULL(){

diff --git a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/pesi/ErmsActivator.java b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/pesi/ErmsActivator.java
index cff0ac228bbf8ea2406c7f8aedbb9c403a8c1895..ea039bff36587d85817ab26c81d3e269fdf61481 100644 (file)
--- a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/pesi/ErmsActivator.java
+++ b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/pesi/ErmsActivator.java
@@ -42,7 +42,7 @@ public class ErmsActivator {
        //database validation status (create, update, validate ...)\r
        static DbSchemaValidation hbm2dll = DbSchemaValidation.CREATE;\r
        static final Source berlinModelSource = PesiSources.PESI_ERMS();\r
-       static final ICdmDataSource cdmDestination = CdmDestinations.cdm_pesi_erms();\r
+       static final ICdmDataSource cdmDestination = CdmDestinations.cdm_portal_test_localhost(); \r
        static final UUID treeUuid = UUID.fromString("8bd27d84-fd4f-4bfa-bde0-3e6b7311b334");\r
        static final int sourceSecId = 500000;\r
        static final UUID featureTreeUuid = UUID.fromString("33cbf7a8-0c47-4d47-bd11-b7d77a38d0f6");\r

diff --git a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/pesi/EuroMedActivator.java b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/pesi/EuroMedActivator.java
index 79b84969d825d4f507ab409c3f44d0bd924f6956..172de1957f82794308dc512d3b4dd77721733c2c 100644 (file)
--- a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/pesi/EuroMedActivator.java
+++ b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/pesi/EuroMedActivator.java
@@ -49,7 +49,9 @@ public class EuroMedActivator {
        static final Source berlinModelSource = BerlinModelSources.euroMed();\r
 //     static final Source berlinModelSource = BerlinModelSources.EDIT_Diptera();\r
        \r
-       static final ICdmDataSource cdmDestination = CdmDestinations.cdm_euroMed_dev();\r
+//     static final ICdmDataSource cdmDestination = CdmDestinations.cdm_euroMed_dev();\r
+       static final ICdmDataSource cdmDestination = CdmDestinations.cdm_test_local_mysql();\r
+       \r
        static final int sourceSecId = 7000000; //500000\r
        \r
        static final UUID classificationUuid = UUID.fromString("314a68f9-8449-495a-91c2-92fde8bcf344");\r
@@ -63,7 +65,7 @@ public class EuroMedActivator {
        static final int partitionSize = 2000;\r
        \r
        //check - import\r
-       static final CHECK check = CHECK.CHECK_AND_IMPORT;\r
+       static final CHECK check = CHECK.IMPORT_WITHOUT_CHECK;\r
 \r
        //editor - import\r
        static final EDITOR editor = EDITOR.EDITOR_AS_EDITOR;\r
@@ -87,8 +89,9 @@ public class EuroMedActivator {
        \r
        static String referenceFilter = "SELECT refId FROM v_cdm_exp_allReferences";\r
        \r
+       \r
 // **************** ALL *********************  \r
-//\r
+\r
        static final boolean doUser = true;\r
        //authors\r
        static final boolean doAuthors = true;\r
@@ -131,6 +134,7 @@ public class EuroMedActivator {
 //     static final boolean doRelTaxa = false;\r
 //     static final boolean doFacts = false;\r
 //     static final boolean doOccurences = false;\r
+//     static final boolean doCommonNames = false;\r
 //     \r
 //     //etc.\r
 //     static final boolean doMarker = false;\r

diff --git a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/pesi/FaunaEuropaeaActivator.java b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/pesi/FaunaEuropaeaActivator.java
index 52ec7deff2358d64e66995435b1f357e598104fd..d78533ca4fab96069064dd70b33d3d308ee2bf35 100644 (file)
--- a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/pesi/FaunaEuropaeaActivator.java
+++ b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/pesi/FaunaEuropaeaActivator.java
@@ -36,7 +36,7 @@ public class FaunaEuropaeaActivator {
        private static final Logger logger = Logger.getLogger(FaunaEuropaeaActivator.class);\r
 \r
        static final Source faunaEuropaeaSource = PesiSources.faunaEu_1_3();\r
-       static final ICdmDataSource cdmDestination = CdmDestinations.cdm_test_andreasM();\r
+       static final ICdmDataSource cdmDestination = CdmDestinations.cdm_test_jaxb2();\r
        \r
        static final int limitSave = 2000;\r
 \r

diff --git a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/pesi/PesiExportActivator.java b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/pesi/PesiExportActivator.java
index 067d91313b076384bc5f5dc15b236f6d5c01c886..76230a538970c69afa79915f68b0d7693d1aee15 100644 (file)
--- a/cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/pesi/PesiExportActivator.java
+++ b/cdm-pesi/src/main/java/eu/etaxonomy/cdm/app/pesi/PesiExportActivator.java
@@ -35,7 +35,7 @@ public class PesiExportActivator {
 \r
        //database validation status (create, update, validate ...)\r
        static final Source pesiDestination = PesiDestinations.pesi_test_local_CDM_DWH_FaEu();\r
-       static final ICdmDataSource cdmSource = CdmDestinations.cdm_test_jaxb();\r
+       static final ICdmDataSource cdmSource = CdmDestinations.cdm_test_jaxb2();\r
        static final UUID secUuid = UUID.fromString("d03ef02a-f226-4cb1-bdb4-f6c154f08a34");\r
        static final int sourceSecId = 7331;\r
        static final int isHomotypicId = 72;\r