[jboss-cvs] JBossAS SVN: r85667 - in projects/ejb3/trunk/transactions: .settings and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Mar 10 05:38:18 EDT 2009
Author: wolfc
Date: 2009-03-10 05:38:17 -0400 (Tue, 10 Mar 2009)
New Revision: 85667
Removed:
projects/ejb3/trunk/transactions/src/test/java/org/jboss/aop/
Modified:
projects/ejb3/trunk/transactions/.settings/org.maven.ide.eclipse.prefs
projects/ejb3/trunk/transactions/pom.xml
projects/ejb3/trunk/transactions/src/test/resources/instance/deployers.xml
Log:
EJBTHREE-1734: remove old aop deployers set from transactions
Modified: projects/ejb3/trunk/transactions/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- projects/ejb3/trunk/transactions/.settings/org.maven.ide.eclipse.prefs 2009-03-10 07:53:55 UTC (rev 85666)
+++ projects/ejb3/trunk/transactions/.settings/org.maven.ide.eclipse.prefs 2009-03-10 09:38:17 UTC (rev 85667)
@@ -1,8 +1,8 @@
-#Mon Jul 14 14:54:36 CEST 2008
+#Tue Nov 25 12:07:18 CET 2008
activeProfiles=eclipse
eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
+fullBuildGoals=
includeModules=false
resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
+resourceFilterGoals=
version=1
Modified: projects/ejb3/trunk/transactions/pom.xml
===================================================================
--- projects/ejb3/trunk/transactions/pom.xml 2009-03-10 07:53:55 UTC (rev 85666)
+++ projects/ejb3/trunk/transactions/pom.xml 2009-03-10 09:38:17 UTC (rev 85667)
@@ -20,91 +20,32 @@
specification.
</description>
+ <properties>
+ <version.org.jboss.deployers>2.0.5.GA</version.org.jboss.deployers>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ <version>2.1.0.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ <version>2.0.4.GA</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
<dependencies>
- <!--
<dependency>
- <groupId>jboss.aop</groupId>
- <artifactId>jboss-aop-deployer-jdk50</artifactId>
- <version>2.0.0.CR8</version>
- <scope>test</scope>
- </dependency>
- -->
- <dependency>
- <groupId>org.jboss.aspects</groupId>
- <artifactId>jboss-current-invocation-aspects</artifactId>
- <version>1.0.0.CR1</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.integration</groupId>
- <artifactId>jboss-transaction-spi</artifactId>
- <version>5.0.3.GA</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <!-- TODO: remove dependency -->
- <!-- Bring in the AOP deployers
<dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-aspects</artifactId>
- <version>5.0.0-SNAPSHOT</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-test</artifactId>
- </exclusion>
- </exclusions>
- </dependency> -->
- <dependency>
- <groupId>org.jboss.naming</groupId>
- <artifactId>jnpserver</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop-asintegration-mc</artifactId>
- <version>${version.org.jboss.aop_jboss-aop}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-test</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop-asintegration-core</artifactId>
- <version>${version.org.jboss.aop_jboss-aop}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-test</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>org.jboss.aspects</groupId>
<artifactId>jboss-transaction-aspects</artifactId>
<version>1.0.0.Beta1</version>
@@ -119,14 +60,22 @@
<groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-vfs</artifactId>
<version>${version.org.jboss.deployers}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.deployers</groupId>
<artifactId>jboss-deployers-vfs-spi</artifactId>
<version>${version.org.jboss.deployers}</version>
+ <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>
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-cache</artifactId>
<version>1.0.0</version>
<scope>test</scope>
@@ -142,33 +91,39 @@
<version>1.0.0</version>
</dependency>
<dependency>
+ <groupId>org.jboss.integration</groupId>
+ <artifactId>jboss-transaction-spi</artifactId>
+ <version>5.0.3.GA</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-ejb-api</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-aop-mc-int</artifactId>
- <version>${version.org.jboss.microcontainer}</version>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
<scope>test</scope>
</dependency>
- <!--
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-managed</artifactId>
- <version>2.0.0.CR1</version>
+ <groupId>org.jboss.naming</groupId>
+ <artifactId>jnpserver</artifactId>
<scope>test</scope>
</dependency>
- -->
<dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata</artifactId>
+ </dependency>
+ <dependency>
<groupId>jboss.jbossts</groupId>
<artifactId>jbossjta</artifactId>
<version>4.3.0.GA</version>
<scope>test</scope>
</dependency>
+
<!-- For Eclipse Maven 2 Plugin -->
<dependency>
<groupId>org.jboss</groupId>
Modified: projects/ejb3/trunk/transactions/src/test/resources/instance/deployers.xml
===================================================================
--- projects/ejb3/trunk/transactions/src/test/resources/instance/deployers.xml 2009-03-10 07:53:55 UTC (rev 85666)
+++ projects/ejb3/trunk/transactions/src/test/resources/instance/deployers.xml 2009-03-10 09:38:17 UTC (rev 85667)
@@ -22,9 +22,11 @@
</classloader>
<!-- use legacy ordering -->
+ <!-- Can't depend on AS
<bean name="topContextComparator">
<constructor factoryClass="org.jboss.system.deployers.LegacyDeploymentContextComparator" factoryMethod="getInstance"/>
</bean>
+ -->
<!-- The ManagedObjectFactory -->
<!-- No managed stuff in unit test
@@ -46,14 +48,18 @@
<bean name="MainDeployer" class="org.jboss.deployers.plugins.main.MainDeployerImpl">
<property name="structuralDeployers"><inject bean="StructuralDeployers"/></property>
<property name="deployers"><inject bean="Deployers"/></property>
+ <!--
<property name="mgtDeploymentCreator"><inject bean="ManagedDeploymentCreator"/></property>
<property name="comparator"><inject bean="topContextComparator"/></property>
+ -->
</bean>
<!-- The ManagedDeploymentCreator implementation that supports mapping
attachment types to ManagedDeployment#getTypes
-->
+ <!-- Can't depend on AS
<bean name="ManagedDeploymentCreator" class="org.jboss.deployers.plugins.managed.TypedManagedDeploymentCreator" />
+ -->
<!-- The holder for deployers that determine structure -->
<bean name="StructuralDeployers" class="org.jboss.deployers.vfs.plugins.structure.VFSStructuralDeployersImpl">
More information about the jboss-cvs-commits
mailing list