[jboss-cvs] JBossAS SVN: r82572 - projects/aop/trunk/asintegration-core/src/etc.

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

Author: flavia.rainone at jboss.com
Date: 2008-12-31 06:49:03 -0500 (Wed, 31 Dec 2008)
New Revision: 82572

Modified:
   projects/aop/trunk/asintegration-core/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml
   projects/aop/trunk/asintegration-core/src/etc/jboss-42-install-jboss-aop-jdk50-build.xml
Log:
[JBAOP-685] Unjar of jboss-aop-jdk50.jar was overwriting the manifest file of jbossall-client.jar. Fixed.

Modified: projects/aop/trunk/asintegration-core/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml
===================================================================
--- projects/aop/trunk/asintegration-core/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml	2008-12-31 09:02:19 UTC (rev 82571)
+++ projects/aop/trunk/asintegration-core/src/etc/jboss-40-install-jboss-aop-jdk50-build.xml	2008-12-31 11:49:03 UTC (rev 82572)
@@ -115,7 +115,11 @@
       <delete file="${lib.jbossall-client}"/>
       <!-- Get rid of the files that exist in jboss-aop-jdk50.jar -->
       <delete dir="jbossall-client-library-temp/org/jboss/aop"/>
-      <unjar src="jboss-aop-jdk50.jar" dest="jbossall-client-library-temp"/>
+      <unjar src="jboss-aop-jdk50.jar" dest="jbossall-client-library-temp">
+         <patternset>
+            <exclude name="META-INF/MANIFEST.MF"/>
+         </patternset>
+      </unjar>
       <jar destfile="${lib.jbossall-client}" basedir="jbossall-client-library-temp" manifest="jbossall-client-library-temp/META-INF/MANIFEST.MF"/>
 
       <delete dir="jbossall-client-library-temp"/>

Modified: projects/aop/trunk/asintegration-core/src/etc/jboss-42-install-jboss-aop-jdk50-build.xml
===================================================================
--- projects/aop/trunk/asintegration-core/src/etc/jboss-42-install-jboss-aop-jdk50-build.xml	2008-12-31 09:02:19 UTC (rev 82571)
+++ projects/aop/trunk/asintegration-core/src/etc/jboss-42-install-jboss-aop-jdk50-build.xml	2008-12-31 11:49:03 UTC (rev 82572)
@@ -116,7 +116,11 @@
       <delete file="${lib.jbossall-client}"/>
       <!-- Get rid of the files that exist in jboss-aop-jdk50.jar -->
       <delete dir="jbossall-client-library-temp/org/jboss/aop"/>
-      <unjar src="jboss-aop-jdk50.jar" dest="jbossall-client-library-temp"/>
+      <unjar src="jboss-aop-jdk50.jar" dest="jbossall-client-library-temp">
+         <patternset>
+            <exclude name="META-INF/MANIFEST.MF"/>
+         </patternset>
+      </unjar>
       <jar destfile="${lib.jbossall-client}" basedir="jbossall-client-library-temp" manifest="jbossall-client-library-temp/META-INF/MANIFEST.MF"/>
 
       <delete dir="jbossall-client-library-temp"/>