361871 - Dali build tests should get EclipseLink libraries from bundled libraries
diff --git a/releng.wtpbuilder/distribution/dali.tests/testScripts/testServer.properties b/releng.wtpbuilder/distribution/dali.tests/testScripts/testServer.properties
index 1f5abb2..ce548ff 100644
--- a/releng.wtpbuilder/distribution/dali.tests/testScripts/testServer.properties
+++ b/releng.wtpbuilder/distribution/dali.tests/testScripts/testServer.properties
@@ -14,8 +14,8 @@
jsf1.1Dir=myfaces-core-1.1.5/lib
# JPT Persistence Runtime Library path
-jpt-persistence-jar=jpt/jpt-persistence-2.0.3/lib/javax.persistence_2.0.3.v201010191057.jar
-jpt-eclipselink-jar=jpt/jpt-eclipselink-2.3.1/lib/eclipselink.jar
+jpt-persistence-jar=eclipselink/jlib/jpa/javax.persistence_2.0.3.v201010191057.jar
+jpt-eclipselink-jar=eclipselink/jlib/eclipselink.jar
jpt-eclipselink230-jar=jpt/jpt-eclipselink-2.3.0/lib/eclipselink.jar
diff --git a/releng.wtpbuilder/distribution/dali.tests/testdependency.xml b/releng.wtpbuilder/distribution/dali.tests/testdependency.xml
index 3e4b458..5545522 100644
--- a/releng.wtpbuilder/distribution/dali.tests/testdependency.xml
+++ b/releng.wtpbuilder/distribution/dali.tests/testdependency.xml
@@ -88,14 +88,10 @@
<antcall target="getAndInstallBase">
<param
name="groupId"
- value="jpt-persistence.jar"/>
- </antcall>
- <antcall target="getAndInstallBase">
- <param
- name="groupId"
- value="jpt-eclipselink.jar"/>
+ value="eclipselink"/>
</antcall>
</target>
+
<target name="getAndInstallBase">
<ant
antfile="${dependencyTargets}"
@@ -115,6 +111,7 @@
value="${base.install.dir}"/>
</ant>
</target>
+
<target name="getAndInstallDropins">
<ant
antfile="${dependencyTargets}"
diff --git a/releng.wtpbuilder/distribution/patches32x.tests/testScripts/testServer.properties b/releng.wtpbuilder/distribution/patches32x.tests/testScripts/testServer.properties
index 6532f28..e8b3a46 100644
--- a/releng.wtpbuilder/distribution/patches32x.tests/testScripts/testServer.properties
+++ b/releng.wtpbuilder/distribution/patches32x.tests/testScripts/testServer.properties
@@ -14,8 +14,8 @@
jsf1.1Dir=myfaces-core-1.1.5/lib
# JPT Persistence Runtime Library path
-jpt-persistence-jar=jpt/jpt-persistence-2.0.3/lib/javax.persistence_2.0.3.v201010191057.jar
-jpt-eclipselink-jar=jpt/jpt-eclipselink-2.3.1/lib/eclipselink.jar
+jpt-persistence-jar=eclipselink/jlib/jpa/javax.persistence_2.0.3.v201010191057.jar
+jpt-eclipselink-jar=eclipselink/jlib/eclipselink.jar
jpt-persistence200-jar=jpt/jpt-persistence-2.0-preview/lib/javax.persistence_2.0_preview.jar
jpt-eclipselink200-jar=jpt/jpt-eclipselink-2.0.0/lib/eclipselink.jar
diff --git a/releng.wtpbuilder/distribution/wtp.tests/testScripts/testServer.properties b/releng.wtpbuilder/distribution/wtp.tests/testScripts/testServer.properties
index 1f5abb2..ce548ff 100644
--- a/releng.wtpbuilder/distribution/wtp.tests/testScripts/testServer.properties
+++ b/releng.wtpbuilder/distribution/wtp.tests/testScripts/testServer.properties
@@ -14,8 +14,8 @@
jsf1.1Dir=myfaces-core-1.1.5/lib
# JPT Persistence Runtime Library path
-jpt-persistence-jar=jpt/jpt-persistence-2.0.3/lib/javax.persistence_2.0.3.v201010191057.jar
-jpt-eclipselink-jar=jpt/jpt-eclipselink-2.3.1/lib/eclipselink.jar
+jpt-persistence-jar=eclipselink/jlib/jpa/javax.persistence_2.0.3.v201010191057.jar
+jpt-eclipselink-jar=eclipselink/jlib/eclipselink.jar
jpt-eclipselink230-jar=jpt/jpt-eclipselink-2.3.0/lib/eclipselink.jar
diff --git a/releng.wtpbuilder/distribution/wtp4x.tests/testScripts/testServer.properties b/releng.wtpbuilder/distribution/wtp4x.tests/testScripts/testServer.properties
index 1f5abb2..ce548ff 100644
--- a/releng.wtpbuilder/distribution/wtp4x.tests/testScripts/testServer.properties
+++ b/releng.wtpbuilder/distribution/wtp4x.tests/testScripts/testServer.properties
@@ -14,8 +14,8 @@
jsf1.1Dir=myfaces-core-1.1.5/lib
# JPT Persistence Runtime Library path
-jpt-persistence-jar=jpt/jpt-persistence-2.0.3/lib/javax.persistence_2.0.3.v201010191057.jar
-jpt-eclipselink-jar=jpt/jpt-eclipselink-2.3.1/lib/eclipselink.jar
+jpt-persistence-jar=eclipselink/jlib/jpa/javax.persistence_2.0.3.v201010191057.jar
+jpt-eclipselink-jar=eclipselink/jlib/eclipselink.jar
jpt-eclipselink230-jar=jpt/jpt-eclipselink-2.3.0/lib/eclipselink.jar
diff --git a/releng.wtpbuilder/scripts/dependency/dependency.xml b/releng.wtpbuilder/scripts/dependency/dependency.xml
index 8b5733a..6fc7b10 100644
--- a/releng.wtpbuilder/scripts/dependency/dependency.xml
+++ b/releng.wtpbuilder/scripts/dependency/dependency.xml
@@ -340,12 +340,7 @@
<antcall target="getAndInstall">
<param
name="groupId"
- value="jpt-persistence.jar"/>
- </antcall>
- <antcall target="getAndInstall">
- <param
- name="groupId"
- value="jpt-eclipselink.jar"/>
+ value="eclipselink"/>
</antcall>
</target>