move jpa test framework to its own package namespace

Signed-off-by: Lukas Jungmann <[email protected]>
eclipse-ee4j · Jul 11, 2022 · b660033 · b660033
1 parent b94b509
commit b660033
Show file tree

Hide file tree

Showing 276 changed files with 617 additions and 767 deletions.
diff --git a/...main/resources/nonfiltered/eclipselink-test-src.zip/jpa/eclipselink.jpa.test/antbuild.xml b/...main/resources/nonfiltered/eclipselink-test-src.zip/jpa/eclipselink.jpa.test/antbuild.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 1998, 2020 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 1998, 2022 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0 which is available at
@@ -950,8 +950,8 @@
                 <property name="gen.srv.cls.dir" value="${jpatest.server.build.dir}/@{testname}/ejb-classes"/>
                 <mkdir dir="${gen.srv.src.dir}"/>
                 <copy overwrite="true"
-                      tofile="${gen.srv.src.dir}/org/eclipse/persistence/testing/framework/server/TestRunnerBean.java"
-                      file="${jpatest.src.dir}/org/eclipse/persistence/testing/framework/server/${bean.src}">
+                      tofile="${gen.srv.src.dir}/org/eclipse/persistence/testing/framework/jpa/server/TestRunnerBean.java"
+                      file="${jpatest.src.dir}/org/eclipse/persistence/testing/framework/jpa/server/${bean.src}">
                     <filterset>
                         <filter token="puName" value="@{puname}"/>
                     </filterset>
@@ -991,7 +991,7 @@
                                   org/eclipse/persistence/testing/tests/TestRunModel*"/>
                     <zipfileset  src="${jpatest.basedir}/${jpatest.framework}.jar"
                                  includes="org/eclipse/persistence/testing/framework/junit/*.class,
-                                  org/eclipse/persistence/testing/framework/server/*.class"
+                                  org/eclipse/persistence/testing/framework/jpa/server/*.class"
                                  excludes="${impl.excluded.runners}"/>
                     <fileset dir="${jpatest.server.build.dir}/@{testname}/ejb-classes" erroronmissingdir="false"/>
                     <fileset dir="${stage.build.dir.ejb}" includes="@{ejbjarincludes}" excludes="@{ejbjarexcludes}"/>
@@ -1213,7 +1213,7 @@
                target="${javac.version}"
                deprecation="${javac.deprecation}"
                failonerror="true">
-            <include name="org/eclipse/persistence/testing/framework/server/**"/>
+            <include name="org/eclipse/persistence/testing/framework/jpa/server/**"/>
             <classpath>
                 <path refid="compile.path"/>
                 <path refid="spring.path"/>
@@ -2319,7 +2319,7 @@
         <property name="additional.jvmargs" value="-Ddummy2=dummy"/>
 
         <junit printsummary="yes" haltonfailure="yes" fork="yes" forkmode="once" showoutput="true" maxmemory="512m" dir="${run.dir}">
-            <sysproperty key="TEST_SERVER_PLATFORM" value="org.eclipse.persistence.testing.framework.server.SpringPlatform"/>
+            <sysproperty key="TEST_SERVER_PLATFORM" value="org.eclipse.persistence.testing.framework.jpa.server.SpringPlatform"/>
             <sysproperty key="proxy.user.name" value="${oracle.proxy.user}"/>
             <sysproperty key="run.metadata.cache.test.suite" value="${run.metadata.cache.test.suite}"/>
             <jvmarg line="${additional.jvmargs}"/>

diff --git a/...ources/nonfiltered/eclipselink-test-src.zip/jpa/eclipselink.jpa.test/glassfish.properties b/...ources/nonfiltered/eclipselink-test-src.zip/jpa/eclipselink.jpa.test/glassfish.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2022 Oracle and/or its affiliates. All rights reserved.
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License v. 2.0 which is available at
@@ -72,13 +72,13 @@ server.pwd=
 server.user=admin
 adminpassfile=glassfishadminpass
 server.url=http://localhost:4848/
-server.testrunner=TestRunner#org.eclipse.persistence.testing.framework.server.TestRunner
-server.testrunner1=TestRunner1#org.eclipse.persistence.testing.framework.server.TestRunner1
-server.testrunner2=TestRunner2#org.eclipse.persistence.testing.framework.server.TestRunner2
-server.testrunner3=TestRunner3#org.eclipse.persistence.testing.framework.server.TestRunner3
-server.testrunner4=TestRunner4#org.eclipse.persistence.testing.framework.server.TestRunner4
-server.testrunner5=TestRunner5#org.eclipse.persistence.testing.framework.server.TestRunner5
-server.testrunner6=TestRunner6#org.eclipse.persistence.testing.framework.server.TestRunner6
+server.testrunner=TestRunner#org.eclipse.persistence.testing.framework.jpa.server.TestRunner
+server.testrunner1=TestRunner1#org.eclipse.persistence.testing.framework.jpa.server.TestRunner1
+server.testrunner2=TestRunner2#org.eclipse.persistence.testing.framework.jpa.server.TestRunner2
+server.testrunner3=TestRunner3#org.eclipse.persistence.testing.framework.jpa.server.TestRunner3
+server.testrunner4=TestRunner4#org.eclipse.persistence.testing.framework.jpa.server.TestRunner4
+server.testrunner5=TestRunner5#org.eclipse.persistence.testing.framework.jpa.server.TestRunner5
+server.testrunner6=TestRunner6#org.eclipse.persistence.testing.framework.jpa.server.TestRunner6
 server.lib=${install.dir}/glassfish/lib
 server.depend=appserv-rt.jar, javaee.jar
 server.platform=Glassfish

diff --git a/.../resources/nonfiltered/eclipselink-test-src.zip/jpa/eclipselink.jpa.test/jboss.properties b/.../resources/nonfiltered/eclipselink-test-src.zip/jpa/eclipselink.jpa.test/jboss.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2022 Oracle and/or its affiliates. All rights reserved.
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License v. 2.0 which is available at
@@ -33,13 +33,13 @@ server.pwd=admin
 
 ## JBoss 5.1.x specific properties.
 jboss.home=C:/jboss-5.1.0.GA
-server.testrunner=TestRunner/remote-org.eclipse.persistence.testing.framework.server.TestRunner
-server.testrunner1=TestRunner1/remote-org.eclipse.persistence.testing.framework.server.TestRunner1
-server.testrunner2=TestRunner2/remote-org.eclipse.persistence.testing.framework.server.TestRunner2
-server.testrunner3=TestRunner3/remote-org.eclipse.persistence.testing.framework.server.TestRunner3
-server.testrunner4=TestRunner4/remote-org.eclipse.persistence.testing.framework.server.TestRunner4
-server.testrunner5=TestRunner5/remote-org.eclipse.persistence.testing.framework.server.TestRunner5
-server.testrunner6=TestRunner6/remote-org.eclipse.persistence.testing.framework.server.TestRunner6
+server.testrunner=TestRunner/remote-org.eclipse.persistence.testing.framework.jpa.server.TestRunner
+server.testrunner1=TestRunner1/remote-org.eclipse.persistence.testing.framework.jpa.server.TestRunner1
+server.testrunner2=TestRunner2/remote-org.eclipse.persistence.testing.framework.jpa.server.TestRunner2
+server.testrunner3=TestRunner3/remote-org.eclipse.persistence.testing.framework.jpa.server.TestRunner3
+server.testrunner4=TestRunner4/remote-org.eclipse.persistence.testing.framework.jpa.server.TestRunner4
+server.testrunner5=TestRunner5/remote-org.eclipse.persistence.testing.framework.jpa.server.TestRunner5
+server.testrunner6=TestRunner6/remote-org.eclipse.persistence.testing.framework.jpa.server.TestRunner6
 server.testrunner.wdf=ServerTestRunner/remote-org.eclipse.persistence.testing.framework.wdf.server.ServerTestRunner
 persistence10.jar=${jboss.home}/common/lib/ejb3-persistence.jar
 

diff --git a/...ources/nonfiltered/eclipselink-test-src.zip/jpa/eclipselink.jpa.test/netweaver.properties b/...ources/nonfiltered/eclipselink-test-src.zip/jpa/eclipselink.jpa.test/netweaver.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2022 Oracle and/or its affiliates. All rights reserved.
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License v. 2.0 which is available at
@@ -56,7 +56,7 @@ netweaver.datasource.app=servertest_datasource
 ####################################
 # DO NOT CHANGE
 ####################################
-server.testrunner=JavaEE/servertest/REMOTE/TestRunner/org.eclipse.persistence.testing.framework.server.TestRunner
+server.testrunner=JavaEE/servertest/REMOTE/TestRunner/org.eclipse.persistence.testing.framework.jpa.server.TestRunner
 server.testrunner.wdf=JavaEE/servertest/REMOTE/ServerTestRunner/org.eclipse.persistence.testing.framework.wdf.server.ServerTestRunner
 server.lib=${netweaver.instance.dir}/j2ee/j2eeclient
 server.platform=NetWeaver_7_1

diff --git a/...rces/nonfiltered/eclipselink-test-src.zip/jpa/eclipselink.jpa.test/weblogic-mt.properties b/...rces/nonfiltered/eclipselink-test-src.zip/jpa/eclipselink.jpa.test/weblogic-mt.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2014, 2020 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2022 Oracle and/or its affiliates. All rights reserved.
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License v. 2.0 which is available at
@@ -82,13 +82,13 @@ eclipselink.lib=../../eclipselink.jar
 server.depend=weblogic.jar
 
 # Test runners
-server.testrunner=TestRunner#org.eclipse.persistence.testing.framework.server.TestRunner
+server.testrunner=TestRunner#org.eclipse.persistence.testing.framework.jpa.server.TestRunner
 server.testrunner.wdf=ServerTestRunner#org.eclipse.persistence.testing.framework.wdf.server.ServerTestRunner
-server.testrunner1=TestRunner1#org.eclipse.persistence.testing.framework.server.TestRunner1
-server.testrunner2=TestRunner2#org.eclipse.persistence.testing.framework.server.TestRunner2
-server.testrunner3=TestRunner3#org.eclipse.persistence.testing.framework.server.TestRunner3
-server.testrunner4=TestRunner4#org.eclipse.persistence.testing.framework.server.TestRunner4
-server.testrunner5=TestRunner5#org.eclipse.persistence.testing.framework.server.TestRunner5
+server.testrunner1=TestRunner1#org.eclipse.persistence.testing.framework.jpa.server.TestRunner1
+server.testrunner2=TestRunner2#org.eclipse.persistence.testing.framework.jpa.server.TestRunner2
+server.testrunner3=TestRunner3#org.eclipse.persistence.testing.framework.jpa.server.TestRunner3
+server.testrunner4=TestRunner4#org.eclipse.persistence.testing.framework.jpa.server.TestRunner4
+server.testrunner5=TestRunner5#org.eclipse.persistence.testing.framework.jpa.server.TestRunner5
 
 ###############################################################################
 ########### EclipseLink MT build script variables, do not change! #############

diff --git a/...sources/nonfiltered/eclipselink-test-src.zip/jpa/eclipselink.jpa.test/weblogic.properties b/...sources/nonfiltered/eclipselink-test-src.zip/jpa/eclipselink.jpa.test/weblogic.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2022 Oracle and/or its affiliates. All rights reserved.
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License v. 2.0 which is available at
@@ -58,14 +58,14 @@ weblogic.domain=${weblogic.installdir}/samples/domains/mydomain
 server.lib=${weblogic.installdir}/server/lib
 server.modules=${weblogic.installdir}/../oracle_common/modules
 server.module.toplink=${server.modules}/oracle.toplink
-server.testrunner=TestRunner#org.eclipse.persistence.testing.framework.server.TestRunner
+server.testrunner=TestRunner#org.eclipse.persistence.testing.framework.jpa.server.TestRunner
 server.testrunner.wdf=ServerTestRunner#org.eclipse.persistence.testing.framework.wdf.server.ServerTestRunner
-server.testrunner1=TestRunner1#org.eclipse.persistence.testing.framework.server.TestRunner1
-server.testrunner2=TestRunner2#org.eclipse.persistence.testing.framework.server.TestRunner2
-server.testrunner3=TestRunner3#org.eclipse.persistence.testing.framework.server.TestRunner3
-server.testrunner4=TestRunner4#org.eclipse.persistence.testing.framework.server.TestRunner4
-server.testrunner5=TestRunner5#org.eclipse.persistence.testing.framework.server.TestRunner5
-server.testrunner6=TestRunner6#org.eclipse.persistence.testing.framework.server.TestRunner6
+server.testrunner1=TestRunner1#org.eclipse.persistence.testing.framework.jpa.server.TestRunner1
+server.testrunner2=TestRunner2#org.eclipse.persistence.testing.framework.jpa.server.TestRunner2
+server.testrunner3=TestRunner3#org.eclipse.persistence.testing.framework.jpa.server.TestRunner3
+server.testrunner4=TestRunner4#org.eclipse.persistence.testing.framework.jpa.server.TestRunner4
+server.testrunner5=TestRunner5#org.eclipse.persistence.testing.framework.jpa.server.TestRunner5
+server.testrunner6=TestRunner6#org.eclipse.persistence.testing.framework.jpa.server.TestRunner6
 server.depend=weblogic.jar,weblogic_sp.jar
 server.platform=weblogic
 server.platform.class=weblogic-12-platform

diff --git a/...ources/nonfiltered/eclipselink-test-src.zip/jpa/eclipselink.jpa.test/websphere.properties b/...ources/nonfiltered/eclipselink-test-src.zip/jpa/eclipselink.jpa.test/websphere.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2022 Oracle and/or its affiliates. All rights reserved.
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License v. 2.0 which is available at
@@ -19,13 +19,13 @@ server.version=as
 
 server.user=
 server.pwd=
-server.testrunner=org.eclipse.persistence.testing.framework.server.TestRunner
-server.testrunner1=org.eclipse.persistence.testing.framework.server.TestRunner1
-server.testrunner2=org.eclipse.persistence.testing.framework.server.TestRunner2
-server.testrunner3=org.eclipse.persistence.testing.framework.server.TestRunner3
-server.testrunner4=org.eclipse.persistence.testing.framework.server.TestRunner4
-server.testrunner5=org.eclipse.persistence.testing.framework.server.TestRunner5
-server.testrunner6=org.eclipse.persistence.testing.framework.server.TestRunner6
+server.testrunner=org.eclipse.persistence.testing.framework.jpa.server.TestRunner
+server.testrunner1=org.eclipse.persistence.testing.framework.jpa.server.TestRunner1
+server.testrunner2=org.eclipse.persistence.testing.framework.jpa.server.TestRunner2
+server.testrunner3=org.eclipse.persistence.testing.framework.jpa.server.TestRunner3
+server.testrunner4=org.eclipse.persistence.testing.framework.jpa.server.TestRunner4
+server.testrunner5=org.eclipse.persistence.testing.framework.jpa.server.TestRunner5
+server.testrunner6=org.eclipse.persistence.testing.framework.jpa.server.TestRunner6
 server.lib=${was.home}/runtimes
 server.factory=com.ibm.websphere.naming.WsnInitialContextFactory
 server.persistence20.lib=${was.home}/feature_packs/jpa/plugins

diff --git a/...esources/nonfiltered/eclipselink-test-src.zip/jpa/eclipselink.jpa.test/wildfly.properties b/...esources/nonfiltered/eclipselink-test-src.zip/jpa/eclipselink.jpa.test/wildfly.properties
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2022 Oracle and/or its affiliates. All rights reserved.
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License v. 2.0 which is available at
@@ -29,13 +29,13 @@ server.pwd=admin
 wildfly.home=/Users/lukas/java/wildfly-11.0.0.Final
 wildfly.config=standalone-full.xml
 
-server.testrunner=TestRunner!org.eclipse.persistence.testing.framework.server.TestRunner
-server.testrunner1=TestRunner1!org.eclipse.persistence.testing.framework.server.TestRunner1
-server.testrunner2=TestRunner2!org.eclipse.persistence.testing.framework.server.TestRunner2
-server.testrunner3=TestRunner3!org.eclipse.persistence.testing.framework.server.TestRunner3
-server.testrunner4=TestRunner4!org.eclipse.persistence.testing.framework.server.TestRunner4
-server.testrunner5=TestRunner5!org.eclipse.persistence.testing.framework.server.TestRunner5
-server.testrunner6=TestRunner6!org.eclipse.persistence.testing.framework.server.TestRunner6
+server.testrunner=TestRunner!org.eclipse.persistence.testing.framework.jpa.server.TestRunner
+server.testrunner1=TestRunner1!org.eclipse.persistence.testing.framework.jpa.server.TestRunner1
+server.testrunner2=TestRunner2!org.eclipse.persistence.testing.framework.jpa.server.TestRunner2
+server.testrunner3=TestRunner3!org.eclipse.persistence.testing.framework.jpa.server.TestRunner3
+server.testrunner4=TestRunner4!org.eclipse.persistence.testing.framework.jpa.server.TestRunner4
+server.testrunner5=TestRunner5!org.eclipse.persistence.testing.framework.jpa.server.TestRunner5
+server.testrunner6=TestRunner6!org.eclipse.persistence.testing.framework.jpa.server.TestRunner6
 server.testrunner.wdf=ServerTestRunner/remote-org.eclipse.persistence.testing.framework.wdf.server.ServerTestRunner
 persistence10.jar=${jboss.home}/common/lib/ejb3-persistence.jar
 

diff --git a/etc/el-testjee.glassfish.properties b/etc/el-testjee.glassfish.properties
@@ -32,10 +32,10 @@ jee.client.version=5.1.0
 skip.jee.server.installation=false
 cargo.container.installation.home=${user.home}/.eclipselinktests/glassfish5
 
-server.testrunner.suffix=TestRunner#org.eclipse.persistence.testing.framework.server.TestRunner
-server.testrunner1.suffix=TestRunner1#org.eclipse.persistence.testing.framework.server.TestRunner1
-server.testrunner2.suffix=TestRunner2#org.eclipse.persistence.testing.framework.server.TestRunner2
-server.testrunner3.suffix=TestRunner3#org.eclipse.persistence.testing.framework.server.TestRunner3
-server.testrunner4.suffix=TestRunner4#org.eclipse.persistence.testing.framework.server.TestRunner4
-server.testrunner5.suffix=TestRunner5#org.eclipse.persistence.testing.framework.server.TestRunner5
-server.testrunner6.suffix=TestRunner6#org.eclipse.persistence.testing.framework.server.TestRunner6
+server.testrunner.suffix=TestRunner#org.eclipse.persistence.testing.framework.jpa.server.TestRunner
+server.testrunner1.suffix=TestRunner1#org.eclipse.persistence.testing.framework.jpa.server.TestRunner1
+server.testrunner2.suffix=TestRunner2#org.eclipse.persistence.testing.framework.jpa.server.TestRunner2
+server.testrunner3.suffix=TestRunner3#org.eclipse.persistence.testing.framework.jpa.server.TestRunner3
+server.testrunner4.suffix=TestRunner4#org.eclipse.persistence.testing.framework.jpa.server.TestRunner4
+server.testrunner5.suffix=TestRunner5#org.eclipse.persistence.testing.framework.jpa.server.TestRunner5
+server.testrunner6.suffix=TestRunner6#org.eclipse.persistence.testing.framework.jpa.server.TestRunner6
diff --git a/etc/el-testjee.weblogic.properties b/etc/el-testjee.weblogic.properties
@@ -30,10 +30,10 @@ jee.client.version=12.2.1-3
 skip.jee.server.installation=true
 cargo.container.installation.home=/usr/local/oracle/wls122130/wlserver
 
-server.testrunner.suffix=TestRunner#org.eclipse.persistence.testing.framework.server.TestRunner
-server.testrunner1.suffix=TestRunner1#org.eclipse.persistence.testing.framework.server.TestRunner1
-server.testrunner2.suffix=TestRunner2#org.eclipse.persistence.testing.framework.server.TestRunner2
-server.testrunner3.suffix=TestRunner3#org.eclipse.persistence.testing.framework.server.TestRunner3
-server.testrunner4.suffix=TestRunner4#org.eclipse.persistence.testing.framework.server.TestRunner4
-server.testrunner5.suffix=TestRunner5#org.eclipse.persistence.testing.framework.server.TestRunner5
-server.testrunner6.suffix=TestRunner6#org.eclipse.persistence.testing.framework.server.TestRunner6
+server.testrunner.suffix=TestRunner#org.eclipse.persistence.testing.framework.jpa.server.TestRunner
+server.testrunner1.suffix=TestRunner1#org.eclipse.persistence.testing.framework.jpa.server.TestRunner1
+server.testrunner2.suffix=TestRunner2#org.eclipse.persistence.testing.framework.jpa.server.TestRunner2
+server.testrunner3.suffix=TestRunner3#org.eclipse.persistence.testing.framework.jpa.server.TestRunner3
+server.testrunner4.suffix=TestRunner4#org.eclipse.persistence.testing.framework.jpa.server.TestRunner4
+server.testrunner5.suffix=TestRunner5#org.eclipse.persistence.testing.framework.jpa.server.TestRunner5
+server.testrunner6.suffix=TestRunner6#org.eclipse.persistence.testing.framework.jpa.server.TestRunner6