[jboss-cvs] JBossAS SVN: r72032 - in trunk/aspects: src/main/org/jboss/aspects and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: dimitris at jboss.org
Date: 2008-04-11 11:36:40 -0400 (Fri, 11 Apr 2008)
New Revision: 72032

Removed:
   trunk/aspects/src/main/org/jboss/aspects/tx/
   trunk/aspects/src/main/org/jboss/aspects/txlock/
Modified:
   trunk/aspects/build.xml
   trunk/aspects/pom.xml
Log:
JBAS-5403, remove tx and txlock aspects from AS/aspects - import those from the new jboss-aspects project

Modified: trunk/aspects/build.xml
===================================================================
--- trunk/aspects/build.xml	2008-04-11 15:35:24 UTC (rev 72031)
+++ trunk/aspects/build.xml	2008-04-11 15:36:40 UTC (rev 72032)
@@ -236,6 +236,11 @@
          <zipfileset src="${org.jboss.aspects.lib}/jboss-security-aspects.jar">
             <include name="org/jboss/aspects/security/**.class"/>
          </zipfileset>
+         <!-- include the broken out transaction aspects in the lib -->
+         <zipfileset src="${org.jboss.aspects.lib}/jboss-transaction-aspects.jar">
+           <include name="org/jboss/aspects/tx/**.class"/>
+           <include name="org/jboss/aspects/txlock/**.class"/>
+         </zipfileset>
       </jar>
 
       <!-- Build jboss-aop-jboss5.jar -->
@@ -278,13 +283,16 @@
             <include name="org/jboss/aspects/remoting/IsLocalInterceptor.class"/>
             <include name="org/jboss/aspects/remoting/MergeMetaDataInterceptor.class"/>
             <include name="org/jboss/aspects/remoting/PojiProxy.class"/>
-            <include name="org/jboss/aspects/tx/ClientTxPropagationInterceptor.class"/>
          </fileset>
          <!-- include the broken out security aspects in the client lib -->
          <zipfileset src="${org.jboss.aspects.lib}/jboss-security-aspects.jar">
             <include name="org/jboss/aspects/security/SecurityClientInterceptor.class"/>
             <include name="org/jboss/aspects/security/SecurityActions*.class"/>         
          </zipfileset>
+         <!-- include the broken out transaction aspects in the client lib -->
+         <zipfileset src="${org.jboss.aspects.lib}/jboss-transaction-aspects.jar">
+            <include name="org/jboss/aspects/tx/ClientTxPropagationInterceptor.class"/>         
+         </zipfileset>         
       </jar>
 
    	<copy file="${project.root}/aspects/src/etc/base-aop.xml" tofile="${build.meta.inf}/base-aspects.xml"/>

Modified: trunk/aspects/pom.xml
===================================================================
--- trunk/aspects/pom.xml	2008-04-11 15:35:24 UTC (rev 72031)
+++ trunk/aspects/pom.xml	2008-04-11 15:36:40 UTC (rev 72032)
@@ -51,6 +51,10 @@
       <artifactId>jboss-security-aspects</artifactId>
     </dependency>
     <dependency>
+      <groupId>org.jboss.aspects</groupId>
+      <artifactId>jboss-transaction-aspects</artifactId>
+    </dependency>    
+    <dependency>
       <groupId>org.jboss.security</groupId>
       <artifactId>jboss-security-spi-bare</artifactId>
     </dependency>
@@ -114,7 +118,7 @@
     <dependency>
       <groupId>org.jboss</groupId>
       <artifactId>jboss-transaction-spi</artifactId>
-    </dependency>
+    </dependency>    
     <dependency>
       <groupId>org.jboss</groupId>
       <artifactId>jboss-test</artifactId>