[jboss-cvs] JBossAS SVN: r71967 - 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-10 13:18:51 -0400 (Thu, 10 Apr 2008)
New Revision: 71967

Removed:
   trunk/aspects/src/main/org/jboss/aspects/security/
Modified:
   trunk/aspects/build.xml
   trunk/aspects/pom.xml
Log:
JBAS-5396, break security aspects out of AS

Modified: trunk/aspects/build.xml
===================================================================
--- trunk/aspects/build.xml	2008-04-10 17:16:00 UTC (rev 71966)
+++ trunk/aspects/build.xml	2008-04-10 17:18:51 UTC (rev 71967)
@@ -75,7 +75,6 @@
          <path refid="beanshell.beanshell.classpath"/>
          <path refid="jboss.remoting.classpath"/>
          <path refid="apache.xerces.classpath"/>
-      	<path refid="jboss.metadata.classpath"/>
          <path refid="jboss.jboss.cl.classpath"/>      
          <path refid="jboss.jboss.deployers.classpath"/>      
          <path refid="jboss.jboss.man.classpath"/>      
@@ -87,16 +86,13 @@
          <path refid="jboss.jboss.ha.server.api.classpath"/>
          <path refid="jboss.test.classpath"/>
          <path refid="jboss.integration.classpath"/>
-      	<path refid="jboss.jbossxb.classpath"/>
          <path refid="jboss.common.core.classpath"/>
          <path refid="jboss.common.logging.spi.classpath"/>
          <path refid="jboss.common.logging.log4j.classpath"/>
          <path refid="jboss.common.logging.jdk.classpath"/>
          <path refid="jboss.jboss.javaee.classpath"/>
-         <path refid="jboss.jboss.jaspi.api.classpath"/>
-         <path refid="jboss.jbosssx.classpath"/>
-         <path refid="jboss.jboss.security.spi.classpath"/>
-      	<path refid="sun.jaxb.classpath"/>
+         <path refid="org.jboss.aspects.classpath"/>
+      	 <path refid="sun.jaxb.classpath"/>
       </path>
 
       <!-- Configure modules -->
@@ -279,9 +275,12 @@
             <include name="org/jboss/aspects/remoting/MergeMetaDataInterceptor.class"/>
             <include name="org/jboss/aspects/remoting/PojiProxy.class"/>
             <include name="org/jboss/aspects/tx/ClientTxPropagationInterceptor.class"/>
-            <include name="org/jboss/aspects/security/SecurityClientInterceptor.class"/>
-            <include name="org/jboss/aspects/security/SecurityActions*.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>
       </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-10 17:16:00 UTC (rev 71966)
+++ trunk/aspects/pom.xml	2008-04-10 17:18:51 UTC (rev 71967)
@@ -47,6 +47,10 @@
   <dependencies>
     <!-- Compile (global dependencies) -->
     <dependency>
+      <groupId>org.jboss.aspects</groupId>
+      <artifactId>jboss-security-aspects</artifactId>
+    </dependency>
+    <dependency>
       <groupId>org.jboss.security</groupId>
       <artifactId>jboss-security-spi-bare</artifactId>
     </dependency>
@@ -114,20 +118,12 @@
     <dependency>
       <groupId>org.jboss</groupId>
       <artifactId>jboss-test</artifactId>
-    </dependency>
+    </dependency>    
     <dependency>
-      <groupId>javax.security</groupId>
-      <artifactId>jaas</artifactId>
-    </dependency>
-    <dependency>
       <groupId>javassist</groupId>
       <artifactId>javassist</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.jboss.security</groupId>
-      <artifactId>jbosssx-client</artifactId>
-    </dependency>
-    <dependency>
       <groupId>oswego-concurrent</groupId>
       <artifactId>concurrent</artifactId>
     </dependency>