portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r918650 - in /portals/jetspeed-2/portal/trunk: ./ components/jetspeed-cm/ components/jetspeed-cm/src/main/java/org/apache/jetspeed/cache/impl/
Date Wed, 03 Mar 2010 19:27:24 GMT
Author: rwatler
Date: Wed Mar  3 19:27:24 2010
New Revision: 918650

URL: http://svn.apache.org/viewvc?rev=918650&view=rev
Log:
bumping ehcache version to 1.7.2

Modified:
    portals/jetspeed-2/portal/trunk/components/jetspeed-cm/pom.xml
    portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/cache/impl/EhCacheDistributedImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/cache/impl/EhCacheImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/cache/impl/EhDecorationContentCacheImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/cache/impl/EhPortletContentCacheImpl.java
    portals/jetspeed-2/portal/trunk/pom.xml

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-cm/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-cm/pom.xml?rev=918650&r1=918649&r2=918650&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-cm/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-cm/pom.xml Wed Mar  3 19:27:24 2010
@@ -163,7 +163,7 @@
         </dependency>
         <dependency>
         	<groupId>net.sf.ehcache</groupId>
-        	<artifactId>ehcache</artifactId>
+        	<artifactId>ehcache-core</artifactId>
         </dependency>
          <dependency>
             <groupId>oro</groupId>

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/cache/impl/EhCacheDistributedImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/cache/impl/EhCacheDistributedImpl.java?rev=918650&r1=918649&r2=918650&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/cache/impl/EhCacheDistributedImpl.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/cache/impl/EhCacheDistributedImpl.java
Wed Mar  3 19:27:24 2010
@@ -247,7 +247,11 @@
 				else if (action == CacheElement.ActionAdded)
 					refList.put(arg1.getKey(), arg1);
 				e.notifyChange(action);
-				notifyListeners(local, action,arg1.getKey(),arg1.getObjectValue());
+	            notifyListeners(local, action, arg1.getKey(), arg1.getObjectValue());
+			}
+			else
+			{
+	            notifyListeners(local, action, arg1.getKey(), null);
 			}
 		} catch (Exception e)
 		{

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/cache/impl/EhCacheImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/cache/impl/EhCacheImpl.java?rev=918650&r1=918649&r2=918650&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/cache/impl/EhCacheImpl.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/cache/impl/EhCacheImpl.java
Wed Mar  3 19:27:24 2010
@@ -54,12 +54,12 @@
 
     public int getTimeToIdleSeconds()
     {
-        return (int)ehcache.getTimeToIdleSeconds();
+        return (int)ehcache.getCacheConfiguration().getTimeToIdleSeconds();
     }
 
     public int getTimeToLiveSeconds()
     {
-        return (int)ehcache.getTimeToLiveSeconds();
+        return (int)ehcache.getCacheConfiguration().getTimeToLiveSeconds();
     }
 
     public boolean isKeyInCache(Object key)
@@ -193,7 +193,7 @@
         // check if cache part of a distributed cluster
         try
         {
-            CacheManagerPeerProvider peerProvider = ehcache.getCacheManager().getCachePeerProvider();
+            CacheManagerPeerProvider peerProvider = ehcache.getCacheManager().getCacheManagerPeerProvider("RMI");
             return ((peerProvider != null) && (peerProvider.listRemoteCachePeers(ehcache).size()
> 0));
         }
         catch (CacheException ce)

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/cache/impl/EhDecorationContentCacheImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/cache/impl/EhDecorationContentCacheImpl.java?rev=918650&r1=918649&r2=918650&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/cache/impl/EhDecorationContentCacheImpl.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/cache/impl/EhDecorationContentCacheImpl.java
Wed Mar  3 19:27:24 2010
@@ -166,12 +166,12 @@
 
     public int getTimeToIdleSeconds()
     {
-        return (int)ehcache.getTimeToIdleSeconds();
+        return (int)ehcache.getCacheConfiguration().getTimeToIdleSeconds();
     }
 
     public int getTimeToLiveSeconds()
     {
-        return (int)ehcache.getTimeToLiveSeconds();
+        return (int)ehcache.getCacheConfiguration().getTimeToLiveSeconds();
     }
 
     public boolean isKeyInCache(Object key)

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/cache/impl/EhPortletContentCacheImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/cache/impl/EhPortletContentCacheImpl.java?rev=918650&r1=918649&r2=918650&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/cache/impl/EhPortletContentCacheImpl.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-cm/src/main/java/org/apache/jetspeed/cache/impl/EhPortletContentCacheImpl.java
Wed Mar  3 19:27:24 2010
@@ -165,12 +165,12 @@
 
     public int getTimeToIdleSeconds()
     {
-        return (int)ehcache.getTimeToIdleSeconds();
+        return (int)ehcache.getCacheConfiguration().getTimeToIdleSeconds();
     }
 
     public int getTimeToLiveSeconds()
     {
-        return (int)ehcache.getTimeToLiveSeconds();
+        return (int)ehcache.getCacheConfiguration().getTimeToLiveSeconds();
     }
 
     public boolean isKeyInCache(Object key)

Modified: portals/jetspeed-2/portal/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/pom.xml?rev=918650&r1=918649&r2=918650&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/pom.xml (original)
+++ portals/jetspeed-2/portal/trunk/pom.xml Wed Mar  3 19:27:24 2010
@@ -259,7 +259,7 @@
     <ddlutils.version>r551445-patched-75</ddlutils.version>
     <directory.version>0.9.3</directory.version>
     <dom4j.version>1.6.1</dom4j.version>
-    <ehcache.version>1.5.0</ehcache.version>
+    <ehcache.version>1.7.2</ehcache.version>
     <hsqldb.version>1.8.0.2</hsqldb.version>
     <javolution.version>4.0.2</javolution.version>
     <javax.activation.version>1.1</javax.activation.version>
@@ -932,14 +932,8 @@
       </dependency>
       <dependency>
         <groupId>net.sf.ehcache</groupId>
-        <artifactId>ehcache</artifactId>
+        <artifactId>ehcache-core</artifactId>
         <version>${ehcache.version}</version>
-        <exclusions>
-          <exclusion>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-          </exclusion>
-        </exclusions>
       </dependency>
 
       <!-- defining dom4j just to be able to exclude
@@ -1103,11 +1097,6 @@
         <version>${xerces.version}</version>
       </dependency>
       <dependency>
-        <groupId>xerces</groupId>
-        <artifactId>xerces</artifactId>
-        <version>${xerces.version}</version>
-      </dependency>
-      <dependency>
         <groupId>xalan</groupId>
         <artifactId>xalan</artifactId>
         <version>${xalan.version}</version>



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message