[jboss-cvs] JBossAS SVN: r63069 - trunk/build.

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

Author: anil.saldhana at jboss.com
Date: 2007-05-15 23:27:46 -0400 (Tue, 15 May 2007)
New Revision: 63069

Modified:
   trunk/build/build-distr.xml
   trunk/build/build-thirdparty.xml
   trunk/build/build.xml
Log:
SECURITY-26:move jboss5 security integration code to jbas trunk

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2007-05-16 03:26:51 UTC (rev 63068)
+++ trunk/build/build-distr.xml	2007-05-16 03:27:46 UTC (rev 63069)
@@ -374,6 +374,13 @@
     <property name="_module.name" value="server" override="true"/>
     <property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
 
+    <!-- Copy the security-policies-service.xml -->
+    <copy todir="${install.server}/all/deploy" filtering="no">
+      <fileset dir="${_module.output}/resources">
+        <include name="security-policies-service.xml"/>
+      </fileset>
+    </copy>
+
     <!-- Copy the generated libraries -->
     <mkdir dir="${install.all.lib}"/>
     <copy todir="${install.all.lib}" filtering="no">
@@ -848,12 +855,14 @@
     <property name="_module.name" value="security" override="true"/>
     <property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
 
-    <!-- Copy the security-policies-service.xml -->
-    <copy todir="${install.server}/all/deploy" filtering="no">
-      <fileset dir="${_module.output}/resources">
-        <include name="security-policies-service.xml"/>
-      </fileset>
-    </copy>
+   
+   <!-- Copy the generated libraries -->
+   <mkdir dir="${install.all.lib}"/>
+   <copy todir="${install.all.lib}" filtering="no">
+     <fileset dir="${_module.output}/lib">
+       <include name="jbosssx-server.jar"/>
+     </fileset>
+   </copy>
   </target>
 
   <target name="_module-security-all" depends="_module-security-most">

Modified: trunk/build/build-thirdparty.xml
===================================================================
--- trunk/build/build-thirdparty.xml	2007-05-16 03:26:51 UTC (rev 63068)
+++ trunk/build/build-thirdparty.xml	2007-05-16 03:27:46 UTC (rev 63069)
@@ -104,8 +104,8 @@
       <componentref name="jboss/jbossretro" version="1.0.4.GA"/>
       <componentref name="jboss/jbossts" version="snapshot"/>
       <componentref name="jboss/jms-integration-tests" version="1.0.1.GA"/>
-      <componentref name="jboss/security-spi" version="2.0.0.snapshot"/>
-      <componentref name="jboss/security" version="2.0.0.snapshot"/>
+      <componentref name="jboss/security-spi" version="2.0.0.TEST"/>
+      <componentref name="jboss/security" version="2.0.0.TEST"/>
       <componentref name="jboss/serialization" version="1.0.3.GA"/>
       <componentref name="jboss/profiler/jvmti" version="1.0.0.CR5"/>
       <componentref name="jboss/test" version="1.0.2.GA"/>

Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2007-05-16 03:26:51 UTC (rev 63068)
+++ trunk/build/build.xml	2007-05-16 03:27:46 UTC (rev 63069)
@@ -102,6 +102,7 @@
       <module name="jmx-remoting"/>
       <module name="jbossas/jmx-remoting"/>
       <module name="profileservice"/>
+      <module name="security"/>
       <module name="server"/>
       <module name="spring-int"/>
       <module name="system"/>
@@ -126,6 +127,7 @@
 
       <group name="basic">
         <include modules="transaction,
+                          security,
                           server,
                           deployment" />