ref #9207 , ref #9204 upgrade taxeditor.cdmlib to ehcache-2.10.6

diff --git a/.gitattributes b/.gitattributes
index ff88cf75c8db58547442d2cbe1569416fbec0d80..3e3ee3f144848e9dac8ade6b7fdaccb934bb93db 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -155,7 +155,6 @@ eu.etaxonomy.taxeditor.cdmlib/lib/dom4j-1.6.1.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/dozer-5.3.0.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/easymock-3.1.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/easymockclassextension-2.3.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-core-2.6.9.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/ezmorph-1.0.6.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/fop-1.1.jar -text
 eu.etaxonomy.taxeditor.cdmlib/lib/google-api-translate-java-0.92.jar -text

diff --git a/.gitignore b/.gitignore
index be7640868914d519c210b6dc23979a6d85d6b444..83d238ea67fbdc3d85f71d3daa2d3aae324099a4 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -112,3 +112,4 @@ eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-envers-5.*.Final.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/apache-log4j-extras-1.2.17.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/antlr-2.*.jar
 eu.etaxonomy.taxeditor.cdmlib/lib/cglib-nodep-3.*.jar
+eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-2.*.jar

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 080d756999db5b8cb568bee6679d226db771fa9b..4961dfe0985ba94fea6d84b29cba4234b9a4ffb2 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -629,7 +629,7 @@ Bundle-ClassPath: .,
  lib/commons-pool-1.5.4.jar,
  lib/dom4j-1.6.1.jar,
  lib/dtd-parser-1.1.jar,
- lib/ehcache-core-2.6.11.jar,
+ lib/ehcache-2.10.6.jar,
  lib/ezmorph-1.0.6.jar,
  lib/google-api-translate-java-0.92.jar,
  lib/h2-1.4.190.jar,

diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index 66128d7369790745ac39411d0ee80d1220b51c56..a3a2e360bf59add18605efe4a272c7b75ca2f694 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -26,7 +26,7 @@ bin.includes = META-INF/,\
                lib/commons-pool-1.5.4.jar,\
                lib/dom4j-1.6.1.jar,\
                lib/dtd-parser-1.1.jar,\
-               lib/ehcache-core-2.6.11.jar,\
+               lib/ehcache-2.10.6.jar,\
                lib/ezmorph-1.0.6.jar,\
                lib/google-api-translate-java-0.92.jar,\
                lib/h2-1.4.190.jar,\

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-core-2.6.11.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-core-2.6.11.jar
deleted file mode 100644 (file)
index 0eb926b..0000000
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-core-2.6.11.jar and /dev/null differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
index d4161051e1bc6494b0eb54b2f07d0cb149dcd7ed..8dcd3fcdb5910941b113c6c94e949eb903aaff2f 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@ -62,6 +62,7 @@
                 httpclient,JavaAPIforKml,iiif-apis,commons-beanutils,commons-lang3,commons-lang,commons-codec,\r
                 commons-imaging,jackson-databind,jackson-annotations,jackson-core,jboss-logging,\r
                 validation-api,classmate,javax.el-api,slf4j-api,slf4j-log4j12,\r
+                ehcache,\r
                 hibernate-validator,hibernate-validator-cdi,\r
                 spring-context,spring-context-support,spring-aspects,spring-test,spring-beans,\r
                 spring-tx,spring-web,spring-core,spring-aop,spring-expression,spring-orm,\r
@@ -261,6 +262,13 @@
       <version>${cdmlib.version}</version>\r
     </dependency>\r
     \r
+    <!-- required -->\r
+    <dependency>\r
+           <groupId>net.sf.ehcache</groupId>\r
+           <artifactId>ehcache</artifactId>\r
+           <version>2.10.6</version>\r
+       </dependency>\r
+    \r
     <!-- needed, but should try to remove -->\r
     <dependency>\r
        <!-- see #9205 for how to remove -->\r

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/CdmEntitySession.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/CdmEntitySession.java
index 76879b2b0d9f33b4a802fe5193bd00cec82b9c36..2f185c993452563035b2ae87eee5683e25cafc87 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/CdmEntitySession.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/CdmEntitySession.java
@@ -26,7 +26,7 @@ import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.persistence.dao.initializer.IBeanInitializer;
 import eu.etaxonomy.cdm.persistence.dto.MergeResult;
 import eu.etaxonomy.taxeditor.remoting.cache.ConversationalTransientEntityCacher;
-import net.sf.ehcache.statistics.LiveCacheStatistics;
+import net.sf.ehcache.statistics.FlatStatistics;
 
 /**
  * NOTE : It would be nice to have this class performing merge / delete operations
@@ -230,7 +230,7 @@ public class CdmEntitySession implements ICdmEntitySession  {
     }
 
     @Override
-    public LiveCacheStatistics getCacheStatistics() {
+    public FlatStatistics getCacheStatistics() {
         return cdmTransientEntityCacher.getCacheStatistics();
     }
 

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/ICdmEntitySession.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/ICdmEntitySession.java
index fdb5166f1e587d07bb39137b5aff9810a276b14a..0935281d0bdf82d92d0f5d93da006249b0b08080 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/ICdmEntitySession.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/ICdmEntitySession.java
@@ -9,13 +9,13 @@ import eu.etaxonomy.cdm.api.service.UpdateResult;
 import eu.etaxonomy.cdm.cache.EntityCacherDebugResult;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.persistence.dto.MergeResult;
-import net.sf.ehcache.statistics.LiveCacheStatistics;
+import net.sf.ehcache.statistics.FlatStatistics;
 
 public interface ICdmEntitySession {
 
     public ICdmEntitySessionEnabled getOwner();
 
-    public LiveCacheStatistics getCacheStatistics();
+    public FlatStatistics getCacheStatistics();
 
        public  <O extends Object> O load(O obj, boolean update);
 

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/NullSession.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/NullSession.java
index 5f24b119a6ffe7ef0cbb6e999abb8676ee3b31f3..473c905934c302dd657d313d8c9368b1a31a12ed 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/NullSession.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/NullSession.java
@@ -18,7 +18,7 @@ import eu.etaxonomy.cdm.api.service.UpdateResult;
 import eu.etaxonomy.cdm.cache.EntityCacherDebugResult;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.persistence.dto.MergeResult;
-import net.sf.ehcache.statistics.LiveCacheStatistics;
+import net.sf.ehcache.statistics.FlatStatistics;
 
 /**
  * @author cmathew
@@ -44,7 +44,7 @@ public class NullSession implements ICdmEntitySession {
     }
 
     @Override
-    public LiveCacheStatistics getCacheStatistics() {
+    public FlatStatistics getCacheStatistics() {
         return null;
     }
 

diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/mock/MockCdmEntitySession.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/mock/MockCdmEntitySession.java
index 64c1bd5ff974570383273284d8411ae5af5f750d..a2ae1c0aed565c5ad68b0e51d92801053a67e739 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/mock/MockCdmEntitySession.java
+++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/taxeditor/session/mock/MockCdmEntitySession.java
@@ -19,7 +19,7 @@ import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.persistence.dto.MergeResult;
 import eu.etaxonomy.taxeditor.session.ICdmEntitySession;
 import eu.etaxonomy.taxeditor.session.ICdmEntitySessionEnabled;
-import net.sf.ehcache.statistics.LiveCacheStatistics;
+import net.sf.ehcache.statistics.FlatStatistics;
 
 /**
  * @author cmathew
@@ -86,7 +86,7 @@ public class MockCdmEntitySession implements ICdmEntitySession  {
     }
 
     @Override
-    public LiveCacheStatistics getCacheStatistics() {
+    public FlatStatistics getCacheStatistics() {
         return null;
     }
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/sessions/InspectSessionsDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/sessions/InspectSessionsDialog.java
index 74801d2b84a63b32507f7d5a9efc51aa693ecbb3..2559417e3a8ca202da7bac41209b06e7b07d32fb 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/sessions/InspectSessionsDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/sessions/InspectSessionsDialog.java
@@ -8,6 +8,7 @@
  */
 package eu.etaxonomy.taxeditor.view.sessions;
 
+import java.awt.Checkbox;
 import java.util.List;
 
 import org.eclipse.jface.viewers.ILabelProvider;
@@ -54,6 +55,7 @@ public class InspectSessionsDialog extends Dialog {
     protected Shell shlInspectSessions;
     private Text txtDebugInfo;
     private Label lblDebugInformation;
+    private Checkbox chkIncludeIgnored;
 
     private final Cache cdmlibModelCache;
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/sessions/SessionsViewPart.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/sessions/SessionsViewPart.java
index f270200bd9ef59077e163dd903f781a9b9fa2bad..ec7994803b2bc546856a5c06e9a72533b66fe5ee 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/sessions/SessionsViewPart.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/sessions/SessionsViewPart.java
@@ -41,7 +41,7 @@ import eu.etaxonomy.taxeditor.session.NullSession;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 import net.sf.ehcache.Cache;
 import net.sf.ehcache.CacheManager;
-import net.sf.ehcache.statistics.LiveCacheStatistics;
+import net.sf.ehcache.statistics.FlatStatistics;
 
 /**
  * @author cmathew
@@ -282,7 +282,7 @@ public class SessionsViewPart implements ICdmEntitySessionManagerObserver {
         txtDefaultInMemory.setText("");
         txtDefaultOnDisk.setText("");
         if(defaultCache != null) {
-            LiveCacheStatistics liveCacheStatistics = defaultCache.getLiveCacheStatistics();
+               FlatStatistics liveCacheStatistics = defaultCache.getStatistics();
             txtDefaultInMemory.setText(getInMemoryStats(liveCacheStatistics));
             txtDefaultOnDisk.setText(getOnDiskStats(liveCacheStatistics));
         }
@@ -291,7 +291,7 @@ public class SessionsViewPart implements ICdmEntitySessionManagerObserver {
         txtCdmModelInMemory.setText("");
         txtCdmModelOnDisk.setText("");
         if(cdmModelGetMethodsCache != null) {
-            LiveCacheStatistics liveCacheStatistics = cdmModelGetMethodsCache.getLiveCacheStatistics();
+               FlatStatistics liveCacheStatistics = cdmModelGetMethodsCache.getStatistics();
             txtCdmModelInMemory.setText(getInMemoryStats(liveCacheStatistics));
             txtCdmModelOnDisk.setText(getOnDiskStats(liveCacheStatistics));
         }
@@ -315,12 +315,12 @@ public class SessionsViewPart implements ICdmEntitySessionManagerObserver {
             }
         }
         item.setText(0, activePrefix + sessionOwnerString);
-        LiveCacheStatistics cacheStatistics = session.getCacheStatistics();
+        FlatStatistics cacheStatistics = session.getCacheStatistics();
         item.setText(1, getInMemoryStats(cacheStatistics));
         item.setText(2, getOnDiskStats(cacheStatistics));
     }
 
-    private String getInMemoryStats(LiveCacheStatistics statistics) {
+    private String getInMemoryStats(FlatStatistics statistics) {
         if(statistics != null) {
             long localHeapSize = statistics.getLocalHeapSize();
 
@@ -332,7 +332,7 @@ public class SessionsViewPart implements ICdmEntitySessionManagerObserver {
         return "";
     }
 
-    private String getOnDiskStats(LiveCacheStatistics statistics) {
+    private String getOnDiskStats(FlatStatistics statistics) {
         if(statistics != null) {
             long localDiskSize = statistics.getLocalDiskSize();