From: Andreas Müller <a.mueller@bgbm.org>
Date: Mon, 30 May 2016 12:29:21 +0000 (+0200)
Subject: Remove test server information from CdmServerInfo  #5769
X-Git-Tag: 4.1.0^2~10
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/ac852ffb99ec4cbb12250887eab9b8ad66d51692

Remove test server information from CdmServerInfo  #5769
---

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmServerInfo.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmServerInfo.java
index c2eecd443..2a5f81522 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmServerInfo.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmServerInfo.java
@@ -62,18 +62,9 @@ public class CdmServerInfo {
     private final static String NAME_PRODUCTION = "cybertaxonomy.org";
     private final static String SERVER_PRODUCTION = "api.cybertaxonomy.org";
 
-    private final static String NAME_INTEGRATION = "edit-integration";
-    private final static String SERVER_INTEGRATION = "int.e-taxonomy.eu";
-
     private final static String NAME_DEMO_1 = "edit-WS I";
     private final static String SERVER_DEMO_1 = "160.45.63.230";
 
-    private final static String NAME_DEMO_2 = "edit-WS II";
-    private final static String SERVER_DEMO_2 = "160.45.63.231";
-
-    private final static String NAME_TEST = "edit-test";
-    private final static String SERVER_TEST = "test.e-taxonomy.eu";
-
     public final static String SERVER_LOCALHOST = "localhost";
     private final static String NAME_LOCALHOST = "localhost";
     public final static String NAME_LOCALHOST_MGD = "localhost mgd.";
@@ -81,7 +72,6 @@ public class CdmServerInfo {
     private final static String NAME_LOCALHOST_DEV = "localhost-dev";
     private final static String NAME_INSTANCE_LOCALHOST_DEV = "local-dev";
     private final static String SERVER_LOCALHOST_DEV = "localhost";
-    private final static int PORT_LOCALHOST_DEV = 8080;
     private final static String BASEPATH_LOCALHOST_DEV = "";
 
     public final static int NULL_PORT = -1;
@@ -442,10 +432,7 @@ public class CdmServerInfo {
 
         List<CdmServerInfoConfig> serverInfoList = new ArrayList<CdmServerInfoConfig>();
         serverInfoList.add(new CdmServerInfoConfig(NAME_PRODUCTION, SERVER_PRODUCTION, 80, "", false));
-       // serverInfoList.add(new CdmServerInfoConfig(NAME_INTEGRATION, SERVER_INTEGRATION, 80, CDMSERVER_PREFIX));
         serverInfoList.add(new CdmServerInfoConfig(NAME_DEMO_1, SERVER_DEMO_1, 80, CDMSERVER_PREFIX, false));
-       // serverInfoList.add(new CdmServerInfoConfig(NAME_DEMO_2, SERVER_DEMO_2, 80, CDMSERVER_PREFIX));
-//        serverInfoList.add(new CdmServerInfoConfig(NAME_TEST, SERVER_TEST, 80, CDMSERVER_PREFIX, false));
         serverInfoList.add(new CdmServerInfoConfig(NAME_LOCALHOST, SERVER_LOCALHOST, 8080, CDMSERVER_PREFIX, true));
         return serverInfoList;
     }