aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcel Valovy2014-07-30 22:27:25 (EDT)
committerLukas Jungmann2014-08-07 13:32:11 (EDT)
commit40d3670853b72d9fac1b1a45037fb473395ce39b (patch)
tree795a0052de6717d529c90c1cbe93a35eda92ca83
parentf57a81bb8b1a8653e9ca5f1a766e4406cb05bb3b (diff)
downloadeclipselink.runtime-40d3670853b72d9fac1b1a45037fb473395ce39b.zip
eclipselink.runtime-40d3670853b72d9fac1b1a45037fb473395ce39b.tar.gz
eclipselink.runtime-40d3670853b72d9fac1b1a45037fb473395ce39b.tar.bz2
Moved extension libraries used for BV tests from Project structure to external folder.
Signed-off-by: Marcel Valovy <marcel.valovy@oracle.com>
-rw-r--r--jpa/eclipselink.jpa.test/antbuild.properties3
-rw-r--r--jpa/eclipselink.jpa.test/antbuild.xml24
-rw-r--r--moxy/eclipselink.moxy.test/antbuild.properties21
-rw-r--r--moxy/eclipselink.moxy.test/antbuild.xml27
-rw-r--r--moxy/eclipselink.moxy.test/src/org/eclipse/persistence/testing/jaxb/JAXBBeanValidationTestSuite.java (renamed from moxy/eclipselink.moxy.test/src/org/eclipse/persistence/testing/jaxb/JAXBTestSuite5.java)8
-rw-r--r--moxy/eclipselink.moxy.test/src/org/eclipse/persistence/testing/jaxb/JAXBTestSuite4.java2
-rw-r--r--plugins/classmate-1.0.0.jarbin60282 -> 0 bytes
-rw-r--r--plugins/hibernate-validator-5.1.0.Final-sources.jarbin564214 -> 0 bytes
-rw-r--r--plugins/hibernate-validator-5.1.0.Final.jarbin622634 -> 0 bytes
-rw-r--r--plugins/javax.el-2.2.2.jarbin117471 -> 0 bytes
-rw-r--r--plugins/javax.el-api-2.2.jarbin33936 -> 0 bytes
-rw-r--r--plugins/jboss-logging-3.1.4.GA.jarbin57193 -> 0 bytes
12 files changed, 53 insertions, 32 deletions
diff --git a/jpa/eclipselink.jpa.test/antbuild.properties b/jpa/eclipselink.jpa.test/antbuild.properties
index 44f8af1..e529950 100644
--- a/jpa/eclipselink.jpa.test/antbuild.properties
+++ b/jpa/eclipselink.jpa.test/antbuild.properties
@@ -28,6 +28,7 @@ classes21.dir=classes21
build.dir=build
resource.dir=resource
plugins.dir=plugins
+eclipselink.external.libs=../../../extension.lib.external
# General 3rd-Party API jar definitions
-----------------------------------------
@@ -145,7 +146,7 @@ eclipselink.jpa.spring.test=../eclipselink.jpa.spring.test
----------------------------------------------
javax.validation.jar=javax.validation_1.1.0.v201304101302.jar
validation-impl.jar=hibernate-validator-5.1.0.Final.jar
-# Required by the hibernate-validator.
+# Hibernate-validator dependencies.
jboss-logging.jar=jboss-logging-3.1.4.GA.jar
javax.el-api.jar=javax.el-api-2.2.jar
javax.el.jar=javax.el-2.2.2.jar
diff --git a/jpa/eclipselink.jpa.test/antbuild.xml b/jpa/eclipselink.jpa.test/antbuild.xml
index 84a0b6c..faa1fe4 100644
--- a/jpa/eclipselink.jpa.test/antbuild.xml
+++ b/jpa/eclipselink.jpa.test/antbuild.xml
@@ -223,7 +223,15 @@
<available file="${jpatest.2.common.plugins.dir}/${modelgen.jar}" property="modelgen.jar.exist"/>
- <available file="${jpatest.2.common.plugins.dir}/${validation-impl.jar}" property="validate.jar.exist"/>
+ <condition property="validate.jar.exists">
+ <and>
+ <available file="${eclipselink.external.libs}/${validation-impl.jar}" />
+ <available file="${eclipselink.external.libs}/${jboss-logging.jar}" />
+ <available file="${eclipselink.external.libs}/${javax.el-api.jar}" />
+ <available file="${eclipselink.external.libs}/${javax.el.jar}" />
+ <available file="${eclipselink.external.libs}/${classmate.jar}" />
+ </and>
+ </condition>
<target name="set-server-properties">
<property file="${user.home}/${server.name}.properties"/>
@@ -1404,12 +1412,12 @@
</path>
<path id="run.bean.validation.classpath">
<path refid="run.classpath"/>
- <pathelement path="${jpatest.2.common.plugins.dir}/${validation-impl.jar}"/>
- <pathelement path="${jpatest.2.common.plugins.dir}/${jboss-logging.jar}"/>
- <pathelement path="${jpatest.2.common.plugins.dir}/${javax.el-api.jar}"/>
- <pathelement path="${jpatest.2.common.plugins.dir}/${javax.el.jar}"/>
- <pathelement path="${jpatest.2.common.plugins.dir}/${classmate.jar}"/>
- <pathelement path="${jpatest.2.common.plugins.dir}/${javax.validation.jar}"/>
+ <pathelement path="${eclipselink.external.libs}/${validation-impl.jar}"/>
+ <pathelement path="${eclipselink.external.libs}/${jboss-logging.jar}"/>
+ <pathelement path="${eclipselink.external.libs}/${javax.el-api.jar}"/>
+ <pathelement path="${eclipselink.external.libs}/${javax.el.jar}"/>
+ <pathelement path="${eclipselink.external.libs}/${classmate.jar}"/>
+ <pathelement path="${eclipselink.external.libs}/${javax.validation.jar}"/>
</path>
<path id="run.jpa21.classpath">
<pathelement path="${jpatest.basedir}/${classes21.dir}"/>
@@ -1576,7 +1584,7 @@
</target>
<!-- Runs JPA 2.0 BeanValidation tests. -->
- <target name="run-bean-validation-tests" depends="config-classpath" if="validate.jar.exist">
+ <target name="run-bean-validation-tests" depends="config-classpath" if="validate.jar.exists">
<antcall target="run-test" inheritRefs="true">
<param name="TEST_CLASS" value="org.eclipse.persistence.testing.tests.jpa.beanvalidation.BeanValidationJunitTest"/>
<param name="TEST_AGENT" value="${test.agent}"/>
diff --git a/moxy/eclipselink.moxy.test/antbuild.properties b/moxy/eclipselink.moxy.test/antbuild.properties
index 1646007..df0071d 100644
--- a/moxy/eclipselink.moxy.test/antbuild.properties
+++ b/moxy/eclipselink.moxy.test/antbuild.properties
@@ -17,14 +17,6 @@ jaxb-xjc.jar=jaxb-xjc_2.2.11.v201406210428.jar
jaxb-core.jar=jaxb-core_2.2.11.v201406210428.jar
jaxb-impl.jar=com.sun.xml.bind_2.2.11.v201406210428.jar
-javax.validation.jar=javax.validation_1.1.0.v201304101302.jar
-validation-impl.jar=hibernate-validator-5.1.0.Final.jar
-# Required by the hibernate-validator.
-jboss-logging.jar=jboss-logging-3.1.4.GA.jar
-javax.el-api.jar=javax.el-api-2.2.jar
-javax.el.jar=javax.el-2.2.2.jar
-classmate.jar=classmate-1.0.0.jar
-
json.jar=javax.json-1.0.jar
stax_api.jar=javax.xml.stream_1.0.1.v201004272200.jar
activation.jar=javax.activation_1.1.0.v201108011116.jar
@@ -42,8 +34,7 @@ eclipselink.core.depend=${activation.jar},${resource.jar},${ejb.jar},${jms.jar},
eclipselink.jar=eclipselink.jar
eclipselink.core=../../foundation/org.eclipse.persistence.core
eclipselink.plugins=../../plugins
-eclipselink.moxy.plugins=../plugins
-eclipselink.moxy=../org.eclipse.persistence.moxy
+eclipselink.external.libs=../../../extension.lib.external
eclipselink.moxy.test=.
unsigned.persistence10.jar=javax.persistence_unsigned_for_testing_1.0.0.jar
@@ -62,3 +53,13 @@ parser=org.eclipse.persistence.platform.xml.jaxp.JAXPParser
# You can set these properties to run moxy tests with any xml parser other than the default from a JVM
xml.parser.jar.dir=.
xml.parser.jar=dummy_xml_parser.jar
+
+# JSR-303/349 Dependency Definitions
+----------------------------------------------
+javax.validation.jar=javax.validation_1.1.0.v201304101302.jar
+validation-impl.jar=hibernate-validator-5.1.0.Final.jar
+# Hibernate-validator dependencies.
+jboss-logging.jar=jboss-logging-3.1.4.GA.jar
+javax.el-api.jar=javax.el-api-2.2.jar
+javax.el.jar=javax.el-2.2.2.jar
+classmate.jar=classmate-1.0.0.jar \ No newline at end of file
diff --git a/moxy/eclipselink.moxy.test/antbuild.xml b/moxy/eclipselink.moxy.test/antbuild.xml
index 59aa36c..b0e8f86 100644
--- a/moxy/eclipselink.moxy.test/antbuild.xml
+++ b/moxy/eclipselink.moxy.test/antbuild.xml
@@ -35,7 +35,7 @@
* rbarkhouse - 06 Apr 2011 - Separate JavadocAnnotationExamples from JAXBTestSuite
* dmahar - Jan 2012 - remove update-package-names targets
* bdoughan - Sep 2012 - Added RESTful tests and necessary dependencies
-* mvalovy - Mar-Jul 2014 - Added Bean Validation support, JAXBTestSuite5
+* mvalovy - Mar-Jul 2014 - Added Bean Validation support, JAXBBeanValidationTestSuite
and JAXBPerformanceTestSuite
#******************************************************************************/-->
@@ -86,11 +86,21 @@
<property name="jaxb-impl.lib" value="${moxytest.2.common.plugins.dir}/${jaxb-impl.jar}"/>
<property name="jaxb-core.lib" value="${moxytest.2.common.plugins.dir}/${jaxb-core.jar}"/>
<property name="javax.validation.lib" value="${moxytest.2.common.plugins.dir}/${javax.validation.jar}"/>
- <property name="validation-impl.lib" value="${moxytest.2.common.plugins.dir}/${validation-impl.jar}"/>
- <property name="jboss-logging.lib" value="${moxytest.2.common.plugins.dir}/${jboss-logging.jar}"/>
- <property name="javax.el-api.lib" value="${moxytest.2.common.plugins.dir}/${javax.el-api.jar}"/>
- <property name="javax.el.lib" value="${moxytest.2.common.plugins.dir}/${javax.el.jar}"/>
- <property name="classmate.lib" value="${moxytest.2.common.plugins.dir}/${classmate.jar}"/>
+ <property name="validation-impl.lib" value="${eclipselink.external.libs}/${validation-impl.jar}"/>
+ <property name="jboss-logging.lib" value="${eclipselink.external.libs}/${jboss-logging.jar}"/>
+ <property name="javax.el-api.lib" value="${eclipselink.external.libs}/${javax.el-api.jar}"/>
+ <property name="javax.el.lib" value="${eclipselink.external.libs}/${javax.el.jar}"/>
+ <property name="classmate.lib" value="${eclipselink.external.libs}/${classmate.jar}"/>
+
+ <condition property="validate.jar.exists">
+ <and>
+ <available file="${eclipselink.external.libs}/${validation-impl.jar}" />
+ <available file="${eclipselink.external.libs}/${jboss-logging.jar}" />
+ <available file="${eclipselink.external.libs}/${javax.el-api.jar}" />
+ <available file="${eclipselink.external.libs}/${javax.el.jar}" />
+ <available file="${eclipselink.external.libs}/${classmate.jar}" />
+ </and>
+ </condition>
<path id="xml.parser.path">
<fileset
@@ -394,6 +404,7 @@
<macrodef name="run_jaxb_tests">
<attribute name="runpathref"/>
<sequential>
+ <echo message="Bean Validation jars found: ${validate.jar.exists}."/>
<delete dir="${report.dir}/jaxb" includeEmptyDirs="true" failonerror="false"/>
<mkdir dir="${report.dir}/jaxb"/>
<mkdir dir="${resource.dir}/${tmp.dir}"/>
@@ -412,8 +423,7 @@
<include name="org/eclipse/persistence/testing/jaxb/JAXBTestSuite2.java"/>
<include name="org/eclipse/persistence/testing/jaxb/JAXBTestSuite3.java"/>
<include name="org/eclipse/persistence/testing/jaxb/JAXBTestSuite4.java"/>
- <include name="org/eclipse/persistence/testing/jaxb/JAXBTestSuite5.java"/>
- <!--<include name="org/eclipse/persistence/testing/jaxb/JAXBPerformanceTestSuite.java"/>-->
+ <include name="org/eclipse/persistence/testing/jaxb/JAXBBeanValidationTestSuite.java" if="validate.jar.exists"/>
<include name="org/eclipse/persistence/testing/jaxb/listofobjects/JAXBListOfObjectsSuite.java"/>
<include name="org/eclipse/persistence/testing/jaxb/annotations/AnnotationsTestSuite.java"/>
<include name="org/eclipse/persistence/testing/jaxb/externalizedmetadata/ExternalizedMetadataTestSuite.java"/>
@@ -425,6 +435,7 @@
<include name="org/eclipse/persistence/testing/jaxb/dynamic/DynamicJAXBTestSuite.java"/>
<include name="org/eclipse/persistence/testing/jaxb/json/JSONTestSuite.java"/>
<include name="org/eclipse/persistence/testing/jaxb/rs/RESTfulTestSuite.java"/>
+ <!--<include name="org/eclipse/persistence/testing/jaxb/JAXBPerformanceTestSuite.java"/>-->
</fileset>
<formatter type="xml"/>
</batchtest>
diff --git a/moxy/eclipselink.moxy.test/src/org/eclipse/persistence/testing/jaxb/JAXBTestSuite5.java b/moxy/eclipselink.moxy.test/src/org/eclipse/persistence/testing/jaxb/JAXBBeanValidationTestSuite.java
index 7b5486d..36b110a 100644
--- a/moxy/eclipselink.moxy.test/src/org/eclipse/persistence/testing/jaxb/JAXBTestSuite5.java
+++ b/moxy/eclipselink.moxy.test/src/org/eclipse/persistence/testing/jaxb/JAXBBeanValidationTestSuite.java
@@ -16,18 +16,16 @@ import junit.framework.Test;
import junit.framework.TestSuite;
import org.eclipse.persistence.testing.jaxb.beanvalidation.BeanValidationBindingsTestCase;
import org.eclipse.persistence.testing.jaxb.beanvalidation.BeanValidationRuntimeTestCase;
-import org.eclipse.persistence.testing.jaxb.casesensitivity.JAXBCaseInsensitivityTestCase;
/**
* @author Marcel Valovy - marcel.valovy@oracle.com
* @since 2.6
*/
-public class JAXBTestSuite5 {
+public class JAXBBeanValidationTestSuite {
public static Test suite() {
- TestSuite suite = new TestSuite("JAXB20 Compiler Test Suite5");
+ TestSuite suite = new TestSuite("JAXB20 Compiler Bean Validation Test Suite");
- suite.addTestSuite(JAXBCaseInsensitivityTestCase.class);
suite.addTestSuite(BeanValidationRuntimeTestCase.class);
suite.addTestSuite(BeanValidationBindingsTestCase.class);
@@ -36,7 +34,7 @@ public class JAXBTestSuite5 {
public static void main(String[] args) {
- String[] arguments = { "-c", "org.eclipse.persistence.testing.jaxb.JAXBTestSuite5" };
+ String[] arguments = { "-c", "org.eclipse.persistence.testing.jaxb.JAXBBeanValidationTestSuite" };
junit.textui.TestRunner.main(arguments);
}
diff --git a/moxy/eclipselink.moxy.test/src/org/eclipse/persistence/testing/jaxb/JAXBTestSuite4.java b/moxy/eclipselink.moxy.test/src/org/eclipse/persistence/testing/jaxb/JAXBTestSuite4.java
index e8cafe7..39d457e 100644
--- a/moxy/eclipselink.moxy.test/src/org/eclipse/persistence/testing/jaxb/JAXBTestSuite4.java
+++ b/moxy/eclipselink.moxy.test/src/org/eclipse/persistence/testing/jaxb/JAXBTestSuite4.java
@@ -12,6 +12,7 @@
******************************************************************************/
package org.eclipse.persistence.testing.jaxb;
+import org.eclipse.persistence.testing.jaxb.casesensitivity.JAXBCaseInsensitivityTestCase;
import org.eclipse.persistence.testing.jaxb.collections.CollectionsTestSuite;
import org.eclipse.persistence.testing.jaxb.defaultvalue.DefaultValueTestSuite;
import org.eclipse.persistence.testing.jaxb.employee.JAXBEmployeeNSTestCases;
@@ -81,6 +82,7 @@ public class JAXBTestSuite4 {
suite.addTestSuite(TypeAttributeInheritanceTestCases.class);
suite.addTestSuite(OtherRootTestCases.class);
suite.addTest(TypeVariableTestSuite.suite());
+ suite.addTestSuite(JAXBCaseInsensitivityTestCase.class);
return suite;
}
diff --git a/plugins/classmate-1.0.0.jar b/plugins/classmate-1.0.0.jar
deleted file mode 100644
index 728746f..0000000
--- a/plugins/classmate-1.0.0.jar
+++ /dev/null
Binary files differ
diff --git a/plugins/hibernate-validator-5.1.0.Final-sources.jar b/plugins/hibernate-validator-5.1.0.Final-sources.jar
deleted file mode 100644
index 3ee0b4b..0000000
--- a/plugins/hibernate-validator-5.1.0.Final-sources.jar
+++ /dev/null
Binary files differ
diff --git a/plugins/hibernate-validator-5.1.0.Final.jar b/plugins/hibernate-validator-5.1.0.Final.jar
deleted file mode 100644
index c3fbe2f..0000000
--- a/plugins/hibernate-validator-5.1.0.Final.jar
+++ /dev/null
Binary files differ
diff --git a/plugins/javax.el-2.2.2.jar b/plugins/javax.el-2.2.2.jar
deleted file mode 100644
index a4ad898..0000000
--- a/plugins/javax.el-2.2.2.jar
+++ /dev/null
Binary files differ
diff --git a/plugins/javax.el-api-2.2.jar b/plugins/javax.el-api-2.2.jar
deleted file mode 100644
index da6730c..0000000
--- a/plugins/javax.el-api-2.2.jar
+++ /dev/null
Binary files differ
diff --git a/plugins/jboss-logging-3.1.4.GA.jar b/plugins/jboss-logging-3.1.4.GA.jar
deleted file mode 100644
index 34e53b5..0000000
--- a/plugins/jboss-logging-3.1.4.GA.jar
+++ /dev/null
Binary files differ