From ecee792dc7dae9de167e4cc6cb01ede53f2fc298 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Mon, 19 Dec 2011 16:09:50 +0000 Subject: [PATCH] clean up pesi destinations --- .../cdm/app/common/CdmDestinations.java | 203 +----------------- 1 file changed, 4 insertions(+), 199 deletions(-) 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 227b0897..676fcbcf 100644 --- 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 @@ -87,7 +87,7 @@ public class CdmDestinations { DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL; String cdmServer = "127.0.0.1"; String cdmDB = "cdm_test"; - String cdmUserName = "edit"; + String cdmUserName = "root"; return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null); } @@ -249,22 +249,6 @@ public class CdmDestinations { return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null); } - public static ICdmDataSource cdm_pesi_euroMed(){ - DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL; - String cdmServer = "192.168.2.10"; - String cdmDB = "cdm_pesi_euroMed"; - String cdmUserName = "edit"; - return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null); - } - - public static ICdmDataSource cdm_pesi_all(){ - DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL; - String cdmServer = "192.168.2.10"; - String cdmDB = "cdm_pesi_all"; - 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"; @@ -312,14 +296,7 @@ public class CdmDestinations { String cdmUserName = "edit"; return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null); } - - public static ICdmDataSource cdm_local_cichorieae_d(){ - DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL; - String cdmServer = "127.0.0.1"; - String cdmDB = "cdm_edit_cichorieae_d"; - String cdmUserName = "root"; - return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null); - } + public static ICdmDataSource cdm_local_postgres_CdmTest(){ DatabaseTypeEnum dbType = DatabaseTypeEnum.PostgreSQL; @@ -350,23 +327,10 @@ public class CdmDestinations { public static ICdmDataSource localH2(String database, String username, String filePath){ return CdmDataSource.NewH2EmbeddedInstance(database, "sa", "", filePath, null); } - - public static ICdmDataSource localH2Salvador(){ - return CdmDataSource.NewH2EmbeddedInstance("salvador", "sa", ""); - } - - public static ICdmDataSource localH2Diptera(){ - return CdmDataSource.NewH2EmbeddedInstance("diptera", "sa", ""); - } - - public static ICdmDataSource localH2Cichorieae(){ return CdmDataSource.NewH2EmbeddedInstance("cichorieae", "sa", ""); } - - public static ICdmDataSource localH2Palmae(){ - return CdmDataSource.NewH2EmbeddedInstance("palmae", "sa", ""); - } + public static ICdmDataSource localH2EuroMed(){ return CdmDataSource.NewH2EmbeddedInstance("euroMed", "sa", ""); @@ -375,38 +339,6 @@ public class CdmDestinations { public static ICdmDataSource localH2Erms(){ return CdmDataSource.NewH2EmbeddedInstance("erms", "sa", ""); } - - public static ICdmDataSource localH2_viola(){ - return CdmDataSource.NewH2EmbeddedInstance("testViola", "sa", ""); - } - - public static ICdmDataSource localH2_LIAS(){ - return CdmDataSource.NewH2EmbeddedInstance("testLIAS", "sa", ""); - } - - public static ICdmDataSource localH2_Erythroneura(){ - return CdmDataSource.NewH2EmbeddedInstance("testErythroneura", "sa", ""); - } - - public static ICdmDataSource localH2_Cicad(){ - return CdmDataSource.NewH2EmbeddedInstance("testCicad", "sa", ""); - } - - public static ICdmDataSource localH2_ValRosandraFRIDAKey(){ - return CdmDataSource.NewH2EmbeddedInstance("testValRosandraFRIDAKey", "sa", ""); - } - - public static ICdmDataSource localH2_FreshwaterAquaticInsects(){ - return CdmDataSource.NewH2EmbeddedInstance("testFreshwaterAquaticInsects", "sa", ""); - } - - public static ICdmDataSource cdm_portal_test_pollux(){ - DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL; - String cdmServer = "192.168.2.11"; - String cdmDB = "cdm_portal_test"; - String cdmUserName = "edit"; - return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null); - } public static ICdmDataSource cdm_algaterra_preview(){ DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL; @@ -415,16 +347,7 @@ public class CdmDestinations { String cdmUserName = "edit"; return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null); } - - public static ICdmDataSource cdm_edit_cichorieae_PG(){ - DatabaseTypeEnum dbType = DatabaseTypeEnum.PostgreSQL; - String cdmServer = "127.0.0.1"; - String cdmDB = "cdm_edit_cichorieae_a"; - String cdmUserName = "edit"; - int port = 15432; - return makeDestination(dbType, cdmServer, cdmDB, port, cdmUserName, null); - } - + public static ICdmDataSource cdm_euroMed_dev(){ DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL; @@ -434,125 +357,7 @@ public class CdmDestinations { return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null); } - public static ICdmDataSource cdm_cichorieae_preview(){ - DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL; - String cdmServer = "160.45.63.201"; - String cdmDB = "cdm_edit_cichorieae"; - String cdmUserName = "edit"; - return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null); - } - - public static ICdmDataSource cdm_production_cichorieae(){ - DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL; - String cdmServer = "160.45.63.151"; -// String cdmServer = "127.0.0.1"; - String cdmDB = "cdm_production_cichorieae"; - String cdmUserName = "edit"; - return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null); - } - - public static ICdmDataSource cdm_production_palmae(){ - DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL; - String cdmServer = "160.45.63.151"; - String cdmDB = "cdm_production_palmae"; - String cdmUserName = "edit"; - return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null); - } - - - public static ICdmDataSource cdm_production_diptera(){ - DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL; - String cdmServer = "160.45.63.151"; - String cdmDB = "cdm_production_diptera"; - String cdmUserName = "edit"; - return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null); - } - - public static ICdmDataSource local_cdm_edit_cichorieae_a(){ - DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL; - String cdmServer = "127.0.0.1"; - String cdmDB = "cdm_edit_cichorieae_a"; - String cdmUserName = "edit"; - return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null); - } - - public static ICdmDataSource local_cdm_edit_cichorieae_b(){ - DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL; - String cdmServer = "127.0.0.1"; - String cdmDB = "cdm_edit_cichorieae_b"; - String cdmUserName = "edit"; - return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null); - } - - public static ICdmDataSource cdm_edit_palmae_a(){ - DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL; - String cdmServer = "192.168.2.10"; - String cdmDB = "cdm_edit_palmae_a"; - String cdmUserName = "edit"; - return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null); - } - - public static ICdmDataSource cdm_edit_diptera_preview_B(){ - DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL; - String cdmServer = "127.0.0.1"; - String cdmDB = "cdm_edit_diptera_b"; - String cdmUserName = "edit"; - int port = 13306; - return makeDestination(dbType, cdmServer, cdmDB, port, cdmUserName, null); - } - - public static ICdmDataSource cdm_edit_cichorieae_preview(){ - DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL; - String cdmServer = "127.0.0.1"; - String cdmDB = "cdm_edit_cichorieae"; - String cdmUserName = "edit"; - int port = 13306; - return makeDestination(dbType, cdmServer, cdmDB, port, cdmUserName, null); - } - public static ICdmDataSource cdm_edit_palmae_preview(){ - DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL; - String cdmServer = "127.0.0.1"; - String cdmDB = "cdm_edit_palmae"; - String cdmUserName = "edit"; - int port = 13306; - return makeDestination(dbType, cdmServer, cdmDB, port, cdmUserName, null); - } - - public static ICdmDataSource cdm_edit_salvador(){ - DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL; - String cdmServer = "192.168.2.10"; - String cdmDB = "cdm_edit_salvador"; - String cdmUserName = "edit"; - return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null); - } - - public static ICdmDataSource cdm_import_salvador() { - DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL; - String cdmServer = "192.168.2.10"; - String cdmDB = "cdm_import_salvador"; - String cdmUserName = "edit"; - return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null); - } - - public static ICdmDataSource cdm_salvador_production() { - DatabaseTypeEnum dbType = DatabaseTypeEnum.MySQL; - String cdmServer = "192.168.2.10"; - String cdmDB = "salvador_cdm"; - String cdmUserName = "salvador"; - return makeDestination(dbType, cdmServer, cdmDB, -1, cdmUserName, null); - } - - -// public static ICdmDataSource LAPTOP_HP(){ -// DatabaseTypeEnum dbType = DatabaseTypeEnum.SqlServer2005; -// String cdmServer = "LAPTOPHP"; -// String cdmDB = "cdmTest"; -// String cdmUserName = "edit"; -// return makeDestination(cdmServer, cdmDB, -1, cdmUserName, null); -// } - - /** -- 2.34.1