Add access to service cacher

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationState.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationState.java
index eb5eaa954249bf71254555e95e43c985ef8de856..070df43a12f8ad947d1fa7772857fd74c5854e3d 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationState.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationState.java
@@ -36,12 +36,15 @@ public class CdmApplicationState {
 
     private SecurityContext securityContext;
 
+    private static CdmServiceCacher cdmServiceCacher;
+
 
     public static CdmApplicationState getInstance() {
         if(cdmApplicationState == null) {
             cdmApplicationState = new CdmApplicationState();
-            new CdmServiceCacher();
+            cdmServiceCacher = new CdmServiceCacher();
         }
+
         return cdmApplicationState;
     }
 
@@ -117,6 +120,8 @@ public class CdmApplicationState {
         getInstance().setCurrentDataChangeService(null);
         getInstance().setAppConfig(null);
         getInstance().setSecurityContext(null);
+        cdmApplicationState = null;
+        cdmServiceCacher = null;
     }
 
 
@@ -183,4 +188,9 @@ public class CdmApplicationState {
 
     }
 
+    public static CdmServiceCacher getCdmServiceCacher() {
+
+        return cdmServiceCacher;
+    }
+
 }

diff --git a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/lazyloading/CdmServiceCacherTest.java b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/lazyloading/CdmServiceCacherTest.java
index 32b39ce0e84e8b9f2472fb84486a53685445ffa3..b81692e27891b1e49e0bcabfcce4931a1a279b50 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/lazyloading/CdmServiceCacherTest.java
+++ b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/lazyloading/CdmServiceCacherTest.java
@@ -4,6 +4,7 @@ import org.apache.log4j.Logger;
 import org.junit.Assert;
 import org.junit.Test;
 
+import eu.etaxonomy.cdm.api.application.CdmApplicationState;
 import eu.etaxonomy.cdm.api.cache.CdmServiceCacher;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.taxeditor.httpinvoker.RemotingSessionAwareTest;
@@ -13,7 +14,7 @@ public class CdmServiceCacherTest extends RemotingSessionAwareTest {
        private static final Logger logger = Logger.getLogger(CdmServiceCacherTest.class);
 
 
-       private static CdmServiceCacher cdmServiceCacher = (CdmServiceCacher)getRemoteApplicationController().getBean("cdmServiceCacher");
+       private static CdmServiceCacher cdmServiceCacher = CdmApplicationState.getCdmServiceCacher();
 
        @Test
        public void testLanguageCache() {

diff --git a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/service/ServiceInterceptorTest.java b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/service/ServiceInterceptorTest.java
index 03cd872b2260de7389f173439d859b7bb14d6d20..9eaee83c6ccd0098f02b1a4f1d380abc2820d430 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/service/ServiceInterceptorTest.java
+++ b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/service/ServiceInterceptorTest.java
@@ -7,6 +7,7 @@ import org.apache.log4j.Logger;
 import org.junit.Assert;
 import org.junit.Test;
 
+import eu.etaxonomy.cdm.api.application.CdmApplicationState;
 import eu.etaxonomy.cdm.api.cache.CdmServiceCacher;
 import eu.etaxonomy.cdm.api.service.ITermService;
 import eu.etaxonomy.cdm.model.common.DefinedTermBase;
@@ -18,7 +19,7 @@ public class ServiceInterceptorTest extends RemotingSessionAwareTest {
 
         private static final Logger logger = Logger.getLogger(ServiceInterceptorTest.class);
         private final ITermService termService = getRemoteApplicationController().getTermService();
-        private final CdmServiceCacher cdmServiceCacher = (CdmServiceCacher)getRemoteApplicationController().getBean("cdmServiceCacher");
+        private static CdmServiceCacher cdmServiceCacher = CdmApplicationState.getCdmServiceCacher();
 
 
            @Test