cleaning up

diff --git a/.gitattributes b/.gitattributes
index 88eb8d38c64f55652d3e5ba1373dd02a285b0ce5..d91f554c89afe9e4b1a466193711364f1cbacbf5 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1038,10 +1038,6 @@ eu.etaxonomy.taxeditor.remoting/src/main/java/eu/etaxonomy/cdm/remote/CdmRemoteS
 eu.etaxonomy.taxeditor.remoting/src/main/java/eu/etaxonomy/cdm/remote/ICdmRemoteSource.java -text
 eu.etaxonomy.taxeditor.remoting/src/main/java/eu/etaxonomy/taxeditor/remoting/CdmRemotingException.java -text
 eu.etaxonomy.taxeditor.remoting/src/main/java/eu/etaxonomy/taxeditor/remoting/RemotingTestPluginActivator.java -text
-eu.etaxonomy.taxeditor.remoting/src/main/java/eu/etaxonomy/taxeditor/remoting/session/CdmClientSessionException.java -text
-eu.etaxonomy.taxeditor.remoting/src/main/java/eu/etaxonomy/taxeditor/remoting/session/CdmEntitySession.java -text
-eu.etaxonomy.taxeditor.remoting/src/main/java/eu/etaxonomy/taxeditor/remoting/session/CdmEntitySessionManager.java -text
-eu.etaxonomy.taxeditor.remoting/src/main/java/eu/etaxonomy/taxeditor/remoting/session/ISessionEventListener.java -text
 eu.etaxonomy.taxeditor.remoting/src/main/java/org/hibernate/collection/internal/AbstractPersistentCollection.java -text
 eu.etaxonomy.taxeditor.remoting/src/main/java/org/hibernate/proxy/AbstractLazyInitializer.java -text
 eu.etaxonomy.taxeditor.remoting/src/main/resources/cdmlib-ehcache.xml -text

diff --git a/.gitignore b/.gitignore
index 000adc05f15f4ef02806aa2daf2685871378c5ee..88b00ac05e3153250950312c4662a0def4ae7636 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -35,6 +35,8 @@ eu.etaxonomy.taxeditor.remoting/*.log
 eu.etaxonomy.taxeditor.remoting/.settings
 eu.etaxonomy.taxeditor.remoting/lib
 eu.etaxonomy.taxeditor.remoting/lib/*.jar
+eu.etaxonomy.taxeditor.remoting/src/main/java/eu/etaxonomy/taxeditor/remoting/session
+eu.etaxonomy.taxeditor.remoting/src/main/java/eu/etaxonomy/taxeditor/sessio
 eu.etaxonomy.taxeditor.remoting/src/main/resources/etc/jetty/cdmlib-remote-webapp.war
 eu.etaxonomy.taxeditor.remoting/target
 eu.etaxonomy.taxeditor.store/.settings

diff --git a/eu.etaxonomy.taxeditor.remoting/src/main/java/eu/etaxonomy/taxeditor/remoting/session/CdmClientSessionException.java b/eu.etaxonomy.taxeditor.remoting/src/main/java/eu/etaxonomy/taxeditor/remoting/session/CdmClientSessionException.java
deleted file mode 100644 (file)
index e48017d..0000000
--- a/eu.etaxonomy.taxeditor.remoting/src/main/java/eu/etaxonomy/taxeditor/remoting/session/CdmClientSessionException.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package eu.etaxonomy.taxeditor.remoting.session;
-
-public class CdmClientSessionException extends RuntimeException {
-
-       public CdmClientSessionException(String message) {
-               super(message);
-       }
-}

diff --git a/eu.etaxonomy.taxeditor.remoting/src/main/java/eu/etaxonomy/taxeditor/remoting/session/CdmEntitySession.java b/eu.etaxonomy.taxeditor.remoting/src/main/java/eu/etaxonomy/taxeditor/remoting/session/CdmEntitySession.java
deleted file mode 100644 (file)
index e526024..0000000
--- a/eu.etaxonomy.taxeditor.remoting/src/main/java/eu/etaxonomy/taxeditor/remoting/session/CdmEntitySession.java
+++ /dev/null
@@ -1,59 +0,0 @@
-// $Id$
-/**
-* Copyright (C) 2014 EDIT
-* European Distributed Institute of Taxonomy
-* http://www.e-taxonomy.eu
-*
-* The contents of this file are subject to the Mozilla Public License Version 1.1
-* See LICENSE.TXT at the top of this package for the full license terms.
-*/
-package eu.etaxonomy.taxeditor.remoting.session;
-
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import eu.etaxonomy.cdm.api.cache.CdmTransientEntityCacher;
-import eu.etaxonomy.cdm.model.common.CdmBase;
-
-
-/**
- * @author cmathew
- * @date 20 Oct 2014
- *
- */
-
-public class CdmEntitySession {
-
-       
-       private CdmEntitySessionManager cdmEntitySessionManager;
-       
-       private ISessionEventListener sessionOwner;
-               
-       private CdmTransientEntityCacher cdmTransientEntityCacher;
-       
-       CdmEntitySession(ISessionEventListener sessionOwner, CdmEntitySessionManager cdmEntitySessionManager) {
-               this.sessionOwner = sessionOwner;
-               this.cdmTransientEntityCacher = new CdmTransientEntityCacher(sessionOwner);
-               cdmEntitySessionManager.addToOwnerSessionMap(sessionOwner, this);
-       }
-       
-       public CdmTransientEntityCacher getCdmTransientEntityCacher() {
-               return cdmTransientEntityCacher;
-       }
-       
-       public CdmBase cachify(CdmBase cdmBase) {
-               return cdmTransientEntityCacher.load(cdmBase,true);
-       }
-       
-       public void setEntitiesAsLatest() {
-               List<CdmBase> entities = cdmTransientEntityCacher.getAllEntities();
-               for(CdmBase entity : entities) {
-                       cdmEntitySessionManager.setEntityAsLatest(entity);
-               }
-       }
-               
-       
-
-}

diff --git a/eu.etaxonomy.taxeditor.remoting/src/main/java/eu/etaxonomy/taxeditor/remoting/session/CdmEntitySessionManager.java b/eu.etaxonomy.taxeditor.remoting/src/main/java/eu/etaxonomy/taxeditor/remoting/session/CdmEntitySessionManager.java
deleted file mode 100644 (file)
index b8c69e5..0000000
--- a/eu.etaxonomy.taxeditor.remoting/src/main/java/eu/etaxonomy/taxeditor/remoting/session/CdmEntitySessionManager.java
+++ /dev/null
@@ -1,122 +0,0 @@
-// $Id$
-/**
-* Copyright (C) 2014 EDIT
-* European Distributed Institute of Taxonomy
-* http://www.e-taxonomy.eu
-*
-* The contents of this file are subject to the Mozilla Public License Version 1.1
-* See LICENSE.TXT at the top of this package for the full license terms.
-*/
-package eu.etaxonomy.taxeditor.remoting.session;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-
-import org.apache.log4j.Logger;
-import org.springframework.stereotype.Component;
-
-import eu.etaxonomy.cdm.api.cache.CachedCommonServiceImpl;
-import eu.etaxonomy.cdm.api.cache.CdmClientCacheException;
-import eu.etaxonomy.cdm.api.cache.CdmClientCachingTest;
-import eu.etaxonomy.cdm.api.cache.CdmTransientEntityCacher;
-import eu.etaxonomy.cdm.model.common.CdmBase;
-
-/**
- * @author cmathew
- * @date 16 Oct 2014
- *
- */
-@Component
-public class CdmEntitySessionManager {
-       private static final Logger logger = Logger.getLogger(CdmEntitySessionManager.class);
-
-    private Map<ISessionEventListener, CdmEntitySession> ownerSessionMap = 
-               new HashMap<ISessionEventListener, CdmEntitySession>();
-    
-//    private HashMap<String, HashSet<CdmClientBase<T>>> entitiesMap = 
-//             new HashMap<String, HashSet<CdmClientBase<T>>>();
-    
-    private CdmTransientEntityCacher latestEntityCacher =
-               new CdmTransientEntityCacher("latestEntityCacher");
-    
-    private CdmEntitySession activeSession;
-    
-    public CdmEntitySession getActiveSession() {
-               return activeSession;
-       }
-       
-       public CdmTransientEntityCacher getActiveCdmTransientEntityCacher() {
-               if(activeSession == null) {
-                       throw new CdmClientSessionException("No active session has been bound");
-               }
-        return activeSession.getCdmTransientEntityCacher();
-    }
-       
-       public CdmTransientEntityCacher getCdmTransientEntityCacher(ISessionEventListener sessionOwner) {
-               if(sessionOwner == null) {
-                       throw new CdmClientSessionException("Session owner object cannot be null");
-               }
-               CdmEntitySession session = ownerSessionMap.get(sessionOwner);
-               if(session == null) {
-                       logger.info("No session exists for session owner with class : " + sessionOwner.getClass().getName());
-                       return null;
-               }
-        return session.getCdmTransientEntityCacher();
-    }
-       
-       private CdmEntitySession newSession(ISessionEventListener sessionOwner, boolean setAsActive) {
-               CdmEntitySession session = ownerSessionMap.get(sessionOwner);
-               if(session == null) {           
-                       session = new CdmEntitySession(sessionOwner, this);
-                       addToOwnerSessionMap(sessionOwner, session);
-               }
-               
-               if(setAsActive) {
-                       activeSession = session;
-               }               
-               return session;
-       }
-       
-       public void bind(ISessionEventListener sessionOwner) {
-               CdmEntitySession session  = ownerSessionMap.get(sessionOwner);
-               if(session == null) {
-                       session = newSession(sessionOwner,true);
-               }
-               activeSession = session;
-       }
-       
-       @SuppressWarnings("unchecked")
-       public <T extends CdmBase> T add(ISessionEventListener sessionOwner, T cdmBase) {
-               CdmEntitySession session = newSession(sessionOwner,true);
-               return (T)session.getCdmTransientEntityCacher().load(cdmBase,true);
-       }
-       
-       void addToOwnerSessionMap(ISessionEventListener owner, CdmEntitySession session) {
-               ownerSessionMap.put(owner, session);
-       }
-       
-//     void addToLinkedEntities(T cdmBase) {
-//             if(cdmBase == null) {
-//                     return;
-//             }
-//             String id = CdmTransientEntityCacher.generateId(cdmBase);
-//             HashSet<CdmClientBase<T>> linkedEntities = entitiesMap.get(id);
-//             if(linkedEntities == null) {
-//                     linkedEntities = new HashSet<CdmClientBase<T>>();                       
-//             }
-//             linkedEntities.add(cdmBase);
-//     }
-
-       void setEntityAsLatest(CdmBase cdmBase) {               
-               latestEntityCacher.put(cdmBase);
-       }
-       
-       void promoteSessionEntitiesToLatest(ISessionEventListener owner) {
-               CdmEntitySession session = ownerSessionMap.get(owner);
-               if(session != null) {
-                       session.setEntitiesAsLatest();
-               }
-       }
-
-}

diff --git a/eu.etaxonomy.taxeditor.remoting/src/main/java/eu/etaxonomy/taxeditor/remoting/session/ISessionEventListener.java b/eu.etaxonomy.taxeditor.remoting/src/main/java/eu/etaxonomy/taxeditor/remoting/session/ISessionEventListener.java
deleted file mode 100644 (file)
index fe008d0..0000000
--- a/eu.etaxonomy.taxeditor.remoting/src/main/java/eu/etaxonomy/taxeditor/remoting/session/ISessionEventListener.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package eu.etaxonomy.taxeditor.remoting.session;
-
-public interface ISessionEventListener {
-
-}