move to improved p2 functions
diff --git a/releng.wtpbuilder/distribution/patches312.site/staticDropFiles/miscUtil.php b/releng.wtpbuilder/distribution/patches312.site/staticDropFiles/miscUtil.php
index 32754b8..2f7a4b2 100644
--- a/releng.wtpbuilder/distribution/patches312.site/staticDropFiles/miscUtil.php
+++ b/releng.wtpbuilder/distribution/patches312.site/staticDropFiles/miscUtil.php
@@ -37,11 +37,11 @@
 function displayFileLine($downloadprefix, $filename, $zipfilesize, $fileShortDescription) {
 	echo "<td align=\"right\" valign=\"top\" width=\"15%\">";
 	echo "<a href=\"$downloadprefix$filename\">" . $fileShortDescription . "</a>";
-	echo "</td><td align=\"right\" valign=\"top\" width=\"3%\">";
+	echo "</td><td align=\"right\" valign=\"top\" width=\"2%\">";
 	echo $zipfilesize;
 	echo "</td>";
-	echo "<td align=\"right\" valign=\"top\" width=\"9%\">";
-	echo "[<a href=\"checksum/$filename.md5\">md5</a>] [<a href=\"checksum/$filename.sha1\">sha1</a>]";
+	echo "<td align=\"right\" valign=\"top\" width=\"7%\">";
+	echo "[<a href=\"checksum/$filename.md5\">md5</a>][<a href=\"checksum/$filename.sha1\">sha1</a>]";
 	echo "</td>";
 }
 
diff --git a/releng.wtpbuilder/scripts/build/buildutilitiesp2.xml b/releng.wtpbuilder/scripts/build/buildutilitiesp2.xml
index b876770..bd1aa69 100644
--- a/releng.wtpbuilder/scripts/build/buildutilitiesp2.xml
+++ b/releng.wtpbuilder/scripts/build/buildutilitiesp2.xml
@@ -106,13 +106,14 @@
             <property
                 name="archiveName"
                 value="temp-${buildLabel}-${component}.zip"/>
+            	
         </ant>
         <unzip
             dest="${buildDirectory}/${buildLabel}/${component}/repository/"
             src="${buildDirectory}/${buildLabel}/temp-${buildLabel}-${component}.zip"
             overwrite="true">
-            <exclude
-                name="pack.properties"/>
+        	<patternset excludes="pack.properties" />
+        	
         </unzip>
 
 
@@ -231,72 +232,8 @@
         <echo
             message="doP2Repo: ${doP2Repo}"/>
     </target>
-    <target
-        name="normalizeJarFiles"
-        if="doNormalize"
-        depends="init">
-        <!--
-            stick with JAVA5 for signing/packing for now ... I've heard
-            rumors of some 'compatibility' issues with JAVA6?
-        -->
-        <echo
-            message="Starting normalizeJarFiles"/>
-        <echo
-            message="archiveDir: ${archiveDir}"/>
-        <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="${logIfDebug}"/>
-            <arg
-                line="-application org.eclipse.update.core.siteOptimizer"/>
-            <!--
-                note: this -processAll option is critical in this first
-                step. For various reasons, jarProcessor is written to
-                not act on any jar if the jar is not "marked", or if not
-                told explicitly to to processAll. There are ways where
-                not all are literally processed, such as using
-                pack.properties (and others, see
-                http://wiki.eclipse.org/JarProcessor_Options).
-            -->
-            <arg
-                line="-jarProcessor ${verboseIfDebug} -processAll -outputDir ${archiveDir}  -repack ${buildDirectory}/${buildLabel}/${archiveName}"/>
-        </java>
-    </target>
-    <target
-        name="createPackFilesIfDesired"
-        if="doPack"
-        depends="init">
-        <!--
-            stick with JAVA5 for signing/packing for now ... there are
-            'compatibility' issues with JAVA6?
-        -->
-        <java
-            jar="${pde.builder.path}/plugins/org.eclipse.equinox.launcher.jar"
-            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="${logIfDebug}"/>
-            <arg
-                line="-application org.eclipse.update.core.siteOptimizer"/>
-            <arg
-                line="-jarProcessor  ${verboseIfDebug} -outputDir ${buildDirectory}/${buildLabel}/${component}/repository -pack ${buildDirectory}/${buildLabel}/${component}/repository"/>
-        </java>
-
-        <!-- TODO: need to udpate meta data! -->
-    </target>
-    <!--
+   
+       <!--
         always make copy, since normally either normalized, or signed
         (and normalized) TODO: (minor) tiny improvement in efficiency
         could be made, for N-builds?, that are neither normalized nor