diff --git a/releng.wtpbuilder/components/dali-sdk/customTargets.xml b/releng.wtpbuilder/components/dali-sdk/customTargets.xml
index 9014580c4bcb93edb269752fbeb91677f4d75c17..c113c95c3a7f0df4cd5dca3a8d7c0dd8df3d34ed 100644
--- a/releng.wtpbuilder/components/dali-sdk/customTargets.xml
+++ b/releng.wtpbuilder/components/dali-sdk/customTargets.xml
@@ -20,7 +20,7 @@
value="feature" />
<property
name="id"
- value="org.eclipse.jpa.sdk" />
+ value="org.eclipse.jpt.sdk" />
</ant>
</target>
@@ -31,10 +31,10 @@
<!-- Add one target for each root element and each configuration -->
<!-- ===================================================================== -->
- <target name="assemble.org.eclipse.jpa.sdk">
+ <target name="assemble.org.eclipse.jpt.sdk">
<property
name="archiveName"
- value="wtp-jpa-sdk-${buildLabel}.zip" />
+ value="wtp-jpt-sdk-${buildLabel}.zip" />
<ant
antfile="${assembleScriptName}"
dir="${buildDirectory}" />
@@ -45,7 +45,7 @@
<target name="postPackage">
<property
name="archiveName"
- value="wtp-jpa-sdk-${buildLabel}.zip" />
+ value="wtp-jpt-sdk-${buildLabel}.zip" />
<ant
antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
@@ -248,7 +248,7 @@
<unzip
dest="${buildDirectory}/${buildLabel}/compilelogs"
overwrite="true">
- <fileset dir="${buildDirectory}/features/org.eclipse.jpa.sdk">
+ <fileset dir="${buildDirectory}/features/org.eclipse.jpt.sdk">
<include name="**/*.log.zip" />
</fileset>
</unzip>
diff --git a/releng.wtpbuilder/components/dali.tests/customTargets.xml b/releng.wtpbuilder/components/dali.tests/customTargets.xml
index b09c86217b0aa4506bb1f5200cd64ad1c22252ff..128b71463a8d732cb4f824b855a8cf42082c0636 100644
--- a/releng.wtpbuilder/components/dali.tests/customTargets.xml
+++ b/releng.wtpbuilder/components/dali.tests/customTargets.xml
@@ -20,7 +20,7 @@
value="feature" />
<property
name="id"
- value="org.eclipse.jpa.tests" />
+ value="org.eclipse.jpt.tests" />
</ant>
</target>
@@ -31,10 +31,10 @@
<!-- Add one target for each root element and each configuration -->
<!-- ===================================================================== -->
- <target name="assemble.org.eclipse.jpa.tests">
+ <target name="assemble.org.eclipse.jpt.tests">
<property
name="archiveName"
- value="wtp-jpa-Automated-Tests-${buildLabel}.zip" />
+ value="wtp-jpt-Automated-Tests-${buildLabel}.zip" />
<ant
antfile="${assembleScriptName}"
dir="${buildDirectory}" />
@@ -47,7 +47,7 @@
<target name="postPackage">
<property
name="archiveName"
- value="wtp-jpa-Automated-Tests-${buildLabel}.zip" />
+ value="wtp-jpt-Automated-Tests-${buildLabel}.zip" />
<ant
antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
@@ -193,7 +193,7 @@
value="feature" />
<property
name="id"
- value="org.eclipse.jpa.feature" />
+ value="org.eclipse.jpt.feature" />
</ant>
</target>
@@ -260,16 +260,16 @@
unless="dontRunTests">
<property
name="eclipseAutomatedTestHome"
- value="${buildDirectory}/plugins/org.eclipse.jpa.utility.tests" />
+ value="${buildDirectory}/plugins/org.eclipse.jpt.utility.tests" />
<echo message="Setting up tests in ${eclipseAutomatedTestHome}" />
<copy
- file="${buildDirectory}/${buildLabel}/wtp-jpa-${buildLabel}.zip"
- tofile="${eclipseAutomatedTestHome}/eclipse-SDK-wtp-jpa-${buildLabel}.zip" />
+ file="${buildDirectory}/${buildLabel}/wtp-jpt-${buildLabel}.zip"
+ tofile="${eclipseAutomatedTestHome}/eclipse-SDK-wtp-jpt-${buildLabel}.zip" />
<copy
- file="${buildDirectory}/${buildLabel}/wtp-jpa-Automated-Tests-${buildLabel}.zip"
- tofile="${eclipseAutomatedTestHome}/eclipse-junit-tests-wtp-jpa-${buildLabel}.zip" />
+ file="${buildDirectory}/${buildLabel}/wtp-jpt-Automated-Tests-${buildLabel}.zip"
+ tofile="${eclipseAutomatedTestHome}/eclipse-junit-tests-wtp-jpt-${buildLabel}.zip" />
<ant
antfile="${eclipseAutomatedTestHome}/test.xml"
@@ -317,7 +317,7 @@
<unzip
dest="${buildDirectory}/${buildLabel}/testcompilelogs"
overwrite="true">
- <fileset dir="${buildDirectory}/features/org.eclipse.jpa.tests">
+ <fileset dir="${buildDirectory}/features/org.eclipse.jpt.tests">
<include name="**/*.log.zip" />
</fileset>
</unzip>
diff --git a/releng.wtpbuilder/components/dali/customTargets.xml b/releng.wtpbuilder/components/dali/customTargets.xml
index 588c4de705ae23df77d034685495ffd70322f74a..ac602da2a4f60175ea6836314cf471c8ef628331 100644
--- a/releng.wtpbuilder/components/dali/customTargets.xml
+++ b/releng.wtpbuilder/components/dali/customTargets.xml
@@ -21,7 +21,7 @@
value="feature" />
<property
name="id"
- value="org.eclipse.jpa" />
+ value="org.eclipse.jpt" />
</ant>
</target>
@@ -32,10 +32,10 @@
<!-- Add one target for each root element and each configuration -->
<!-- ===================================================================== -->
- <target name="assemble.org.eclipse.jpa">
+ <target name="assemble.org.eclipse.jpt">
<property
name="archiveName"
- value="wtp-jpa-${buildLabel}.zip" />
+ value="wtp-jpt-${buildLabel}.zip" />
<ant
antfile="${assembleScriptName}"
dir="${buildDirectory}" />
@@ -47,7 +47,7 @@
<target name="postPackage">
<property
name="archiveName"
- value="wtp-jpa-${buildLabel}.zip" />
+ value="wtp-jpt-${buildLabel}.zip" />
<ant
antfile="${wtp.builder.home}/scripts/build/buildutilities.xml"
@@ -292,7 +292,7 @@
<unzip
dest="${buildDirectory}/${buildLabel}/compilelogs"
overwrite="true">
- <fileset dir="${buildDirectory}/features/org.eclipse.jpa">
+ <fileset dir="${buildDirectory}/features/org.eclipse.jpt">
<include name="**/*.log.zip" />
</fileset>
</unzip>
diff --git a/releng.wtpbuilder/distribution/dali.tests/build.xml b/releng.wtpbuilder/distribution/dali.tests/build.xml
index 007aee363b17d0633f223c90faaf040523597072..e501a932f9661b1af177ba6f062bbb788f2cd48f 100644
--- a/releng.wtpbuilder/distribution/dali.tests/build.xml
+++ b/releng.wtpbuilder/distribution/dali.tests/build.xml
@@ -63,42 +63,117 @@
dir="${buildDirectory}/${buildLabel}"
executable="unzip"
failonerror="false">
- <arg line="-o -qq wtp-jpa-${buildLabel}.zip -d ${testRoot}" />
+ <arg line="-o -qq wtp-jpt-${buildLabel}.zip -d ${testRoot}" />
</exec>
<exec
dir="${buildDirectory}/${buildLabel}"
executable="unzip"
failonerror="false">
- <arg line="-o -qq wtp-jpa-Automated-Tests-${buildLabel}.zip -d ${testRoot}" />
+ <arg line="-o -qq wtp-jpt-Automated-Tests-${buildLabel}.zip -d ${testRoot}" />
</exec>
</target>
-
- <target name="runTestEclipse">
- <java taskname="test-dali-${testTarget}" jar="${testRoot}/eclipse/startup.jar" fork="true" failonerror="true" timeout="3600000" output="${testRoot}/results/consolelogs/dalitestlog.txt" dir="${testRoot}">
+ <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" />
+ <property name="plugin-path"
+ value="${testRoot}/eclipse/plugins" />
+ <property name="vmargs"
+ value="-Xms256m -Xmx512m -Dosgi.ws=${env.BASEWS} -Dosgi.os=${env.BASEOS} -Dosgi.arch=${env.BASEARCH} -Dws=${env.BASEWS} -Dos=${env.BASEOS} -Darch=${env.BASEARCH} -Dosgi.clean=true -Dnoclean=true -DbuildBranch=${buildBranch} -DbuildType=${buildType} -DbuildId=${buildId} -DtestRoot=${testRoot} -DtestDir=${testRoot} -DbuildDirectory=${buildDirectory} -Dbuild.home=${env.BUILD_HOME} -DeclipseBuilderDirectory=${pde.builder.path} -DbuildLabel=${buildLabel} -Dtest-vm=${test-vm} -Dperf.buildId=${buildType}${date}-${time}" />
+
+
+ <!-- set path to eclipse folder. If local folder, use '.'; otherwise, use c:\path\to\eclipse or /path/to/eclipse/ -->
+ <property name="eclipse.home" value="${testRoot}" />
+
+ <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,
+ and may indicate an installation that would produce unpredictable
+ results -->
+ <!-- requires ant 1.7, and at this point, we're running 1.6 from
+ eclipse ...
+
+ <condition property="expectedNumberOfLaunchers">
+ <resourcecount when="equal" count="1" >
+ <fileset dir="${testRoot}/eclipse/plugins">
+ <include name="org.eclipse.equinox.launcher_*.jar" />
+ </fileset>
+ </resourcecount>
+ </condition>
+ <fail message="Did not find expected number of launcher jars. Check installation." unless="expectedNumberOfLaunchers" />
+ -->
+ <!--
+ Remember: using -debug for org.eclipse.ant.core.antRunner
+ produces ant debug info to be output ... which is a TON of stuff
+ -->
+ <java
+ taskname="unit-test-masterprocess"
+ fork="true"
+ resultProperty="wtpmasterjunitresult"
+ failonerror="false"
+ timeout="${testTimeLimit}"
+ dir="${testRoot}/eclipse"
+ 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>
+ </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}" />
- <jvmarg value="-DbuildLabel=${buildLabel}" />
+
+ <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="test.xml" />
+ <arg value="${testRoot}/test.xml" />
<arg value="-logger" />
<arg value="org.apache.tools.ant.DefaultLogger" />
- <arg value="${testTarget}" />
- <sysproperty key="build.home" value="${build.home}" />
+ <env key="DISPLAY" value="${env.DISPLAY}" />
+ <redirector
+ output="${testRoot}/results/fullOutput.txt"
+ error="${testRoot}/results/fullErrorLog.txt"/>
+ <sysproperty key="build.home" value="${env.BUILD_HOME}" />
<sysproperty key="buildDirectory" value="${buildDirectory}" />
+ <sysproperty key="buildLabel" value="${buildLabel}" />
<sysproperty key="baseLocation" value="${baseLocation}" />
+ <sysproperty key="testRoot" value="${testRoot}" />
<sysproperty key="testDir" value="${testRoot}" />
- <sysproperty key="perf.buildId" value="${buildType}${date}-${time}" />
- <sysproperty key="eclipseBuilderDirectory" value="${pde.builder.path}" />
+ <sysproperty key="perf.buildId"
+ value="${buildType}${date}-${time}" />
+ <sysproperty key="eclipseBuilderDirectory"
+ value="${pde.builder.path}" />
+ <sysproperty key="buildLabel" value="${buildLabel}" />
</java>
+
+ <echo message="wtpmasterjunitresult ${wtpmasterjunitresult}"/>
</target>
<target name="postRunTestEclipse">
diff --git a/releng.wtpbuilder/distribution/dali.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/dali.tests/testScripts/test.xml
index 6b5ec5c9c97d8f404567fb67b9b8c0bc8d30e86a..7090460f7cef7558cbd21563a1362adebfeff9e3 100644
--- a/releng.wtpbuilder/distribution/dali.tests/testScripts/test.xml
+++ b/releng.wtpbuilder/distribution/dali.tests/testScripts/test.xml
@@ -76,17 +76,17 @@
</target>
- <target name="dali-utility-tests" description="Runs the org.eclipse.jpa.utility.tests test.xml">
+ <target name="dali-utility-tests" description="Runs the org.eclipse.jpt.utility.tests test.xml">
<antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.jpa.utility.tests}" />
- <param name="report" value="org.eclipse.jpa.utility.tests" />
+ <param name="testPlugin" value="${org.eclipse.jpt.utility.tests}" />
+ <param name="report" value="org.eclipse.jpt.utility.tests" />
</antcall>
</target>
- <target name="dali-core-tests" description="Runs the org.eclipse.jpa.core.tests test.xml">
+ <target name="dali-core-tests" description="Runs the org.eclipse.jpt.core.tests test.xml">
<antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.jpa.core.tests}" />
- <param name="report" value="org.eclipse.jpa.core.tests" />
+ <param name="testPlugin" value="${org.eclipse.jpt.core.tests}" />
+ <param name="report" value="org.eclipse.jpt.core.tests" />
</antcall>
</target>
diff --git a/releng.wtpbuilder/distribution/patches.site/build.xml b/releng.wtpbuilder/distribution/patches.site/build.xml
index 20bfd50e0c9f2d798a1e0d6832d6a60e922e98e7..53de70cb2a5c245cac5650da871e9d8b5bdb7daf 100644
--- a/releng.wtpbuilder/distribution/patches.site/build.xml
+++ b/releng.wtpbuilder/distribution/patches.site/build.xml
@@ -49,7 +49,7 @@
</condition>
<ant antfile="${publish.xml}" dir="${component.dir}">
- <property name="dropTokenList" value="%wtppatch%,%wtpruntime%,%wtpsdk%,%wst%,%wst-sdk%,%wst-tests%,%jst-tests%,%wst-perf-tests%,%jst-perf-tests%,%jsf-runtime%,%jsf-sdk%,%jsf-tests%,%jpa-runtime%,%jpa-sdk%,%jpa-tests%" />
+ <property name="dropTokenList" value="%wtppatch%,%wtpruntime%,%wtpsdk%,%wst%,%wst-sdk%,%wst-tests%,%jst-tests%,%wst-perf-tests%,%jst-perf-tests%,%jsf-runtime%,%jsf-sdk%,%jsf-tests%,%jpt-runtime%,%jpt-sdk%,%jpt-tests%" />
<!-- use this form if/when mirror redirects desired
<property name="webtoolsDownloadURL" value="http://www.eclipse.org/downloads/download.php?file=/webtools/patches/drops"/>
diff --git a/releng.wtpbuilder/distribution/wtp.api/build.xml b/releng.wtpbuilder/distribution/wtp.api/build.xml
index 80047693557d3c091eb1c072554db74d1cecf2b3..ea9f45bff770fbc6566758359735c9650a5041a7 100644
--- a/releng.wtpbuilder/distribution/wtp.api/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.api/build.xml
@@ -228,7 +228,7 @@
<antcall target="runJavaMain">
<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 -outputDir ${apiRoot}/apiresults -html -includes org.eclipse.* -excludes org.eclipse.wst.* org.eclipse.jst.* org.eclipse.jem.* org.eclipse.jpa.* -debug"/>
+ <param name="args" value="-src ${local.cache.dir}/${wtp-sdk} -api ${apiRoot}/api-eclipse ${apiRoot}/api-emf ${apiRoot}/api-gef -outputDir ${apiRoot}/apiresults -html -includes org.eclipse.* -excludes org.eclipse.wst.* org.eclipse.jst.* org.eclipse.jem.* org.eclipse.jpt.* -debug"/>
</antcall>
<antcall target="runJavaMain">
@@ -269,7 +269,7 @@
/>
<antcall target="runJavaMain">
<param name="classname" value="org.eclipse.wtp.releng.tools.component.api.progress.APIProgressScanner"/>
- <param name="args" value="-api ${local.cache.dir}/${wtp-sdk} -src ${local.cache.dir}/${wtp-sdk} -outputDir ${apiRoot}/apiresults -progressDir ${apiRoot}/releng.wtptools/api/api_progress/2.0 -timestamp ${timestamp} -excludes .*infopop .*doc.isv .*doc.user .*source org.eclipse.wst org.eclipse.jst org.eclipse.jem org.eclipse.jpa"/>
+ <param name="args" value="-api ${local.cache.dir}/${wtp-sdk} -src ${local.cache.dir}/${wtp-sdk} -outputDir ${apiRoot}/apiresults -progressDir ${apiRoot}/releng.wtptools/api/api_progress/2.0 -timestamp ${timestamp} -excludes .*infopop .*doc.isv .*doc.user .*source org.eclipse.wst org.eclipse.jst org.eclipse.jem org.eclipse.jpt"/>
</antcall>
<antcall target="runJavaMain">
diff --git a/releng.wtpbuilder/distribution/wtp.api/testScripts/piagent_filters.txt b/releng.wtpbuilder/distribution/wtp.api/testScripts/piagent_filters.txt
index a6cf575769ccff8f3fcc12a6146e11dd6b6ae993..f35f6374c4a59de1b74468db10235c4c8673210e 100644
--- a/releng.wtpbuilder/distribution/wtp.api/testScripts/piagent_filters.txt
+++ b/releng.wtpbuilder/distribution/wtp.api/testScripts/piagent_filters.txt
@@ -1,5 +1,5 @@
org.eclipse.wst.* * INCLUDE
org.eclipse.jst.* * INCLUDE
org.eclipse.jem.* * INCLUDE
-org.eclipse.jpa.* * INCLUDE
+org.eclipse.jpt.* * INCLUDE
* * EXCLUDE
diff --git a/releng.wtpbuilder/distribution/wtp.build/build.xml b/releng.wtpbuilder/distribution/wtp.build/build.xml
index 721d2409277b1bf3c2782f20bb9a25c898fa0f79..0c1b4a4c7c5478724a16d589bcffb6018ae876c5 100644
--- a/releng.wtpbuilder/distribution/wtp.build/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.build/build.xml
@@ -111,7 +111,7 @@
</exec>
<exec dir="${buildDirectory}/${buildLabel}" executable="unzip" failonerror="false">
- <arg line="-o -qq wtp-jpa${corename}-${buildLabel}.zip -d ${buildDirectory}/tempforrezipping" />
+ <arg line="-o -qq wtp-jpt${corename}-${buildLabel}.zip -d ${buildDirectory}/tempforrezipping" />
</exec>
diff --git a/releng.wtpbuilder/distribution/wtp.site/build.xml b/releng.wtpbuilder/distribution/wtp.site/build.xml
index 15b5b79d9109afa46fc582b44715aa90a15656c6..cc419ddbf3ca3bd6435aa1ce18016c6d82b1666d 100644
--- a/releng.wtpbuilder/distribution/wtp.site/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.site/build.xml
@@ -64,7 +64,7 @@
</condition>
<ant antfile="${publish.xml}" dir="${component.dir}">
- <property name="dropTokenList" value="%wtpruntime%,%wtpsdk%,%wtptest%,%wst%,%wst-sdk%,%wst-tests%,%jst-tests%,%wst-perf-tests%,%jst-perf-tests%,%jsf-runtime%,%jsf-sdk%,%jsf-tests%,%jpa-runtime%,%jpa-sdk%,%jpa-tests%" />
+ <property name="dropTokenList" value="%wtpruntime%,%wtpsdk%,%wtptest%,%wst%,%wst-sdk%,%wst-tests%,%jst-tests%,%wst-perf-tests%,%jst-perf-tests%,%jsf-runtime%,%jsf-sdk%,%jsf-tests%,%jpt-runtime%,%jpt-sdk%,%jpt-tests%" />
<property name="webtoolsDownloadURL" value="http://www.eclipse.org/downloads/download.php?file=/webtools/committers/drops"/>
<property name="buildBranch" value="${buildBranch}" />
diff --git a/releng.wtpbuilder/distribution/wtp.site/publish.xml b/releng.wtpbuilder/distribution/wtp.site/publish.xml
index be71eed4c62b713f2cf5bef0ae7bd027cd20f27a..7bd894d12a1f1d17c831aeb7e6a121bb50fed6ac 100644
--- a/releng.wtpbuilder/distribution/wtp.site/publish.xml
+++ b/releng.wtpbuilder/distribution/wtp.site/publish.xml
@@ -325,10 +325,10 @@
property="org.eclipse.jst.jsf.feature" />
<replacefilter token="@org.eclipse.jst.jsf_sdk.feature@"
property="org.eclipse.jst.jsf_sdk.feature" />
- <replacefilter token="@org.eclipse.jpa.feature@"
- property="org.eclipse.jpa.feature" />
- <replacefilter token="@org.eclipse.jpa_sdk.feature@"
- property="org.eclipse.jpa_sdk.feature" />
+ <replacefilter token="@org.eclipse.jpt.feature@"
+ property="org.eclipse.jpt.feature" />
+ <replacefilter token="@org.eclipse.jpt_sdk.feature@"
+ property="org.eclipse.jpt_sdk.feature" />
</replace>
</target>
diff --git a/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template b/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template
index 05ae6f120c8293496b2efb8bc57cecaa84e9901e..cb009124e0e58a7cf6a0e6fe3dba3f995bb5e8ab 100644
--- a/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template
+++ b/releng.wtpbuilder/distribution/wtp.site/templateFiles/index.html.template
@@ -133,7 +133,7 @@ foreach ($compileSummary->summaryItem as $summaryItem) {
<tr>
<td align="left" valign="top" colspan="5">
<p>The WTP zip files includes the features and plugins from the WST,
- JST (including JSF), and JPA projects.</p>
+ JST (including JSF), and JPT projects.</p>
</td>
</tr>
<tr>
diff --git a/releng.wtpbuilder/distribution/wtp.site/templateFiles/siteWTP.xml b/releng.wtpbuilder/distribution/wtp.site/templateFiles/siteWTP.xml
index 1b0ee696914e177eb267ca5ef310332eb9ec7252..bc745dda1c6aa6cea389dbb31d60344f900e044b 100644
--- a/releng.wtpbuilder/distribution/wtp.site/templateFiles/siteWTP.xml
+++ b/releng.wtpbuilder/distribution/wtp.site/templateFiles/siteWTP.xml
@@ -36,11 +36,11 @@ digestURL="http://download.eclipse.org/webtools/testUpdates/">
</feature>
- <feature url="features/org.eclipse.jpa.feature_@org.eclipse.jpa.feature@.jar" id="org.eclipse.jpa.feature" version="@org.eclipse.jpa.feature@">
+ <feature url="features/org.eclipse.jpt.feature_@org.eclipse.jpt.feature@.jar" id="org.eclipse.jpt.feature" version="@org.eclipse.jpt.feature@">
<category name="Web Tools Platform (WTP)" />
</feature>
- <feature url="features/org.eclipse.jpa_sdk.feature_@org.eclipse.jpa_sdk.feature@.jar" id="org.eclipse.jpa_sdk.feature" version="@org.eclipse.jpa_sdk.feature@">
+ <feature url="features/org.eclipse.jpt_sdk.feature_@org.eclipse.jpt_sdk.feature@.jar" id="org.eclipse.jpt_sdk.feature" version="@org.eclipse.jpt_sdk.feature@">
<category name="Web Tools Platform (WTP)" />
</feature>
diff --git a/releng.wtpbuilder/distribution/wtp.tests/build.xml b/releng.wtpbuilder/distribution/wtp.tests/build.xml
index 77c9aeb865e515245f39997448e485ca50092f00..2d883d6316739ed70bf0000c38beddc7a733434c 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/build.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/build.xml
@@ -103,12 +103,12 @@
<exec dir="${buildDirectory}/${buildLabel}" executable="unzip"
failonerror="false">
- <arg line="-o -qq wtp-jpa-sdk-${buildLabel}.zip -d ${testRoot}" />
+ <arg line="-o -qq wtp-jpt-sdk-${buildLabel}.zip -d ${testRoot}" />
</exec>
<exec dir="${buildDirectory}/${buildLabel}" executable="unzip"
failonerror="false">
<arg
- line="-o -qq wtp-jpa-Automated-Tests-${buildLabel}.zip -d ${testRoot}" />
+ line="-o -qq wtp-jpt-Automated-Tests-${buildLabel}.zip -d ${testRoot}" />
</exec>
</target>
diff --git a/releng.wtpbuilder/distribution/wtp.tests/testScripts/test.xml b/releng.wtpbuilder/distribution/wtp.tests/testScripts/test.xml
index b13ced934836fd088bc6793d41f7b3824a66d68f..d70ea4797f3d53898d8f315ef3da58b7ab0d779e 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/testScripts/test.xml
+++ b/releng.wtpbuilder/distribution/wtp.tests/testScripts/test.xml
@@ -378,16 +378,16 @@
</target>
<!-- Dali tests -->
- <target name="jpa-utility-tests" description="Runs the org.eclipse.jpa.utility.tests test.xml">
+ <target name="jpt-utility-tests" description="Runs the org.eclipse.jpt.utility.tests test.xml">
<antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.jpa.utility.tests}" />
- <param name="report" value="org.eclipse.jpa.utility.tests" />
+ <param name="testPlugin" value="${org.eclipse.jpt.utility.tests}" />
+ <param name="report" value="org.eclipse.jpt.utility.tests" />
</antcall>
</target>
- <target name="dali-core-tests" description="Runs the org.eclipse.jpa.core.tests test.xml">
+ <target name="dali-core-tests" description="Runs the org.eclipse.jpt.core.tests test.xml">
<antcall target="runtests">
- <param name="testPlugin" value="${org.eclipse.jpa.core.tests}" />
- <param name="report" value="org.eclipse.jpa.core.tests" />
+ <param name="testPlugin" value="${org.eclipse.jpt.core.tests}" />
+ <param name="report" value="org.eclipse.jpt.core.tests" />
</antcall>
</target>
@@ -485,14 +485,14 @@
<antcall target="wst-facets-tests" />
- <echo message="Starting JPA Unit Tests" />
+ <echo message="Starting JPT Unit Tests" />
- <echo message="Starting jpa-utility-tests" />
- <antcall target="jpa-utility-tests" />
+ <echo message="Starting jpt-utility-tests" />
+ <antcall target="jpt-utility-tests" />
<echo message="Starting dali-core-tests" />
<antcall target="dali-core-tests" />
- <echo message="Ended JPA Unit Tests" />
+ <echo message="Ended JPT Unit Tests" />
<echo message="Starting JSF Tests" />
<antcall target="jsf-tests" />