aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Grebac2014-08-05 17:28:22 (EDT)
committerLukas Jungmann2014-08-06 09:33:40 (EDT)
commitd763bcc9e6e541b47cf443ddac17fae1293816f8 (patch)
treeabe5ac5c78584084e2b0d48672dc0051aa315e1c
parent6a1e3c6c16482efe2399a8fe6b148d13394edd23 (diff)
downloadeclipselink.runtime-d763bcc9e6e541b47cf443ddac17fae1293816f8.zip
eclipselink.runtime-d763bcc9e6e541b47cf443ddac17fae1293816f8.tar.gz
eclipselink.runtime-d763bcc9e6e541b47cf443ddac17fae1293816f8.tar.bz2
Bug 441207 - Fix installer zip bundle: remove obsolete javax apis, add missing validation, jaxb-core and json api jars.
Signed-off-by: Martin Grebac <martin.grebac@oracle.com>
-rw-r--r--antbuild.xml22
-rwxr-xr-xmoxy/bin/jaxb-compiler.cmd9
-rwxr-xr-xmoxy/bin/jaxb-compiler.sh9
3 files changed, 17 insertions, 23 deletions
diff --git a/antbuild.xml b/antbuild.xml
index 99cb1a5..2f63d67 100644
--- a/antbuild.xml
+++ b/antbuild.xml
@@ -158,14 +158,12 @@
<pathelement path="${eclipselink.plugins}/${jaxb-api.jar}"/>
<pathelement path="${eclipselink.plugins}/${jaxb-core.jar}"/>
<pathelement path="${eclipselink.plugins}/${jaxb-xjc.jar}"/>
- <pathelement path="${eclipselink.plugins}/${persistence10.jar}"/>
- <pathelement path="${eclipselink.plugins}/${activation.jar}"/>
+ <pathelement path="${eclipselink.plugins}/${persistence21.jar}"/>
<pathelement path="${eclipselink.plugins}/${resource.jar}"/>
<pathelement path="${eclipselink.plugins}/${json-api.jar}"/>
<pathelement path="${eclipselink.plugins}/${javax.validation.jar}"/>
<pathelement path="${eclipselink.plugins}/${ejb.jar}"/>
<pathelement path="${eclipselink.plugins}/${jms.jar}"/>
- <pathelement path="${eclipselink.plugins}/${stax_api.jar}"/>
<pathelement path="${eclipselink.plugins}/${transaction.jar}"/>
<pathelement path="${eclipselink.plugins}/${mail.jar}"/>
<pathelement path="${eclipselink.plugins}/${wsrs.jar}"/>
@@ -1247,21 +1245,19 @@
<include name="readme.html"/>
</zipfileset>
<!-- modelgen processor jar -->
- <zipfileset dir="${eclipselink.plugins}/" includes="${eclipselink.modelgen.prefix}*_${version.string}.jar" prefix="eclipselink/jlib/jpa"/>
+ <zipfileset dir="${eclipselink.plugins}/" includes="${eclipselink.modelgen.prefix}_${version.string}.jar, ${eclipselink.modelgen.prefix}.source_${version.string}.jar" prefix="eclipselink/jlib/jpa"/>
<!-- jpa persistence 2.1 jars -->
- <zipfileset dir="${eclipselink.jpa.plugins}/" includes="javax.persistence*2.1*.jar" prefix="eclipselink/jlib/jpa"/>
+ <zipfileset dir="${eclipselink.jpa.plugins}/" includes="${persistence21.jar}, ${persistence21.src.jar}" prefix="eclipselink/jlib/jpa"/>
<!-- JPA RS jar -->
- <zipfileset dir="${eclipselink.plugins}/" includes="org.eclipse.persistence.jpars*.jar" prefix="eclipselink/jlib/jpa"/>
+ <zipfileset dir="${eclipselink.plugins}/" includes="org.eclipse.persistence.jpars_*.jar, org.eclipse.persistence.jpars.source*.jar" prefix="eclipselink/jlib/jpa"/>
<!-- moxy jar's and zips -->
<zipfileset dir="${eclipselink.plugins}/" prefix="eclipselink/jlib/moxy">
- <include name="${activation.jar}"/>
<include name="${mail.jar}"/>
- <include name="${stax_api.jar}"/>
- </zipfileset>
- <!-- moxy jar's and zips -->
- <zipfileset dir="${eclipselink.plugins}" prefix="eclipselink/jlib/moxy">
<include name="${jaxb-api.jar}"/>
+ <include name="${jaxb-core.jar}"/>
<include name="${jaxb-xjc.jar}"/>
+ <include name="${javax.validation.jar}"/>
+ <include name="${json-api.jar}"/>
</zipfileset>
<!-- grab the sdo jar -->
<zipfileset dir="${eclipselink.sdo.base}/${plugins.dir}/" includes="${commonj.sdo.jar}" prefix="eclipselink/jlib/sdo"/>
@@ -1271,12 +1267,12 @@
<zipfileset dir="${eclipselink.util.plugins}" includes="${wsdl.jar}, *oracleddl*.jar" prefix="eclipselink/utils/dbws"/>
<zipfileset dir="${eclipselink.plugins}" includes="${servlet.jar}" prefix="eclipselink/utils/dbws"/>
<!-- workbench jars -->
- <zipfileset dir="${eclipselink.util.workbench.lib}/mw/" includes="elmwcore.jar, eclipselinkmw.jar" prefix="eclipselink/utils/workbench/jlib"/>
+<!-- <zipfileset dir="${eclipselink.util.workbench.lib}/mw/" includes="elmwcore.jar, eclipselinkmw.jar" prefix="eclipselink/utils/workbench/jlib"/>
<zipfileset dir="${eclipselink.util.workbench.lib}/compile/" includes="xercesImpl.jar" prefix="eclipselink/utils/workbench/jlib"/>
<zipfileset dir="${eclipselink.util.workbench.lib}/run/" includes="connector.jar" prefix="eclipselink/utils/workbench/jlib"/>
<zipfileset dir="${eclipselink.util.workbench}/config/" includes="*, platforms/*" prefix="eclipselink/utils/workbench/config"/>
<zipfileset dir="${eclipselink.util.workbench}" includes="readme.html" prefix="eclipselink/utils/workbench"/>
- <zipfileset dir="${eclipselink.util.workbench}/bin/" includes="*" prefix="eclipselink/utils/workbench/bin" filemode="755"/>
+ <zipfileset dir="${eclipselink.util.workbench}/bin/" includes="*" prefix="eclipselink/utils/workbench/bin" filemode="755"/>-->
</zip>
</target>
diff --git a/moxy/bin/jaxb-compiler.cmd b/moxy/bin/jaxb-compiler.cmd
index 75f20ed..fda89d2 100755
--- a/moxy/bin/jaxb-compiler.cmd
+++ b/moxy/bin/jaxb-compiler.cmd
@@ -13,11 +13,10 @@ set JVM_ARGS=-Xmx256m
set _FIXPATH=
call :fixpath "%~dp0"
set THIS=%_FIXPATH:~1%
-set CLASSPATH=%THIS%..\jlib\moxy\javax.xml.stream_1.0.1.v201004272200.jar
-set CLASSPATH=%CLASSPATH%;%THIS%..\jlib\moxy\javax.xml.bind_2.2.0.v201105210648.jar
-set CLASSPATH=%CLASSPATH%;%THIS%..\jlib\moxy\javax.activation_1.1.0.v201108011116.jar
-set CLASSPATH=%CLASSPATH%;%THIS%..\jlib\moxy\com.sun.xml.bind_2.2.0.v201004141950.jar
-set CLASSPATH=%CLASSPATH%;%THIS%..\jlib\moxy\com.sun.tools.xjc_2.2.0.jar
+set CLASSPATH=%THIS%..\jlib\moxy\javax.xml.bind_2.2.0.v201105210648.jar
+set CLASSPATH=%CLASSPATH%;%THIS%..\jlib\moxy\javax.json-1.0.jar
+set CLASSPATH=%CLASSPATH%;%THIS%..\jlib\moxy\jaxb-core_2.2.11.v201406210428.jar
+set CLASSPATH=%CLASSPATH%;%THIS%..\jlib\moxy\jaxb-xjc_2.2.11.v201406210428.jar
set CLASSPATH=%CLASSPATH%;%THIS%..\jlib\moxy\javax.validation_1.1.0.v201304101302.jar
set CLASSPATH=%CLASSPATH%;%THIS%..\jlib\eclipselink.jar
set JAVA_ARGS=%*
diff --git a/moxy/bin/jaxb-compiler.sh b/moxy/bin/jaxb-compiler.sh
index 92a2ed7..a88615c 100755
--- a/moxy/bin/jaxb-compiler.sh
+++ b/moxy/bin/jaxb-compiler.sh
@@ -8,11 +8,10 @@ JVM_ARGS="-Xmx256m"
# JVM_ARGS="${JVM_ARGS} -DproxySet=true -Dhttp.proxyHost= -Dhttp.proxyPort="
# Please do not change any of the following lines:
-CLASSPATH=`dirname $0`/../jlib/moxy/javax.xml.stream_1.0.1.v201004272200.jar:\
-`dirname $0`/../jlib/moxy/javax.xml.bind_2.2.0.v201105210648.jar:\
-`dirname $0`/../jlib/moxy/javax.activation_1.1.0.v201108011116.jar:\
-`dirname $0`/../jlib/moxy/com.sun.xml.bind_2.2.0.v201004141950.jar:\
-`dirname $0`/../jlib/moxy/com.sun.tools.xjc_2.2.0.jar:\
+CLASSPATH=`dirname $0`/../jlib/moxy/javax.xml.bind_2.2.0.v201105210648.jar:\
+`dirname $0`/../jlib/moxy/jaxb-core_2.2.11.v201406210428.jar:\
+`dirname $0`/../jlib/moxy/jaxb-xjc_2.2.11.v201406210428.jar:\
+`dirname $0`/../jlib/moxy/javax.json-1.0.jar:\
`dirname $0`/../jlib/moxy/javax.validation_1.1.0.v201304101302.jar:\
`dirname $0`/../jlib/eclipselink.jar
JAVA_ARGS="$@"