move to improved p2 functions
diff --git a/releng.wtpbuilder/build.properties b/releng.wtpbuilder/build.properties
index bdb8ed1..e7f4306 100644
--- a/releng.wtpbuilder/build.properties
+++ b/releng.wtpbuilder/build.properties
@@ -43,3 +43,5 @@
 flattenDependencies=true
 parallelCompilation=true
 
+p2.gathering=true
+p2.build.repo=${buildDirectory}/${buildLabel}/${component}/repository
diff --git a/releng.wtpbuilder/scripts/build/buildutilities.xml b/releng.wtpbuilder/scripts/build/buildutilities.xml
index ce45838..e355ca0 100644
--- a/releng.wtpbuilder/scripts/build/buildutilities.xml
+++ b/releng.wtpbuilder/scripts/build/buildutilities.xml
@@ -219,17 +219,12 @@
             recreate zip file now, same name, traditional content, which
             is mix of folders and jars
         -->
-        <!--
-            explicitly exclude any features with assembly anywhere in
-            directory names, as these are just for controlling what's
-            built, and are not intended for delivery
-        -->
+
         <zip
             destfile="${buildDirectory}/${buildLabel}/${archiveName}"
             basedir="${tmpsite}/unpacked"
             update="false"
-            duplicate="preserve"
-            excludes="**/*assembly*/**"/>
+            duplicate="preserve"/>
         <!-- always produce checksum files for any zips produced -->
         <antcall
             target="createChecksums"/>
@@ -445,8 +440,6 @@
             overwrite="false">
             <fileset
                 dir="${tmpsite}/eclipse">
-                <exclude
-                    name="**/*assembly*/**"/>
             </fileset>
         </copy>
         <mkdir
@@ -456,8 +449,6 @@
             overwrite="false">
             <fileset
                 dir="${tmpsite}/eclipse">
-                <exclude
-                    name="**/*assembly*/**"/>
             </fileset>
         </copy>
     </target>
@@ -544,108 +535,14 @@
 
         <!-- 1. Generate the P2 metadata -->
         <!--
-            ant version <p2.generator
-            updateSite="${buildDirectory}/${buildLabel}/${component}/repository"
-            compress="true"
-            metadataRepository="file:${buildDirectory}/${buildLabel}/${component}/repository"
-            artifactRepository="file:${buildDirectory}/${buildLabel}/${component}/repository"
-            metadataRepositoryName="Web Tools Platform Repository"
-            artifactRepositoryName="Web Tools Platform Repository"
-            noDefaultIUs="true"/>
+            initial generation now hanlded by 
+            p2.gathering=true
+            in build.properties
         -->
         <!--
-            java invocation version (Orbit had trouble running ant
-            version, so used direct java call
+              TODO: should "merge" component repos into main one here? 
         -->
         <!--
-            these shouldn't exist ... but, just in case something
-            changes in future we'll be sure
-        -->
-        <delete
-            quiet="true"
-            file="${buildDirectory}/${buildLabel}/${component}/repository/artifacts.jar"/>
-        <delete
-            quiet="true"
-            file="${buildDirectory}/${buildLabel}/${component}/repository/content.jar"/>
-        <java
-            jar="${eclipse.launcher}"
-            fork="true"
-            jvm="${env.JAVA_5_HOME}/bin/java"
-            failonerror="true"
-            maxmemory="512m"
-            dir="${buildDirectory}">
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <arg
-                line="-application org.eclipse.equinox.p2.metadata.generator.EclipseGenerator"/>
-            <arg
-                line="-consoleLog"/>
-            <arg
-                line="-nosplash"/>
-            <arg
-                line="--launcher.suppressErrors"/>
-            <arg
-                line="-metadataRepository file:${buildDirectory}/${buildLabel}/${component}/repository"/>
-            <arg
-                line="-artifactRepository file:${buildDirectory}/${buildLabel}/${component}/repository"/>
-            <arg
-                line="-metadataRepositoryName Web-Tools-Platform-${buildLabel}"/>
-            <arg
-                line="-artifactRepositoryName Web-Tools-Platform-${buildLabel}"/>
-            <arg
-                line="-updateSite ${buildDirectory}/${buildLabel}/${component}/repository"/>
-            <arg
-                line="-reusePack200Files"/>
-            <arg
-                line="-compress"/>
-            <arg
-                line="-noDefaultIUs"/>
-            <arg
-                line="-site file:${buildDirectory}/${buildLabel}/${component}/repository/site.xml"/>
-        </java>
-        <delete
-            quiet="true"
-            file="${buildDirectory}/${buildLabel}/repository/artifacts.jar"/>
-        <delete
-            quiet="true"
-            file="${buildDirectory}/${buildLabel}/repository/content.jar"/>
-        <java
-            jar="${eclipse.launcher}"
-            fork="true"
-            jvm="${env.JAVA_5_HOME}/bin/java"
-            failonerror="true"
-            maxmemory="512m"
-            dir="${buildDirectory}">
-            <jvmarg
-                value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <arg
-                line="-application org.eclipse.equinox.p2.metadata.generator.EclipseGenerator"/>
-            <arg
-                line="-consoleLog"/>
-            <arg
-                line="-nosplash"/>
-            <arg
-                line="--launcher.suppressErrors"/>
-            <arg
-                line="-metadataRepository file:${buildDirectory}/${buildLabel}/repository"/>
-            <arg
-                line="-artifactRepository file:${buildDirectory}/${buildLabel}/repository"/>
-            <arg
-                line="-metadataRepositoryName Web-Tools-Platform-${buildLabel}"/>
-            <arg
-                line="-artifactRepositoryName Web-Tools-Platform-${buildLabel}"/>
-            <arg
-                line="-updateSite ${buildDirectory}/${buildLabel}/repository"/>
-            <arg
-                line="-reusePack200Files"/>
-            <arg
-                line="-compress"/>
-            <arg
-                line="-noDefaultIUs"/>
-            <arg
-                line="-site file:${buildDirectory}/${buildLabel}/repository/site.xml"/>
-        </java>
-        <!--
             2. Create zip of P2 repo. Note we put it in
             'repoBaseLocation' for use by subsequent build steps TODO:
             investigate a location outside a per-build location