cleanup and simplify
diff --git a/releng.wtpbuilder/distribution/dali.build/build.xml b/releng.wtpbuilder/distribution/dali.build/build.xml
index d9f434d..ad8e953 100644
--- a/releng.wtpbuilder/distribution/dali.build/build.xml
+++ b/releng.wtpbuilder/distribution/dali.build/build.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project
     default="build"
     basedir=".">
@@ -5,9 +6,32 @@
         unless="wtp.builder.home"/>
     <property
         file="${wtp.builder.home}/build.properties"/>
+    <property
+        environment="env"/>
+
+	<!-- required to get proper value of doCreateFprojZips -->
+    <property
+        name="keyCfgFile"
+        value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
+    <echo
+        level="info"
+        message="keyCfgFile: ${keyCfgFile}"/>
+    <property
+        file="${keyCfgFile}"/>
+
+    <echo
+        message="transformedRepoLocation: ${transformedRepoLocation}"/>
+    <mkdir
+        dir="${transformedRepoLocation}"/>
+
+
+	<!-- main -->
     <target
-        name="build"
+        name="build" 
         depends="getBaseBuilder">
+
+        <echoproperties/>
+
         <dirname
             file="${ant.file}"
             property="distribution.wtp.build.dir"/>
@@ -22,31 +46,81 @@
             name="dependency.properties"
             value="${buildDirectory}/maps/${env.RELENGDALI}/maps/dependencies.properties"/>
 
-
         <ant
             antfile="${buildTargets}">
             <property
                 name="component"
-                value="dali"/>
+                value="${build.distribuion}-sdk"/>
         </ant>
         <ant
             antfile="${buildTargets}">
             <property
                 name="component"
-                value="dali-sdk"/>
-        </ant>
-        <ant
-            antfile="${buildTargets}">
-            <property
-                name="component"
-                value="dali.tests"/>
+                value="${build.distribuion}.tests"/>
             <property
                 name="eclipseBuildFailOnError"
                 value="false"/>
         </ant>
+
+    	<!-- copy early, if we can ... else site won't be created, if we fail -->
+        <ant
+            antfile="${wtp.builder.home}/scripts/build/copyArtifactsEarly.xml"/>
+
         <antcall
-            target="package"/>
+            target="handleCompilationProblems"/>
+
     </target>
+
+    <target
+        name="handleCompilationProblems"
+        depends="checkIfCompileProblems"
+        if="compilation.problem.found">
+
+    	<!-- if there is a problem, leave a marker file in download directory, so the webpage can 
+    	describe what happened -->
+
+        <echo
+            message="Compilation problems were found"
+            file="${buildDirectory}/${buildLabel}/compilationProblems.txt"/>
+
+       <!-- always force an early copy, before fail, so all results and files get to "downloads" area -->
+        <ant
+            antfile="${wtp.builder.home}/scripts/build/copyArtifactsEarly.xml"/>
+        <fail
+            if="compilation.problem.found"
+            message="The remaining build and tests were canceled since compilation problems were found."/>
+    </target>
+
+
+    <target
+        name="checkIfCompileProblems">
+       <!-- 
+       Not sure how reliable the presence of this 'compilation.problem' file is ... 
+                I just noticed it in recent PDE builds with compile problems. 
+                May have to make this "fancier" in future. 
+                For now, looks only one level down in plugins directory (in build's workdir) for a file with 
+                the name 'complilation.problem'. We may have a "summary" in xml file format, summarizing logs, 
+                 ... but not sure then created (during site? We'd have to call site first. This way, we'll see if the match :) . 
+-->
+        <available
+            file="compilation.problem"
+            type="file"
+            property="compilation.problem.found">
+            <filepath>
+                <dirset
+                    dir="${buildDirectory}">
+                    <include
+                        name="plugins/*"/>
+                </dirset>
+
+            </filepath>
+        </available>
+        <echo
+            message="compilation.problem path buildDirectory: ${buildDirectory}/plugins/*/"/>
+    </target>
+	
+	
+    <!-- invoking runbuild.xml targetting getBaseBuilder -->
     <target
         name="getBaseBuilder"
         if="eclipse.builder.fetch">
@@ -56,16 +130,11 @@
         <property
             name="buildTargets"
             value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
+        <echo
+            level="info"
+            message="invoking buildTargets: ${buildTargets} -> getBaseBuilder"/>
         <ant
             antfile="${buildTargets}"
             target="getBaseBuilder"/>
     </target>
-    <target
-        name="package">
-        <!--
-            post, post packaging, for WTP ... "manually" assemble the
-            desired zips
-        -->
-        <!-- nothing to assemble right now -->
-    </target>
 </project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/distribution/dali.tests/build.xml b/releng.wtpbuilder/distribution/dali.tests/build.xml
index 8a2bfa2..7cf6ea8 100644
--- a/releng.wtpbuilder/distribution/dali.tests/build.xml
+++ b/releng.wtpbuilder/distribution/dali.tests/build.xml
@@ -18,15 +18,12 @@
         name="keyCfgFile"
         value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg"/>
     <echo
-        level="debug"
+        level="info"
         message="keyCfgFile: ${keyCfgFile}"/>
     <property
         file="${keyCfgFile}"/>
 
-    <!-- if not otherwise set, assume 'all' tests -->
-    <property
-        name="testTarget"
-        value="all"/>
+
     <!--
         typcially already set, but in case of standalone tests, may not
         be
@@ -87,8 +84,27 @@
         </copy>
         <echo
             message="BASEOS: ${env.BASEOS}   BASEWS: ${env.BASEWS}   BASEARCH: ${env.BASEARCH} "/>
+
+        <property
+            name="dependency.properties"
+            value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
+        <available
+            file="${dependency.properties}"
+            property="dependency.properties.exists"/>
+        <fail
+            message="dependency file not found: ${dependency.properties}"
+            unless="dependency.properties.exists"/>
+        <property
+            name="test.dependency"
+            value="${buildDirectory}/maps/${env.RELENG}/${testdependencyFileLocation}"/>
+        <available
+            file="${test.dependency}"
+            property="test.dependency.exists"/>
+        <fail
+            message="test dependency file not found: ${test.dependency}"
+            unless="test.dependency.exists"/>
         <ant
-            antfile="${test.component.dir}/testdependency.xml"
+            antfile="${test.dependency}"
             target="get">
             <property
                 name="dependency.properties"
@@ -190,10 +206,12 @@
             unless="expectedNumberOfLaunchers" />
         -->
         <!--
-            Remember: using -debug for org.eclipse.ant.core.antRunner
+            Remember: using dash 'debug' for org.eclipse.ant.core.antRunner
             produces ant debug info to be output ... which is a TON of
-            stuff
+            stuff. Even 'verbose' is a bit too much.
         -->
+        <echo
+            message="eclipse.launcher: ${eclipse.launcher}"/>
         <java
             taskname="unit-test-masterprocess"
             fork="true"
@@ -287,13 +305,7 @@
             <jvmarg
                 value="-DtestDir=${testRoot}"/>
             <jvmarg
-                value="-Dperf.buildId=${buildType}${date}-${time}"/>
-            <jvmarg
                 value="-DeclipseBuilderDirectory=${pde.builder.path}"/>
-            <jvmarg
-                value="-DbuildLabel=${buildLabel}"/>
-            <jvmarg
-                value="-Dplugin-path=${plugin-path}"/>
         </java>
         <echo
             message="wtpmasterjunitresult ${wtpmasterjunitresult}"/>
diff --git a/releng.wtpbuilder/distribution/jsdt.build/build.xml b/releng.wtpbuilder/distribution/jsdt.build/build.xml
index 8293e34..2b110d1 100644
--- a/releng.wtpbuilder/distribution/jsdt.build/build.xml
+++ b/releng.wtpbuilder/distribution/jsdt.build/build.xml
@@ -38,29 +38,24 @@
         <property
             name="buildTargets"
             value="${wtp.builder.home}/scripts/build/runbuild.xml"/>
+        <ant
+            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
 
         <property
             name="dependency.properties"
             value="${buildDirectory}/maps/${env.RELENG}/${dependencyFileLocation}"/>
 
-        <!-- calling label.xml to createg label.properties file -->
-        <ant
-            antfile="${wtp.builder.home}/scripts/build/label.xml"/>
-        <echo
-            level="info"
-            message="invoking buildTargets: ${buildTargets} to build for each component"/>
-
         <ant
             antfile="${buildTargets}">
             <property
                 name="component"
-                value="jsdt_sdk"/>
+                value="${build.distribuion}-sdk"/>
         </ant>
         <ant
             antfile="${buildTargets}">
             <property
                 name="component"
-                value="jsdt_tests"/>
+                value="${build.distribuion}.tests"/>
             <property
                 name="eclipseBuildFailOnError"
                 value="false"/>
diff --git a/releng.wtpbuilder/distribution/jsdt.tests/build.xml b/releng.wtpbuilder/distribution/jsdt.tests/build.xml
index 661f3fd..15f20cb 100644
--- a/releng.wtpbuilder/distribution/jsdt.tests/build.xml
+++ b/releng.wtpbuilder/distribution/jsdt.tests/build.xml
@@ -257,8 +257,7 @@
         <property
             name="test-vm"
             value="${env.JAVA_6_HOME}/bin/java"/>
-
-       <!--
+        <!--
             set path to eclipse folder. If local folder, use '.';
             otherwise, use c:\path\to\eclipse or /path/to/eclipse/
         -->
@@ -278,6 +277,7 @@
             <isset
                 property="testBundle"/>
         </condition>
+
         <echo
             message="Running junits"/>
         <!--
@@ -394,11 +394,6 @@
                 value="-DtestDir=${testRoot}"/>
             <jvmarg
                 value="-DeclipseBuilderDirectory=${pde.builder.path}"/>
-            <!--
-                <!- - IBM_JAVA_OPTIONS contains JIT work arounds for bug
-                284441 - -> <env key="IBM_JAVA_OPTIONS"
-                value="-Xjit:{org/eclipse/wst/html/core/internal/contenttype/HTMLHeadTokenizer.primGetNextToken()Ljava/lang/String;}(disableLookahead),{org/eclipse/jst/jsp/core/internal/parser/internal/JSPTokenizer.primGetNextToken()Ljava/lang/String;}(disableLookahead)"/>
-            -->
         </java>
         <echo
             message="wtpmasterjunitresult ${wtpmasterjunitresult}"/>