Adapt CdmServerInfo to always include cybertaxonomy.org (production) #5769
authorAndreas Müller <a.mueller@bgbm.org>
Wed, 11 May 2016 09:40:56 +0000 (11:40 +0200)
committerAndreas Müller <a.mueller@bgbm.org>
Wed, 11 May 2016 09:43:04 +0000 (11:43 +0200)
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmServerInfo.java

index 28e6446b29d963d1fec667167159dc73810d607e..c2eecd44389c73b5cee38c8f376661b6145c5aab 100644 (file)
@@ -380,7 +380,7 @@ public class CdmServerInfo {
             return serverLastModified.compareTo(editorLastModified);
         }
 
-        return 0;
+        return result;
     }
 
 
@@ -441,11 +441,11 @@ public class CdmServerInfo {
     private static List<CdmServerInfoConfig> createDefaultServerConfigList() {
 
         List<CdmServerInfoConfig> serverInfoList = new ArrayList<CdmServerInfoConfig>();
-       // serverInfoList.add(new CdmServerInfoConfig(NAME_PRODUCTION, SERVER_PRODUCTION, 80, ""));
-       //serverInfoList.add(new CdmServerInfoConfig(NAME_INTEGRATION, SERVER_INTEGRATION, 80, CDMSERVER_PREFIX));
+        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_TEST, SERVER_TEST, 80, CDMSERVER_PREFIX, false));
         serverInfoList.add(new CdmServerInfoConfig(NAME_LOCALHOST, SERVER_LOCALHOST, 8080, CDMSERVER_PREFIX, true));
         return serverInfoList;
     }