[jboss-cvs] JBossAS SVN: r70282 - in trunk: build and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Feb 29 13:30:20 EST 2008
Author: bstansberry at jboss.com
Date: 2008-02-29 13:30:19 -0500 (Fri, 29 Feb 2008)
New Revision: 70282
Modified:
trunk/build/build-distr.xml
trunk/build/build-thirdparty.xml
trunk/build/build.xml
trunk/cluster/.classpath
trunk/cluster/build.xml
trunk/ejb3/.classpath
trunk/ejb3/build-test.xml
trunk/ejb3/build.xml
trunk/hibernate-int/.classpath
trunk/hibernate-int/build.xml
trunk/pom.xml
trunk/testsuite/
trunk/testsuite/.classpath
trunk/testsuite/build.xml
trunk/testsuite/imports/sections/cluster.xml
trunk/testsuite/src/main/org/jboss/test/cluster/testutil/DelegatingMockCacheSPI.java
trunk/tomcat/.classpath
trunk/tomcat/build.xml
trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheService.java
Log:
[JBAS-5148] Upgrade JBC to 2.1.0.CR4
[JBAS-5265] Upgrade JGroups to 2.6.2
Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml 2008-02-29 18:17:47 UTC (rev 70281)
+++ trunk/build/build-distr.xml 2008-02-29 18:30:19 UTC (rev 70282)
@@ -1709,10 +1709,12 @@
<!-- 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.cache.jbosscache.pojo.lib}">
+ <include name="jbosscache-pojo.jar"/>
+ </fileset>
<fileset dir="${jboss.jboss.security.spi.lib}">
<include name="jboss-security-spi.jar"/>
</fileset>
Modified: trunk/build/build-thirdparty.xml
===================================================================
--- trunk/build/build-thirdparty.xml 2008-02-29 18:17:47 UTC (rev 70281)
+++ trunk/build/build-thirdparty.xml 2008-02-29 18:30:19 UTC (rev 70282)
@@ -83,7 +83,8 @@
<componentref name="javassist" version="3.6.0.GA"/>
<componentref name="jaxen" version="1.1-brew"/>
<componentref name="jboss/aop" version="2.0.0.CR7"/>
- <componentref name="jboss/cache" version="2.1.0.CR3"/>
+ <componentref name="jboss/cache/jbosscache-core" version="2.1.0.CR4"/>
+ <componentref name="jboss/cache/jbosscache-pojo" version="2.1.0.CR4"/>
<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"/>
@@ -120,7 +121,7 @@
<componentref name="jboss/test" version="1.0.5.GA"/>
<componentref name="jboss/web" version="2.1.0.CR12"/>
<componentref name="jfreechart" version="1.0.2"/>
- <componentref name="jgroups" version="2.6.1.GA"/>
+ <componentref name="jgroups" version="2.6.2"/>
<componentref name="joesnmp" version="0.3.4-brew"/>
<componentref name="juddi" version="0.9RC4-brew"/>
<componentref name="junit" version="3.8.2-brew"/>
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2008-02-29 18:17:47 UTC (rev 70281)
+++ trunk/build/build.xml 2008-02-29 18:30:19 UTC (rev 70282)
@@ -711,8 +711,8 @@
<exclude name="lib/jgroups.jar"/>
<exclude name="lib/jacorb.jar"/>
<exclude name="lib/jaxr-client.jar" />
- <exclude name="lib/jbosscache.jar"/>
- <exclude name="lib/pojocache.jar"/>
+ <exclude name="lib/jbosscache-core.jar"/>
+ <exclude name="lib/jbosscache-pojo.jar"/>
<exclude name="lib/jbossmqha.jar"/>
<exclude name="deploy/cluster/**"/>
<exclude name="deploy/iiop-service.xml"/>
Modified: trunk/cluster/.classpath
===================================================================
--- trunk/cluster/.classpath 2008-02-29 18:17:47 UTC (rev 70281)
+++ trunk/cluster/.classpath 2008-02-29 18:30:19 UTC (rev 70282)
@@ -12,7 +12,6 @@
<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/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"/>
@@ -29,5 +28,6 @@
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-ha-client/lib/jboss-ha-client.jar" sourcepath="/thirdparty/jboss/jboss-ha-client/lib/jboss-ha-client-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-ha-server-api/lib/jboss-ha-server-api.jar" sourcepath="/thirdparty/jboss/jboss-ha-server-api/lib/jboss-ha-server-api-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jnp-client/lib/jnp-client.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/cache/jbosscache-core/lib/jbosscache-core.jar" sourcepath="/thirdparty/jboss/cache/jbosscache-core/lib/jbosscache-core-sources.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/cluster/build.xml
===================================================================
--- trunk/cluster/build.xml 2008-02-29 18:17:47 UTC (rev 70281)
+++ trunk/cluster/build.xml 2008-02-29 18:30:19 UTC (rev 70282)
@@ -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.jboss.ha.client.classpath"/>
<path refid="jboss.jboss.ha.server.api.classpath"/>
<path refid="oswego.concurrent.classpath"/>
Modified: trunk/ejb3/.classpath
===================================================================
--- trunk/ejb3/.classpath 2008-02-29 18:17:47 UTC (rev 70281)
+++ trunk/ejb3/.classpath 2008-02-29 18:30:19 UTC (rev 70282)
@@ -24,7 +24,7 @@
<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/jboss/cache/jbosscache-core/lib/jbosscache-core.jar" sourcepath="/thirdparty/jboss/cache/jbosscache-core/lib/jbosscache-core-sources.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"/>
Modified: trunk/ejb3/build-test.xml
===================================================================
--- trunk/ejb3/build-test.xml 2008-02-29 18:17:47 UTC (rev 70281)
+++ trunk/ejb3/build-test.xml 2008-02-29 18:30:19 UTC (rev 70282)
@@ -197,7 +197,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"/>
Modified: trunk/ejb3/build.xml
===================================================================
--- trunk/ejb3/build.xml 2008-02-29 18:17:47 UTC (rev 70281)
+++ trunk/ejb3/build.xml 2008-02-29 18:30:19 UTC (rev 70282)
@@ -133,7 +133,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: trunk/hibernate-int/.classpath
===================================================================
--- trunk/hibernate-int/.classpath 2008-02-29 18:17:47 UTC (rev 70281)
+++ trunk/hibernate-int/.classpath 2008-02-29 18:30:19 UTC (rev 70282)
@@ -11,7 +11,7 @@
<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 kind="lib" path="/thirdparty/jboss/cache/jbosscache-core/lib/jbosscache-core.jar" sourcepath="/thirdparty/jboss/cache/jbosscache-core/lib/jbosscache-core-sources.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"/>
Modified: trunk/hibernate-int/build.xml
===================================================================
--- trunk/hibernate-int/build.xml 2008-02-29 18:17:47 UTC (rev 70281)
+++ trunk/hibernate-int/build.xml 2008-02-29 18:30:19 UTC (rev 70282)
@@ -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: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2008-02-29 18:17:47 UTC (rev 70281)
+++ trunk/pom.xml 2008-02-29 18:30:19 UTC (rev 70282)
@@ -439,7 +439,7 @@
<dependency>
<groupId>jgroups</groupId>
<artifactId>jgroups</artifactId>
- <version>2.4.1</version>
+ <version>2.6.2</version>
</dependency>
<dependency>
<groupId>joesnmp</groupId>
@@ -595,12 +595,12 @@
<dependency>
<groupId>org.jboss.cache</groupId>
<artifactId>jbosscache-core</artifactId>
- <version>2.1.0.CR3</version>
+ <version>2.1.0.CR4</version>
</dependency>
<dependency>
<groupId>org.jboss.cache</groupId>
<artifactId>jbosscache-pojo</artifactId>
- <version>2.1.0.CR3</version>
+ <version>2.1.0.CR4</version>
<exclusions>
<exclusion>
<groupId>jboss</groupId>
Property changes on: trunk/testsuite
___________________________________________________________________
Name: svn:ignore
- .settings
output
build.log
run.tstamp
junit*.properties
target
+ .settings
output
build.log
run.tstamp
junit*.properties
20070819
20070821
Modified: trunk/testsuite/.classpath
===================================================================
--- trunk/testsuite/.classpath 2008-02-29 18:17:47 UTC (rev 70281)
+++ trunk/testsuite/.classpath 2008-02-29 18:30:19 UTC (rev 70282)
@@ -70,8 +70,8 @@
<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/cache/jbosscache-core/lib/jbosscache-core.jar" sourcepath="/thirdparty/jboss/cache/jbosscache-core/lib/jbosscache-core-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/cache/jbosscache-pojo/lib/jbosscache-pojo.jar" sourcepath="/thirdparty/jboss/cache/jbosscache-pojo/lib/jbosscache-pojo-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/microcontainer/lib/jboss-metatype.jar" sourcepath="/thirdparty/jboss/microcontainer/lib/jboss-metatype-src.zip"/>
<classpathentry combineaccessrules="false" kind="src" path="/profileservice"/>
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2008-02-29 18:17:47 UTC (rev 70281)
+++ trunk/testsuite/build.xml 2008-02-29 18:30:19 UTC (rev 70282)
@@ -102,6 +102,8 @@
<path refid="httpunit.httpunit.classpath"/>
<path refid="ibm.wsdl4j.classpath"/>
<path refid="jacorb.jacorb.classpath"/>
+ <path refid="jboss.cache.jbosscache.core.classpath"/>
+ <path refid="jboss.cache.jbosscache.pojo.classpath"/>
<path refid="jgroups.jgroups.classpath"/>
<path refid="joesnmp.joesnmp.classpath"/>
<path refid="junit.junit.classpath"/>
@@ -177,7 +179,6 @@
<path id="dependentmodule.classpath">
<path refid="jboss.aop.classpath"/>
<path refid="jboss.aspects.classpath"/>
- <path refid="jboss.cache.classpath"/>
<path refid="jboss.cluster.classpath"/>
<path refid="jboss.common.core.classpath"/>
<path refid="jboss.common.logging.spi.classpath"/>
Modified: trunk/testsuite/imports/sections/cluster.xml
===================================================================
--- trunk/testsuite/imports/sections/cluster.xml 2008-02-29 18:17:47 UTC (rev 70281)
+++ trunk/testsuite/imports/sections/cluster.xml 2008-02-29 18:30:19 UTC (rev 70282)
@@ -262,7 +262,8 @@
<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.cache.jbosscache.pojo.classpath"/>
</path>
<taskdef name="annotationc" classname="org.jboss.aop.ant.AnnotationC"
@@ -656,8 +657,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"/>
@@ -673,8 +674,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: trunk/testsuite/src/main/org/jboss/test/cluster/testutil/DelegatingMockCacheSPI.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/testutil/DelegatingMockCacheSPI.java 2008-02-29 18:17:47 UTC (rev 70281)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/testutil/DelegatingMockCacheSPI.java 2008-02-29 18:30:19 UTC (rev 70282)
@@ -88,16 +88,16 @@
return delegate.exists(arg0);
}
- public void fetchPartialState(List arg0, Fqn arg1) throws Exception
- {
- delegate.fetchPartialState(arg0, arg1);
- }
+// public void fetchPartialState(List arg0, Fqn arg1) throws Exception
+// {
+// delegate.fetchPartialState(arg0, arg1);
+// }
+//
+// public void fetchPartialState(List arg0, Fqn arg1, Fqn arg2) throws Exception
+// {
+// delegate.fetchPartialState(arg0, arg1, arg2);
+// }
- public void fetchPartialState(List arg0, Fqn arg1, Fqn arg2) throws Exception
- {
- delegate.fetchPartialState(arg0, arg1, arg2);
- }
-
public BuddyManager getBuddyManager()
{
return delegate.getBuddyManager();
@@ -143,10 +143,10 @@
return delegate.getInternalFqns();
}
- public Map getLockTable()
- {
- return delegate.getLockTable();
- }
+// public Map getLockTable()
+// {
+// return delegate.getLockTable();
+// }
public Marshaller getMarshaller()
{
@@ -328,12 +328,12 @@
return delegate.getMembers();
}
- public Node getNode(Fqn arg0)
+ public NodeSPI getNode(Fqn arg0)
{
return delegate.getNode(arg0);
}
- public Node getNode(String arg0)
+ public NodeSPI getNode(String arg0)
{
return delegate.getNode(arg0);
}
Modified: trunk/tomcat/.classpath
===================================================================
--- trunk/tomcat/.classpath 2008-02-29 18:17:47 UTC (rev 70281)
+++ trunk/tomcat/.classpath 2008-02-29 18:30:19 UTC (rev 70282)
@@ -19,8 +19,8 @@
<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/jboss/cache/jbosscache-core/lib/jbosscache-core.jar" sourcepath="/thirdparty/jboss/cache/jbosscache-core/lib/jbosscache-core-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/cache/jbosscache-pojo/lib/jbosscache-pojo.jar" sourcepath="/thirdparty/jboss/cache/jbosscache-pojo/lib/jbosscache-pojo-sources.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"/>
Modified: trunk/tomcat/build.xml
===================================================================
--- trunk/tomcat/build.xml 2008-02-29 18:17:47 UTC (rev 70281)
+++ trunk/tomcat/build.xml 2008-02-29 18:30:19 UTC (rev 70282)
@@ -91,7 +91,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.jca.classpath"/>
Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheService.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheService.java 2008-02-29 18:17:47 UTC (rev 70281)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/session/JBossCacheService.java 2008-02-29 18:30:19 UTC (rev 70282)
@@ -51,6 +51,7 @@
import org.jboss.cache.Region;
import org.jboss.cache.pojo.PojoCache;
import org.jboss.cache.pojo.PojoCacheAlreadyDetachedException;
+import org.jboss.cache.pojo.PojoCacheThreadContext;
import org.jboss.cache.pojo.jmx.PojoCacheJmxWrapperMBean;
import org.jboss.cache.buddyreplication.BuddyManager;
import org.jboss.cache.config.CacheLoaderConfig;
@@ -754,15 +755,21 @@
}
// Construct the fqn.
Fqn fqn = getFieldFqn(realId, key);
-
+
+ PojoCacheThreadContext ctx = pojoCache_.getThreadContext();
try
{
+ ctx.setGravitationEnabled(true);
return pojoCache_.find(fqn.toString());
}
catch (CacheException e)
{
throw new RuntimeException("JBossCacheService: exception occurred in cache getPojo ... ", e);
}
+ finally
+ {
+ ctx.clear();
+ }
}
/**
More information about the jboss-cvs-commits
mailing list