Diff of /common.build/trunk/common-webstart-targets.xml [r5984] .. [r5985] Maximize Restore

  Switch to side-by-side view

--- a/common.build/trunk/common-webstart-targets.xml
+++ b/common.build/trunk/common-webstart-targets.xml
@@ -189,30 +189,32 @@
             <!-- Packing alters the order of the classes in the jar.  The repack
 		step MUST precede a signing -->
 
-            <echo message="Before repack (pack and unpack)" />
-            <pack200fs destdir="${tmp}/lib" repack="true">
-                <fileset dir="lib">
+<!-- UNCOMMENT TO RE-ENABLE PACKING AND SIGNING!!!!!!  -->
+            <echo message="Beginning repack (pack and unpack)" />
+            <mkdir dir="${tmp}/webstart" />
+            <pack200fs destdir="${tmp}/webstart" repack="true">
+                <fileset dir="${lib}">
                     <include name="*.jar" />
                     <include name="*.txt" />
                 </fileset>
                 <fileset file="${jar.file.versioned}" />
             </pack200fs>
 
-            <echo message="Before signing" />
+            <echo message="Beginning signing" />
             <signjar keystore="../common.build/keystore" keypass="rptools" alias="rptools" storepass="rptools" lazy="true">
-                <fileset dir="${tmp}/lib">
+                <fileset dir="${tmp}/webstart">
                     <include name="*.jar" />
                 </fileset>
             </signjar>
-
-            <!-- WEBSTART DEPLOYMENT -->
 
             <echo message="Before copy" />
             <copy todir="${dist}/lib">
-                <fileset dir="${tmp.zipdir}/lib">
+                <fileset dir="${tmp}/webstart">
                     <present present="srconly" targetdir="${dist}/lib" />
                 </fileset>
             </copy>
+
+            <!-- WEBSTART DEPLOYMENT -->
 
             <echo file="${dist}/${ant.project.name}-development.txt">
 			${application.name}