[jboss-cvs] JBossAS SVN: r80452 - in trunk: ejb3/src/resources/META-INF and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Nov 3 23:53:02 EST 2008
Author: ALRubinger
Date: 2008-11-03 23:53:02 -0500 (Mon, 03 Nov 2008)
New Revision: 80452
Modified:
trunk/component-matrix/pom.xml
trunk/ejb3/src/resources/META-INF/jpa-deployers-jboss-beans.xml
trunk/testsuite/src/main/org/jboss/test/cluster/testutil/DelegatingMockCache.java
trunk/testsuite/src/main/org/jboss/test/cluster/testutil/SessionTestUtil.java
trunk/thirdparty/pom.xml
Log:
[JBAS-6093][JBAS-6079][JBAS-6160][EJBTHREE-1544] AS Component Upgrades to JBossCache 3, jboss-ejb3-as-int:1.0.0-Beta6, jboss-jpa-deployers:1.0.0-Beta2 and associated required patches
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2008-11-04 04:51:55 UTC (rev 80451)
+++ trunk/component-matrix/pom.xml 2008-11-04 04:53:02 UTC (rev 80452)
@@ -47,12 +47,13 @@
<version.org.hibernate.validator>3.1.0.GA</version.org.hibernate.validator>
<version.org.jboss.aop>2.0.0.GA</version.org.jboss.aop>
<version.org.jboss.common.core>2.2.9.GA</version.org.jboss.common.core>
- <version.org.jboss.ejb3>1.0.0-Beta5</version.org.jboss.ejb3>
+ <version.org.jboss.ejb3>1.0.0-Beta6</version.org.jboss.ejb3>
<version.org.jboss.ejb3.common.client>1.0.0-Beta1</version.org.jboss.ejb3.common.client>
- <version.org.jboss.ejb3.proxy.client>1.0.0-Beta1</version.org.jboss.ejb3.proxy.client>
- <version.org.jboss.ejb3.proxy.clustered.client>1.0.0-Beta1</version.org.jboss.ejb3.proxy.clustered.client>
+ <version.org.jboss.ejb3.core.client>1.0.0-Beta6</version.org.jboss.ejb3.core.client>
+ <version.org.jboss.ejb3.proxy.client>1.0.0-Beta2</version.org.jboss.ejb3.proxy.client>
+ <version.org.jboss.ejb3.proxy.clustered.client>1.0.0-Beta2</version.org.jboss.ejb3.proxy.clustered.client>
<version.org.jboss.ejb3.security.client>1.0.0-Beta1</version.org.jboss.ejb3.security.client>
- <version.org.jboss.jpa>1.0.0-Beta1</version.org.jboss.jpa>
+ <version.org.jboss.jpa>1.0.0-Beta2</version.org.jboss.jpa>
<version.org.jboss.reflect>2.0.0.GA</version.org.jboss.reflect>
<version.org.jboss.vfs>2.0.0.CR1</version.org.jboss.vfs>
<version.org.jboss.mdr>2.0.0.GA</version.org.jboss.mdr>
@@ -60,8 +61,8 @@
<version.org.jboss.microcontainer>2.0.0.CR3</version.org.jboss.microcontainer>
<version.org.jboss.cl>2.0.0.CR4</version.org.jboss.cl>
<version.org.jboss.deployers>2.0.0.CR3</version.org.jboss.deployers>
- <version.org.jboss.cache.core>2.2.1.GA</version.org.jboss.cache.core>
- <version.org.jboss.cache.pojo>2.2.0.GA</version.org.jboss.cache.pojo>
+ <version.org.jboss.cache.core>3.0.0.CR4</version.org.jboss.cache.core>
+ <version.org.jboss.cache.pojo>3.0.0.CR4</version.org.jboss.cache.pojo>
<version.org.jboss.cluster>1.1.0.GA</version.org.jboss.cluster>
<version.org.jboss.cluster.cache.spi>1.0.0.GA</version.org.jboss.cluster.cache.spi>
<version.org.jboss.cluster.cache.jbc>1.0.1.CR1</version.org.jboss.cluster.cache.jbc>
@@ -1507,7 +1508,7 @@
<dependency>
<groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-core</artifactId>
+ <artifactId>jboss-ejb3-as-int</artifactId>
<version>${version.org.jboss.ejb3}</version>
<exclusions>
<exclusion>
@@ -1519,46 +1520,6 @@
<artifactId>jboss-metadata</artifactId>
</exclusion>
<exclusion>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-aspects</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-connector</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-iiop</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-j2se</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-main</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-mbeans</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-server</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-system</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-system-jmx</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-test</artifactId>
- </exclusion>
- <exclusion>
<groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop</artifactId>
</exclusion>
@@ -1571,6 +1532,10 @@
<artifactId>jboss-remoting</artifactId>
</exclusion>
<exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-test</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.jboss</groupId>
<artifactId>jboss-transaction-spi</artifactId>
</exclusion>
@@ -1584,7 +1549,7 @@
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-core</artifactId>
- <version>${version.org.jboss.ejb3}</version>
+ <version>${version.org.jboss.ejb3.core.client}</version>
<classifier>client</classifier>
<exclusions>
<exclusion>
@@ -1596,46 +1561,6 @@
<artifactId>jboss-metadata</artifactId>
</exclusion>
<exclusion>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-aspects</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-connector</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-iiop</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-j2se</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-main</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-mbeans</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-server</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-system</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-system-jmx</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-test</artifactId>
- </exclusion>
- <exclusion>
<groupId>jboss</groupId>
<artifactId>jboss-test</artifactId>
</exclusion>
Modified: trunk/ejb3/src/resources/META-INF/jpa-deployers-jboss-beans.xml
===================================================================
--- trunk/ejb3/src/resources/META-INF/jpa-deployers-jboss-beans.xml 2008-11-04 04:51:55 UTC (rev 80451)
+++ trunk/ejb3/src/resources/META-INF/jpa-deployers-jboss-beans.xml 2008-11-04 04:53:02 UTC (rev 80452)
@@ -6,6 +6,8 @@
<bean name="PersistenceUnitDependencyResolver" class="org.jboss.jpa.resolvers.DefaultPersistenceUnitDependencyResolver"/>
+ <bean name="XPCResolver" class="org.jboss.ejb3.stateful.EJB3XPCResolver"/>
+
<bean name="PersistenceParsingDeployer" class="org.jboss.jpa.deployers.PersistenceParsingDeployer"/>
<bean name="PersistenceDeployer" class="org.jboss.jpa.deployers.PersistenceDeployer"/>
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/testutil/DelegatingMockCache.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/testutil/DelegatingMockCache.java 2008-11-04 04:51:55 UTC (rev 80451)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/testutil/DelegatingMockCache.java 2008-11-04 04:53:02 UTC (rev 80452)
@@ -35,6 +35,7 @@
import org.jboss.cache.NodeNotExistsException;
import org.jboss.cache.Region;
import org.jboss.cache.config.Configuration;
+import org.jboss.cache.interceptors.base.CommandInterceptor;
import org.jgroups.Address;
/**
@@ -44,16 +45,48 @@
* @author <a href="brian.stansberry at jboss.com">Brian Stansberry</a>
* @version $Revision: 1.1 $
*/
-public class DelegatingMockCache implements Cache
+public class DelegatingMockCache<K, V> implements Cache<K, V>
{
- private final Cache delegate;
+
+ private final Cache<K, V> delegate;
- public DelegatingMockCache(Cache delegate)
+ public DelegatingMockCache(Cache<K, V> delegate)
{
super();
this.delegate = delegate;
}
+ public void addInterceptor(CommandInterceptor arg0, Class arg1)
+ {
+ delegate.addInterceptor(arg0, arg1);
+ }
+
+ public void addInterceptor(CommandInterceptor arg0, int arg1)
+ {
+ delegate.addInterceptor(arg0, arg1);
+ }
+
+ public void removeInterceptor(int arg0)
+ {
+ delegate.removeInterceptor(arg0);
+ }
+
+ public void startBatch()
+ {
+ delegate.startBatch();
+ }
+
+ public void endBatch(boolean arg0)
+ {
+ delegate.endBatch(arg0);
+ }
+
+ public void removeInterceptor(Class arg0)
+ {
+ // TODO Auto-generated method stub
+
+ }
+
// public void addInterceptor(Interceptor arg0, int arg1)
// {
// delegate.addInterceptor(arg0, arg1);
@@ -269,12 +302,12 @@
delegate.evict(arg0, arg1);
}
- public Object get(Fqn arg0, Object arg1)
+ public V get(Fqn arg0, K arg1)
{
return delegate.get(arg0, arg1);
}
- public Object get(String arg0, Object arg1)
+ public V get(String arg0, K arg1)
{
return delegate.get(arg0, arg1);
}
@@ -369,27 +402,27 @@
delegate.put(arg0, arg1);
}
- public Object put(Fqn arg0, Object arg1, Object arg2)
+ public V put(Fqn arg0, K arg1, V arg2)
{
return delegate.put(arg0, arg1, arg2);
}
- public Object put(String arg0, Object arg1, Object arg2)
+ public V put(String arg0, K arg1, V arg2)
{
return delegate.put(arg0, arg1, arg2);
}
- public void putForExternalRead(Fqn arg0, Object arg1, Object arg2)
+ public void putForExternalRead(Fqn arg0, K arg1, V arg2)
{
delegate.putForExternalRead(arg0, arg1, arg2);
}
- public Object remove(Fqn arg0, Object arg1)
+ public V remove(Fqn arg0, K arg1)
{
return delegate.remove(arg0, arg1);
}
- public Object remove(String arg0, Object arg1)
+ public V remove(String arg0, K arg1)
{
return delegate.remove(arg0, arg1);
}
Modified: trunk/testsuite/src/main/org/jboss/test/cluster/testutil/SessionTestUtil.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/cluster/testutil/SessionTestUtil.java 2008-11-04 04:51:55 UTC (rev 80451)
+++ trunk/testsuite/src/main/org/jboss/test/cluster/testutil/SessionTestUtil.java 2008-11-04 04:53:02 UTC (rev 80452)
@@ -169,6 +169,12 @@
config.setUseRegionBasedMarshalling(marshalling);
config.setInactiveOnStartup(marshalling);
+ // No async marshalling
+ config.setSerializationExecutorPoolSize(0);
+ // Block for commits -- no races between test driver and replication
+ config.setSyncCommitPhase(true);
+ config.setSyncRollbackPhase(true);
+
return config;
}
Modified: trunk/thirdparty/pom.xml
===================================================================
--- trunk/thirdparty/pom.xml 2008-11-04 04:51:55 UTC (rev 80451)
+++ trunk/thirdparty/pom.xml 2008-11-04 04:53:02 UTC (rev 80452)
@@ -1386,7 +1386,7 @@
</dependency>
<dependency>
<groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-core</artifactId>
+ <artifactId>jboss-ejb3-as-int</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.ejb3</groupId>
More information about the jboss-cvs-commits
mailing list