[jboss-cvs] JBossAS SVN: r106330 - in branches/JBPAPP_5_1: main and 2 other directories.

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

Author: fnasser at redhat.com
Date: 2010-06-29 14:48:02 -0400 (Tue, 29 Jun 2010)
New Revision: 106330

Modified:
   branches/JBPAPP_5_1/console/build.xml
   branches/JBPAPP_5_1/main/build.xml
   branches/JBPAPP_5_1/server/build.xml
   branches/JBPAPP_5_1/varia/build.xml
Log:
Remove signature files before altering JAR files or including parts of them them into other JARs

Modified: branches/JBPAPP_5_1/console/build.xml
===================================================================
--- branches/JBPAPP_5_1/console/build.xml	2010-06-29 18:46:25 UTC (rev 106329)
+++ branches/JBPAPP_5_1/console/build.xml	2010-06-29 18:48:02 UTC (rev 106330)
@@ -321,26 +321,34 @@
     </jar>
 
     <!-- Build applet.jar -->
-    <jar destfile="${build.lib}/applet.jar" excludes="META-INF/INDEX.LIST">
-      <zipgroupfileset dir="${jboss.server.lib}">
-        <include name="jmx-rmi-adaptor.jar"/>
-      </zipgroupfileset>
-      <zipgroupfileset dir="${jfreechart.jfreechart.lib}">
-        <include name="jfreechart.jar"/>
-        <include name="jcommon.jar"/>
-      </zipgroupfileset>
+    <jar destfile="${build.lib}/applet.jar">
+      <!-- <zipfileset src="${jboss.server.lib}/jmx-rmi-adaptor.jar" /> -->
+      <zipfileset src="${jfreechart.jfreechart.lib}/jfreechart.jar">
+        <exclude name="META-INF/INDEX.LIST"/>
+        <exclude name="META-INF/JBOSSCOD.*"/>
+      </zipfileset>
+      <zipfileset src="${jfreechart.jfreechart.lib}/jcommon.jar">
+        <exclude name="META-INF/INDEX.LIST"/>
+        <exclude name="META-INF/JBOSSCOD.*"/>
+      </zipfileset>
       <zipfileset src="${jboss.server.lib}/jboss-client.jar">
         <include name="org/jboss/invocation/*"/>
         <exclude name="META-INF/INDEX.LIST"/>
+        <exclude name="META-INF/JBOSSCOD.*"/>
       </zipfileset>
       <zipfileset src="${jboss.common.logging.spi.lib}/jboss-logging-spi.jar">
         <include name="org/jboss/logging/**"/>
+        <exclude name="META-INF/INDEX.LIST"/>
+        <exclude name="META-INF/JBOSSCOD.*"/>
       </zipfileset>
       <zipfileset src="${jboss.common.logging.log4j.lib}/jboss-logging-log4j.jar">
         <include name="org/jboss/logging/**"/>
+        <exclude name="META-INF/INDEX.LIST"/>
+        <exclude name="META-INF/JBOSSCOD.*"/>
       </zipfileset>      
       <zipfileset src="${jboss.common.core.lib}/jboss-common-core.jar">
         <exclude name="META-INF/INDEX.LIST"/>
+        <exclude name="META-INF/JBOSSCOD.*"/>
         <exclude name="org/jboss/util/property/**"/>
         <exclude name="org/jboss/util/propertyeditor/**"/>
         <exclude name="org/jboss/util/state/**"/>
@@ -355,12 +363,15 @@
       </zipfileset>
       <zipfileset src="${jboss.system.lib}/jboss-system-client.jar">
         <exclude name="META-INF/INDEX.LIST"/>
+        <exclude name="META-INF/JBOSSCOD.*"/>
       </zipfileset>
       <zipfileset src="${jboss.jnp.client.lib}/jnp-client.jar">
         <exclude name="META-INF/INDEX.LIST"/>
+        <exclude name="META-INF/JBOSSCOD.*"/>
       </zipfileset>
       <zipfileset src="${jboss.jmx.lib}/jboss-jmx.jar">
         <exclude name="META-INF/INDEX.LIST"/>
+        <exclude name="META-INF/JBOSSCOD.*"/>
         <exclude name="org/jboss/mx/server/**"/>
         <exclude name="org/jboss/mx/remote/**"/>
         <exclude name="org/jboss/mx/persistence/**"/>

Modified: branches/JBPAPP_5_1/main/build.xml
===================================================================
--- branches/JBPAPP_5_1/main/build.xml	2010-06-29 18:46:25 UTC (rev 106329)
+++ branches/JBPAPP_5_1/main/build.xml	2010-06-29 18:48:02 UTC (rev 106330)
@@ -174,6 +174,7 @@
       <!-- Include getopt -->
       <zipfileset src="${gnu.getopt.lib}/getopt.jar">
         <include name="**"/>
+        <exclude name="META-INF/JBOSSCOD.*"/>
       </zipfileset>
     </jar>
   	

Modified: branches/JBPAPP_5_1/server/build.xml
===================================================================
--- branches/JBPAPP_5_1/server/build.xml	2010-06-29 18:46:25 UTC (rev 106329)
+++ branches/JBPAPP_5_1/server/build.xml	2010-06-29 18:48:02 UTC (rev 106330)
@@ -533,6 +533,7 @@
       <!-- Include getopt -->
       <zipfileset src="${gnu.getopt.lib}/getopt.jar">
         <include name="**"/>
+        <exclude name="META-INF/JBOSSCOD.*"/>
       </zipfileset>
     </jar>
   	

Modified: branches/JBPAPP_5_1/varia/build.xml
===================================================================
--- branches/JBPAPP_5_1/varia/build.xml	2010-06-29 18:46:25 UTC (rev 106329)
+++ branches/JBPAPP_5_1/varia/build.xml	2010-06-29 18:48:02 UTC (rev 106330)
@@ -508,6 +508,8 @@
         <include name="org/jboss/ant/**"/>
       </fileset>
       <zipfileset src="${jboss.jnpserver.lib}/jnpserver.jar">
+        <exclude name="META-INF/INDEX.LIST"/>
+        <exclude name="META-INF/JBOSSCOD.*"/>
       </zipfileset>
       <fileset dir="${jboss.server.root}/classes">
         <include name="org/jboss/jmx/adaptor/rmi/RMIAdaptor.class"/>