svn commit: r507763 - in /portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/cache/impl: EhCacheElementImpl.java EhCacheImpl.java EhPortletContentCacheElementImpl.java EhPortletContentCacheImpl.java

[taylor]

Author: taylor
Date: Wed Feb 14 17:08:19 2007
New Revision: 507763

URL: http://svn.apache.org/viewvc?view=rev&rev=507763
Log:
having a little svn issue here
trying to readd EhCacheImpl.java

Added:
    
portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/cache/impl/EhPortletContentCacheElementImpl.java
      - copied, changed from r506825, 
portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheElementImpl.java
    
portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/cache/impl/EhPortletContentCacheImpl.java
      - copied, changed from r506825, 
portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheImpl.java
Removed:
    
portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheElementImpl.java
    
portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheImpl.java

Copied: 
portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/cache/impl/EhPortletContentCacheElementImpl.java
 (from r506825, 
portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheElementImpl.java)
URL: 
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/cache/impl/EhPortletContentCacheElementImpl.java?view=diff&rev=507763&p1=portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheElementImpl.java&r1=506825&p2=portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/cache/impl/EhPortletContentCacheElementImpl.java&r2=507763
==============================================================================
--- 
portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheElementImpl.java
 (original)
+++ 
portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/cache/impl/EhPortletContentCacheElementImpl.java
 Wed Feb 14 17:08:19 2007
@@ -25,12 +25,12 @@
  * @author <a href="mailto:[EMAIL PROTECTED]">David Sean Taylor</a>
  * @version $Id: $
  */
-public class EhCacheElementImpl implements CacheElement
+public class EhPortletContentCacheElementImpl implements CacheElement
 {
     Element element;
     public static final String KEY_SEPARATOR = "/";
     
-    public EhCacheElementImpl(Element element)
+    public EhPortletContentCacheElementImpl(Element element)
     {
         this.element = element;
     }

Copied: 
portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/cache/impl/EhPortletContentCacheImpl.java
 (from r506825, 
portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheImpl.java)
URL: 
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/cache/impl/EhPortletContentCacheImpl.java?view=diff&rev=507763&p1=portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheImpl.java&r1=506825&p2=portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/cache/impl/EhPortletContentCacheImpl.java&r2=507763
==============================================================================
--- 
portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/cache/impl/EhCacheImpl.java
 (original)
+++ 
portals/jetspeed-2/trunk/components/cm/src/java/org/apache/jetspeed/cache/impl/EhPortletContentCacheImpl.java
 Wed Feb 14 17:08:19 2007
@@ -32,13 +32,12 @@
  * @author <a href="mailto:[EMAIL PROTECTED]">David Sean Taylor</a>
  * @version $Id: $
  */
-public class EhCacheImpl implements JetspeedCache
+public class EhPortletContentCacheImpl extends EhCacheImpl implements 
JetspeedCache
 {
-    private Cache ehcache;
-    
-    public EhCacheImpl(Cache ehcache)
+   
+    public EhPortletContentCacheImpl(Cache ehcache)
     {
-        this.ehcache = ehcache;
+        super(ehcache);
     }
 
     public CacheElement get(Object key)
@@ -46,7 +45,7 @@
         Element element = ehcache.get(key);
         if (element == null)
             return null;
-        return new EhCacheElementImpl(element);
+        return new EhPortletContentCacheElementImpl(element);
     }
 
     public int getTimeToIdleSeconds()
@@ -66,7 +65,7 @@
 
     public void put(CacheElement element)
     {
-        EhCacheElementImpl impl = (EhCacheElementImpl)element;
+        EhPortletContentCacheElementImpl impl = 
(EhPortletContentCacheElementImpl)element;
         Element ehl = impl.getImplElement();
         String userKey = impl.getUserKey();
         String entity = impl.getEntityKey();
@@ -89,7 +88,7 @@
     public CacheElement createElement(Object key, Object content)
     {
         Element cachedElement = new Element(key, content);        
-        return new EhCacheElementImpl(cachedElement);
+        return new EhPortletContentCacheElementImpl(cachedElement);
     }
 
     public boolean remove(Object key)
@@ -99,7 +98,7 @@
         if (element == null)
             return false;
         removed = ehcache.remove(key);
-        EhCacheElementImpl impl = (EhCacheElementImpl)element;
+        EhPortletContentCacheElementImpl impl = 
(EhPortletContentCacheElementImpl)element;
         Element ehl = impl.getImplElement();
         String userKey = impl.getUserKey();
         String entity = impl.getEntityKey();
@@ -135,9 +134,14 @@
         }
     }
     
+    public void clear()
+    {
+        ehcache.removeAll();
+    }
+    
     public String createCacheKey(String primary, String secondary)
     {
-        return primary + EhCacheElementImpl.KEY_SEPARATOR + secondary;
+        return primary + EhPortletContentCacheElementImpl.KEY_SEPARATOR + 
secondary;
     }
 
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]