Add HTTP access checking for JUnit tests
diff --git a/releng.wtpbuilder/distribution/patches.tests/build.xml b/releng.wtpbuilder/distribution/patches.tests/build.xml
index e1844ab..9a50776 100644
--- a/releng.wtpbuilder/distribution/patches.tests/build.xml
+++ b/releng.wtpbuilder/distribution/patches.tests/build.xml
@@ -186,6 +186,12 @@
             <jvmarg
                 value="-Declipse.launcher=${testRoot}/eclipse/startup.jar" />
 
+           <jvmarg
+                value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol" />
+            <jvmarg
+                value="-DurlLogLocation=${buildDirectory}/fromtestsoutgoinghttp.log" />
+
+
             <jvmarg value="-Dosgi.ws=${env.BASEWS}" />
             <jvmarg value="-Dosgi.os=${env.BASEOS}" />
             <jvmarg value="-Dosgi.arch=${env.BASEARCH}" />
diff --git a/releng.wtpbuilder/distribution/wtp.site/build.xml b/releng.wtpbuilder/distribution/wtp.site/build.xml
index a4fd72d..4e208bb 100644
--- a/releng.wtpbuilder/distribution/wtp.site/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.site/build.xml
@@ -36,6 +36,11 @@
             <jvmarg value="-Dbuild.distribution=${build.distribution}" />
             <jvmarg value="-DbuildDirectory=${buildDirectory}" />
             <jvmarg value="-Dwtp.builder.home=${wtp.builder.home}" />
+          <jvmarg
+               value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol" />
+           <jvmarg
+               value="-DurlLogLocation=${buildDirectory}/fromsiteoutgoinghttp.log" />
+
             <arg value="-data" />
             <arg value="${basedir}/workspace" />
             <arg value="-application" />
diff --git a/releng.wtpbuilder/distribution/wtp.tests/build.xml b/releng.wtpbuilder/distribution/wtp.tests/build.xml
index ccfce64..c053145 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/build.xml
@@ -6,8 +6,8 @@
         some variables, e.g. ones we set, since properties are case sensitive, even if
         the environment variables on your operating system are not, e.g. it will
         be ${env.Path} not ${env.PATH} on Windows -->
-    <property environment="env" />
-
+    <property
+        environment="env" />
     <fail
         message="testRoot must be set for this task"
         unless="testRoot" />
@@ -15,7 +15,8 @@
     <!-- ===================================================================== -->
     <!-- Steps to do after the build is done. -->
     <!-- ===================================================================== -->
-    <target name="test">
+    <target
+        name="test">
         <dirname
             file="${ant.file}"
             property="currentDirectory" />
@@ -28,39 +29,43 @@
     <!-- ===================================================================== -->
     <!-- Steps to do to test the build results -->
     <!-- ===================================================================== -->
-    <target name="runTest">
-
+    <target
+        name="runTest">
         <dirname
             file="${ant.file}"
             property="test.component.dir" />
-        <ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
-        <property file="${buildDirectory}/label.properties" />
-        <property file="${wtp.builder.home}/build.properties" />
-
+        <ant
+            antfile="${wtp.builder.home}/scripts/build/label.xml" />
+        <property
+            file="${buildDirectory}/label.properties" />
+        <property
+            file="${wtp.builder.home}/build.properties" />
         <fail
             message="testRoot must be set for this task"
             unless="testRoot" />
-        <mkdir dir="${testRoot}" />
+        <mkdir
+            dir="${testRoot}" />
 
         <!-- if results already exist, delete them -->
         <delete
             dir="${testRoot}/results"
             failOnError="false" />
-        <mkdir dir="${testRoot}/results" />
-
-        <mkdir dir="${testRoot}/results/consolelogs" />
-        <mkdir dir="${testRoot}/results/consolelogs/metadata-logs" />
-        <mkdir dir="${testRoot}/results/consolelogs/configuration-logs" />
-
+        <mkdir
+            dir="${testRoot}/results" />
+        <mkdir
+            dir="${testRoot}/results/consolelogs" />
+        <mkdir
+            dir="${testRoot}/results/consolelogs/metadata-logs" />
+        <mkdir
+            dir="${testRoot}/results/consolelogs/configuration-logs" />
         <copy
             todir="${testRoot}"
             overwrite="true">
-            <fileset dir="${test.component.dir}/testScripts"></fileset>
+            <fileset
+                dir="${test.component.dir}/testScripts"></fileset>
         </copy>
-
         <echo
             message="BASEOS: ${env.BASEOS}   BASEWS: ${env.BASEWS}   BASEARCH: ${env.BASEARCH} " />
-
         <ant
             antfile="${test.component.dir}/testdependency.xml"
             target="get">
@@ -71,23 +76,23 @@
                 name="base.install.dir"
                 value="${testRoot}" />
         </ant>
-
-        <antcall target="unzipTests" />
-
-        <antcall target="runTestEclipse">
+        <antcall
+            target="unzipTests" />
+        <antcall
+            target="runTestEclipse">
             <param
                 name="testTarget"
                 value="all" />
         </antcall>
-        <antcall target="postRunTestEclipse">
+        <antcall
+            target="postRunTestEclipse">
             <param
                 name="testTarget"
                 value="all" />
         </antcall>
-
     </target>
-
-    <target name="unzipTests">
+    <target
+        name="unzipTests">
 
         <!--unzip the builds and junit tests
             we use 'unzip' here, so we can continue on error
@@ -97,9 +102,9 @@
             dir="${buildDirectory}/${buildLabel}"
             executable="unzip"
             failonerror="false">
-            <arg line="-o -qq wtp-sdk-${buildLabel}.zip -d ${testRoot}" />
+            <arg
+                line="-o -qq wtp-sdk-${buildLabel}.zip -d ${testRoot}" />
         </exec>
-
         <exec
             dir="${buildDirectory}/${buildLabel}"
             executable="unzip"
@@ -114,8 +119,6 @@
             <arg
                 line="-o -qq wtp-jst-Automated-Tests-${buildLabel}.zip -d ${testRoot}" />
         </exec>
-
-
         <exec
             dir="${buildDirectory}/${buildLabel}"
             executable="unzip"
@@ -130,7 +133,6 @@
             <arg
                 line="-o -qq wtp-jpt-Automated-Tests-${buildLabel}.zip -d ${testRoot}" />
         </exec>
-
     </target>
 
     <!-- time out may need to be set/adjust for api or performance tests?
@@ -143,19 +145,15 @@
         1800000: 30 minutes
         600000: 10 minutes
     -->
-
     <property
         name="testTimeLimit"
         value="7200000" />
     <property
         name="testFailOnError"
         value="false" />
-
     <target
         name="runTestEclipse"
         description="Run our JUnit's within an instance of antRunner">
-
-
         <property
             name="test-vm"
             value="${env.JAVA_5_HOME}/bin/java" />
@@ -171,8 +169,8 @@
         <property
             name="eclipse.home"
             value="${testRoot}" />
-
-        <echo message="Running junits" />
+        <echo
+            message="Running junits" />
 
         <!-- If there is not exactly one launcher in the stack, 
             we'd best fail fast, since we are not expecting that, 
@@ -204,38 +202,62 @@
             jvm="${env.JAVA_5_HOME}/bin/java"
             classname="org.eclipse.equinox.launcher.Main">
             <classpath>
-                <fileset dir="${testRoot}/eclipse/plugins">
-                    <include name="org.eclipse.equinox.launcher_*.jar" />
+                <fileset
+                    dir="${testRoot}/eclipse/plugins">
+                    <include
+                        name="org.eclipse.equinox.launcher_*.jar" />
                 </fileset>
             </classpath>
-
-            <jvmarg value="-Xms256m" />
-            <jvmarg value="-Xmx512m" />
-
-            <jvmarg value="-Dosgi.ws=${env.BASEWS}" />
-            <jvmarg value="-Dosgi.os=${env.BASEOS}" />
-            <jvmarg value="-Dosgi.arch=${env.BASEARCH}" />
-            <jvmarg value="-Dws=${env.BASEWS}" />
-            <jvmarg value="-Dos=${env.BASEOS}" />
-            <jvmarg value="-Darch=${env.BASEARCH}" />
-
-            <jvmarg value="-Dosgi.clean=true" />
-            <jvmarg value="-Dnoclean=true" />
-            <jvmarg value="-DbuildBranch=${buildBranch}" />
-            <jvmarg value="-DbuildType=${buildType}" />
-            <jvmarg value="-DbuildId=${buildId}" />
-
-            <arg value="-nosplash" />
-            <arg value="-consolelog" />
-
-            <arg value="-data" />
-            <arg value="${testRoot}/overallTestWorkspace" />
-            <arg value="-application" />
-            <arg value="org.eclipse.ant.core.antRunner" />
-            <arg value="-file" />
-            <arg value="${testRoot}/test.xml" />
-            <arg value="-logger" />
-            <arg value="org.apache.tools.ant.DefaultLogger" />
+            <jvmarg
+                value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol" />
+            <jvmarg
+                value="-DurlLogLocation=${buildDirectory}/fromtestsoutgoinghttp.log" />
+            <jvmarg
+                value="-Xms512m" />
+            <jvmarg
+                value="-Xmx1024m" />
+            <jvmarg
+                value="-Dosgi.ws=${env.BASEWS}" />
+            <jvmarg
+                value="-Dosgi.os=${env.BASEOS}" />
+            <jvmarg
+                value="-Dosgi.arch=${env.BASEARCH}" />
+            <jvmarg
+                value="-Dws=${env.BASEWS}" />
+            <jvmarg
+                value="-Dos=${env.BASEOS}" />
+            <jvmarg
+                value="-Darch=${env.BASEARCH}" />
+            <jvmarg
+                value="-Dosgi.clean=true" />
+            <jvmarg
+                value="-Dnoclean=true" />
+            <jvmarg
+                value="-DbuildBranch=${buildBranch}" />
+            <jvmarg
+                value="-DbuildType=${buildType}" />
+            <jvmarg
+                value="-DbuildId=${buildId}" />
+            <arg
+                value="-nosplash" />
+            <arg
+                value="-consolelog" />
+            <arg
+                value="-data" />
+            <arg
+                value="${testRoot}/overallTestWorkspace" />
+            <arg
+                value="-application" />
+            <arg
+                value="org.eclipse.ant.core.antRunner" />
+            <arg
+                value="-file" />
+            <arg
+                value="${testRoot}/test.xml" />
+            <arg
+                value="-logger" />
+            <arg
+                value="org.apache.tools.ant.DefaultLogger" />
             <env
                 key="DISPLAY"
                 value="${env.DISPLAY}" />
@@ -270,26 +292,29 @@
                 key="buildLabel"
                 value="${buildLabel}" />
         </java>
-
-        <echo message="wtpmasterjunitresult ${wtpmasterjunitresult}" />
+        <echo
+            message="wtpmasterjunitresult ${wtpmasterjunitresult}" />
     </target>
-
-
-    <target name="postRunTestEclipse">
+    <target
+        name="postRunTestEclipse">
         <copy
             todir="${buildDirectory}/${buildLabel}/testResults/consolelogs/testLogs"
             overwrite="true"
             failonerror="false">
-            <fileset dir="${testRoot}/results">
-                <include name="*output.txt" />
+            <fileset
+                dir="${testRoot}/results">
+                <include
+                    name="*output.txt" />
             </fileset>
         </copy>
         <copy
             todir="${buildDirectory}/${buildLabel}/testResults/consolelogs/testSysErrorLogs"
             overwrite="true"
             failonerror="false">
-            <fileset dir="${testRoot}/results">
-                <include name="*error.txt" />
+            <fileset
+                dir="${testRoot}/results">
+                <include
+                    name="*error.txt" />
             </fileset>
         </copy>
         <copy
@@ -304,24 +329,25 @@
             overwrite="true"
             failonerror="false">
         </copy>
-
         <copy
             todir="${buildDirectory}/${buildLabel}/testResults/xml"
             overwrite="true"
             failonerror="false">
-            <fileset dir="${testRoot}/results/xml">
-                <include name="*.xml" />
+            <fileset
+                dir="${testRoot}/results/xml">
+                <include
+                    name="*.xml" />
             </fileset>
         </copy>
         <copy
             todir="${buildDirectory}/${buildLabel}/testResults/html"
             overwrite="true"
             failonerror="false">
-            <fileset dir="${testRoot}/results/html">
-                <include name="*.html" />
+            <fileset
+                dir="${testRoot}/results/html">
+                <include
+                    name="*.html" />
             </fileset>
         </copy>
     </target>
-
-
-</project>
+</project>
\ No newline at end of file
diff --git a/releng.wtpbuilder/scripts/build/runbuild.xml b/releng.wtpbuilder/scripts/build/runbuild.xml
index ab36b40..78222b9 100644
--- a/releng.wtpbuilder/scripts/build/runbuild.xml
+++ b/releng.wtpbuilder/scripts/build/runbuild.xml
@@ -1,408 +1,269 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project
-    name="runbuild"
-    default="runbuild"
-    basedir=".">
+<project name="runbuild" default="runbuild" basedir=".">
 
-    <!-- = = = standard properties pattern = = = -->
-    <!-- 
+	<!-- = = = standard properties pattern = = = -->
+	<!-- 
         Note to be cross-platform, "environment variables" are only appropriate for 
         some variables, e.g. ones we set, since properties are case sensitive, even if 
         the environment variables on your operating system are not, e.g. it will 
         be ${env.Path} not ${env.PATH} on Windows -->
-    <property environment="env" />
+	<property environment="env" />
 
-    <!-- 
+	<!-- 
         Let users override standard properties, if desired.
         If directory, file, or some properties do not exist,  
         then standard properties will be used.
     -->
-    <property
-        file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties" />
+	<property file="${env.LOCAL_BUILD_PROPERTIES_DIR}/${ant.project.name}.properties" />
 
-    <!-- = = = end standard properties pattern = = = -->
-  <fail unless="env.BUILD_HOME" message="all scripts need a BUILD_HOME" />
+	<!-- = = = end standard properties pattern = = = -->
+	<fail unless="env.BUILD_HOME" message="all scripts need a BUILD_HOME" />
 
-  <echo
-      level="info"
-      message="buildDirectory: ${buildDirectory}" />
-	
+	<echo level="info" message="buildDirectory: ${buildDirectory}" />
+
 	<property name="keyCfgFile" value="${env.PROJECT_BUILDERS}/${projectname}/${env.RELENG}/maps/build.cfg" />
 	<echo message="keyCfgFile: ${keyCfgFile}" />
-  <property
-      file="${keyCfgFile}" />
-	  <fail unless="builderVersion" message="Could not get builderVersion. Probably could not checkout build.cfg?" />
-    <fail unless="eclipse.builder.version" message="Could not get eclipse.builder.version. Perhaps an old format build.cfg?" />
+	<property file="${keyCfgFile}" />
+	<fail unless="builderVersion" message="Could not get builderVersion. Probably could not checkout build.cfg?" />
+	<fail unless="eclipse.builder.version" message="Could not get eclipse.builder.version. Perhaps an old format build.cfg?" />
 
-    <property
-        name="basebuilder.path"
-        value="${env.BASE_BUILDERS}/${eclipse.builder.version}" />
+	<property name="basebuilder.path" value="${env.BASE_BUILDERS}/${eclipse.builder.version}" />
 
 
 
-    <!-- if not explicitly set by caller, we'll assume we should fail 
+	<!-- if not explicitly set by caller, we'll assume we should fail 
         here on errors. In some cases, such as JUnit test compiles, or 
         even leaf components, the caller may want to set to false, so that 
         some part of the build is still made available -->
-    <property
-        name="eclipseBuildFailOnError"
-        value="true" />
+	<property name="eclipseBuildFailOnError" value="true" />
 
 
-    <target name="runbuild">
-        <dirname
-            file="${ant.file}"
-            property="scripts.build.dir" />
-        <property
-            name="wtp.builder.home"
-            value="${scripts.build.dir}/../../.." />
+	<target name="runbuild">
+		<dirname file="${ant.file}" property="scripts.build.dir" />
+		<property name="wtp.builder.home" value="${scripts.build.dir}/../../.." />
 
-        <antcall target="runEclipseBuild">
-           
-        </antcall>
-        <antcall target="runEclipseBuildStamped">
-            
-        </antcall>
-    </target>
+		<antcall target="runEclipseBuild">
+
+		</antcall>
+		<antcall target="runEclipseBuildStamped">
+
+		</antcall>
+	</target>
 
 
 
-    <target
-        name="build"
-        depends="init">
+	<target name="build" depends="init">
 
-        <!--this property required as of Eclipse 3.0 stream builds > 20031126 -->
-        <property
-            name="buildingOSGi"
-            value="true" />
+		<!--this property required as of Eclipse 3.0 stream builds > 20031126 -->
+		<property name="buildingOSGi" value="true" />
 
-        <!-- this generateFeatureVersionSuffix property causes feature 
+		<!-- this generateFeatureVersionSuffix property causes feature 
             suffixes to be calcuated based on their 
             own CVS tag, plus the qualifier of their contained plugins -->
-        <!-- 
+		<!-- 
             https://bugs.eclipse.org/bugs/show_bug.cgi?id=138825
             false for builds intended for 3.1.2, since can generate underscores
             true for builds instended for 3.2
         -->
-        <property
-            name="generateFeatureVersionSuffix"
-            value="true" />
+		<property name="generateFeatureVersionSuffix" value="true" />
 
-        <property
-            name="outputUpdateJars"
-            value="true" />
+		<property name="outputUpdateJars" value="true" />
 
-        <property
-            name="runPackager"
-            value="true" />
+		<property name="runPackager" value="true" />
 
-        <!--run the build for the specified component-->
-        <echo
-            level="debug"
-            message="basedir: ${basedir}" />
-        <echo
-            level="debug"
-            message="component: ${component}" />
-        <echo
-            level="debug"
-            message="buildDirectory: ${buildDirectory}" />
-        <echo
-            level="debug"
-            message="wtp.builder.home: ${wtp.builder.home}" />
-        <echo
-            level="debug"
-            message="buildBranch: ${buildBranch}" />
+		<!--run the build for the specified component-->
+		<echo level="debug" message="basedir: ${basedir}" />
+		<echo level="debug" message="component: ${component}" />
+		<echo level="debug" message="buildDirectory: ${buildDirectory}" />
+		<echo level="debug" message="wtp.builder.home: ${wtp.builder.home}" />
+		<echo level="debug" message="buildBranch: ${buildBranch}" />
 
-        <fail unless="buildBranch" />
+		<fail unless="buildBranch" />
 
-        <ant
-            antfile="build.xml"
-            dir="${pde.build.scripts}">
-            <property
-                name="builder"
-                value="${wtp.builder.home}/components/${component}" />
-            <property
-                name="wtp.builder.home"
-                value="${wtp.builder.home}" />
-            <property
-                name="buildBranch"
-                value="${buildBranch}" />
-            <property
-                name="dependencyTargets"
-                value="${wtp.builder.home}/scripts/dependency/build.xml" />
-            <property
-                name="local.cache.dir"
-                value="${env.LOCAL_PREREQS_CACHE}" />
-            <property
-                name="baseLocation"
-                value="${env.PROJECT_PROJECTS}/${projectname}/eclipse" />
-            <property
-                name="buildRoot"
-                value="${env.PROJECT_PROJECTS}/${projectname}" />
-            <property
-                name="testRoot"
-                value="${env.PROJECT_TESTS}/${projectname}" />
-            <property
-                name="performanceRoot"
-                value="${env.BUILD_HOME}/${build.perf.tests}-${buildType}" />
-        </ant>
-    </target>
+		<ant antfile="build.xml" dir="${pde.build.scripts}">
+			<property name="builder" value="${wtp.builder.home}/components/${component}" />
+			<property name="wtp.builder.home" value="${wtp.builder.home}" />
+			<property name="buildBranch" value="${buildBranch}" />
+			<property name="dependencyTargets" value="${wtp.builder.home}/scripts/dependency/build.xml" />
+			<property name="local.cache.dir" value="${env.LOCAL_PREREQS_CACHE}" />
+			<property name="baseLocation" value="${env.PROJECT_PROJECTS}/${projectname}/eclipse" />
+			<property name="buildRoot" value="${env.PROJECT_PROJECTS}/${projectname}" />
+			<property name="testRoot" value="${env.PROJECT_TESTS}/${projectname}" />
+			<property name="performanceRoot" value="${env.BUILD_HOME}/${build.perf.tests}-${buildType}" />
+		</ant>
+	</target>
 
-    <target
-        name="checkBaseBuilder"
-        depends="checkWTPBaseBuilder">
+	<target name="checkBaseBuilder" depends="checkWTPBaseBuilder">
 
-        <!-- we just check if both base, and our wtp specific one are current, if 
+		<!-- we just check if both base, and our wtp specific one are current, if 
             either is not, we'll get them both -->
 
-        <condition property="basebuilderlocal">
-            <and>
-                <available file="${pde.builder.path}" />
-                <!-- should we check explicitly for "true" instead of just isset? 
+		<condition property="basebuilderlocal">
+			<and>
+				<available file="${pde.builder.path}" />
+				<!-- should we check explicitly for "true" instead of just isset? 
                     either should work for this case, but which is better ant style? -->
-                <isset property="wtpBuilderPresent" />
-            </and>
-        </condition>
-        <echo message="basebuilderlocal: ${basebuilderlocal}" />
-        <echo message="wtpBuilderPresent: ${wtpBuilderPresent}" />
+				<isset property="wtpBuilderPresent" />
+			</and>
+		</condition>
+		<echo message="basebuilderlocal: ${basebuilderlocal}" />
+		<echo message="wtpBuilderPresent: ${wtpBuilderPresent}" />
 
-    </target>
+	</target>
 
-    <target
-        name="getBaseBuilder"
-        depends="init,checkBaseBuilder"
-        unless="basebuilderlocal">
-        <!-- ***  change the repo info -->
-        <property
-            name="builderCvsRoot"
-            value=":pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse" />
+	<target name="getBaseBuilder" depends="init,checkBaseBuilder" unless="basebuilderlocal">
+		<!-- ***  change the repo info -->
+		<property name="builderCvsRoot" value=":pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse" />
 
-        <!-- note: untagged or some default version of base builder is not good to use. 
+		<!-- note: untagged or some default version of base builder is not good to use. 
             in some cases, won't run at all, in the best of cases, will simply
             be unstable, so we'll fail if we forgot to specify it -->
-        <fail unless="eclipse.builder.version" />
-        <mkdir
-            dir="${env.BASE_BUILDERS}/${eclipse.builder.version}" />
-        <cvs
-            quiet="${env.CVS_QUIET}"
-            reallyquiet="${env.CVS_REALLY_QUIET}"
-            cvsRoot="${builderCvsRoot}"
-            package="${eclipse.builder}"
-            dest="${basebuilder.path}"
-            tag="${eclipse.builder.version}" />
+		<fail unless="eclipse.builder.version" />
+		<mkdir dir="${env.BASE_BUILDERS}/${eclipse.builder.version}" />
+		<cvs quiet="${env.CVS_QUIET}" reallyquiet="${env.CVS_REALLY_QUIET}" cvsRoot="${builderCvsRoot}" package="${eclipse.builder}" dest="${basebuilder.path}" tag="${eclipse.builder.version}" />
 
-        <fail unless="wtpBuildTools.url" />
-        <!-- now add our WTP base builder if not there -->
-        <antcall target="getWTPBaseBuilder" />
+		<fail unless="wtpBuildTools.url" />
+		<!-- now add our WTP base builder if not there -->
+		<antcall target="getWTPBaseBuilder" />
 
-    </target>
+	</target>
 
-    <target
-        name="getWTPBaseBuilder"
-        depends="checkWTPBaseBuilder"
-        unless="wtpBuilderPresent">
-        <get
-            dest="${basebuilder.path}/org.eclipse.releng.basebuilder/plugins/${wtpBuildTools.file}"
-            src="${wtpBuildTools.url}/${wtpBuildTools.file}"
-            usetimestamp="true" />
-    </target>
+	<target name="getWTPBaseBuilder" depends="checkWTPBaseBuilder" unless="wtpBuilderPresent">
+		<get dest="${basebuilder.path}/org.eclipse.releng.basebuilder/plugins/${wtpBuildTools.file}" src="${wtpBuildTools.url}/${wtpBuildTools.file}" usetimestamp="true" />
+	</target>
 
-    <target name="checkWTPBaseBuilder">
-        <condition property="wtpBuilderPresent">
-            <available
-                file="${basebuilder.path}/org.eclipse.releng.basebuilder/plugins/${wtpBuildTools.file}" />
-        </condition>
-    </target>
+	<target name="checkWTPBaseBuilder">
+		<condition property="wtpBuilderPresent">
+			<available file="${basebuilder.path}/org.eclipse.releng.basebuilder/plugins/${wtpBuildTools.file}" />
+		</condition>
+	</target>
 
 
 
 
 
-    <target name="init">
+	<target name="init">
 
-        <condition
-            property="buildBranch"
-            value="R3.0">
-            <equals
-                arg1="${mapVersionTag}"
-                arg2="HEAD" />
-        </condition>
-        <condition
-            property="buildBranch"
-            value="R0.7">
-            <equals
-                arg1="${mapVersionTag}"
-                arg2="R0_7_maintenance" />
-        </condition>
-        <condition
-            property="buildBranch"
-            value="R1.0">
-            <equals
-                arg1="${mapVersionTag}"
-                arg2="R1_0_maintenance" />
-        </condition>
-        <condition
-            property="buildBranch"
-            value="R1.5">
-            <equals
-                arg1="${mapVersionTag}"
-                arg2="R1_5_maintenance" />
-        </condition>
-        <condition
-            property="buildBranch"
-            value="R1.5">
-            <equals
-                arg1="${mapVersionTag}"
-                arg2="R1_5_5_patches" />
-        </condition>
-        <condition
-            property="buildBranch"
-            value="R2.0">
-            <equals
-                arg1="${mapVersionTag}"
-                arg2="R2_0_maintenance" />
-        </condition>
-        <!-- if not set above, assume R3.0 -->
-        <!-- this happens, for example, when using a "tempTest" branch -->
-        <property
-            name="buildBranch"
-            value="R3.0" />
+		<condition property="buildBranch" value="R3.0">
+			<equals arg1="${mapVersionTag}" arg2="HEAD" />
+		</condition>
+		<condition property="buildBranch" value="R0.7">
+			<equals arg1="${mapVersionTag}" arg2="R0_7_maintenance" />
+		</condition>
+		<condition property="buildBranch" value="R1.0">
+			<equals arg1="${mapVersionTag}" arg2="R1_0_maintenance" />
+		</condition>
+		<condition property="buildBranch" value="R1.5">
+			<equals arg1="${mapVersionTag}" arg2="R1_5_maintenance" />
+		</condition>
+		<condition property="buildBranch" value="R1.5">
+			<equals arg1="${mapVersionTag}" arg2="R1_5_5_patches" />
+		</condition>
+		<condition property="buildBranch" value="R2.0">
+			<equals arg1="${mapVersionTag}" arg2="R2_0_maintenance" />
+		</condition>
+		<!-- if not set above, assume R3.0 -->
+		<!-- this happens, for example, when using a "tempTest" branch -->
+		<property name="buildBranch" value="R3.0" />
 
-        <!-- strip trailing blanks. Seems either Eclipse, or CVS make it hard to not have trailing spaces -->
-        <replaceregexp
-            flags="gm"
-            file="${wtp.builder.home}/build.properties"
-            match=" *$"
-            replace="" />
-        <property file="${wtp.builder.home}/build.properties" />
+		<!-- strip trailing blanks. Seems either Eclipse, or CVS make it hard to not have trailing spaces -->
+		<replaceregexp flags="gm" file="${wtp.builder.home}/build.properties" match=" *$" replace="" />
+		<property file="${wtp.builder.home}/build.properties" />
 
-        <ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
-        <property file="${buildDirectory}/label.properties" />
+		<ant antfile="${wtp.builder.home}/scripts/build/label.xml" />
+		<property file="${buildDirectory}/label.properties" />
 
-        <!--fetch the HEAD stream of all projects if build type specified as N-->
-        <condition
-            property="fetchTag"
-            value="HEAD">
-            <equals
-                arg1="${buildType}"
-                arg2="N" />
-        </condition>
+		<!--fetch the HEAD stream of all projects if build type specified as N-->
+		<condition property="fetchTag" value="HEAD">
+			<equals arg1="${buildType}" arg2="N" />
+		</condition>
 
-        <condition property="tagMaps">
-            <equals
-                arg1="${build.trial}"
-                arg2="false" />
-        </condition>
-    </target>
+		<condition property="tagMaps">
+			<equals arg1="${build.trial}" arg2="false" />
+		</condition>
+	</target>
 
-    <target
-        name="runEclipseBuild"
-        if="buildId">
+	<target name="runEclipseBuild" if="buildId">
 
-        <fail unless="eclipse.builder.version" />
+		<fail unless="eclipse.builder.version" />
 
-        <!-- if not otherwise set "externally", set the classpath jars for 
+		<!-- if not otherwise set "externally", set the classpath jars for 
             the Execution Envirnonments we need in WTP. 
             And other parameters we need set. 
             To successfully do local builds, most of these do have to be provided 
             externally, such as in "localbuildproperties" directory -->
-        <property
-            name="J2SE-1.4"
-            value="${env.JAVA_4_HOME}/jre/lib/core.jar:${env.JAVA_4_HOME}/jre/lib/xml.jar:${env.JAVA_4_HOME}/jre/lib/graphics.jar:${env.JAVA_4_HOME}/jre/lib/server.jar:${env.JAVA_4_HOME}/jre/lib/ibmorbapi.jar:${env.JAVA_4_HOME}/jre/lib/security.jar" />
-        <property
-            name="J2SE-1.5"
-            value="${env.JAVA_5_HOME}/jre/lib/core.jar:${env.JAVA_5_HOME}/jre/lib/vm.jar:${env.JAVA_5_HOME}/jre/lib/xml.jar:${env.JAVA_5_HOME}/jre/lib/graphics.jar:${env.JAVA_5_HOME}/jre/lib/server.jar:${env.JAVA_5_HOME}/jre/lib/ibmorbapi.jar:${env.JAVA_5_HOME}/jre/lib/security.jar" />
+		<property name="J2SE-1.4" value="${env.JAVA_4_HOME}/jre/lib/core.jar:${env.JAVA_4_HOME}/jre/lib/xml.jar:${env.JAVA_4_HOME}/jre/lib/graphics.jar:${env.JAVA_4_HOME}/jre/lib/server.jar:${env.JAVA_4_HOME}/jre/lib/ibmorbapi.jar:${env.JAVA_4_HOME}/jre/lib/security.jar" />
+		<property name="J2SE-1.5" value="${env.JAVA_5_HOME}/jre/lib/core.jar:${env.JAVA_5_HOME}/jre/lib/vm.jar:${env.JAVA_5_HOME}/jre/lib/xml.jar:${env.JAVA_5_HOME}/jre/lib/graphics.jar:${env.JAVA_5_HOME}/jre/lib/server.jar:${env.JAVA_5_HOME}/jre/lib/ibmorbapi.jar:${env.JAVA_5_HOME}/jre/lib/security.jar" />
 
-    	  <!-- local  builds must set build.trial to true, in runbuild.properties, to avoid erroneous time stamps -->
-        <property
-            name="build.trial"
-            value="false" />
+		<!-- local  builds must set build.trial to true, in runbuild.properties, to avoid erroneous time stamps -->
+		<property name="build.trial" value="false" />
 
-        <fail
-            unless="J2SE-1.5"
-            message="classpath to J2SE-1.5 Execution Environment must be set" />
-        <fail
-            unless="J2SE-1.4"
-            message="classpath to J2SE-1.4 Execution Environment must be set" />
+		<fail unless="J2SE-1.5" message="classpath to J2SE-1.5 Execution Environment must be set" />
+		<fail unless="J2SE-1.4" message="classpath to J2SE-1.4 Execution Environment must be set" />
 
-    	<!-- we read these in as ant properties, so in java call below, we convert 
+		<!-- we read these in as ant properties, so in java call below, we convert 
     	them to system (environment) properties, which is where PDE expects to find them -->
-        <echo message="J2SE-1.5=${J2SE-1.5}" />
-        <echo message="J2SE-1.4=${J2SE-1.4}" />
+		<echo message="J2SE-1.5=${J2SE-1.5}" />
+		<echo message="J2SE-1.4=${J2SE-1.4}" />
 
-        <java
-            taskname="build-${build.distribution}-${component}"
-            jar="${eclipse.launcher}"
-            fork="true"
-            failonerror="${eclipseBuildFailOnError}">
-            <jvmarg value="-Dosgi.ws=${env.BASEWS}" />
-            <jvmarg value="-Dosgi.os=${env.BASEOS}" />
-            <jvmarg value="-Dosgi.arch=${env.BASEARCH}" />
-            <jvmarg value="-Dbuild.home=${env.BUILD_HOME}" />
-        	<jvmarg value="-DJAVA_5_HOME=${env.JAVA_5_HOME}" />
-        	<jvmarg value="-DJAVA_4_HOME=${env.JAVA_4_HOME}" />
-        	<jvmarg value="-DJ2SE-1.5=${J2SE-1.5}" />
-            <jvmarg value="-DJ2SE-1.4=${J2SE-1.4}" />
-            <jvmarg value="-Dbuild.trial=${build.trial}" />
-            <jvmarg value="-DbuildType=${buildType}" />
-            <jvmarg value="-DbuildId=${buildId}" />
-            <jvmarg value="-Dosgi.clean=true" />
-            <jvmarg value="-DmapVersionTag=${mapVersionTag}" />
-            <jvmarg
-                value="-Declipse.builder.version=${eclipse.builder.version}" />
-            <jvmarg
-                value="-Declipse.builder=${eclipse.builder}" />
-            <jvmarg
-                value="-Dprojectname=${projectname}" />
-            <jvmarg
-                value="-Dreleng.jsf-mapVersionTag=${releng.jsf-mapVersionTag}" />
-            <jvmarg
-                value="-Dreleng.dali-mapVersionTag=${releng.dali-mapVersionTag}" />
-            <jvmarg value="-Dwtp.builder.home=${wtp.builder.home}" />
-            <jvmarg value="-Dbuild.distribution=${build.distribution}" />
-            <jvmarg value="-Dcomponent=${component}" />
-            <jvmarg value="-Dbasebiulder.path=${basebuilder.path}" />
-            <jvmarg value="-DwtpBuildTools.file=${wtpBuildTools.file}" />
-            <arg value="-application" />
-            <arg value="org.eclipse.ant.core.antRunner" />
-            <arg value="-buildfile" />
-            <arg value="${ant.file}" />
-            <arg value="build" />
+		<java taskname="build-${build.distribution}-${component}" jar="${eclipse.launcher}" fork="true" failonerror="${eclipseBuildFailOnError}">
+			<jvmarg value="-Djava.protocol.handler.pkgs=com.ibm.etools.www.protocol" />
+			<jvmarg value="-DurlLogLocation=${buildDirectory}/buildoutgoinghttp.log" />
+			<jvmarg value="-Dosgi.ws=${env.BASEWS}" />
+			<jvmarg value="-Dosgi.os=${env.BASEOS}" />
+			<jvmarg value="-Dosgi.arch=${env.BASEARCH}" />
+			<jvmarg value="-Dbuild.home=${env.BUILD_HOME}" />
+			<jvmarg value="-DJAVA_5_HOME=${env.JAVA_5_HOME}" />
+			<jvmarg value="-DJAVA_4_HOME=${env.JAVA_4_HOME}" />
+			<jvmarg value="-DJ2SE-1.5=${J2SE-1.5}" />
+			<jvmarg value="-DJ2SE-1.4=${J2SE-1.4}" />
+			<jvmarg value="-Dbuild.trial=${build.trial}" />
+			<jvmarg value="-DbuildType=${buildType}" />
+			<jvmarg value="-DbuildId=${buildId}" />
+			<jvmarg value="-Dosgi.clean=true" />
+			<jvmarg value="-DmapVersionTag=${mapVersionTag}" />
+			<jvmarg value="-Declipse.builder.version=${eclipse.builder.version}" />
+			<jvmarg value="-Declipse.builder=${eclipse.builder}" />
+			<jvmarg value="-Dprojectname=${projectname}" />
+			<jvmarg value="-Dreleng.jsf-mapVersionTag=${releng.jsf-mapVersionTag}" />
+			<jvmarg value="-Dreleng.dali-mapVersionTag=${releng.dali-mapVersionTag}" />
+			<jvmarg value="-Dwtp.builder.home=${wtp.builder.home}" />
+			<jvmarg value="-Dbuild.distribution=${build.distribution}" />
+			<jvmarg value="-Dcomponent=${component}" />
+			<jvmarg value="-Dbasebiulder.path=${basebuilder.path}" />
+			<jvmarg value="-DwtpBuildTools.file=${wtpBuildTools.file}" />
+			<arg value="-application" />
+			<arg value="org.eclipse.ant.core.antRunner" />
+			<arg value="-buildfile" />
+			<arg value="${ant.file}" />
+			<arg value="build" />
 
-        </java>
-    </target>
+		</java>
+	</target>
 
-    <target
-        name="runEclipseBuildStamped"
-        unless="buildId">
-        <java
-            taskname="build-${build.distribution}-${component}"
-            jar="${eclipse.launcher}"
-            fork="true"
-            failonerror="${eclipseBuildFailOnError}">
-            <jvmarg value="-Dosgi.ws=${env.BASEWS}" />
-            <jvmarg value="-Dosgi.os=${env.BASEOS}" />
-            <jvmarg value="-Dosgi.arch=${env.BASEARCH}" />
-            <jvmarg value="-Dbuild.home=${env.BUILD_HOME}" />
-        <jvmarg value="-DJAVA_5_HOME=${env.JAVA_5_HOME}" />
-        <jvmarg value="-DJAVA_4_HOME=${env.JAVA_4_HOME}" />
-        <jvmarg value="-DJ2SE-1.5=${J2SE-1.5}" />
-        <jvmarg value="-DJ2SE-1.4=${J2SE-1.4}" />        	
-            <jvmarg value="-Dbuild.trial=${build.trial}" />
-            <jvmarg value="-DbuildType=${buildType}" />
-            <jvmarg value="-DmapVersionTag=${mapVersionTag}" />
-            <jvmarg
-                value="-Dreleng.jsf-mapVersionTag=${releng.jsf-mapVersionTag}" />
-            <jvmarg
-                value="-Dreleng.dali-mapVersionTag=${releng.dali-mapVersionTag}" />
-            <jvmarg value="-Dwtp.builder.home=${wtp.builder.home}" />
-            <jvmarg value="-Dbuild.distribution=${build.distribution}" />
-            <jvmarg value="-Dcomponent=${component}" />
-            <arg value="-application" />
-            <arg value="org.eclipse.ant.core.antRunner" />
-            <arg value="-buildfile" />
-            <arg value="${ant.file}" />
-            <arg value="build" />
-        </java>
-    </target>
+	<target name="runEclipseBuildStamped" unless="buildId">
+		<java taskname="build-${build.distribution}-${component}" jar="${eclipse.launcher}" fork="true" failonerror="${eclipseBuildFailOnError}">
+			<jvmarg value="-Dosgi.ws=${env.BASEWS}" />
+			<jvmarg value="-Dosgi.os=${env.BASEOS}" />
+			<jvmarg value="-Dosgi.arch=${env.BASEARCH}" />
+			<jvmarg value="-Dbuild.home=${env.BUILD_HOME}" />
+			<jvmarg value="-DJAVA_5_HOME=${env.JAVA_5_HOME}" />
+			<jvmarg value="-DJAVA_4_HOME=${env.JAVA_4_HOME}" />
+			<jvmarg value="-DJ2SE-1.5=${J2SE-1.5}" />
+			<jvmarg value="-DJ2SE-1.4=${J2SE-1.4}" />
+			<jvmarg value="-Dbuild.trial=${build.trial}" />
+			<jvmarg value="-DbuildType=${buildType}" />
+			<jvmarg value="-DmapVersionTag=${mapVersionTag}" />
+			<jvmarg value="-Dreleng.jsf-mapVersionTag=${releng.jsf-mapVersionTag}" />
+			<jvmarg value="-Dreleng.dali-mapVersionTag=${releng.dali-mapVersionTag}" />
+			<jvmarg value="-Dwtp.builder.home=${wtp.builder.home}" />
+			<jvmarg value="-Dbuild.distribution=${build.distribution}" />
+			<jvmarg value="-Dcomponent=${component}" />
+			<arg value="-application" />
+			<arg value="org.eclipse.ant.core.antRunner" />
+			<arg value="-buildfile" />
+			<arg value="${ant.file}" />
+			<arg value="build" />
+		</java>
+	</target>
 </project>