[jboss-cvs] JBossAS SVN: r80085 - in projects/ejb3/dev/Branch_JBoss_Cache_3/core: src/main/java/org/jboss/ejb3/cache/tree and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: bstansberry at jboss.com
Date: 2008-10-26 14:24:16 -0400 (Sun, 26 Oct 2008)
New Revision: 80085

Modified:
   projects/ejb3/dev/Branch_JBoss_Cache_3/core/.classpath
   projects/ejb3/dev/Branch_JBoss_Cache_3/core/pom.xml
   projects/ejb3/dev/Branch_JBoss_Cache_3/core/src/main/java/org/jboss/ejb3/cache/tree/AbortableLRUAlgorithm.java
Log:
Depend on JBC 3.0.0.CR2

Modified: projects/ejb3/dev/Branch_JBoss_Cache_3/core/.classpath
===================================================================
--- projects/ejb3/dev/Branch_JBoss_Cache_3/core/.classpath	2008-10-26 18:17:03 UTC (rev 80084)
+++ projects/ejb3/dev/Branch_JBoss_Cache_3/core/.classpath	2008-10-26 18:24:16 UTC (rev 80085)
@@ -119,7 +119,7 @@
   <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-transaction-spi/5.0.0.Beta4/jboss-transaction-spi-5.0.0.Beta4.jar" sourcepath="M2_REPO/org/jboss/jboss-transaction-spi/5.0.0.Beta4/jboss-transaction-spi-5.0.0.Beta4-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-transaction-spi/5.0.0.CR2/jboss-transaction-spi-5.0.0.CR2.jar" sourcepath="M2_REPO/org/jboss/integration/jboss-transaction-spi/5.0.0.CR2/jboss-transaction-spi-5.0.0.CR2-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-vfs/2.0.0.CR1/jboss-vfs-2.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/jboss-vfs/2.0.0.CR1/jboss-vfs-2.0.0.CR1-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/org/jboss/cache/jbosscache-core/2.1.1.GA/jbosscache-core-2.1.1.GA.jar"/>
+  <classpathentry kind="var" path="M2_REPO/org/jboss/cache/jbosscache-core/3.0.0.CR2/jbosscache-core-3.0.0.CR2.jar" sourcepath="M2_REPO/org/jboss/cache/jbosscache-core/3.0.0.CR2/jbosscache-core-3.0.0.CR2-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/jboss/jbossts/jbossjta/4.3.0.GA/jbossjta-4.3.0.GA.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/jboss/security/jbosssx/2.0.2.CR5/jbosssx-2.0.2.CR5.jar" sourcepath="M2_REPO/org/jboss/security/jbosssx/2.0.2.CR5/jbosssx-2.0.2.CR5-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/jboss/security/jbosssx-client/2.0.2.CR6/jbosssx-client-2.0.2.CR6.jar" sourcepath="M2_REPO/org/jboss/security/jbosssx-client/2.0.2.CR6/jbosssx-client-2.0.2.CR6-sources.jar"/>
@@ -128,7 +128,7 @@
   <classpathentry kind="var" path="M2_REPO/org/jboss/ws/native/jbossws-native-saaj/3.0.3.GA/jbossws-native-saaj-3.0.3.GA.jar" sourcepath="M2_REPO/org/jboss/ws/native/jbossws-native-saaj/3.0.3.GA/jbossws-native-saaj-3.0.3.GA-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/jboss/ws/jbossws-spi/1.0.3.GA/jbossws-spi-1.0.3.GA.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.0.CR13/jbossxb-2.0.0.CR13.jar" sourcepath="M2_REPO/org/jboss/jbossxb/2.0.0.CR13/jbossxb-2.0.0.CR13-sources.jar"/>
-  <classpathentry kind="var" path="M2_REPO/jgroups/jgroups/2.6.2/jgroups-2.6.2.jar"/>
+  <classpathentry kind="var" path="M2_REPO/jgroups/jgroups/2.6.5.GA/jgroups-2.6.5.GA.jar" sourcepath="M2_REPO/jgroups/jgroups/2.6.5.GA/jgroups-2.6.5.GA-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/jboss/naming/jnp-client/5.0.0.CR2/jnp-client-5.0.0.CR2.jar" sourcepath="M2_REPO/org/jboss/naming/jnp-client/5.0.0.CR2/jnp-client-5.0.0.CR2-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/org/jboss/naming/jnpserver/5.0.0.CR1/jnpserver-5.0.0.CR1.jar" sourcepath="M2_REPO/org/jboss/naming/jnpserver/5.0.0.CR1/jnpserver-5.0.0.CR1-sources.jar"/>
   <classpathentry kind="var" path="M2_REPO/jpl-pattern/jpl-pattern/1.0/jpl-pattern-1.0.jar"/>

Modified: projects/ejb3/dev/Branch_JBoss_Cache_3/core/pom.xml
===================================================================
--- projects/ejb3/dev/Branch_JBoss_Cache_3/core/pom.xml	2008-10-26 18:17:03 UTC (rev 80084)
+++ projects/ejb3/dev/Branch_JBoss_Cache_3/core/pom.xml	2008-10-26 18:24:16 UTC (rev 80085)
@@ -245,7 +245,7 @@
       <groupId>org.jboss.cache</groupId>
       <artifactId>jbosscache-core</artifactId>
       <!-- not used anywhere else -->
-      <version>2.1.1.GA</version>
+      <version>3.0.0.CR2</version>
       <exclusions>
         <exclusion>
           <groupId>org.jboss.javaee</groupId>

Modified: projects/ejb3/dev/Branch_JBoss_Cache_3/core/src/main/java/org/jboss/ejb3/cache/tree/AbortableLRUAlgorithm.java
===================================================================
--- projects/ejb3/dev/Branch_JBoss_Cache_3/core/src/main/java/org/jboss/ejb3/cache/tree/AbortableLRUAlgorithm.java	2008-10-26 18:17:03 UTC (rev 80084)
+++ projects/ejb3/dev/Branch_JBoss_Cache_3/core/src/main/java/org/jboss/ejb3/cache/tree/AbortableLRUAlgorithm.java	2008-10-26 18:24:16 UTC (rev 80085)
@@ -58,10 +58,9 @@
          log.trace("Attempting to evict cache node with fqn of " + fqn);
       }
       
-      EvictionPolicy policy = region.getEvictionPolicy();
       try
       {
-         policy.evict(fqn);
+         evictionActionPolicy.evict(fqn);
       }
       catch (ContextInUseException e)
       {