generate P2 repos
diff --git a/releng.wtpbuilder/distribution/wtp.build/build.xml b/releng.wtpbuilder/distribution/wtp.build/build.xml
index 8f817c4..69ec551 100644
--- a/releng.wtpbuilder/distribution/wtp.build/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.build/build.xml
@@ -52,18 +52,21 @@
             antfile="${buildTargets}"> <property name="component"
             value="xml" /> </ant>
         -->
+    	
         <ant
             antfile="${buildTargets}">
             <property
                 name="component"
                 value="wst"/>
         </ant>
+         
         <ant
             antfile="${buildTargets}">
             <property
                 name="component"
                 value="wst-sdk"/>
         </ant>
+        	
         <ant
             antfile="${buildTargets}">
             <property
@@ -71,7 +74,7 @@
                 value="wst.tests"/>
             <property
                 name="eclipseBuildFailOnError"
-                value="false"/>
+                value="true"/>
         </ant>
 
         <ant
@@ -93,7 +96,7 @@
                 value="jst.tests"/>
             <property
                 name="eclipseBuildFailOnError"
-                value="false"/>
+                value="true"/>
         </ant>
 
         <ant
@@ -146,7 +149,7 @@
                 value="dali.tests"/>
             <property
                 name="eclipseBuildFailOnError"
-                value="false"/>
+                value="true"/>
         </ant>
 
         <!-- package -->
diff --git a/releng.wtpbuilder/distribution/wtp.tests/build.xml b/releng.wtpbuilder/distribution/wtp.tests/build.xml
index e2af86c..7fbc499 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/build.xml
@@ -247,7 +247,9 @@
                 value="-Dprojectname=${projectname}"/>
             <jvmarg
                 value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
-            <arg
+            <arg 
+               value="--launcher.suppressErrors"/>
+        	  <arg
                 value="-nosplash"/>
             <arg
                 value="-consolelog"/>
diff --git a/releng.wtpbuilder/scripts/build/buildutilities.xml b/releng.wtpbuilder/scripts/build/buildutilities.xml
index 204919e..0f0cb0b 100644
--- a/releng.wtpbuilder/scripts/build/buildutilities.xml
+++ b/releng.wtpbuilder/scripts/build/buildutilities.xml
@@ -102,12 +102,12 @@
             ==================================================================================
         -->
         <echo
-            level="debug"
+            level="info"
             message="normalize jars if desired ..."/>
         <antcall
             target="normalizeJarFiles"/>
         <echo
-            level="debug"
+            level="info"
             message="normalized jars: ${normalizeJarFiles}"/>
         <!--
             ==================================================================================
@@ -124,20 +124,26 @@
             ==================================================================================
         -->
         <echo
-            level="debug"
+            level="info"
             message="unzip normalized update jars to a holding place"/>
         <echo
             level="info"
+            message="tmpsite: ${tmpsite}"/>  
+         <echo
+            level="info"
             message="archiveDir: ${archiveDir}"/>
+         <echo
+            level="info"
+            message="archiveName: ${archiveName}"/>    
         <unzip
             dest="${tmpsite}"
             src="${archiveDir}/${archiveName}"/>
         <!--
             ==================================================================================
-            5 copy all update jars to a common update site directory, if
-            desired. Note: overwite is false to avoid "touching" files
-            already produced and processed by previous steps in a larger
-            build process. This means the updateSite *must* be
+            5. copy all update jars to a common update site directory,
+            if desired. Note: overwite is false to avoid "touching"
+            files already produced and processed by previous steps in a
+            larger build process. This means the updateSite *must* be
             completely clean before the larger process starts.
             ==================================================================================
         -->
@@ -155,18 +161,18 @@
             ==================================================================================
         -->
         <echo
-            level="debug"
+            level="info"
             message="create pack files if desired ..."/>
         <antcall
             target="createPackFilesIfDesired"/>
         <echo
-            level="debug"
+            level="info"
             message="created pack files: ${packJarFiles}"/>
             
             
         <!-- 6b. now generate P2 meta data for that P2 repo -->
         <echo
-            level="debug"
+            level="info"
             message="Generating p2 metadata for P2 repo."/>
         <antcall
             target="generateP2Metadata"/>    
@@ -310,11 +316,16 @@
         <echo
             message="doPack: ${doPack}"/>
         <echo
+            message="packJarFiles: ${packJarFiles}"/>
+        <echo
             message="normalizeJarFiles: ${normalizeJarFiles}"/>
         <echo
             message="doSign: ${doSign}"/>
         <echo
             message="doNormalize: ${doNormalize}"/>
+        <echo
+            message="doP2Repo: ${doP2Repo}" />    
+            
     </target>
     <target
         name="deleteTmpSite"
@@ -330,12 +341,14 @@
             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="256m"
+            maxmemory="512m"
             dir="${buildDirectory}">
             <jvmarg
                 value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
@@ -369,7 +382,7 @@
             fork="true"
             jvm="${env.JAVA_5_HOME}/bin/java"
             failonerror="true"
-            maxmemory="256m"
+            maxmemory="512m"
             dir="${buildDirectory}">
             <jvmarg
                 value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
@@ -478,28 +491,19 @@
     <!-- Call the p2 metadata generator on the update site. -->
     <!-- TODO: do we need to pack200 files first? (create gz files?) -->
     <target
-        name="generateP2Metadata">
+        name="generateP2Metadata"
+        depends="init"
+        if="doP2Repo">
 
-        <!-- ant version 
-        <p2.generator
-            updateSite="${buildDirectory}/${buildLabel}/updateSite"
-            compress="true"
-            metadataRepository="file:${buildDirectory}/${buildLabel}/updateSite"
-            artifactRepository="file:${buildDirectory}/${buildLabel}/updateSite"
-            metadataRepositoryName="Web Tools Platform Repository"
-            artifactRepositoryName="Web Tools Platform Repository"
-            noDefaultIUs="true"/>
-        -->
-        <!--
-            java invocation version (Orbit had trouble running ant
-            version, so used direct java call
-        -->
+
+        <!-- 1. Generate the P2 metadata -->
+
         <java
             jar="${eclipse.launcher}"
             fork="true"
             jvm="${env.JAVA_5_HOME}/bin/java"
             failonerror="true"
-            maxmemory="256m"
+            maxmemory="512m"
             dir="${buildDirectory}">
             <jvmarg
                 value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}"/>
@@ -527,6 +531,8 @@
                 line="-compress"/>
             <arg
                 line="-noDefaultIUs"/>
+            <arg
+                line="-site file:${buildDirectory}/${buildLabel}/updateSite/site.xml"/>
         </java>
         
     </target>
diff --git a/releng.wtpbuilder/scripts/build/runbuild.xml b/releng.wtpbuilder/scripts/build/runbuild.xml
index f121b3a..0a7a735 100644
--- a/releng.wtpbuilder/scripts/build/runbuild.xml
+++ b/releng.wtpbuilder/scripts/build/runbuild.xml
@@ -348,6 +348,8 @@
     	  <fail message="dependancy.properties must be specified by distribution script"
     	      unless="dependency.properties" />
 
+
+    	
 		<!-- if not otherwise set "externally", set the classpath jars for 
             the Execution Envirnonments we need in WTP. 
             And other parameters we need set. 
@@ -429,7 +431,9 @@
                 value="-Declipse.builder=${eclipse.builder}" />
             <jvmarg
                 value="-Dprojectname=${projectname}" />
-            <jvmarg
+          <jvmarg
+              value="-DbuildLabel=${buildLabel}" />
+           <jvmarg
                 value="-Dreleng.jsf-mapVersionTag=${releng.jsf-mapVersionTag}" />
             <jvmarg
                 value="-Dreleng.dali-mapVersionTag=${releng.dali-mapVersionTag}" />
@@ -442,8 +446,6 @@
         	  <jvmarg
         	      value="-Ddependency.properties=${dependency.properties}" />
             <jvmarg
-                value="-Dbasebiulder.path=${basebuilder.path}" />
-            <jvmarg
                 value="-DwtpBuildTools.file=${wtpBuildTools.file}" />
             <jvmarg
                 value="-Djava.io.tmpdir=${env.RECOMMENDED_TMP_DIR}" />