[jboss-cvs] JBossAS SVN: r88098 - in projects/ejb3/trunk/endpoint-deployer: src/test/java/org/jboss/ejb3/endpoint/deployers/test/simple/unit and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri May 1 05:55:23 EDT 2009
Author: wolfc
Date: 2009-05-01 05:55:23 -0400 (Fri, 01 May 2009)
New Revision: 88098
Modified:
projects/ejb3/trunk/endpoint-deployer/pom.xml
projects/ejb3/trunk/endpoint-deployer/src/test/java/org/jboss/ejb3/endpoint/deployers/test/simple/unit/DeployEndpointTestCase.java
projects/ejb3/trunk/endpoint-deployer/src/test/resources/conf/bootstrap/aop.xml
Log:
EJBTHREE-1817: update to jboss-aop-deployers 2.1.0.CR3 plus others
Modified: projects/ejb3/trunk/endpoint-deployer/pom.xml
===================================================================
--- projects/ejb3/trunk/endpoint-deployer/pom.xml 2009-05-01 07:15:07 UTC (rev 88097)
+++ projects/ejb3/trunk/endpoint-deployer/pom.xml 2009-05-01 09:55:23 UTC (rev 88098)
@@ -22,6 +22,13 @@
</description>
<url>http://www.jboss.org/jbossejb3</url>
+ <properties>
+ <version.org.jboss.aop>2.1.0.CR3</version.org.jboss.aop>
+ <version.org.jboss.cl>2.2.0.M4</version.org.jboss.cl>
+ <version.org.jboss.deployers>2.2.0.M2</version.org.jboss.deployers>
+ <version.org.jboss.microcontainer>2.2.0.M1</version.org.jboss.microcontainer>
+ </properties>
+
<!-- Use Java 6 because of dependency on ejb3-embedded -->
<build>
<plugins>
@@ -34,6 +41,37 @@
</plugins>
</build>
+ <dependencyManagement>
+ <dependencies>
+ <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>jboss-vfs</artifactId>
+ <version>2.2.0.M2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ <version>2.0.1.CR2</version>
+ </dependency>
+ <!-- jboss-aop-deployers depends upon the wrong version of jboss-aop -->
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ <version>${version.org.jboss.aop}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
@@ -42,6 +80,19 @@
</dependency>
<dependency>
+ <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>
+ </exclusions>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.bootstrap</groupId>
<artifactId>jboss-bootstrap</artifactId>
<version>1.0.0-Beta-2</version>
@@ -49,6 +100,13 @@
</dependency>
<dependency>
+ <groupId>org.jboss.cl</groupId>
+ <artifactId>jboss-classloading</artifactId>
+ <version>${version.org.jboss.cl}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-spi</artifactId>
<version>${version.org.jboss.deployers}</version>
@@ -61,13 +119,6 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-aop-deployers</artifactId>
- <version>0.1.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
<!-- TODO: this should come in via ejb3-deployers, for now we want to override embedded -->
<dependency>
<groupId>org.jboss.ejb3</groupId>
@@ -97,6 +148,13 @@
<artifactId>jboss-ejb3-embedded</artifactId>
<version>1.0.0-SNAPSHOT</version>
<scope>test</scope>
+ <exclusions>
+ <!-- comes in through org.jboss.aop:jboss-aop-asintegration-core -->
+ <exclusion>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-deployer-jdk50</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!--
@@ -125,14 +183,14 @@
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-aop-mc-int</artifactId>
- <version>2.0.0.CR5</version>
+ <version>${version.org.jboss.microcontainer}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-kernel</artifactId>
- <version>2.0.0.CR5</version>
+ <version>${version.org.jboss.microcontainer}</version>
</dependency>
<dependency>
Modified: projects/ejb3/trunk/endpoint-deployer/src/test/java/org/jboss/ejb3/endpoint/deployers/test/simple/unit/DeployEndpointTestCase.java
===================================================================
--- projects/ejb3/trunk/endpoint-deployer/src/test/java/org/jboss/ejb3/endpoint/deployers/test/simple/unit/DeployEndpointTestCase.java 2009-05-01 07:15:07 UTC (rev 88097)
+++ projects/ejb3/trunk/endpoint-deployer/src/test/java/org/jboss/ejb3/endpoint/deployers/test/simple/unit/DeployEndpointTestCase.java 2009-05-01 09:55:23 UTC (rev 88098)
@@ -67,13 +67,15 @@
@AfterClass
public static void afterClass()
{
- if(server != null)
+ if(server != null && server.isStarted())
server.shutdown();
}
@BeforeClass
public static void beforeClass() throws Exception
{
+ System.setProperty("xb.builder.useUnorderedSequence", "true");
+
server = new ServerImpl();
String dir = mkdir("target/bootstrap");
Modified: projects/ejb3/trunk/endpoint-deployer/src/test/resources/conf/bootstrap/aop.xml
===================================================================
--- projects/ejb3/trunk/endpoint-deployer/src/test/resources/conf/bootstrap/aop.xml 2009-05-01 07:15:07 UTC (rev 88097)
+++ projects/ejb3/trunk/endpoint-deployer/src/test/resources/conf/bootstrap/aop.xml 2009-05-01 09:55:23 UTC (rev 88098)
@@ -17,8 +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>
<property name="managerProperty">aspectManager</property>
More information about the jboss-cvs-commits
mailing list