update dbws ant build for jpa-rs
diff --git a/dbws/org.eclipse.persistence.dbws/antbuild.properties b/dbws/org.eclipse.persistence.dbws/antbuild.properties
index 78b6795..dd059f5 100644
--- a/dbws/org.eclipse.persistence.dbws/antbuild.properties
+++ b/dbws/org.eclipse.persistence.dbws/antbuild.properties
@@ -25,7 +25,9 @@
# Variable Definitions (execution location dependent)
# -----------------------------------
-dbws.common.dependencies=javax.activation_1.1.0.v201108011116.jar,javax.xml.soap_1.3.0.v200906010428.jar,javax.servlet_2.4.0.v200806031604.jar,javax.xml.ws_2.0.0.v200902170419.jar
+dbws.common.dependencies=javax.activation_1.1.0.v201108011116.jar,javax.xml.soap_1.3.0.v200906010428.jar,javax.servlet_2.4.0.v200806031604.jar,javax.xml.ws_2.0.0.v200902170419.jar,javax.ws.rs_1.1.1.v20101004-1200.jar
+
+dbws.jpa.dependencies=javax.persistence_2.0.4.v201112161009.jar
bin.includes = .,\
META-INF/
diff --git a/dbws/org.eclipse.persistence.dbws/antbuild.xml b/dbws/org.eclipse.persistence.dbws/antbuild.xml
index 290b253..2aa60e7 100644
--- a/dbws/org.eclipse.persistence.dbws/antbuild.xml
+++ b/dbws/org.eclipse.persistence.dbws/antbuild.xml
@@ -51,6 +51,7 @@
</condition>
<echo message="dbws.2.base.dir = '${dbws.2.base.dir}'"/>
<property name="dbws.2.common.plugins.dir" value="${dbws.2.base.dir}/plugins"/>
+ <property name="dbws.2.jpa.plugins.dir" value="${dbws.2.base.dir}/jpa/plugins"/>
<property name="dbws.2.buildsys.dir" value="${dbws.2.base.dir}/buildsystem"/>
<!-- OS environment variables have 'env' as a prefix -->
@@ -114,18 +115,29 @@
<!-- dependency properties -->
<property name="core.lib" value="${dbws.2.common.plugins.dir}/org.eclipse.persistence.core_${version.string}.jar"/>
+ <property name="moxy.lib" value="${dbws.2.common.plugins.dir}/org.eclipse.persistence.jpa_${version.string}.jar"/>
+ <property name="jpa.lib" value="${dbws.2.common.plugins.dir}/org.eclipse.persistence.moxy_${version.string}.jar"/>
<!-- dependency tests -->
<available file="${core.lib}" property="core.bundle.exist"/>
<fail message="Cannot find: '${core.lib}'" unless="core.bundle.exist"/>
+ <available file="${moxy.lib}" property="moxy.bundle.exist"/>
+ <fail message="Cannot find: '${moxy.lib}'" unless="moxy.bundle.exist"/>
+ <available file="${jpa.lib}" property="jpa.bundle.exist"/>
+ <fail message="Cannot find: '${jpa.lib}'" unless="jpa.bundle.exist"/>
<!-- Set Compile Path-->
<path id="dbws.compile.path">
<pathelement path="${dbws.2.common.plugins.dir}/${asm}"/>
<pathelement path="${core.lib}"/>
+ <pathelement path="${moxy.lib}"/>
+ <pathelement path="${jpa.lib}"/>
<fileset
dir="${dbws.2.common.plugins.dir}"
includes="${dbws.common.dependencies}"/>
+ <fileset
+ dir="${dbws.2.jpa.plugins.dir}"
+ includes="${dbws.jpa.dependencies}"/>
</path>
<!-- Check for BND library -->