[jboss-cvs] JBossAS SVN: r89269 - in projects/ejb3/trunk/transactions: src/test/java/org/jboss/ejb3/test/tx/common and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri May 22 06:44:06 EDT 2009
Author: jaikiran
Date: 2009-05-22 06:44:05 -0400 (Fri, 22 May 2009)
New Revision: 89269
Modified:
projects/ejb3/trunk/transactions/pom.xml
projects/ejb3/trunk/transactions/src/test/java/org/jboss/ejb3/test/tx/common/AbstractTxTestCase.java
projects/ejb3/trunk/transactions/src/test/resources/instance/aop.xml
Log:
EJBTHREE-1836 Removed the dependency on ejb3-aop-deployers and instead used jboss-aop-deployers. Also added the xb.builder.useUnorderedSequence=true in testcase to prevent xmls from failing during parsing
Modified: projects/ejb3/trunk/transactions/pom.xml
===================================================================
--- projects/ejb3/trunk/transactions/pom.xml 2009-05-22 09:24:00 UTC (rev 89268)
+++ projects/ejb3/trunk/transactions/pom.xml 2009-05-22 10:44:05 UTC (rev 89269)
@@ -21,21 +21,45 @@
</description>
<properties>
- <version.org.jboss.deployers>2.0.5.GA</version.org.jboss.deployers>
+ <version.org.jboss.deployers>2.2.0.M2</version.org.jboss.deployers>
+ <version.org.jboss.aop>2.1.0.CR3</version.org.jboss.aop>
+ <version.org.jboss.microcontainer>2.2.0.M1</version.org.jboss.microcontainer>
</properties>
+
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-vfs</artifactId>
- <version>2.1.0.GA</version>
+ <version>2.2.0.M2</version>
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId>
- <version>2.0.4.GA</version>
+ <version>${version.org.jboss.microcontainer}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ <version>2.2.11.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect</artifactId>
+ <version>2.0.2.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ <version>2.0.1.CR2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ <version>${version.org.jboss.aop}</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
@@ -69,12 +93,31 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-aop-deployers</artifactId>
- <version>0.1.0-SNAPSHOT</version>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-deployers</artifactId>
+ <version>${version.org.jboss.aop}</version>
<scope>test</scope>
+
+ <exclusions>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-test</artifactId>
+ </exclusion>
+
+ <exclusion>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system-jmx</artifactId>
+ </exclusion>
+ </exclusions>
+
</dependency>
<dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-aop-mc-int</artifactId>
+ <version>${version.org.jboss.microcontainer}</version>
+
+ </dependency>
+ <dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-cache</artifactId>
<version>1.0.0</version>
@@ -128,7 +171,6 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-reflect</artifactId>
- <version>2.0.0.CR1</version>
<scope>test</scope>
</dependency>
Modified: projects/ejb3/trunk/transactions/src/test/java/org/jboss/ejb3/test/tx/common/AbstractTxTestCase.java
===================================================================
--- projects/ejb3/trunk/transactions/src/test/java/org/jboss/ejb3/test/tx/common/AbstractTxTestCase.java 2009-05-22 09:24:00 UTC (rev 89268)
+++ projects/ejb3/trunk/transactions/src/test/java/org/jboss/ejb3/test/tx/common/AbstractTxTestCase.java 2009-05-22 10:44:05 UTC (rev 89269)
@@ -46,6 +46,11 @@
@BeforeClass
public static void beforeClass() throws Throwable
{
+ // JBossXB is very strict with xml content ordering. This
+ // is a workaround to prevent failures of testcase because
+ // of xml contents
+ System.setProperty("xb.builder.useUnorderedSequence", "true");
+
bootstrap = new UnitTestBootstrap();
bootstrap.deploy(getResource("instance/classloader.xml"));
bootstrap.deploy(getResource("instance/aop.xml"));
Modified: projects/ejb3/trunk/transactions/src/test/resources/instance/aop.xml
===================================================================
--- projects/ejb3/trunk/transactions/src/test/resources/instance/aop.xml 2009-05-22 09:24:00 UTC (rev 89268)
+++ projects/ejb3/trunk/transactions/src/test/resources/instance/aop.xml 2009-05-22 10:44:05 UTC (rev 89269)
@@ -17,7 +17,26 @@
</classloader>
<!-- Integration -->
- <bean name="AOPJBossIntegration" class="org.jboss.aop.asintegration.jboss5.JBoss5Integration"/>
+ <bean name="AOPClassLoaderScopingPolicy" class="org.jboss.aop.asintegration.jboss5.VFSClassLoaderScopingPolicy"/>
+
+ <bean name="AOPRegisterModuleCallback" class="org.jboss.aop.asintegration.jboss5.RegisterModuleCallback">
+ <!-- classloader><null/></classloader -->
+ <incallback method="addModule" state="Installed"/>
+ <uncallback method="removeModule" state="Installed"/>
+ </bean>
+
+ <bean name="AOPClassPoolFactory" class="org.jboss.aop.classpool.jbosscl.JBossClDelegatingClassPoolFactory">
+ <constructor>
+ <parameter><inject bean="AOPClassLoaderScopingPolicy" property="registry"/></parameter>
+ <parameter><inject bean="AOPRegisterModuleCallback"/></parameter>
+ </constructor>
+ </bean>
+
+
+ <bean name="AOPJBossIntegration" class="org.jboss.aop.asintegration.jboss5.JBoss5Integration">
+ <property name="classPoolFactory"><inject bean="AOPClassPoolFactory"/></property>
+ <property name="aopClassLoaderScopingPolicy"><inject bean="AOPClassLoaderScopingPolicy"/></property>
+ </bean>
<bean name="DefaultAspectManager" class="org.jboss.aop.microcontainer.beans.metadata.DefaultAspectManager">
<property name="managerBean">AspectManager</property>
More information about the jboss-cvs-commits
mailing list