Merge branch 'release/5.0.0'

[taxeditor.git] / eu.etaxonomy.taxeditor.cdmlib / src / main / java / eu / etaxonomy / cdm / api / application / CdmApplicationRemoteController.java

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteController.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteController.java
index 07890e6f1fa94fa3d1244a73b3171da46ed0ed9a..56aa1d483460a2c055050e8f8c7998b965033ada 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteController.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteController.java
@@ -19,11 +19,13 @@ import org.springframework.context.ApplicationListener;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 
+import eu.etaxonomy.cdm.api.longrunningService.ILongRunningTasksService;
 import eu.etaxonomy.cdm.api.service.ITestService;
+import eu.etaxonomy.cdm.cache.CdmRemoteCacheManager;
 import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
 import eu.etaxonomy.cdm.common.monitor.NullProgressMonitor;
+import eu.etaxonomy.cdm.ext.geo.IEditGeoService;
 import eu.etaxonomy.cdm.io.service.IIOService;
-import eu.etaxonomy.taxeditor.remoting.cache.CdmRemoteCacheManager;
 import eu.etaxonomy.taxeditor.remoting.source.ICdmRemoteSource;
 import eu.etaxonomy.taxeditor.service.ICachedCommonService;
 import eu.etaxonomy.taxeditor.session.ICdmEntitySessionManager;
@@ -45,7 +47,7 @@ public class CdmApplicationRemoteController  extends CdmApplicationController {
             new ClassPathResource("/eu/etaxonomy/cdm/remotingApplicationContext.xml");
     private final Resource applicationContextResource;
     private final IProgressMonitor progressMonitor;
-    private ICdmRemoteSource remoteSource;
+    private final ICdmRemoteSource remoteSource;
 
 
     /**
@@ -150,6 +152,7 @@ public class CdmApplicationRemoteController  extends CdmApplicationController {
 
         progressMonitor.subTask("Initialising CDM Model Cache ...");
         CdmRemoteCacheManager.getInstance();
+        CdmRemoteCacheManager.removeEntityCaches();
         progressMonitor.worked(1);
         progressMonitor.subTask("Starting application context ...");
         init();
@@ -179,6 +182,10 @@ public class CdmApplicationRemoteController  extends CdmApplicationController {
         return ((CdmApplicationRemoteConfiguration)configuration).getIOService();
     }
 
+    public ILongRunningTasksService getLongRunningTasksService(){
+        return ((CdmApplicationRemoteConfiguration)configuration).getLongRunningTasksService();
+    }
+
     public ITestService getTestService(){
         return ((CdmApplicationRemoteConfiguration)configuration).getTestService();
     }
@@ -186,4 +193,8 @@ public class CdmApplicationRemoteController  extends CdmApplicationController {
     public ICachedCommonService getCachedCommonService(){
         return ((CdmApplicationRemoteConfiguration)configuration).getCachedCommonService();
     }
+
+    public IEditGeoService getEditGeoService() {
+        return ((CdmApplicationRemoteConfiguration)configuration).getEditGeoService();
+    }
 }