[jboss-cvs] JBossAS SVN: r72800 - in trunk: component-matrix and 1 other directories.

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

Author: anil.saldhana at jboss.com
Date: 2008-04-28 18:19:28 -0400 (Mon, 28 Apr 2008)
New Revision: 72800

Modified:
   trunk/aspects/build.xml
   trunk/component-matrix/pom.xml
   trunk/thirdparty/pom.xml
Log:
JBASPECT-6: bring back two aspect security classes

Modified: trunk/aspects/build.xml
===================================================================
--- trunk/aspects/build.xml	2008-04-28 21:54:27 UTC (rev 72799)
+++ trunk/aspects/build.xml	2008-04-28 22:19:28 UTC (rev 72800)
@@ -91,6 +91,9 @@
          <path refid="jboss.common.logging.log4j.classpath"/>
          <path refid="jboss.common.logging.jdk.classpath"/>
          <path refid="jboss.jboss.javaee.classpath"/>
+         <path refid="jboss.jboss.javaee.classpath"/>
+         <path refid="jboss.jboss.security.spi.classpath"/>
+         <path refid="jboss.jbosssx.classpath"/>
          <path refid="org.jboss.aspects.classpath"/>
       	 <path refid="sun.jaxb.classpath"/>
       </path>
@@ -240,10 +243,6 @@
          <zipfileset src="${org.jboss.aspects.lib}/jboss-remoting-aspects.jar">
            <include name="org/jboss/aspects/remoting/**.class"/>
          </zipfileset>
-         <!-- include the broken out security aspects in the lib -->
-         <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"/>
@@ -293,6 +292,7 @@
             <include name="org/jboss/aspects/asynch/RemotableFuture.class"/>
             <include name="org/jboss/aspects/asynch/TimeoutException.class"/>
             <include name="org/jboss/aspects/asynch/ThreadPoolExecutor*.class"/>
+            <include name="org/jboss/aspects/security/*.*"/>
          </fileset>
          <!-- include the broken out remoting aspects in the client lib -->
          <zipfileset src="${org.jboss.aspects.lib}/jboss-remoting-aspects.jar">
@@ -301,11 +301,6 @@
             <include name="org/jboss/aspects/remoting/MergeMetaDataInterceptor.class"/>
             <include name="org/jboss/aspects/remoting/PojiProxy.class"/>
          </zipfileset>
-         <!-- 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"/>         

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2008-04-28 21:54:27 UTC (rev 72799)
+++ trunk/component-matrix/pom.xml	2008-04-28 22:19:28 UTC (rev 72800)
@@ -466,12 +466,6 @@
       
        <dependency>
         <groupId>org.jboss.aspects</groupId>
-        <artifactId>jboss-security-aspects</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
-      </dependency>
-      
-       <dependency>
-        <groupId>org.jboss.aspects</groupId>
         <artifactId>jboss-transaction-aspects</artifactId>
         <version>1.0.0-SNAPSHOT</version>
       </dependency>

Modified: trunk/thirdparty/pom.xml
===================================================================
--- trunk/thirdparty/pom.xml	2008-04-28 21:54:27 UTC (rev 72799)
+++ trunk/thirdparty/pom.xml	2008-04-28 22:19:28 UTC (rev 72800)
@@ -1152,12 +1152,9 @@
       <groupId>jboss.aop</groupId>
       <artifactId>pluggable-instrumentor</artifactId>
     </dependency>
+
     <dependency>
       <groupId>org.jboss.aspects</groupId>
-      <artifactId>jboss-security-aspects</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.aspects</groupId>
       <artifactId>jboss-transaction-aspects</artifactId>
     </dependency>    
     <!-- Combined integration jar.  Maybe this can be removed when we just use the