From 92344bf3b22c7ba3946c65c3c13a775406d0ce9a Mon Sep 17 00:00:00 2001 From: Andreas Kohlbecker Date: Mon, 15 May 2017 15:39:44 +0200 Subject: [PATCH] adapting to chages in CdmUtils --- .../main/java/eu/etaxonomy/cdm/api/cache/CdmServiceCacher.java | 2 +- .../eu/etaxonomy/taxeditor/remoting/source/CdmServerInfo.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 5365fe280..c8fd418cf 100644 --- 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 3065a86fb..b7ee903dd 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 @@ -375,7 +375,7 @@ public class CdmServerInfo { public static List getCdmServers() { - List configList = loadFromConfigFile(new File(CdmUtils.perUserCdmFolder, CDM_REMOTE_SERVERS_CONFIG_FILE)); + List configList = loadFromConfigFile(new File(CdmUtils.PER_USER_CDM_FOLDER, CDM_REMOTE_SERVERS_CONFIG_FILE)); List serverInfoList = new ArrayList(configList.size()); for(CdmServerInfoConfig config : configList) { serverInfoList.add(new CdmServerInfo(config)); -- 2.34.1