adapting to chages in CdmUtils

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmServiceCacher.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmServiceCacher.java
index 5365fe2805e42671048e28c75e8a5cfce2b88c14..c8fd418cfcfbb2fa9230f6f3c2f6208b5a8ecd36 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmServiceCacher.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmServiceCacher.java
@@ -66,7 +66,7 @@ public class CdmServiceCacher extends CdmCacher implements ICdmEntitySessionMana
         EhCacheConfiguration cacheConfig = new EhCacheConfiguration();
 
         DiskStoreConfiguration diskStoreConfiguration = new DiskStoreConfiguration();
-        File ehcacheFolder = CdmUtils.getCdmSubDir("taxeditor-ehcache");
+        File ehcacheFolder = CdmUtils.getCdmHomeSubDir("taxeditor-ehcache");
         // FIXME use subfolder per taxeditor version to allow running multiple installations in parallel
         // String taxEditorVersion = ..;
         // File ehcacheFolder = new File(ehcacheFolder, taxEditorVersion);

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 3065a86fb14b26da4ebdb819f3df18dbd453414b..b7ee903dd950f482245bfb25923bd17f0678cd1f 100644 (file)
--- 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
@@ -375,7 +375,7 @@ public class CdmServerInfo {
 
 
     public static List<CdmServerInfo> getCdmServers() {
-        List<CdmServerInfoConfig> configList = loadFromConfigFile(new File(CdmUtils.perUserCdmFolder, CDM_REMOTE_SERVERS_CONFIG_FILE));
+        List<CdmServerInfoConfig> configList = loadFromConfigFile(new File(CdmUtils.PER_USER_CDM_FOLDER, CDM_REMOTE_SERVERS_CONFIG_FILE));
         List<CdmServerInfo> serverInfoList = new ArrayList<CdmServerInfo>(configList.size());
         for(CdmServerInfoConfig config : configList) {
             serverInfoList.add(new CdmServerInfo(config));