cleanup and simplify
diff --git a/releng.wtpbuilder/distribution/jsdt.package/createziptasks.xml b/releng.wtpbuilder/distribution/jsdt.package/createziptasks.xml
index 7cfbe0a..0cc75c3 100644
--- a/releng.wtpbuilder/distribution/jsdt.package/createziptasks.xml
+++ b/releng.wtpbuilder/distribution/jsdt.package/createziptasks.xml
@@ -3,7 +3,7 @@
     <target
         name="createCodeZip">
         <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            antfile="${wtp.builder.home}/scripts/build/ziputils.xml"
             target="premirrortasks"/>
         <p2.mirror
             source="${buildDirectory}/${buildLabel}/repository"
@@ -18,13 +18,13 @@
                 id="org.eclipse.wst.jsdt.feature.feature.group"/>
         </p2.mirror>
         <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            antfile="${wtp.builder.home}/scripts/build/ziputils.xml"
             target="postmirrortasks"/>
     </target>
     <target
         name="createSDKZip">
         <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            antfile="${wtp.builder.home}/scripts/build/ziputils.xml"
             target="premirrortasks"/>
         <p2.mirror
             source="${buildDirectory}/${buildLabel}/repository"
@@ -39,13 +39,13 @@
                 id="org.eclipse.wst.jsdt_sdk.feature.feature.group"/>
         </p2.mirror>
         <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            antfile="${wtp.builder.home}/scripts/build/ziputils.xml"
             target="postmirrortasks"/>
     </target>
     <target
         name="createTestZip">
         <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            antfile="${wtp.builder.home}/scripts/build/ziputils.xml"
             target="premirrortasks"/>
         <p2.mirror
             source="${buildDirectory}/${buildLabel}/repository"
@@ -60,7 +60,7 @@
                 id="org.eclipse.wst.jsdt_tests.feature.feature.group"/>
         </p2.mirror>
         <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            antfile="${wtp.builder.home}/scripts/build/ziputils.xml"
             target="postmirrortasks"/>
     </target>
 </project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches32x.package/createziptasks.xml b/releng.wtpbuilder/distribution/patches32x.package/createziptasks.xml
index 1a3fe84..564c304 100644
--- a/releng.wtpbuilder/distribution/patches32x.package/createziptasks.xml
+++ b/releng.wtpbuilder/distribution/patches32x.package/createziptasks.xml
@@ -3,7 +3,7 @@
     <target
         name="createCodeZip">
         <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            antfile="${wtp.builder.home}/scripts/build/ziputils.xml"
             target="premirrortasks"/>
         <p2.mirror
             source="${buildDirectory}/${buildLabel}/repository"
@@ -18,7 +18,7 @@
                 id="org.eclipse.wst.common_core.feature.patch.feature.group"/>
         </p2.mirror>
         <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            antfile="${wtp.builder.home}/scripts/build/ziputils.xml"
             target="postmirrortasks"/>
     </target>
 	
@@ -26,7 +26,7 @@
         name="createSDKZip">
         <!--
         <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            antfile="${wtp.builder.home}/scripts/build/ziputils.xml"
             target="premirrortasks"/>
         <p2.mirror
             source="${buildDirectory}/${buildLabel}/repository"
@@ -41,7 +41,7 @@
                 id="org.eclipse.wst.common_SDK.feature.patch.feature.group"/>
         </p2.mirror>
         <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            antfile="${wtp.builder.home}/scripts/build/ziputils.xml"
             target="postmirrortasks"/>
             -->
     </target>
@@ -50,7 +50,7 @@
     	
     	<!--
         <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            antfile="${wtp.builder.home}/scripts/build/ziputils.xml"
             target="premirrortasks"/>
         <p2.mirror
             source="${buildDirectory}/${buildLabel}/repository"
@@ -67,7 +67,7 @@
                 
         </p2.mirror>
         <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            antfile="${wtp.builder.home}/scripts/build/ziputils.xml"
             target="postmirrortasks"/>
     	
     	-->
diff --git a/releng.wtpbuilder/distribution/wtp.package/createjaxws.xml b/releng.wtpbuilder/distribution/wtp.package/createjaxws.xml
index e3dfe96..eb12983 100644
--- a/releng.wtpbuilder/distribution/wtp.package/createjaxws.xml
+++ b/releng.wtpbuilder/distribution/wtp.package/createjaxws.xml
@@ -64,7 +64,7 @@
     <target
         name="createZip">
         <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            antfile="${wtp.builder.home}/scripts/build/ziputils.xml"
             target="premirrortasks"/>
         <p2.mirror
             source="${buildDirectory}/${buildLabel}/repository"
@@ -83,13 +83,13 @@
                 id="org.eclipse.jst.ws.jaxws.feature.feature.group"/>
         </p2.mirror>
         <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            antfile="${wtp.builder.home}/scripts/build/ziputils.xml"
             target="createzippedrepo"/>
     </target>
     <target
         name="createSDKZip">
         <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            antfile="${wtp.builder.home}/scripts/build/ziputils.xml"
             target="premirrortasks"/>
         <p2.mirror
             source="${buildDirectory}/${buildLabel}/repository"
@@ -108,13 +108,13 @@
                 id="org.eclipse.jst.ws.jaxws.dom_sdk.feature.feature.group"/>
         </p2.mirror>
         <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            antfile="${wtp.builder.home}/scripts/build/ziputils.xml"
             target="createzippedrepo"/>
     </target>
     <target
         name="createTestZip">
         <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            antfile="${wtp.builder.home}/scripts/build/ziputils.xml"
             target="premirrortasks"/>
         <p2.mirror
             source="${buildDirectory}/${buildLabel}/repository"
@@ -133,7 +133,7 @@
                 id="org.eclipse.jst.ws.jaxws.dom_tests.feature.feature.group"/>
         </p2.mirror>
         <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            antfile="${wtp.builder.home}/scripts/build/ziputils.xml"
             target="createzippedrepo"/>
     </target>
 </project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtp.package/createmainzips.xml b/releng.wtpbuilder/distribution/wtp.package/createmainzips.xml
index c7462c5..0612823 100644
--- a/releng.wtpbuilder/distribution/wtp.package/createmainzips.xml
+++ b/releng.wtpbuilder/distribution/wtp.package/createmainzips.xml
@@ -63,7 +63,7 @@
     <target
         name="createCodeZip">
         <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            antfile="${wtp.builder.home}/scripts/build/ziputils.xml"
             target="premirrortasks"/>
         <p2.mirror
             source="${buildDirectory}/${buildLabel}/repository"
@@ -119,13 +119,13 @@
                 id="org.eclipse.jpt.eclipselink.feature.feature.group"/>
         </p2.mirror>
         <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            antfile="${wtp.builder.home}/scripts/build/ziputils.xml"
             target="postmirrortasks"/>
     </target>
     <target
         name="createSDKZip">
         <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            antfile="${wtp.builder.home}/scripts/build/ziputils.xml"
             target="premirrortasks"/>
         <p2.mirror
             source="${buildDirectory}/${buildLabel}/repository"
@@ -180,13 +180,13 @@
                 id="org.eclipse.jpt.eclipselink_sdk.feature.feature.group"/>
         </p2.mirror>
         <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            antfile="${wtp.builder.home}/scripts/build/ziputils.xml"
             target="postmirrortasks"/>
     </target>
     <target
         name="createTestZip">
         <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            antfile="${wtp.builder.home}/scripts/build/ziputils.xml"
             target="premirrortasks"/>
         <p2.mirror
             source="${buildDirectory}/${buildLabel}/repository"
@@ -247,7 +247,7 @@
 	            -->
         </p2.mirror>
         <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            antfile="${wtp.builder.home}/scripts/build/ziputils.xml"
             target="postmirrortasks"/>
     </target>
 </project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtp.package/createnoopzips.xml b/releng.wtpbuilder/distribution/wtp.package/createnoopzips.xml
index ad829ba..6f2e310 100644
--- a/releng.wtpbuilder/distribution/wtp.package/createnoopzips.xml
+++ b/releng.wtpbuilder/distribution/wtp.package/createnoopzips.xml
@@ -65,7 +65,7 @@
     <target
         name="createNoOptionalZip">
         <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            antfile="${wtp.builder.home}/scripts/build/ziputils.xml"
             target="premirrortasks"/>
         <p2.mirror
             source="${buildDirectory}/${buildLabel}/repository"
@@ -104,13 +104,13 @@
                 id="org.eclipse.jsf.feature.feature.group"/>
         </p2.mirror>
         <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            antfile="${wtp.builder.home}/scripts/build/ziputils.xml"
             target="postmirrortasks"/>
     </target>
     <target
         name="createNoOptionalSDKZip">
         <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            antfile="${wtp.builder.home}/scripts/build/ziputils.xml"
             target="premirrortasks"/>
         <p2.mirror
             source="${buildDirectory}/${buildLabel}/repository"
@@ -149,13 +149,13 @@
                 id="org.eclipse.jsf_sdk.feature.feature.group"/>
         </p2.mirror>
         <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            antfile="${wtp.builder.home}/scripts/build/ziputils.xml"
             target="postmirrortasks"/>
     </target>
     <target
         name="createNoOptionalTestZip">
         <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            antfile="${wtp.builder.home}/scripts/build/ziputils.xml"
             target="premirrortasks"/>
         <p2.mirror
             source="${buildDirectory}/${buildLabel}/repository"
@@ -197,7 +197,7 @@
                 id="org.eclipse.wtp.releng.tests.feature.feature.group"/>
         </p2.mirror>
         <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            antfile="${wtp.builder.home}/scripts/build/ziputils.xml"
             target="postmirrortasks"/>
     </target>
 </project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtpe4.build/createjaxws.xml b/releng.wtpbuilder/distribution/wtpe4.build/createjaxws.xml
index e3dfe96..eb12983 100644
--- a/releng.wtpbuilder/distribution/wtpe4.build/createjaxws.xml
+++ b/releng.wtpbuilder/distribution/wtpe4.build/createjaxws.xml
@@ -64,7 +64,7 @@
     <target
         name="createZip">
         <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            antfile="${wtp.builder.home}/scripts/build/ziputils.xml"
             target="premirrortasks"/>
         <p2.mirror
             source="${buildDirectory}/${buildLabel}/repository"
@@ -83,13 +83,13 @@
                 id="org.eclipse.jst.ws.jaxws.feature.feature.group"/>
         </p2.mirror>
         <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            antfile="${wtp.builder.home}/scripts/build/ziputils.xml"
             target="createzippedrepo"/>
     </target>
     <target
         name="createSDKZip">
         <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            antfile="${wtp.builder.home}/scripts/build/ziputils.xml"
             target="premirrortasks"/>
         <p2.mirror
             source="${buildDirectory}/${buildLabel}/repository"
@@ -108,13 +108,13 @@
                 id="org.eclipse.jst.ws.jaxws.dom_sdk.feature.feature.group"/>
         </p2.mirror>
         <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            antfile="${wtp.builder.home}/scripts/build/ziputils.xml"
             target="createzippedrepo"/>
     </target>
     <target
         name="createTestZip">
         <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            antfile="${wtp.builder.home}/scripts/build/ziputils.xml"
             target="premirrortasks"/>
         <p2.mirror
             source="${buildDirectory}/${buildLabel}/repository"
@@ -133,7 +133,7 @@
                 id="org.eclipse.jst.ws.jaxws.dom_tests.feature.feature.group"/>
         </p2.mirror>
         <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            antfile="${wtp.builder.home}/scripts/build/ziputils.xml"
             target="createzippedrepo"/>
     </target>
 </project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/wtpe4.build/createnoopzips.xml b/releng.wtpbuilder/distribution/wtpe4.build/createnoopzips.xml
index ad829ba..6f2e310 100644
--- a/releng.wtpbuilder/distribution/wtpe4.build/createnoopzips.xml
+++ b/releng.wtpbuilder/distribution/wtpe4.build/createnoopzips.xml
@@ -65,7 +65,7 @@
     <target
         name="createNoOptionalZip">
         <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            antfile="${wtp.builder.home}/scripts/build/ziputils.xml"
             target="premirrortasks"/>
         <p2.mirror
             source="${buildDirectory}/${buildLabel}/repository"
@@ -104,13 +104,13 @@
                 id="org.eclipse.jsf.feature.feature.group"/>
         </p2.mirror>
         <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            antfile="${wtp.builder.home}/scripts/build/ziputils.xml"
             target="postmirrortasks"/>
     </target>
     <target
         name="createNoOptionalSDKZip">
         <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            antfile="${wtp.builder.home}/scripts/build/ziputils.xml"
             target="premirrortasks"/>
         <p2.mirror
             source="${buildDirectory}/${buildLabel}/repository"
@@ -149,13 +149,13 @@
                 id="org.eclipse.jsf_sdk.feature.feature.group"/>
         </p2.mirror>
         <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            antfile="${wtp.builder.home}/scripts/build/ziputils.xml"
             target="postmirrortasks"/>
     </target>
     <target
         name="createNoOptionalTestZip">
         <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            antfile="${wtp.builder.home}/scripts/build/ziputils.xml"
             target="premirrortasks"/>
         <p2.mirror
             source="${buildDirectory}/${buildLabel}/repository"
@@ -197,7 +197,7 @@
                 id="org.eclipse.wtp.releng.tests.feature.feature.group"/>
         </p2.mirror>
         <ant
-            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            antfile="${wtp.builder.home}/scripts/build/ziputils.xml"
             target="postmirrortasks"/>
     </target>
 </project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/scripts/build/ziputils.xml b/releng.wtpbuilder/scripts/build/ziputils.xml
new file mode 100644
index 0000000..34e78c4
--- /dev/null
+++ b/releng.wtpbuilder/scripts/build/ziputils.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+    default="nodefault"
+    basedir=".">
+    <target
+        name="premirrortasks">
+        <!--
+            if desired zip already exists, remove it. It normally would
+            not exist, but might if restarting a build, or something
+        -->
+        <delete
+            file="${buildDirectory}/${buildLabel}/${newarchiveName}"
+            quiet="true"
+            failonerror="false"/>
+    </target>
+    <target
+        name="createzippedrepo">
+	        <!-- are these required?
+	        <copy
+	            todir="${tempRunnableEclipse}"
+	            overwrite="false">
+	            <fileset
+	                dir="${wtp.builder.home}/rootfiles">
+	            </fileset>
+	        </copy>
+	        -->
+        <zip
+            destfile="${buildDirectory}/${buildLabel}/components/${newarchiveName}"
+            basedir="${tempRepo}"/>
+        <delete
+            dir="${tempRepo}"
+            quiet="true"
+            failonerror="false"/>
+        <ant
+            antfile="${wtp.builder.home}/scripts/build/buildutilitiesp2.xml"
+            target="createChecksums">
+            <property
+                name="subdir"
+                value="components/"/>
+            <property
+                name="archiveName"
+                value="${newarchiveName}"/>
+        </ant>
+    </target>
+    <target
+        name="postmirrortasks">
+        <p2.repo2runnable>
+            <repository
+                location="${tempRunnableEclipse}"/>
+            <source>
+                <repository
+                    location="${tempRepo}"/>
+            </source>
+        </p2.repo2runnable>
+        <!--
+            remove content.jar and artifacts.jar, since not in
+            traditional zips
+        -->
+        <delete
+            file="${tempRunnableEclipse}/artifacts.jar"
+            quiet="true"
+            failonerror="false"/>
+        <delete
+            file="${tempRunnableEclipse}/content.jar"
+            quiet="true"
+            failonerror="false"/>
+        <!-- copy in standard root license files -->
+        <copy
+            todir="${tempRunnableEclipse}"
+            overwrite="false">
+            <fileset
+                dir="${wtp.builder.home}/rootfiles">
+            </fileset>
+        </copy>
+        <zip
+            destfile="${buildDirectory}/${buildLabel}/${newarchiveName}"
+            basedir="${tempDir}"/>
+        <delete
+            dir="${tempDir}"
+            quiet="true"
+            failonerror="false"/>
+        <delete
+            dir="${tempRepo}"
+            quiet="true"
+            failonerror="false"/>
+        <ant
+            antfile="${wtp.builder.home}/scripts/build/buildutilitiesp2.xml"
+            target="createChecksums">
+            <property
+                name="buildDirectory"
+                value="${buildDirectory}"/>
+            <property
+                name="buildLabel"
+                value="${buildLabel}"/>
+            <property
+                name="archiveName"
+                value="${newarchiveName}"/>
+        </ant>
+    </target>
+    <target
+        name="nodefault">
+        <fail
+            message="There is do default task. Must be specified when calling."/>
+    </target>
+</project>
\ No newline at end of file