prep for 322 patches
diff --git a/releng.wtpbuilder/distribution/patches32x.build/build.xml b/releng.wtpbuilder/distribution/patches32x.build/build.xml
index bac5a65..a05dacc 100644
--- a/releng.wtpbuilder/distribution/patches32x.build/build.xml
+++ b/releng.wtpbuilder/distribution/patches32x.build/build.xml
@@ -70,16 +70,8 @@
 
         <antcall
             target="handleCompilationProblems"/>
-    
-    	
-    	<!-- note this createFinalRepo.xml file is in 'releng' directory since it will vary from stream to stream -->
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/runAntRunner.xml">
-            <property
-                name="antrunnerfile"
-                value="${buildDirectory}/maps/webtools.maps/releng/packages/createFinalRepo.xml"/>
 
-        </ant>
+
     </target>
 
     <!-- invoking runbuild.xml targetting getBaseBuilder -->
@@ -99,7 +91,7 @@
             antfile="${buildTargets}"
             target="getBaseBuilder"/>
     </target>
-    
+
 
     <target
         name="handleCompilationProblems"
@@ -148,179 +140,7 @@
         <echo
             message="compilation.problem path buildDirectory: ${buildDirectory}/plugins/*/"/>
     </target>
-	
-
-    <target
-        name="package">
-	<!--
-            post, post packaging, for WTP ... "manually" assemble the
-            desired zips
-        -->
-
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/runAntRunner.xml">
-            <property
-                name="antrunnerfile"
-                value="${wtp.builder.home}/distribution/${build.distribution}.build/createmainzips.xml"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/runAntRunner.xml">
-            <property
-                name="antrunnerfile"
-                value="${wtp.builder.home}/distribution/${build.distribution}.build/createjaxws.xml"/>
-        </ant>
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/runAntRunner.xml">
-            <property
-                name="antrunnerfile"
-                value="${wtp.builder.home}/distribution/${build.distribution}.build/createnoopzips.xml"/>
-        </ant>
 
 
-        <antcall
-            target="createFprojZips"/>
-    </target>
-<!--
-        Handles packaging of individual Faceted Project Framework
-        distributions. Note the check on "requested and available" is simply 
-        to avoid extra error messages, if the wtp zip failed to be created due 
-        to some earlier error.
-    -->
-    <target
-        name="checkFprojConditions"
-        if="doCreateFprojZips">
-        <condition
-            property="requestedAndAvailable">
-            <available
-                file="${buildDirectory}/${buildLabel}/wtp-sdk-${buildLabel}.zip"/>
-        </condition>
-    </target>
-    <target
-        name="createFprojZips"
-        depends="checkFprojConditions"
-        if="requestedAndAvailable">
-        <delete
-            file="${buildDirectory}/${buildLabel}/wtp-common-fproj-${buildLabel}.zip"
-            failonerror="false"/>
-        <zip
-            destfile="${buildDirectory}/${buildLabel}/wtp-common-fproj-${buildLabel}.zip">
-            <zipfileset
-                src="${buildDirectory}/${buildLabel}/wtp-sdk-${buildLabel}.zip">
-                <include
-                    name="eclipse/features/org.eclipse.wst.common.fproj_*/**"/>
-                <include
-                    name="eclipse/plugins/org.eclipse.wst.common.project.facet.core_*.jar"/>
-                <include
-                    name="eclipse/plugins/org.eclipse.wst.common.project.facet.ui_*.jar"/>
-            </zipfileset>
-        </zip>
-        <delete
-            file="${buildDirectory}/${buildLabel}/wtp-common-fproj-sdk-${buildLabel}.zip"
-            failonerror="false"/>
-        <zip
-            destfile="${buildDirectory}/${buildLabel}/wtp-common-fproj-sdk-${buildLabel}.zip">
-            <zipfileset
-                src="${buildDirectory}/${buildLabel}/wtp-common-fproj-${buildLabel}.zip"/>
-            <zipfileset
-                src="${buildDirectory}/${buildLabel}/wtp-sdk-${buildLabel}.zip">
-                <include
-                    name="eclipse/features/org.eclipse.wst.common.fproj.sdk_*/**"/>
-                <include
-                    name="eclipse/plugins/org.eclipse.wst.common.fproj.sdk_*.jar"/>
-                <include
-                    name="eclipse/plugins/org.eclipse.wst.common.project.facet.doc.api_*.jar"/>
-                <include
-                    name="eclipse/plugins/org.eclipse.wst.common.project.facet.core.source_*.jar"/>
-                <include
-                    name="eclipse/plugins/org.eclipse.wst.common.project.facet.ui.source_*.jar"/>
-            </zipfileset>
-        </zip>
-        <delete
-            file="${buildDirectory}/${buildLabel}/wtp-common-fproj-enablement-jdt-${buildLabel}.zip"
-            failonerror="false"/>
-        <zip
-            destfile="${buildDirectory}/${buildLabel}/wtp-common-fproj-enablement-jdt-${buildLabel}.zip">
-            <zipfileset
-                src="${buildDirectory}/${buildLabel}/wtp-sdk-${buildLabel}.zip">
-                <include
-                    name="eclipse/features/org.eclipse.jst.common.fproj.enablement.jdt_*/**"/>
-                <include
-                    name="eclipse/plugins/org.eclipse.jst.common.project.facet.core_*.jar"/>
-                <include
-                    name="eclipse/plugins/org.eclipse.jst.common.project.facet.ui_*.jar"/>
-            </zipfileset>
-        </zip>
-        <delete
-            file="${buildDirectory}/${buildLabel}/wtp-common-fproj-enablement-jdt-sdk-${buildLabel}.zip"
-            failonerror="false"/>
-        <zip
-            destfile="${buildDirectory}/${buildLabel}/wtp-common-fproj-enablement-jdt-sdk-${buildLabel}.zip">
-            <zipfileset
-                src="${buildDirectory}/${buildLabel}/wtp-common-fproj-enablement-jdt-${buildLabel}.zip"/>
-            <zipfileset
-                src="${buildDirectory}/${buildLabel}/wtp-sdk-${buildLabel}.zip">
-                <include
-                    name="eclipse/features/org.eclipse.jst.common.fproj.enablement.jdt.sdk_*/**"/>
-                <include
-                    name="eclipse/plugins/org.eclipse.jst.common.fproj.enablement.jdt.sdk_*.jar"/>
-                <include
-                    name="eclipse/plugins/org.eclipse.jst.common.project.facet.core.source_*.jar"/>
-                <include
-                    name="eclipse/plugins/org.eclipse.jst.common.project.facet.ui.source_*.jar"/>
-            </zipfileset>
-        </zip>
-        <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="wtp-common-fproj-${buildLabel}.zip"/>
-        </ant>
-        <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="wtp-common-fproj-sdk-${buildLabel}.zip"/>
-        </ant>
-        <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="wtp-common-fproj-enablement-jdt-${buildLabel}.zip"/>
-        </ant>
-        <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="wtp-common-fproj-enablement-jdt-sdk-${buildLabel}.zip"/>
-        </ant>
-    </target>    
-    
+
 </project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches32x.package/build.xml b/releng.wtpbuilder/distribution/patches32x.package/build.xml
new file mode 100644
index 0000000..49949d0
--- /dev/null
+++ b/releng.wtpbuilder/distribution/patches32x.package/build.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+    default="package"
+    basedir=".">
+    <fail
+        unless="wtp.builder.home"
+        message="wtp.build.home needs to be definded for this script"/>
+    <property
+        file="${wtp.builder.home}/build.properties"/>
+    <property
+        environment="env"/>
+
+	<!-- required to get proper value of branch specific values -->
+    <property
+        name="keyCfgFile"
+        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
+    <echo
+        level="info"
+        message="keyCfgFile: ${keyCfgFile}"/>
+    <property
+        file="${keyCfgFile}"/>
+
+    <target
+        name="package"
+        description="Create the main repository for this build, and any desired zip file distributions">
+       <ant
+           antfile="${wtp.builder.home}/scripts/build/runAntRunner.xml">
+           <property
+               name="antrunnerfile"
+               value="${wtp.builder.home}/distribution/${build.distribution}.package/createFinalRepo.xml"/>
+       </ant>
+
+
+        <ant
+            antfile="${wtp.builder.home}/scripts/build/runAntRunner.xml">
+            <property
+                name="antrunnerfile"
+                value="${wtp.builder.home}/distribution/${build.distribution}.package/createmainzips.xml"/>
+        </ant>
+    </target>
+
+
+</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches32x.package/createFinalRepo.xml b/releng.wtpbuilder/distribution/patches32x.package/createFinalRepo.xml
new file mode 100644
index 0000000..649a274
--- /dev/null
+++ b/releng.wtpbuilder/distribution/patches32x.package/createFinalRepo.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    This script is to create some zips with core features only.
+    Limited, specialized usefulness, so they are not linked or
+    advertised. That is, could change at any time.
+-->
+<project
+    default="build"
+    basedir=".">
+    <target
+        name="build">
+        <!-- final repository work TODO: add comparitor -->
+        <p2.mirror
+            verbose="true">
+            <repository
+                location="file://${buildDirectory}/${buildLabel}/repository/"
+                name="Web Tools Platform Repository ${buildLabel}"
+                format="file://${buildDirectory}/${buildLabel}/buildrepository/"/>
+            <source>
+                <repository
+                    location="file://${buildDirectory}/${buildLabel}/buildrepository/"/>
+            </source>
+            <slicingoptions
+                followStrict="true"/>
+            <iu
+                id="org.eclipse.wst.common_core.feature.patch.feature.group"/>
+
+        </p2.mirror>
+    </target>
+</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/patches32x.package/createmainzips.xml b/releng.wtpbuilder/distribution/patches32x.package/createmainzips.xml
new file mode 100644
index 0000000..605fa78
--- /dev/null
+++ b/releng.wtpbuilder/distribution/patches32x.package/createmainzips.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+    <!--
+        This script is to create some zips with core features only.
+        Limited, specialized usefulness, so they are not linked or
+        advertised. That is, could change at any time.
+    -->
+<project
+    default="build"
+    basedir=".">
+    <!--
+        These properties are normally set by calling task, but for
+        "local" tests from command line, they can be set here
+    -->
+    <property
+        name="buildDirectory"
+        value="/shared/webtools/committers/wtp-R3.2.0-I/20091029001529"/>
+    <property
+        name="buildLabel"
+        value="I-3.2.0-20091029030635"/>
+    <property
+        name="wtp.builder.home"
+        value="/shared/webtools/projectBuilders/wtp-R3.2.0-I/webtools.releng/releng.wtpbuilder"/>
+    <echo
+        message="buildDirectory: ${buildDirectory}"/>
+    <echo
+        message="buildLabel: ${buildLabel}"/>
+    <echo
+        message="wtp.builder.home: ${wtp.builder.home}"/>
+    <!--
+        three convenience variables to help avoid typos, etc. Should
+        never need to be changed
+    -->
+    <property
+        name="tempDir"
+        value="${buildDirectory}/${buildLabel}/tempdir"/>
+    <property
+        name="tempRunnableEclipse"
+        value="${tempDir}/eclipse"/>
+    <property
+        name="tempRepo"
+        value="${buildDirectory}/${buildLabel}/temprepo"/>
+    <target
+        name="build">
+        <antcall
+            target="createCodeZip">
+            <param
+                name="newarchiveName"
+                value="${build.distribution}-${buildLabel}.zip"/>
+        </antcall>
+        <antcall
+            target="createSDKZip">
+            <param
+                name="newarchiveName"
+                value="${build.distribution}-sdk-${buildLabel}.zip"/>
+        </antcall>
+        <antcall
+            target="createTestZip">
+            <param
+                name="newarchiveName"
+                value="${build.distribution}-tests-${buildLabel}.zip"/>
+        </antcall>
+    </target>
+	<!--
+    <import
+        file="${buildDirectory}/maps/webtools.maps/releng/packages/jsdtmirrortasks.xml"/>
+        -->
+    <import
+        file="${wtp.builder.home}/distribution/${build.distribution}.package/createziptasks.xml"/>
+</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
new file mode 100644
index 0000000..c4032fc
--- /dev/null
+++ b/releng.wtpbuilder/distribution/patches32x.package/createziptasks.xml
@@ -0,0 +1,74 @@
+<project
+    name="mirrortasks">
+    <target
+        name="createCodeZip">
+        <ant
+            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            target="premirrortasks"/>
+        <p2.mirror
+            source="${buildDirectory}/${buildLabel}/repository"
+            destination="${tempRepo}"
+            log="${buildDirectory}/${buildLabel}/mirrorlog-${newarchiveName}.log"
+            verbose="true">
+            <slicingoptions
+                followstrict="true"
+                includeNonGreedy="false"
+                includeOptional="false"/>
+            <iu 
+                id="org.eclipse.wst.common_core.feature.patch.feature.group"/>
+        </p2.mirror>
+        <ant
+            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            target="postmirrortasks"/>
+    </target>
+	
+    <target
+        name="createSDKZip">
+        <ant
+            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            target="premirrortasks"/>
+        <p2.mirror
+            source="${buildDirectory}/${buildLabel}/repository"
+            destination="${tempRepo}"
+            log="${buildDirectory}/${buildLabel}/mirrorlog-${newarchiveName}.log"
+            verbose="true">
+            <slicingoptions
+                followstrict="true"
+                includeNonGreedy="false"
+                includeOptional="false"/>
+            <iu
+                id="org.eclipse.wst.common_SDK.feature.patch.feature.group"/>
+        </p2.mirror>
+        <ant
+            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            target="postmirrortasks"/>
+    </target>
+    <target
+        name="createTestZip">
+    	
+    	<!--
+        <ant
+            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            target="premirrortasks"/>
+        <p2.mirror
+            source="${buildDirectory}/${buildLabel}/repository"
+            destination="${tempRepo}"
+            log="${buildDirectory}/${buildLabel}/mirrorlog-${newarchiveName}.log"
+            verbose="true">
+            <slicingoptions
+                followstrict="true"
+                includeNonGreedy="false"
+                includeOptional="false"/>
+        	
+            <iu
+                id="org.eclipse.wst.jsdt_tests.feature.feature.group"/>
+                
+        </p2.mirror>
+        <ant
+            antfile="${wtp.builder.home}/distribution/wtp.build/ziputils.xml"
+            target="postmirrortasks"/>
+    	
+    	-->
+    	
+    </target>
+</project>
\ No newline at end of file