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

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

Author: beve
Date: 2011-05-20 05:54:30 -0400 (Fri, 20 May 2011)
New Revision: 111411

Modified:
   trunk/build/build.xml
Log:
Work for reopened JBAS-9356 "Move the ejb3-async-deployer-jboss-beans.xml out of the jar so that it can be configured by users".


Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml	2011-05-20 08:04:26 UTC (rev 111410)
+++ trunk/build/build.xml	2011-05-20 09:54:30 UTC (rev 111411)
@@ -722,34 +722,23 @@
 		  
       </fileset>
       <fileset refid="org.jboss.ejb3:jboss-ejb3-timerservice-deployer:jar"/>
-      <fileset refid="org.jboss.ejb3.async:jboss-ejb3-async-deployer:jar"/>
       <fileset refid="org.jboss.ejb3.jndi:jboss-ejb3-jndi-deployers:jar"/>
       <!-- Strip version numbers from the jar names -->
 	  <mapper refid="remove-versions" />      
     </copy>
 
-
     <!-- Work for JBAS-9356 "Move the ejb3-async-deployer-jboss-beans.xml out of jboss-esb3-async-deployer.jar" -->
-    <property name="deployers.dir" value="${install.server}/all/deployers"/>
-    <property name="ejb3.async.deployer.jar" value="${deployers.dir}/jboss-ejb3-async-deployer.jar"/>
-    <property name="ejb3.async.deployer.jar.work" value="${deployers.dir}/jboss-ejb3-async-deployer-work.jar"/>
-    <property name="ejb3.async.deployer.beans.xml" value="META-INF/ejb3-async-deployer-jboss-beans.xml"/>
-    <unzip src="${ejb3.async.deployer.jar}" dest="${deployers.dir}">
+    <copy todir="${install.common.lib}" filtering="no">
+      <fileset refid="org.jboss.ejb3.async:jboss-ejb3-async-deployer:jar"/>
+	  <mapper refid="remove-versions" />      
+    </copy>
+
+    <unzip src="${install.common.lib}/jboss-ejb3-async-deployer.jar" dest="${install.server}/all/deployers">
         <patternset>
-            <include name="${ejb3.async.deployer.beans.xml}"/>
-            <include name="META-INF/MANIFEST.MF"/>
+            <include name="META-INF/ejb3-async-deployer-jboss-beans.xml"/>
         </patternset>
         <mapper type="flatten"/>
     </unzip>
-    <copy file="${ejb3.async.deployer.jar}" tofile="${ejb.async.deployer.jar.work}"/>
-    <delete file="${ejb3.async.deployer.jar}"/>
-    <jar destfile="${ejb3.async.deployer.jar}" manifest="${deployers.dir}/MANIFEST.MF">
-       <zipfileset src="${ejb.async.deployer.jar.work}">
-            <exclude name="${ejb3.async.deployer.beans.xml}"/>
-       </zipfileset>
-    </jar>
-    <delete file="${ejb.async.deployer.jar.work}"/>
-    <delete file="${deployers.dir}/MANIFEST.MF"/>
 
   </target>