updates to declared build tests

releng.wtpbuilder/distribution/wtp.api/build.xml

@@ -47,6 +47,7 @@
 			<available file="${wtp.dir}/wtp-jst-Automated-Tests-${buildId}.zip"/>
 		</condition>
 		<antcall target="run"/>
+		<antcall target="upload"/>
 	</target>
 
 	<target name="getReleng">
@@ -237,7 +238,7 @@
 		</antcall>
 
 		<antcall target="runJavaMain">
-			<param name="classname" value="org.eclipse.wtp.releng.tools.component.violation.APIViolationScanner"/>
+			<param name="classname" value="org.eclipse.wtp.releng.tools.component.api.violation.APIViolationScanner"/>
 			<param name="args" value="-src ${local.cache.dir}/${wtp-sdk} -api ${apiRoot}/api-eclipse ${apiRoot}/api-emf ${apiRoot}/api-gef ${apiRoot}/api-jem -outputDir ${apiRoot}/apiresults -html -includes org.eclipse.* -excludes org.eclipse.wst.* org.eclipse.jst.* -debug"/>
 		</antcall>
 
@@ -266,7 +267,7 @@
 			<property name="testTarget" value="all"/>
 		</ant>
 		<antcall target="runJavaMain">
-			<param name="classname" value="org.eclipse.wtp.releng.tools.component.tptp.CodeCoverageScanner"/>
+			<param name="classname" value="org.eclipse.wtp.releng.tools.component.CodeCoverageScanner"/>
 			<param name="args" value="-api ${local.cache.dir}/${wtp-sdk} -src ${local.cache.dir}/${wtp-sdk} ${local.cache.dir}/${wtp-wst-tests} ${local.cache.dir}/${wtp-jst-tests} -trcxml ${apiRoot}/apiresults/trcxml -outputDir ${apiRoot}/apiresults -skipAPIGen -html"/>
 		</antcall>
 
@@ -283,7 +284,7 @@
 		</antcall>
 
 		<antcall target="runJavaMain">
-			<param name="classname" value="org.eclipse.wtp.releng.tools.component.tptp.CodeCoverageScanner"/>
+			<param name="classname" value="org.eclipse.wtp.releng.tools.component.CodeCoverageScanner"/>
 			<param name="args" value="-api ${apiRoot}/api-wtp -src ${local.cache.dir}/${wtp-sdk} ${local.cache.dir}/${wtp-wst-tests} ${local.cache.dir}/${wtp-jst-tests} -trcxml ${apiRoot}/apiresults/trcxml -outputDir ${apiRoot}/apiresults/full_test_coverage -html -includeAllTC -title Test_Coverage_Report"/>
 		</antcall>
 	</target>
@@ -307,10 +308,15 @@
 					<include name="**/org.eclipse.wtp.releng.tools.component.core*.jar"/>
 				</fileset>
 				<fileset dir="${apiRoot}/lib">
-					<include name="**/org.eclipse.jdt.core*.jar"/>
-					<include name="**/org.eclipse.core.runtime*.jar"/>
+					<include name="**/org.eclipse.core.contenttype*.jar"/>
+					<include name="**/org.eclipse.core.jobs*.jar"/>
 					<include name="**/org.eclipse.core.resources*.jar"/>
-					<include name="**/org.eclipse.text*.jar"/>
+					<include name="**/org.eclipse.core.runtime*.jar"/>
+					<include name="**/org.eclipse.equinox*.jar"/>
+					<include name="**/org.eclipse.jdt.core*.jar"/>
+					<include name="**/org.eclipse.jface.text*.jar"/>
+					<include name="**/org.eclipse.osgi*.jar"/>
+					<include name="**/org.eclipse.text*.jar"/>	
 				</fileset>
 			</classpath>
 			<jvmarg value="-Xmx256M"/>
@@ -322,8 +328,8 @@
 		<mkdir dir="${build.home}/archives"/>
 		<zip destfile="${build.home}/archives/${buildType}-${buildId}-${timestamp}.zip" basedir="${build.home}/apiRoot/apiresults"/>
 		<condition property="upload.path.1"
-			else="${login}@download1.eclipse.org:~/downloads/webtools/downloads"
-			value="${login}@download1.eclipse.org:~/downloads/webtools/committers">
+			else="${login}@build.eclipse.org:~/downloads/webtools/downloads"
+			value="${login}@build.eclipse.org:~/downloads/webtools/committers">
 			<isset property="build.committers"/>
 		</condition>
 		<condition property="upload.path"

releng.wtpbuilder/distribution/wtp.api/testScripts/test.xml

 <project default="nodefault" basedir=".">
 
-	<import file="${build.home}/${releng.builder}/distribution/wtp.tests/testScripts/test.xml"/>
+	<import file="${build.home}/releng.wtpbuilder/distribution/wtp.tests/testScripts/test.xml"/>
 
 	<target name="runtests-normal">
 		<ant antfile="${eclipse-home}/plugins/${testPlugin}/test.xml" dir="${eclipse-home}">