[Jboss-cvs] JBossAS SVN: r56655 - trunk/build

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

Author: anil.saldhana at jboss.com
Date: 2006-09-08 15:07:46 -0400 (Fri, 08 Sep 2006)
New Revision: 56655

Modified:
   trunk/build/build-distr.xml
   trunk/build/build.xml
Log:
SECURITY-1: Use the downloaded binaries and do not build the security module

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2006-09-08 19:06:48 UTC (rev 56654)
+++ trunk/build/build-distr.xml	2006-09-08 19:07:46 UTC (rev 56655)
@@ -853,33 +853,6 @@
     <property name="_module.output" override="true"
 	      value="${project.root}/${_module.name}/output"/>
 
-    <!-- Copy the generated libraries -->
-    <mkdir dir="${install.all.lib}"/>
-    <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-         <include name="jbosssx.jar"/>
-      </fileset>
-    </copy>
-
-    <!-- Copy the generated client libraries -->
-    <mkdir dir="${install.client}"/>
-    <copy todir="${install.client}" filtering="no">
-      <fileset dir="${_module.output}/lib">
-         <include name="*-client.jar"/>
-      </fileset>
-      <fileset dir="${_module.output}/etc/client">
-         <include name="*"/>
-      </fileset>
-    </copy>
-
-    <!-- Copy thirdparty code -->
-    <copy todir="${install.all.lib}" filtering="no">
-      <fileset dir="${sun.xacml.lib}">
-        <include name="sunxacml.jar"/>
-        <include name="sunxacml-support.jar"/>
-      </fileset>
-    </copy>
-    
     <!-- Copy the security-policies-service.xml -->
     <copy todir="${install.server}/all/deploy" filtering="no">
       <fileset dir="${_module.output}/resources">
@@ -1729,6 +1702,16 @@
        <fileset dir="${jboss.backport.concurrent.lib}">
          <include name="jboss-backport-concurrent.jar"/>
        </fileset>
+      <fileset dir="${jboss.security.spi.lib}">
+        <include name="jboss-security-spi.jar"/>
+      </fileset>
+      <fileset dir="${jboss.security.lib}">
+        <include name="jbosssx.jar"/>
+      </fileset>
+      <fileset dir="${sun.xacml.lib}">
+        <include name="sunxacml.jar"/>
+        <include name="sunxacml-support.jar"/>
+      </fileset>
      </copy>
 
 
@@ -1777,6 +1760,9 @@
       <fileset dir="${jboss.remoting.lib}">
         <include name="jboss-remoting.jar"/>
       </fileset>
+      <fileset dir="${jboss.security.lib}">
+        <include name="jbosssx-client.jar"/>
+      </fileset>
       <fileset dir="${jboss.serialization.lib}">
         <include name="jboss-serialization.jar"/>
       </fileset>

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2006-09-08 19:06:48 UTC (rev 56654)
+++ trunk/build/build.xml	2006-09-08 19:07:46 UTC (rev 56655)
@@ -102,7 +102,6 @@
       <module name="jbossas/remoting"/>
       <module name="jmx-remoting"/>
       <module name="jbossas/jmx-remoting"/>
-      <module name="security"/>
       <module name="server"/>
       <module name="spring-int"/>
       <module name="system"/>
@@ -127,7 +126,6 @@
       <group name="basic">
         <include modules="j2ee,
                           transaction,
-                          security,
                           server,
                           deployment" />