You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2020/06/17 03:03:18 UTC
[tomee-tck] 03/05: Rename properties jakartaee.cts.home,
jakartaee.ri.home, jakartaee.tck.version
This is an automated email from the ASF dual-hosted git repository.
dblevins pushed a commit to branch jakartaee9-tck
in repository https://gitbox.apache.org/repos/asf/tomee-tck.git
commit 9a3d113f7e86eae1625e489d64fa7a1875e861b2
Author: David Blevins <da...@gmail.com>
AuthorDate: Tue Jun 16 18:54:54 2020 -0700
Rename properties jakartaee.cts.home, jakartaee.ri.home, jakartaee.tck.version
---
pom.xml | 30 +++++++++++-----------
src/test/resources/testsuite.properties | 8 +++---
.../openejb/tck/commands/CommandSupport.groovy | 6 ++---
.../openejb/tck/commands/JavaTestCommand.groovy | 4 +--
.../tck/commands/ReverseSetupCommand.groovy | 2 +-
.../openejb/tck/commands/SetupCommand.groovy | 8 +++---
.../openejb/tck/commands/TsAntCommand.groovy | 2 +-
.../openejb/tck/commands/ValidateCommand.groovy | 4 +--
8 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3fad463..632fe65 100644
--- a/pom.xml
+++ b/pom.xml
@@ -48,9 +48,9 @@
<!--
NOTE: User must define "javaee8.cts.home" and "javaee8.ri.home" in ~/.m2/settings.xml
-->
- <javaee.cts.home>${javaee8.cts.home}</javaee.cts.home>
- <javaee.ri.home>${javaee8.ri.home}</javaee.ri.home>
- <javaee.tck.version>8.0</javaee.tck.version>
+ <jakartaee.cts.home>${jakartaee9.cts.home}</jakartaee.cts.home>
+ <jakartaee.ri.home>${jakartaee9.ri.home}</jakartaee.ri.home>
+ <jakartaee.tck.version>9.0</jakartaee.tck.version>
<localRepository>${settings.localRepository}</localRepository>
<examples.version>1.1-SNAPSHOT</examples.version>
@@ -123,50 +123,50 @@
<!--<dependency>-->
<!--<groupId>com.test</groupId>-->
<!--<artifactId>jar-to-test</artifactId>-->
- <!--<version>${javaee.tck.version}</version>-->
+ <!--<version>${jakartaee.tck.version}</version>-->
<!--<scope>system</scope>-->
<!--<type>jar</type>-->
- <!--<systemPath>${javaee.cts.home}/dist/com/sun/ts/tests/websocket/ee/javax/websocket/clientendpoint/wsc_ee_clientendpoint_Client_nodeploy.jar_client</systemPath>-->
+ <!--<systemPath>${jakartaee.cts.home}/dist/com/sun/ts/tests/websocket/ee/javax/websocket/clientendpoint/wsc_ee_clientendpoint_Client_nodeploy.jar_client</systemPath>-->
<!--</dependency>-->
<dependency>
<groupId>com.sun.javaee.tck</groupId>
<artifactId>tsharness</artifactId>
- <version>${javaee.tck.version}</version>
+ <version>${jakartaee.tck.version}</version>
<scope>system</scope>
- <systemPath>${javaee.cts.home}/lib/tsharness.jar</systemPath>
+ <systemPath>${jakartaee.cts.home}/lib/tsharness.jar</systemPath>
</dependency>
<dependency>
<groupId>com.sun.javaee.tck</groupId>
<artifactId>javatest</artifactId>
- <version>${javaee.tck.version}</version>
+ <version>${jakartaee.tck.version}</version>
<scope>system</scope>
- <systemPath>${javaee.cts.home}/lib/javatest.jar</systemPath>
+ <systemPath>${jakartaee.cts.home}/lib/javatest.jar</systemPath>
</dependency>
<dependency>
<groupId>com.sun.javaee.tck</groupId>
<artifactId>cts</artifactId>
- <version>${javaee.tck.version}</version>
+ <version>${jakartaee.tck.version}</version>
<scope>system</scope>
- <systemPath>${javaee.cts.home}/lib/cts.jar</systemPath>
+ <systemPath>${jakartaee.cts.home}/lib/cts.jar</systemPath>
</dependency>
<dependency>
<groupId>com.sun.javaee.tck</groupId>
<artifactId>whitebox</artifactId>
- <version>${javaee.tck.version}</version>
+ <version>${jakartaee.tck.version}</version>
<scope>system</scope>
- <systemPath>${javaee.cts.home}/dist/com/sun/ts/tests/common/connector/whitebox/whitebox.jar</systemPath>
+ <systemPath>${jakartaee.cts.home}/dist/com/sun/ts/tests/common/connector/whitebox/whitebox.jar</systemPath>
</dependency>
<dependency>
<groupId>com.sun.javaee.tck</groupId>
<artifactId>dbprocedures</artifactId>
- <version>${javaee.tck.version}</version>
+ <version>${jakartaee.tck.version}</version>
<scope>system</scope>
- <systemPath>${javaee.cts.home}/lib/dbprocedures.jar</systemPath>
+ <systemPath>${jakartaee.cts.home}/lib/dbprocedures.jar</systemPath>
</dependency>
<dependency>
diff --git a/src/test/resources/testsuite.properties b/src/test/resources/testsuite.properties
index d269fa1..2377be1 100644
--- a/src/test/resources/testsuite.properties
+++ b/src/test/resources/testsuite.properties
@@ -139,9 +139,9 @@ impl.vi=openejb
javaee.classes.ri=${ri.modules}/javax.ejb.jar${pathsep}${endorsed.dirs.ri}/javax.annotation.jar${pathsep}${ri.modules}/javax.enterprise.deploy.jar${pathsep}${ri.modules}/javax.mail.jar${pathsep}${ri.modules}/javax.persistence.jar${pathsep}${ri.modules}/javax.resource.jar${pathsep}${ri.modules}/javax.security.auth.message.jar${pathsep}${ri.modules}/javax.security.jacc.jar${pathsep}${ri.modules}/javax.servlet.jar${pathsep}${ri.modules}/javax.servlet.jsp.jar${pathsep}${ri.modules}/javax.tra [...]
javaee.classes=${s1as.modules}/javax.ejb.jar${pathsep}${endorsed.dirs}/javax.annotation.jar${pathsep}${s1as.modules}/javax.enterprise.deploy.jar${pathsep}${s1as.modules}/javax.mail.jar${pathsep}${s1as.modules}/javax.persistence.jar${pathsep}${s1as.modules}/javax.resource.jar${pathsep}${s1as.modules}/javax.security.auth.message.jar${pathsep}${s1as.modules}/javax.security.jacc.jar${pathsep}${s1as.modules}/javax.servlet.jar${pathsep}${s1as.modules}/el-impl.jar${pathsep}${s1as.modules}/javax [...]
-jaxrs_impl_lib=%javaee.ri.home%/modules/jersey-core.jar
-javaee.home.ri=%javaee.ri.home%
-javaee.home=%javaee.ri.home%
+jaxrs_impl_lib=%jakartaee.ri.home%/modules/jersey-core.jar
+javaee.home.ri=%jakartaee.ri.home%
+javaee.home=%jakartaee.ri.home%
javaee.level=%javaee.level%
#jdbc.db=hsql
@@ -186,7 +186,7 @@ password3=${derby.passwd}
pathsep=%path.separator%
porting.ts.HttpsURLConnection.class.1=org.apache.openejb.cts.HTTPSURLConnectionImpl
-porting.ts.deploy.class.1=com.sun.ts.lib.deliverable.cts.deploy.StandardDeployment14
+porting.ts.deploy.class.1=org.apache.openejb.cts.deploy.StandardDeployment14
porting.ts.deploy.class.2=com.sun.ts.lib.implementation.sun.javaee.glassfish.AutoDeployment
porting.ts.deploy2.class.1=org.apache.openejb.cts.DeploymentImpl
porting.ts.jms.class.1=org.apache.openejb.cts.JMSAdminImpl
diff --git a/src/test/script/openejb/tck/commands/CommandSupport.groovy b/src/test/script/openejb/tck/commands/CommandSupport.groovy
index b0c5858..4db6d76 100644
--- a/src/test/script/openejb/tck/commands/CommandSupport.groovy
+++ b/src/test/script/openejb/tck/commands/CommandSupport.groovy
@@ -154,8 +154,8 @@ abstract class CommandSupport {
def initPaths() {
def openejbHome = get('openejb.home')
- def javaeetckHome = get('javaee.cts.home')
- def javaeeRiHome = get('javaee.ri.home')
+ def javaeetckHome = get('jakartaee.cts.home')
+ def javaeeRiHome = get('jakartaee.ri.home')
def webcontainer = get('webcontainer')
def tomeeHttpPort = get('webcontainer.default.port')
@@ -296,7 +296,7 @@ abstract class CommandSupport {
return;
}
- log.info("TCK pom version: " + require('javaee.tck.version'))
+ log.info("TCK pom version: " + require('jakartaee.tck.version'))
log.info("Start - Container libraries")
if (lib.exists() && lib.isDirectory()) {
lib.listFiles().grep(~/.*.jar/).sort { it.name }.each {
diff --git a/src/test/script/openejb/tck/commands/JavaTestCommand.groovy b/src/test/script/openejb/tck/commands/JavaTestCommand.groovy
index 9122075..4c3af88 100644
--- a/src/test/script/openejb/tck/commands/JavaTestCommand.groovy
+++ b/src/test/script/openejb/tck/commands/JavaTestCommand.groovy
@@ -121,8 +121,8 @@ class JavaTestCommand
def logFile = "${logOutputDirectory}/javatest.log"
def openejbHome = require('openejb.home')
- def javaeeCtsHome = require('javaee8.cts.home')
- def javaeeRiHome = require('javaee8.ri.home')
+ def javaeeCtsHome = require('jakartaee.cts.home')
+ def javaeeRiHome = require('jakartaee.ri.home')
def workingDir = "${project.build.directory}/tck-work"
// Define a list of options to enable
diff --git a/src/test/script/openejb/tck/commands/ReverseSetupCommand.groovy b/src/test/script/openejb/tck/commands/ReverseSetupCommand.groovy
index 52b5489..5f99d8b 100644
--- a/src/test/script/openejb/tck/commands/ReverseSetupCommand.groovy
+++ b/src/test/script/openejb/tck/commands/ReverseSetupCommand.groovy
@@ -32,7 +32,7 @@ class ReverseSetupCommand
}
def execute() {
- def javaeeCtsHome = requireDirectory('javaee.cts.home')
+ def javaeeCtsHome = requireDirectory('jakartaee.cts.home')
def tsant = new TsAntCommand(this)
tsant.props['build.vi'] = true
diff --git a/src/test/script/openejb/tck/commands/SetupCommand.groovy b/src/test/script/openejb/tck/commands/SetupCommand.groovy
index 47a3194..21fdfa6 100644
--- a/src/test/script/openejb/tck/commands/SetupCommand.groovy
+++ b/src/test/script/openejb/tck/commands/SetupCommand.groovy
@@ -35,7 +35,7 @@ class SetupCommand
}
def generateTsJte() {
- def javaeeCtsHome = requireDirectory('javaee.cts.home')
+ def javaeeCtsHome = requireDirectory('jakartaee.cts.home')
// Install the Javatest testsuite environment configuration, first filter our custom properties
// then merge those properties with the javaee ts.jte
@@ -92,7 +92,7 @@ class SetupCommand
'openejb.home',
'openejb.embedded.classpath',
'javaee.home',
- 'javaee.ri.home',
+ 'jakartaee.ri.home',
'javaee.home.ri',
'ts.run.classpath',
'ts.run.classpath.ri.suffix',
@@ -141,7 +141,7 @@ class SetupCommand
// Modify the sig-test_se6.map file to use the proper signature files.
// Create backups first.
- def javaeeCtsHome = requireDirectory('javaee.cts.home')
+ def javaeeCtsHome = requireDirectory('jakartaee.cts.home')
// Backup the original sig-test_se8.map, load in the new props, and create
// the modified file
@@ -214,7 +214,7 @@ class SetupCommand
initPaths()
- def javaeeCtsHome = get('javaee.cts.home')
+ def javaeeCtsHome = get('jakartaee.cts.home')
ant.mkdir(dir: "${openejbHome}/logs")
ant.mkdir(dir: "${openejbHome}/apps")
diff --git a/src/test/script/openejb/tck/commands/TsAntCommand.groovy b/src/test/script/openejb/tck/commands/TsAntCommand.groovy
index d525ed0..9e20d8f 100644
--- a/src/test/script/openejb/tck/commands/TsAntCommand.groovy
+++ b/src/test/script/openejb/tck/commands/TsAntCommand.groovy
@@ -48,7 +48,7 @@ class TsAntCommand
}
def execute(List goals) {
- def javaeeCtsHome = requireDirectory('javaee.cts.home')
+ def javaeeCtsHome = requireDirectory('jakartaee.cts.home')
log.info("Executing 'tsant' goals: $goals")
diff --git a/src/test/script/openejb/tck/commands/ValidateCommand.groovy b/src/test/script/openejb/tck/commands/ValidateCommand.groovy
index 9c57dde..f3a960e 100644
--- a/src/test/script/openejb/tck/commands/ValidateCommand.groovy
+++ b/src/test/script/openejb/tck/commands/ValidateCommand.groovy
@@ -59,8 +59,8 @@ class ValidateCommand
logProperties(project.properties, "Project")
}
- // Ensure that javaee.cts.home and javaee.ri.home are set to valid directories
- ['javaee.cts.home', 'javaee.ri.home'].each {
+ // Ensure that jakartaee.cts.home and jakartaee.ri.home are set to valid directories
+ ['jakartaee.cts.home', 'jakartaee.ri.home'].each {
def dir = requireDirectory(it)
//