[jboss-cvs] JBossAS SVN: r66921 - in trunk: varia and 1 other directory.

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

Author: alesj
Date: 2007-11-09 10:56:46 -0500 (Fri, 09 Nov 2007)
New Revision: 66921

Modified:
   trunk/build/build-distr.xml
   trunk/varia/build.xml
Log:
Packaging bsh.deployer as a new MC deployer.

Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml	2007-11-09 15:46:15 UTC (rev 66920)
+++ trunk/build/build-distr.xml	2007-11-09 15:56:46 UTC (rev 66921)
@@ -1211,6 +1211,21 @@
     </copy>
     -->
 
+    <!-- copy the bsh.deployer and its associated beanshell lib from thirdparty -->
+    <mkdir dir="${install.server}/all/deployers"/>
+
+    <copy todir="${install.server}/all/deployers" filtering="no">
+       <fileset dir="${_module.output}/deployers">
+          <include name="**"/>
+      </fileset>
+    </copy>
+
+    <copy todir="${install.all.lib}" filtering="no">
+      <fileset dir="${beanshell.beanshell.lib}">
+         <include name="bsh.jar"/>
+      </fileset>
+    </copy>
+
     <!-- Include the HTTP invoker service unpacked -->
     <delete dir="${install.all.deploy.hasingleton}/jms/jbossmq-httpil.sar"/>
     <mkdir dir="${install.all.deploy.hasingleton}/jms/jbossmq-httpil.sar"/>

Modified: trunk/varia/build.xml
===================================================================
--- trunk/varia/build.xml	2007-11-09 15:46:15 UTC (rev 66920)
+++ trunk/varia/build.xml	2007-11-09 15:56:46 UTC (rev 66921)
@@ -140,6 +140,7 @@
     <property name="build.etc" value="${module.output}/etc"/>
     <property name="build.resources" value="${module.output}/resources"/>
     <property name="build.reports" value="${module.output}/reports"/>
+    <property name="build.deployers" value="${module.output}/deployers"/>
 
     <!-- Install/Release structure -->
     <property name="install.id" value="${module.name}-${module.version}"/>
@@ -503,7 +504,24 @@
       </classes>
     </war>
 
-    <!-- bsh-deployer.sar -->
+    <mkdir dir="${build.deployers}/bsh.deployer"/>
+    <mkdir dir="${build.deployers}/bsh.deployer/META-INF"/> 
+
+    <!-- bsh-deployer.jar -->
+    <jar jarfile="${build.deployers}/bsh.deployer/bsh-deployer.jar">
+      <fileset dir="${build.classes}">
+        <include name="org/jboss/varia/deployment/BeanShell**"/>
+        <include name="org/jboss/varia/deployment/Script**"/>
+        <include name="org/jboss/varia/deployment/Test**"/>
+        <include name="org/jboss/varia/deployment/Legacy**"/>
+      </fileset>
+    </jar>
+
+    <copy todir="${build.deployers}/bsh.deployer/META-INF">
+       <fileset file="${source.resources}/beanshell/bsh-deployers-beans.xml"/>
+    </copy>
+
+    <!-- bsh-deployer.jar
     <jar jarfile="${build.lib}/bsh-deployer.jar">
       <fileset dir="${build.classes}">
         <include name="org/jboss/varia/deployment/BeanShell**"/>
@@ -512,6 +530,7 @@
         <include name="org/jboss/varia/deployment/Legacy**"/>
       </fileset>
     </jar>
+    -->
 
     <!-- jbossmq-httpil.sar + war -->
     <war warfile="${build.lib}/jbossmq-httpil.war"