From eaa73b2fa15f136e133f7115641f8f71585d8ed4 Mon Sep 17 00:00:00 2001
From: "James.Nelson" <James@wetheinter.net>
Date: Fri, 8 Aug 2014 02:44:38 -0400
Subject: [PATCH] Remove signature files from dependent jars

Change-Id: I37bb8e0ea8277764a0de03254f9ca2b514d12a02
---
 common.ant.xml |  8 ++++--
 dev/build.xml  | 78 +++++++++++++++++++++++++-------------------------
 user/build.xml |  6 ++--
 3 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/common.ant.xml b/common.ant.xml
index 25fd1d287ad..00f6abbeee6 100755
--- a/common.ant.xml
+++ b/common.ant.xml
@@ -157,7 +157,11 @@
     <javac srcdir="src" destdir="${javac.out}" debug="${javac.debug}"
            debuglevel="${javac.debuglevel}" source="${javac.source}" target="${javac.target}"
            nowarn="${javac.nowarn}" encoding="${javac.encoding}" fork="true" verbose="${javac.verbose}"
-           memoryMaximumSize="1024m" includeantruntime="false"/>
+           memoryMaximumSize="1024m" includeantruntime="false" />
+  </presetdef>
+
+  <presetdef name="gwt.zip">
+    <zipfileset excludes="META-INF/*.RSA,META-INF/*.SF,META-INF/*.DSA" />
   </presetdef>
 
   <macrodef name="gwt.jar">
@@ -166,7 +170,7 @@
     <attribute name="update" default="true"/>
     <element name="jarcontents" implicit="true"/>
     <sequential>
-      <jar destfile="@{destfile}" duplicate="@{duplicate}" filesonly="false"
+      <jar destfile="@{destfile}" duplicate="@{duplicate}" filesonly="false" excludes="META-INF/**.RSA META-INF/**.SF"
           index="true" update="@{update}">
         <jarcontents/>
       </jar>
diff --git a/dev/build.xml b/dev/build.xml
index cf0dca045f3..e73a98166bd 100755
--- a/dev/build.xml
+++ b/dev/build.xml
@@ -109,48 +109,48 @@
       </targetfiles>
       <sequential>
         <gwt.jar destfile="${alldeps.jar}" duplicate="preserve">
-          <zipfileset src="${gwt.tools.lib}/apache/tapestry-util-text-4.0.2.jar" />
-          <zipfileset src="${gwt.tools.lib}/apache/ant-1.6.5.jar" />
-          <zipfileset src="${gwt.tools.lib}/eclipse/org.eclipse.jdt.core_${eclipse.version}.jar" />
-          <zipfileset src="${gwt.tools.lib}/eclipse/jdtCompilerAdapter-${eclipse.version}.jar" />
-          <zipfileset src="${gwt.tools.lib}/guava/guava-16.0.1/guava-16.0.1-rebased.jar" />
-          <zipfileset src="${gwt.tools.lib}/icu4j/50.1.1/icu4j.jar" />
-          <zipfileset src="${gwt.tools.lib}/jetty/jetty-8.1.12.v20130726/jetty-8.1.12.v20130726.jar" />
-          <zipfileset src="${gwt.tools.lib}/jetty/jetty-8.1.12.v20130726/servlet-api-3.0-NoMetaInf.jar" />
-          <zipfileset src="${gwt.tools.lib}/jscomp/20131118/compiler-rebased.jar" />
-          <zipfileset src="${gwt.tools.lib}/jscomp/20131118/sourcemap-rebased.jar" />
-          <zipfileset src="${gwt.tools.lib}/jsr305/jsr305.jar" />
-          <zipfileset src="${gwt.tools.lib}/protobuf/protobuf-2.5.0/protobuf-java-rebased-2.5.0.jar" />
+          <gwt.zip src="${gwt.tools.lib}/apache/tapestry-util-text-4.0.2.jar" />
+          <gwt.zip src="${gwt.tools.lib}/apache/ant-1.6.5.jar" />
+          <gwt.zip src="${gwt.tools.lib}/eclipse/org.eclipse.jdt.core_${eclipse.version}.jar" />
+          <gwt.zip src="${gwt.tools.lib}/eclipse/jdtCompilerAdapter-${eclipse.version}.jar" />
+          <gwt.zip src="${gwt.tools.lib}/guava/guava-16.0.1/guava-16.0.1-rebased.jar" />
+          <gwt.zip src="${gwt.tools.lib}/icu4j/50.1.1/icu4j.jar" />
+          <gwt.zip src="${gwt.tools.lib}/jetty/jetty-8.1.12.v20130726/jetty-8.1.12.v20130726.jar" />
+          <gwt.zip src="${gwt.tools.lib}/jetty/jetty-8.1.12.v20130726/servlet-api-3.0-NoMetaInf.jar" />
+          <gwt.zip src="${gwt.tools.lib}/jscomp/20131118/compiler-rebased.jar" />
+          <gwt.zip src="${gwt.tools.lib}/jscomp/20131118/sourcemap-rebased.jar" />
+          <gwt.zip src="${gwt.tools.lib}/jsr305/jsr305.jar" />
+          <gwt.zip src="${gwt.tools.lib}/protobuf/protobuf-2.5.0/protobuf-java-rebased-2.5.0.jar" />
           <!-- dependencies needed for JSP support in DevMode: BEGIN -->
-          <zipfileset src="${gwt.tools.lib}/tomcat/commons-el-1.0.jar"/>
-          <zipfileset src="${gwt.tools.lib}/tomcat/jasper-compiler-1.0.jar"/>
-          <zipfileset src="${gwt.tools.lib}/tomcat/jasper-runtime-1.0.jar"/>
-          <zipfileset src="${gwt.tools.lib}/tomcat/jsp-api-2.0.jar"/>
+          <gwt.zip src="${gwt.tools.lib}/tomcat/commons-el-1.0.jar"/>
+          <gwt.zip src="${gwt.tools.lib}/tomcat/jasper-compiler-1.0.jar"/>
+          <gwt.zip src="${gwt.tools.lib}/tomcat/jasper-runtime-1.0.jar"/>
+          <gwt.zip src="${gwt.tools.lib}/tomcat/jsp-api-2.0.jar"/>
           <!-- dependencies needed for JSP support in DevMode: END -->
-          <zipfileset
+          <gwt.zip
               src="${gwt.tools.lib}/apache/commons/commons-collections-3.2.1.jar"/>
           <!-- htmlunit dependencies not already included: BEGIN -->
-          <zipfileset src="${gwt.tools.lib}/apache/http/httpclient-4.3.1.jar"/>
-          <zipfileset src="${gwt.tools.lib}/apache/http/httpcore-4.3.jar"/>
-          <zipfileset src="${gwt.tools.lib}/apache/http/httpmime-4.3.1.jar"/>
-          <zipfileset src="${gwt.tools.lib}/apache/james/apache-mime4j-0.6.jar"/>
-          <zipfileset src="${gwt.tools.lib}/apache/commons/commons-codec-1.8.jar"/>
-          <zipfileset src="${gwt.tools.lib}/apache/commons/commons-io-2.4.jar"/>
-          <zipfileset src="${gwt.tools.lib}/apache/commons/commons-lang3-3.1.jar"/>
-          <zipfileset src="${gwt.tools.lib}/apache/commons/commons-logging-1.1.3.jar"/>
-          <zipfileset src="${gwt.tools.lib}/cssparser/cssparser-0.9.11.jar"/>
-          <zipfileset src="${gwt.tools.lib}/htmlunit/htmlunit-2.13/htmlunit-2.13.jar"/>
-          <zipfileset
+          <gwt.zip src="${gwt.tools.lib}/apache/http/httpclient-4.3.1.jar"/>
+          <gwt.zip src="${gwt.tools.lib}/apache/http/httpcore-4.3.jar"/>
+          <gwt.zip src="${gwt.tools.lib}/apache/http/httpmime-4.3.1.jar"/>
+          <gwt.zip src="${gwt.tools.lib}/apache/james/apache-mime4j-0.6.jar"/>
+          <gwt.zip src="${gwt.tools.lib}/apache/commons/commons-codec-1.8.jar"/>
+          <gwt.zip src="${gwt.tools.lib}/apache/commons/commons-io-2.4.jar"/>
+          <gwt.zip src="${gwt.tools.lib}/apache/commons/commons-lang3-3.1.jar"/>
+          <gwt.zip src="${gwt.tools.lib}/apache/commons/commons-logging-1.1.3.jar"/>
+          <gwt.zip src="${gwt.tools.lib}/cssparser/cssparser-0.9.11.jar"/>
+          <gwt.zip src="${gwt.tools.lib}/htmlunit/htmlunit-2.13/htmlunit-2.13.jar"/>
+          <gwt.zip
               src="${gwt.tools.lib}/htmlunit/htmlunit-2.13/htmlunit-core-js-2.13.jar"/>
-          <zipfileset src="${gwt.tools.lib}/nekohtml/nekohtml-1.9.19.jar"/>
-          <zipfileset src="${gwt.tools.lib}/cup/java-cup-11a.jar"/>
-          <zipfileset src="${gwt.tools.lib}/xalan/xalan-2.7.1-nocup.jar"/>
-          <zipfileset src="${gwt.tools.lib}/xerces/xerces-2_11_0/serializer-2.7.1.jar"/>
-          <zipfileset src="${gwt.tools.lib}/xerces/xerces-2_11_0/xercesImpl-2.11.0.jar"/>
-          <zipfileset src="${gwt.tools.lib}/xerces/xerces-2_11_0/xml-apis-1.4.01.jar"/>
-          <zipfileset src="${gwt.tools.lib}/w3c/sac/sac-1.3.jar"/>
+          <gwt.zip src="${gwt.tools.lib}/nekohtml/nekohtml-1.9.19.jar"/>
+          <gwt.zip src="${gwt.tools.lib}/cup/java-cup-11a.jar"/>
+          <gwt.zip src="${gwt.tools.lib}/xalan/xalan-2.7.1-nocup.jar"/>
+          <gwt.zip src="${gwt.tools.lib}/xerces/xerces-2_11_0/serializer-2.7.1.jar"/>
+          <gwt.zip src="${gwt.tools.lib}/xerces/xerces-2_11_0/xercesImpl-2.11.0.jar"/>
+          <gwt.zip src="${gwt.tools.lib}/xerces/xerces-2_11_0/xml-apis-1.4.01.jar"/>
+          <gwt.zip src="${gwt.tools.lib}/w3c/sac/sac-1.3.jar"/>
           <!-- htmlunit dependencies not already included: END -->
-          <zipfileset src="${gwt.tools.lib}/json/android-sdk-19.1/json-android.jar"/>
+          <gwt.zip src="${gwt.tools.lib}/json/android-sdk-19.1/json-android.jar"/>
         </gwt.jar>
       </sequential>
     </outofdate>
@@ -327,11 +327,11 @@
           </fileset>
           <fileset dir="core/super" excludes="**/package.html"/>
           <fileset dir="${javac.out}"/>
-          <zipfileset src="${alldeps.jar}"/>
+          <gwt.zip src="${alldeps.jar}"/>
 
-          <zipfileset file="${gwt.tools.soyc}/classLevel.css"
+          <gwt.zip file="${gwt.tools.soyc}/classLevel.css"
                       prefix="com/google/gwt/soyc/resources/"/>
-          <zipfileset file="${gwt.tools.soyc}/roundedCorners.css"
+          <gwt.zip file="${gwt.tools.soyc}/roundedCorners.css"
                       prefix="com/google/gwt/soyc/resources/"/>
 
           <manifest>
diff --git a/user/build.xml b/user/build.xml
index cd4b7834823..e1e24bd25dc 100755
--- a/user/build.xml
+++ b/user/build.xml
@@ -99,6 +99,7 @@
 
   <target name="compile" description="Compile all class files"
           unless="compile.complete">
+    <sequential>
     <mkdir dir="${javac.out}"/>
     <gwt.javac excludes="**/super/**">
       <classpath>
@@ -125,9 +126,10 @@
     </gwt.javac>
 
     <!-- Build the BrowserManagerServer_Stub to allow remote browser testing -->
-    <rmic base="${javac.out}"
+<!--    <rmic base="${javac.out}"
           classname="com.google.gwt.junit.remote.BrowserManagerServer"
-          stubversion="1.2"/>
+          stubversion="1.2"/> -->
+    </sequential>
   </target>
 
   <!--