From e81027aa7fe92049404b8347b34c38eb58a643e2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Mon, 22 May 2023 16:21:13 +0200 Subject: [PATCH] cleanup (remove some piB destinations --- .../abcdImport/SynthesysCacheActivator.java | 6 ++-- .../cdm/app/common/CdmDestinations.java | 28 +------------------ .../SpecimenImportActivator.java | 5 ++-- .../SynthesysCacheActivator.java | 6 ++-- 4 files changed, 8 insertions(+), 37 deletions(-) diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/abcdImport/SynthesysCacheActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/abcdImport/SynthesysCacheActivator.java index 24afc64b..275b9988 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/app/abcdImport/SynthesysCacheActivator.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/abcdImport/SynthesysCacheActivator.java @@ -14,7 +14,6 @@ import java.net.URISyntaxException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import eu.etaxonomy.cdm.app.common.CdmDestinations; import eu.etaxonomy.cdm.common.URI; import eu.etaxonomy.cdm.database.DbSchemaValidation; import eu.etaxonomy.cdm.database.ICdmDataSource; @@ -36,9 +35,8 @@ public class SynthesysCacheActivator { // final static String xmlSource = "/home/pkelbert/workspace/proibiosphere/cdmlib-io/target/test-classes/eu/etaxonomy/cdm/io/specimen/excel/in/ExcelImportConfiguratorTest-input.xls"; final static String xmlSource = "/home/pkelbert/Documents/Proibiosphere/ChenopodiumQuentin/GBIF data etc.xls"; -// static final ICdmDataSource cdmDestination = CdmDestinations.mon_cdm(); -// static DbSchemaValidation hbm2dll = DbSchemaValidation.CREATE; - static final ICdmDataSource cdmDestination = CdmDestinations.cdm_local_proibiosphere_chenopodium(); +// static final ICdmDataSource cdmDestination = CdmDestinations.cdm_local_proibiosphere_chenopodium(); + static final ICdmDataSource cdmDestination = null; static DbSchemaValidation hbm2dll = DbSchemaValidation.VALIDATE; static final CHECK check = CHECK.IMPORT_WITHOUT_CHECK; 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 60534952..68e06d4e 100644 --- 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 @@ -862,31 +862,7 @@ public class CdmDestinations { return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null); } - public static ICdmDataSource cdm_production_piB(String database){ - DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL; - String cdmServer = "160.45.63.171"; - String cdmDB = "cdm_production_" + database + "_pilot"; - String cdmUserName = "edit"; - return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null); - } - - public static ICdmDataSource cdm_local_proibiosphere_chenopodium() { - DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL; - String cdmServer = "localhost"; - String cdmDB = "cdm_production_proibiosphere_chenopodium_pilot"; - String cdmUserName = "root"; - return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null); - } - - public static ICdmDataSource cdm_local_proibiosphere_spiders() { - DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL; - String cdmServer = "localhost"; - String cdmDB = "cdm_production_proibiosphere_spiders_pilot"; - String cdmUserName = "root"; - return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null); - } - - public static ICdmDataSource cdm_test_pesi_fauna_europaea(){ + public static ICdmDataSource cdm_test_pesi_fauna_europaea(){ DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL; String cdmServer = "160.45.63.175"; String cdmDB = "cdm_pesi_fauna_europaea"; @@ -894,8 +870,6 @@ public class CdmDestinations { return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null); } - - /** * initializes source * TODO only supports MySQL and PostgreSQL diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/proibiosphere/SpecimenImportActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/proibiosphere/SpecimenImportActivator.java index c8bfbd46..fc5c8b59 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/app/proibiosphere/SpecimenImportActivator.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/proibiosphere/SpecimenImportActivator.java @@ -14,7 +14,6 @@ import java.util.UUID; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import eu.etaxonomy.cdm.app.common.CdmDestinations; import eu.etaxonomy.cdm.common.URI; import eu.etaxonomy.cdm.database.DbSchemaValidation; import eu.etaxonomy.cdm.database.ICdmDataSource; @@ -36,7 +35,9 @@ public class SpecimenImportActivator { // final static String xmlSource = "C:\\localCopy\\eclipse\\cdmlib\\app-import\\src\\main\\resources\\specimenABCD\\CDMtabular9c04a474e2_23_09_08.xls"; - static final ICdmDataSource cdmDestination = CdmDestinations.cdm_local_proibiosphere_chenopodium(); + //static final ICdmDataSource cdmDestination = CdmDestinations.cdm_local_proibiosphere_chenopodium(); + static final ICdmDataSource cdmDestination = null; + //check - import static final CHECK check = CHECK.IMPORT_WITHOUT_CHECK; diff --git a/app-import/src/main/java/eu/etaxonomy/cdm/app/proibiosphere/SynthesysCacheActivator.java b/app-import/src/main/java/eu/etaxonomy/cdm/app/proibiosphere/SynthesysCacheActivator.java index be409e8c..83586c38 100644 --- a/app-import/src/main/java/eu/etaxonomy/cdm/app/proibiosphere/SynthesysCacheActivator.java +++ b/app-import/src/main/java/eu/etaxonomy/cdm/app/proibiosphere/SynthesysCacheActivator.java @@ -14,7 +14,6 @@ import java.net.URISyntaxException; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import eu.etaxonomy.cdm.app.common.CdmDestinations; import eu.etaxonomy.cdm.common.URI; import eu.etaxonomy.cdm.database.DbSchemaValidation; import eu.etaxonomy.cdm.database.ICdmDataSource; @@ -40,10 +39,9 @@ public class SynthesysCacheActivator { final static String xmlSource = "/home/pkelbert/Documents/Proibiosphere/ChenopodiumQuentin/dca UK records.xls"; - static final ICdmDataSource cdmDestination = CdmDestinations.cdm_local_proibiosphere_spiders(); +// static final ICdmDataSource cdmDestination = CdmDestinations.cdm_local_proibiosphere_spiders(); static DbSchemaValidation hbm2dll = DbSchemaValidation.VALIDATE; - // static final ICdmDataSource cdmDestination = CdmDestinations.proibiosphere_local(); - // static DbSchemaValidation hbm2dll = DbSchemaValidation.VALIDATE; + static final ICdmDataSource cdmDestination = null; static final CHECK check = CHECK.IMPORT_WITHOUT_CHECK; public static void main(String[] args) { -- 2.34.1