Project

General

Profile

« Previous | Next » 

Revision 55c390a0

Added by Andreas Kohlbecker about 5 years ago

ref #8189 adapting taxeditor to changes in CdmUtils and ConfigFileUtil

View differences:

eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmServiceCacher.java
10 10 
import eu.etaxonomy.cdm.cache.CacheLoader;
11 11 
import eu.etaxonomy.cdm.cache.CdmEntityCacheKey;
12 12 
import eu.etaxonomy.cdm.cache.CdmTransientEntityCacher;
13 
import eu.etaxonomy.cdm.common.CdmUtils;
13 
import eu.etaxonomy.cdm.common.ConfigFileUtil;
14 14 
import eu.etaxonomy.cdm.model.common.CdmBase;
15 15 
import eu.etaxonomy.cdm.model.term.DefinedTermBase;
16 16 
import eu.etaxonomy.cdm.model.term.TermBase;
......
59 59 
        EhCacheConfiguration cacheConfig = new EhCacheConfiguration();
60 60 

  		




  61
  61
  
    
        DiskStoreConfiguration diskStoreConfiguration = new DiskStoreConfiguration();


  		




  62
  
  
    
        File ehcacheFolder = CdmUtils.getCdmHomeSubDir("taxeditor-ehcache");


  		




  
  62
  
    
        File ehcacheFolder = ConfigFileUtil.getCdmHomeSubDir("taxeditor-ehcache");


  		




  63
  63
  
    
        // FIXME use subfolder per taxeditor version to allow running multiple installations in parallel


  		




  64
  64
  
    
        // String taxEditorVersion = ..;


  		




  65
  65
  
    
        // File ehcacheFolder = new File(ehcacheFolder, taxEditorVersion);


  		












  

    
      eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/remoting/source/CdmServerInfo.java
    
  





  376
  376
  
    

  		




  377
  377
  
    

  		




  378
  378
  
    
    public static List<CdmServerInfo> getCdmServers() {


  		




  379
  
  
    
        List<CdmServerInfoConfig> configList = loadFromConfigFile(new File(CdmUtils.PER_USER_CDM_FOLDER, CDM_REMOTE_SERVERS_CONFIG_FILE));


  		




  
  379
  
    
        List<CdmServerInfoConfig> configList = loadFromConfigFile(new File(ConfigFileUtil.perUserCdmFolder(), CDM_REMOTE_SERVERS_CONFIG_FILE));


  		




  380
  380
  
    
        List<CdmServerInfo> serverInfoList = new ArrayList<CdmServerInfo>(configList.size());


  		




  381
  381
  
    
        for(CdmServerInfoConfig config : configList) {


  		




  382
  382
  
    
            serverInfoList.add(new CdmServerInfo(config));


  		












Also available in:  Unified diff