[jboss-cvs] JBossAS SVN: r105916 - in branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0: cluster and 10 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Jun 10 04:18:08 EDT 2010


Author: manaRH
Date: 2010-06-10 04:18:06 -0400 (Thu, 10 Jun 2010)
New Revision: 105916

Modified:
   branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/build/build-distr.xml
   branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/build/build-thirdparty.xml
   branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/cluster/.classpath
   branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/cluster/build.xml
   branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/cluster/jbossbuild.xml
   branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/ejb3/.classpath
   branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/ejb3/build-test.xml
   branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/ejb3/build.xml
   branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/ejb3/deprecated-build-test.xml
   branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/ejb3/jbossbuild.xml
   branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/ejb3/src/main/org/jboss/ejb3/cache/tree/AbortableLRUAlgorithm.java
   branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/embedded/build.xml
   branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/hibernate-int/.classpath
   branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/hibernate-int/build.xml
   branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/hibernate-int/jbossbuild.xml
   branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/jbossas/jbossbuild.xml
   branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/testsuite/.classpath
   branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/testsuite/build.xml
   branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/testsuite/imports/sections/cluster.xml
   branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/testsuite/src/resources/cluster/cache/manifest.mf
   branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/tomcat/.classpath
   branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/tomcat/build-test.xml
   branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/tomcat/build.xml
   branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/tomcat/jbossbuild.xml
   branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/tools/etc/buildmagic/libraries.ent
Log:
upgradesto EAP 5.1 dependencies

Modified: branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/build/build-distr.xml
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/build/build-distr.xml	2010-06-10 06:27:51 UTC (rev 105915)
+++ branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/build/build-distr.xml	2010-06-10 08:18:06 UTC (rev 105916)
@@ -1731,9 +1731,8 @@
     <!-- Copy thirdparty libraries -->
     <mkdir dir="${install.all.lib}"/>
     <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${jboss.cache.lib}">
-        <include name="jbosscache.jar"/>
-        <include name="pojocache.jar"/>
+      <fileset dir="${jboss.cache.jbosscache.core.lib}">
+        <include name="jbosscache-core.jar"/>
       </fileset>
       <fileset dir="${jboss.jboss.security.spi.lib}">
         <include name="jboss-security-spi.jar"/>

Modified: branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/build/build-thirdparty.xml
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/build/build-thirdparty.xml	2010-06-10 06:27:51 UTC (rev 105915)
+++ branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/build/build-thirdparty.xml	2010-06-10 08:18:06 UTC (rev 105916)
@@ -74,19 +74,20 @@
     <componentref name="easymock" version="1.1"/>
     <componentref name="gjt-jpl-util" version="1.0"/>
     <componentref name="gnu-getopt" version="1.0.12-brew"/>
-    <componentref name="hibernate" version="3.3.2.GA-brew"/>
-    <componentref name="hibernate-annotations" version="3.4.0.GA-brew"/>
+    <componentref name="hibernate" version="3.3.2.GA_CP02-brew"/>
+    <componentref name="hibernate-annotations" version="3.4.0.GA_CP02-brew"/>
     <componentref name="hibernate-commons-annotations" version="3.1.0.GA-brew"/>
-    <componentref name="hibernate-entitymanager" version="3.4.0.GA-brew"/>
+    <componentref name="hibernate-entitymanager" version="3.4.0.GA_CP02-brew"/>
     <componentref name="hibernate-validator" version="3.1.0.GA-brew"/>
     <componentref name="slf4j/api" version="1.5.2"/>
     <componentref name="slf4j/log4j" version="1.5.2"/>
     <componentref name="hsqldb" version="1.8.0.8.patch02-brew"/>
     <componentref name="jacorb" version="2.3.0jboss.patch5-brew"/>
-    <componentref name="javassist" version="3.6.0.GA"/>
+    <componentref name="javassist" version="3.12.0.GA-brew" />
     <componentref name="jaxen" version="1.1-brew"/>
     <componentref name="jboss/aop" version="2.0.0.CR1"/>
-    <componentref name="jboss/cache" version="2.1.0.CR2"/>
+    <componentref name="jboss/cache/jbosscache-core" version="3.2.5.GA-brew"/>
+    <componentref name="jboss/cache/jbosscache-pojo" version="3.0.0.GA-brew"/>
     <componentref name="jboss/common-core" version="2.2.3.GA"/>
     <componentref name="jboss/common-logging-jdk" version="2.0.2.GA"/>
     <componentref name="jboss/common-logging-log4j" version="2.0.2.GA"/>
@@ -116,7 +117,7 @@
     <componentref name="jboss/test" version="1.0.4.GA"/>
     <componentref name="jboss/web" version="2.1.0.CR11"/>
     <componentref name="jfreechart" version="0.9.20"/>
-    <componentref name="jgroups" version="2.6.1.GA"/>
+    <componentref name="jgroups" version="2.6.15.GA-brew"/>
     <componentref name="joesnmp" version="0.3.4-brew"/>
     <componentref name="juddi" version="0.9RC4-brew"/>
     <componentref name="junit" version="3.8.2-brew"/>

Modified: branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/cluster/.classpath
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/cluster/.classpath	2010-06-10 06:27:51 UTC (rev 105915)
+++ branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/cluster/.classpath	2010-06-10 08:18:06 UTC (rev 105916)
@@ -14,7 +14,7 @@
 	<classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/apache-logging/lib/commons-logging.jar"/>
 	<classpathentry kind="src" path="/j2se"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/cache/lib/jbosscache.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/cache/jbosscache-core/lib/jbosscache-core.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/remoting/lib/jboss-remoting.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/system-jmx"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar"/>

Modified: branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/cluster/build.xml
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/cluster/build.xml	2010-06-10 06:27:51 UTC (rev 105915)
+++ branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/cluster/build.xml	2010-06-10 08:18:06 UTC (rev 105916)
@@ -77,7 +77,7 @@
       <path refid="apache.log4j.classpath"/>
       <path refid="junit.junit.classpath"/>
       <path refid="jgroups.jgroups.classpath"/>
-      <path refid="jboss.cache.classpath"/>
+      <path refid="jboss.cache.jbosscache.core.classpath"/>
       <path refid="jboss.ha.classpath"/>
       <path refid="oswego.concurrent.classpath"/>
       <path refid="jboss.remoting.classpath"/>

Modified: branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/cluster/jbossbuild.xml
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/cluster/jbossbuild.xml	2010-06-10 06:27:51 UTC (rev 105915)
+++ branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/cluster/jbossbuild.xml	2010-06-10 08:18:06 UTC (rev 105916)
@@ -45,7 +45,7 @@
 
          <include component="j2ee"/>
          <include component="common"/>
-         <include component="jboss/cache"/>
+         <include component="jboss/cache/jbosscache-core"/>
          <include component="system"/>
          <include component="naming"/>
          <include component="messaging"/>
@@ -67,7 +67,7 @@
 
          <include component="j2ee"/>
          <include component="common"/>
-         <include component="jboss/cache"/>
+        <include component="jboss/cache/jbosscache-core"/>
          <include component="system"/>
          <include component="naming"/>
          <include component="messaging"/>

Modified: branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/ejb3/.classpath
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/ejb3/.classpath	2010-06-10 06:27:51 UTC (rev 105915)
+++ branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/ejb3/.classpath	2010-06-10 08:18:06 UTC (rev 105916)
@@ -13,7 +13,6 @@
 	<classpathentry kind="src" path="/naming"/>
 	<classpathentry kind="src" path="/aspects"/>
 	<classpathentry kind="lib" path="/thirdparty/jgroups/lib/jgroups.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/hibernate/lib/hibernate3.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/hibernate-annotations/lib/hibernate-annotations.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/apache-logging/lib/commons-logging.jar"/>
 	<classpathentry kind="src" path="/cluster"/>
@@ -26,7 +25,6 @@
 	<classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/apache-httpclient/lib/commons-httpclient.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/hibernate-entitymanager/lib/hibernate-entitymanager.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/cache/lib/jbosscache.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/sun-javamail/lib/mail.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/serialization/lib/jboss-serialization.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-container.jar"/>
@@ -69,5 +67,7 @@
 	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-ejb3-cache/lib/jboss-ejb3-cache.jar" sourcepath="/thirdparty/jboss/jboss-ejb3-cache/lib/jboss-ejb3-cache-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-ejb3-ext-api/lib/jboss-ejb3-ext-api.jar" sourcepath="/thirdparty/jboss/jboss-ejb3-ext-api/lib/jboss-ejb3-ext-api-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-ejb3-impl/lib/jboss-ejb3-impl.jar" sourcepath="/thirdparty/jboss/jboss-ejb3-impl/lib/jboss-ejb3-impl-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/hibernate/lib/hibernate-core.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/cache/jbosscache-core/lib/jbosscache-core.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/ejb3/build-test.xml
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/ejb3/build-test.xml	2010-06-10 06:27:51 UTC (rev 105915)
+++ branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/ejb3/build-test.xml	2010-06-10 08:18:06 UTC (rev 105916)
@@ -195,7 +195,7 @@
       <path refid="jboss.common.logging.spi.classpath"/>
       <path refid="jboss.common.logging.log4j.classpath"/>
       <path refid="jboss.common.logging.jdk.classpath"/>
-      <path refid="jboss.cache.classpath"/>
+      <path refid="jboss.cache.jbosscache.core.classpath"/>
       <path refid="jboss.cluster.classpath"/>
       <path refid="jboss.main.classpath"/>
       <path refid="jboss.system.classpath"/>
@@ -279,7 +279,7 @@
       <path refid="jboss.metadata.classpath"/>
 
       <!-- FIXME For cache passivation test -->
-      <path refid="jboss.cache.classpath"/>
+      <path refid="jboss.cache.jbosscache.core.classpath"/>
       <path refid="jboss.cluster.classpath"/>
    </path>
 

Modified: branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/ejb3/build.xml
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/ejb3/build.xml	2010-06-10 06:27:51 UTC (rev 105915)
+++ branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/ejb3/build.xml	2010-06-10 08:18:06 UTC (rev 105916)
@@ -127,7 +127,7 @@
          <path refid="jboss.jboss.javaee.classpath"/>
          <path refid="jboss.j2se.classpath"/>
          <path refid="jboss.aop.classpath"/>
-         <path refid="jboss.cache.classpath"/>
+         <path refid="jboss.cache.jbosscache.core.classpath"/>
          <path refid="jboss.aspects.classpath"/>
       <path refid="jboss.common.core.classpath"/>
       <path refid="jboss.common.logging.spi.classpath"/>

Modified: branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/ejb3/deprecated-build-test.xml
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/ejb3/deprecated-build-test.xml	2010-06-10 06:27:51 UTC (rev 105915)
+++ branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/ejb3/deprecated-build-test.xml	2010-06-10 08:18:06 UTC (rev 105916)
@@ -107,7 +107,7 @@
          <path refid="jboss.aspects.classpath"/>
          <path refid="jboss.ejb3x.classpath"/>
          <path refid="jboss.common.classpath"/>
-         <path refid="jboss.cache.classpath"/>
+         <path refid="jboss.cache.jbosscache.core.classpath"/>
          <path refid="jboss.cluster.classpath"/>
          <path refid="jboss.system.classpath"/>
          <path refid="jboss.naming.classpath"/>

Modified: branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/ejb3/jbossbuild.xml
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/ejb3/jbossbuild.xml	2010-06-10 06:27:51 UTC (rev 105915)
+++ branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/ejb3/jbossbuild.xml	2010-06-10 08:18:06 UTC (rev 105916)
@@ -45,7 +45,7 @@
          <include component="j2ee"/>
          <include component="j2se"/>
          <include component="aop"/>
-         <include component="jboss/cache"/>
+         <include component="jboss/cache/jbosscache-core"/>
          <include component="aspects"/>
          <include component="ejb3x"/>
          <include component="common"/>         

Modified: branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/ejb3/src/main/org/jboss/ejb3/cache/tree/AbortableLRUAlgorithm.java
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/ejb3/src/main/org/jboss/ejb3/cache/tree/AbortableLRUAlgorithm.java	2010-06-10 06:27:51 UTC (rev 105915)
+++ branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/ejb3/src/main/org/jboss/ejb3/cache/tree/AbortableLRUAlgorithm.java	2010-06-10 08:18:06 UTC (rev 105916)
@@ -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)
       {

Modified: branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/embedded/build.xml
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/embedded/build.xml	2010-06-10 06:27:51 UTC (rev 105915)
+++ branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/embedded/build.xml	2010-06-10 08:18:06 UTC (rev 105916)
@@ -18,7 +18,7 @@
 
 <project default="main" name="JBoss/Embedded">
 	
-   <property name="embedded.version" value="embedded-jboss-beta3.SP12"/>
+   <property name="embedded.version" value="embedded-jboss-beta3.SP13"/>
 
    <!-- ================================================================== -->
    <!-- Setup                                                              -->
@@ -116,7 +116,7 @@
          <path refid="jboss.jboss.javaee.classpath"/>
          <path refid="jboss.j2se.classpath"/>
          <path refid="jboss.aop.classpath"/>
-         <path refid="jboss.cache.classpath"/>
+         <path refid="jboss.cache.jbosscache.core.classpath"/>
          <path refid="jboss.aspects.classpath"/>
          <path refid="jboss.jboss.javaee.classpath"/>
          <path refid="jboss.common.core.classpath"/>
@@ -533,7 +533,7 @@
             <include name="**"/>
          </fileset>
       </javadoc>
-      <property name="embedded.version" value="embedded-jboss-beta3.SP11"/>
+      <property name="embedded.version" value="embedded-jboss-beta3.SP13"/>
       <zip zipfile="${embedded.version}.zip">
          <zipfileset dir="." prefix="${embedded.version}">
             <include name="DOCUMENTATION.html"/>

Modified: branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/hibernate-int/.classpath
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/hibernate-int/.classpath	2010-06-10 06:27:51 UTC (rev 105915)
+++ branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/hibernate-int/.classpath	2010-06-10 08:18:06 UTC (rev 105916)
@@ -10,13 +10,14 @@
 	<classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jgroups/lib/jgroups.jar"/>
 	<classpathentry kind="src" path="/j2se"/>
-	<classpathentry kind="lib" path="/thirdparty/hibernate/lib/hibernate3.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/cache/lib/jbosscache.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/system-jmx"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/system"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee.jar" sourcepath="/thirdparty/jboss/jboss-javaee/lib/jboss-javaee-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-deployers-core-spi.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-deployers-core-spi-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/integration/lib/jboss-integration.jar" sourcepath="/thirdparty/jboss/integration/lib/integration-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-vfs/lib/jboss-vfs.jar" sourcepath="/thirdparty/jboss/jboss-vfs/lib/jboss-vfs-sources.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/cache/jbosscache-core/lib/jbosscache-core.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/hibernate/lib/hibernate-core.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/hibernate/lib/hibernate-jmx.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/hibernate-int/build.xml
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/hibernate-int/build.xml	2010-06-10 06:27:51 UTC (rev 105915)
+++ branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/hibernate-int/build.xml	2010-06-10 08:18:06 UTC (rev 105916)
@@ -88,7 +88,7 @@
 
     <!-- Specify modules upon which this build depends -->
     <path id="dependentmodule.classpath">
-      <path refid="jboss.cache.classpath"/>
+      <path refid="jboss.cache.jbosscache.core.classpath"/>
       <path refid="jboss.common.core.classpath"/>
       <path refid="jboss.common.logging.spi.classpath"/>
       <path refid="jboss.common.logging.log4j.classpath"/>

Modified: branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/hibernate-int/jbossbuild.xml
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/hibernate-int/jbossbuild.xml	2010-06-10 06:27:51 UTC (rev 105915)
+++ branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/hibernate-int/jbossbuild.xml	2010-06-10 08:18:06 UTC (rev 105916)
@@ -37,7 +37,7 @@
          <include component="hibernate"/>
          <include component="odmg"/>
          <include component="cglib"/>
-         <include component="jboss/cache"/>
+         <include component="jboss/cache/jbosscache-core"/>
          <include component="common"/>
          <include component="j2se"/>         
          <include component="server"/>                  

Modified: branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/jbossas/jbossbuild.xml
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/jbossas/jbossbuild.xml	2010-06-10 06:27:51 UTC (rev 105915)
+++ branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/jbossas/jbossbuild.xml	2010-06-10 08:18:06 UTC (rev 105916)
@@ -1362,8 +1362,8 @@
       <!-- ============================================================ -->
       <!-- jboss/cache                                                  -->
       <!-- ============================================================ -->             
-      <component name="jboss/cache" version="1.2.4_beta" >
-        <artifact id="jboss-cache.jar" release="server/all/lib"/>
+      <component name="jboss/cache/jbosscache-core" version="3.2.5" >
+        <artifact id="jbosscache-core.jar" release="server/all/lib"/>
       </component> 
          
       <!-- ============================================================ -->

Modified: branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/testsuite/.classpath
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/testsuite/.classpath	2010-06-10 06:27:51 UTC (rev 105915)
+++ branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/testsuite/.classpath	2010-06-10 08:18:06 UTC (rev 105916)
@@ -28,7 +28,6 @@
 	<classpathentry kind="lib" path="/thirdparty/hsqldb/lib/hsqldb.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/sun-jaf/lib/activation.jar"/>
 	<classpathentry kind="src" path="/j2se"/>
-	<classpathentry kind="lib" path="/thirdparty/hibernate/lib/hibernate3.jar"/>
 	<classpathentry kind="src" path="/mbeans"/>
 	<classpathentry kind="src" path="/jmx"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/deployment"/>
@@ -71,8 +70,6 @@
 	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-aop-mc-int.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-aop-mc-int-src.zip"/>
 	<classpathentry kind="lib" path="/thirdparty/sun-jaxb/lib/jaxb-api.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/sun-jaxb/lib/jaxb-impl.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/cache/lib/jbosscache.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/cache/lib/pojocache.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-vfs/lib/jboss-vfs.jar" sourcepath="/thirdparty/jboss/jboss-vfs/lib/jboss-vfs-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-metatype.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-metatype-src.zip"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-managed.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-managed-sources.jar"/>
@@ -96,5 +93,8 @@
 	<classpathentry kind="lib" path="/thirdparty/jboss/ha/lib/jboss-ha-client.jar" sourcepath="/thirdparty/jboss/ha/lib/jboss-ha-client-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/jboss-ejb3-ext-api/lib/jboss-ejb3-ext-api.jar" sourcepath="/thirdparty/jboss/jboss-ejb3-ext-api/lib/jboss-ejb3-ext-api-sources.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/apache-codec/lib/commons-codec.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/hibernate/lib/hibernate-core.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/cache/jbosscache-core/lib/jbosscache-core.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/cache/jbosscache-pojo/lib/jbosscache-pojo.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/testsuite/build.xml
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/testsuite/build.xml	2010-06-10 06:27:51 UTC (rev 105915)
+++ branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/testsuite/build.xml	2010-06-10 08:18:06 UTC (rev 105916)
@@ -173,7 +173,8 @@
    <path id="dependentmodule.classpath">
       <path refid="jboss.aop.classpath"/>
       <path refid="jboss.aspects.classpath"/>
-      <path refid="jboss.cache.classpath"/>
+      <path refid="jboss.cache.jbosscache.core.classpath"/>
+	  <path refid="jboss.cache.jbosscache.pojo.classpath" />
       <path refid="jboss.cluster.classpath"/>
       <path refid="jboss.common.core.classpath"/>
       <path refid="jboss.common.logging.spi.classpath"/>

Modified: branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/testsuite/imports/sections/cluster.xml
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/testsuite/imports/sections/cluster.xml	2010-06-10 06:27:51 UTC (rev 105915)
+++ branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/testsuite/imports/sections/cluster.xml	2010-06-10 08:18:06 UTC (rev 105916)
@@ -262,7 +262,7 @@
          <path refid="jboss.common.logging.spi.classpath"/>
          <path refid="jboss.common.logging.log4j.classpath"/>
          <path refid="jboss.common.logging.jdk.classpath"/>
-         <path refid="jboss.cache.classpath"/>
+         <path refid="jboss.cache.jbosscache.core.classpath"/>
       </path>
    	
       <taskdef name="annotationc" classname="org.jboss.aop.ant.AnnotationC"
@@ -631,8 +631,8 @@
          tofile="${build.resources}/cluster/cache/META-INF/jboss-service.xml"/>
       
       <jar destfile="${build.lib}/cachetest.sar">
-         <fileset dir="${jboss.cache.lib}">
-            <include name="jbosscache.jar"/>
+         <fileset dir="${jboss.cache.jbosscache.core.lib}">
+            <include name="jbosscache-core.jar"/>
          </fileset>
          <fileset dir="${jgroups.jgroups.lib}">
             <include name="jgroups.jar"/>
@@ -648,8 +648,8 @@
          tofile="${build.resources}/cluster/cache/META-INF/jboss-service.xml"/>
       
       <jar destfile="${build.lib}/cacheAoptest.sar">
-         <fileset dir="${jboss.cache.lib}">
-            <include name="jbosscache.jar"/>
+         <fileset dir="${jboss.cache.jbosscache.core.lib}">
+            <include name="jbosscache-core.jar"/>
          </fileset>
          <fileset dir="${jgroups.jgroups.lib}">
             <include name="jgroups.jar"/>

Modified: branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/testsuite/src/resources/cluster/cache/manifest.mf
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/testsuite/src/resources/cluster/cache/manifest.mf	2010-06-10 06:27:51 UTC (rev 105915)
+++ branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/testsuite/src/resources/cluster/cache/manifest.mf	2010-06-10 08:18:06 UTC (rev 105916)
@@ -1 +1 @@
-Class-Path: ./lib/jboss-cache.jar
+Class-Path: ./lib/jbosscache-core.jar

Modified: branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/tomcat/.classpath
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/tomcat/.classpath	2010-06-10 06:27:51 UTC (rev 105915)
+++ branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/tomcat/.classpath	2010-06-10 08:18:06 UTC (rev 105916)
@@ -19,8 +19,6 @@
 	<classpathentry kind="lib" path="/thirdparty/apache-logging/lib/commons-logging.jar"/>
 	<classpathentry kind="src" path="/aspects"/>
 	<classpathentry kind="src" path="/j2se"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/cache/lib/pojocache.jar"/>
-	<classpathentry kind="lib" path="/thirdparty/jboss/cache/lib/jbosscache.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/sun-xacml/lib/sunxacml.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/>
 	<classpathentry kind="lib" path="/thirdparty/sun-jsf/lib/jsf-api.jar"/>
@@ -64,5 +62,7 @@
 		</accessrules>
 	</classpathentry>
 	<classpathentry kind="lib" path="/thirdparty/sun-jaxb/lib/jaxb-api.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/cache/jbosscache-core/lib/jbosscache-core.jar"/>
+	<classpathentry kind="lib" path="/thirdparty/jboss/cache/jbosscache-pojo/lib/jbosscache-pojo.jar"/>
 	<classpathentry kind="output" path="output/eclipse-classes"/>
 </classpath>

Modified: branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/tomcat/build-test.xml
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/tomcat/build-test.xml	2010-06-10 06:27:51 UTC (rev 105915)
+++ branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/tomcat/build-test.xml	2010-06-10 08:18:06 UTC (rev 105916)
@@ -167,7 +167,7 @@
       <path refid="jboss.aop.classpath"/>
       <path refid="jboss.aspects.classpath"/>
       <path refid="jboss.common.classpath"/>
-      <path refid="jboss.cache.classpath"/>
+      <path refid="jboss.cache.jbosscache.core.classpath"/>
       <path refid="jboss.cluster.classpath"/>
       <path refid="jboss.main.classpath"/>
       <path refid="jboss.system.classpath"/>

Modified: branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/tomcat/build.xml
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/tomcat/build.xml	2010-06-10 06:27:51 UTC (rev 105915)
+++ branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/tomcat/build.xml	2010-06-10 08:18:06 UTC (rev 105916)
@@ -89,7 +89,8 @@
       <path refid="jboss.server.classpath"/>
       <path refid="jboss.j2se.classpath"/>
       <path refid="jboss.cluster.classpath"/>
-      <path refid="jboss.cache.classpath"/>
+      <path refid="jboss.cache.jbosscache.core.classpath"/>
+      <path refid="jboss.cache.jbosscache.pojo.classpath" />
       <path refid="jboss.aop.classpath"/>
       <path refid="jboss.aspects.classpath"/>
       <path refid="jboss.ejb3.classpath"/>

Modified: branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/tomcat/jbossbuild.xml
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/tomcat/jbossbuild.xml	2010-06-10 06:27:51 UTC (rev 105915)
+++ branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/tomcat/jbossbuild.xml	2010-06-10 08:18:06 UTC (rev 105916)
@@ -37,7 +37,7 @@
          <include component="security"/>                  
          <include component="cluster"/>                  
          <include component="j2ee"/>
-         <include component="jboss/cache"/>
+         <include component="jboss/cache/jbosscache-core"/>
          <include component="apache-log4j"/>         
          <include component="sun-servlet"/>                  
          <include component="connector"/>         

Modified: branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/tools/etc/buildmagic/libraries.ent
===================================================================
--- branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/tools/etc/buildmagic/libraries.ent	2010-06-10 06:27:51 UTC (rev 105915)
+++ branches/EMBEDDED_JBOSS_BETA3_JBPAPP_5_0/tools/etc/buildmagic/libraries.ent	2010-06-10 08:18:06 UTC (rev 105916)
@@ -638,9 +638,11 @@
      <pathelement path="${struts.test.case.lib}/strutstest-2.1.3.jar"/>
   </path>  
   
-  <!-- cache -->
-  <property name="jboss.cache.root" value="${project.thirdparty}/jboss/cache"/>
-  <property name="jboss.cache.lib" value="${jboss.cache.root}/lib"/>
-  <path id="jboss.cache.classpath">
-    <pathelement path="${jboss.cache.lib}/jboss-cache.jar"/>
-  </path>  
+ 
+  <!-- jboss/cache/jbosscache-core -->
+<property name="jboss.cache.jbosscache.core.root" value="${project.thirdparty}/jboss/cache/jbosscache-core"/>
+<property name="jboss.cache.jbosscache.core.lib" value="${jboss.cache.jbosscache.core.root}/lib/"/>
+<property name="jboss.cache.jbosscache.core.resources" value="${jboss.cache.jbosscache.core.root}/resources/"/>
+<path id="jboss.cache.jbosscache.core.classpath">
+   <pathelement path="${jboss.cache.jbosscache.core.lib}/jbosscache-core.jar"/>
+</path>



More information about the jboss-cvs-commits mailing list