You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2020/11/19 08:37:47 UTC
[tomee-tck] branch jakartaee9-tck updated: avoid the javaee versus
jakartaee prefix in variable names so it's easier to pull changes from
master
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch jakartaee9-tck
in repository https://gitbox.apache.org/repos/asf/tomee-tck.git
The following commit(s) were added to refs/heads/jakartaee9-tck by this push:
new 81ca6d5 avoid the javaee versus jakartaee prefix in variable names so it's easier to pull changes from master
81ca6d5 is described below
commit 81ca6d5a101db77fdf749dd473ce246fc55a0417
Author: Jean-Louis Monteiro <jl...@tomitribe.com>
AuthorDate: Thu Nov 19 09:37:19 2020 +0100
avoid the javaee versus jakartaee prefix in variable names so it's easier to pull changes from master
---
DESIGN.adoc | 4 +--
pom.xml | 38 +++++++++++-----------
src/test/resources/testsuite.properties | 6 ++--
.../openejb/tck/commands/CommandSupport.groovy | 2 +-
.../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 +--
9 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/DESIGN.adoc b/DESIGN.adoc
index c040577..b8897e1 100644
--- a/DESIGN.adoc
+++ b/DESIGN.adoc
@@ -9,9 +9,9 @@ There are several dependencies that do not point to Maven Central, but actually
<dependency>
<groupId>com.sun.javaee.tck</groupId>
<artifactId>tsharness</artifactId>
- <version>${jakartaee.tck.version}</version>
+ <version>${tck.version}</version>
<scope>system</scope>
- <systemPath>${jakartaee.cts.home}/lib/tsharness.jar</systemPath>
+ <systemPath>${cts.home}/lib/tsharness.jar</systemPath>
</dependency>
----
diff --git a/pom.xml b/pom.xml
index 15f49cd..711cdf5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,9 +54,9 @@
<!--
NOTE: User must define "javaee8.cts.home" and "javaee8.ri.home" in ~/.m2/settings.xml
-->
- <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>
+ <cts.home>${jakartaee9.cts.home}</cts.home>
+ <ri.home>${jakartaee9.ri.home}</ri.home>
+ <tck.version>9.0</tck.version>
<localRepository>${settings.localRepository}</localRepository>
<examples.version>1.1-SNAPSHOT</examples.version>
@@ -161,64 +161,64 @@
<!--<dependency>-->
<!--<groupId>com.test</groupId>-->
<!--<artifactId>jar-to-test</artifactId>-->
- <!--<version>${jakartaee.tck.version}</version>-->
+ <!--<version>${tck.version}</version>-->
<!--<scope>system</scope>-->
<!--<type>jar</type>-->
- <!--<systemPath>${jakartaee.cts.home}/dist/com/sun/ts/tests/websocket/ee/javax/websocket/clientendpoint/wsc_ee_clientendpoint_Client_nodeploy.jar_client</systemPath>-->
+ <!--<systemPath>${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>${jakartaee.tck.version}</version>
+ <version>${tck.version}</version>
<scope>system</scope>
- <systemPath>${jakartaee.cts.home}/lib/tsharness.jar</systemPath>
+ <systemPath>${cts.home}/lib/tsharness.jar</systemPath>
</dependency>
<dependency>
<groupId>com.sun.javaee.tck</groupId>
<artifactId>tssv</artifactId>
- <version>${jakartaee.tck.version}</version>
+ <version>${tck.version}</version>
<scope>system</scope>
- <systemPath>${jakartaee.cts.home}/lib/tssv.jar</systemPath>
+ <systemPath>${cts.home}/lib/tssv.jar</systemPath>
</dependency>
<dependency>
<groupId>com.sun.javaee.tck</groupId>
<artifactId>tsprovider</artifactId>
- <version>${jakartaee.tck.version}</version>
+ <version>${tck.version}</version>
<scope>system</scope>
- <systemPath>${jakartaee.cts.home}/lib/tsprovider.jar</systemPath>
+ <systemPath>${cts.home}/lib/tsprovider.jar</systemPath>
</dependency>
<dependency>
<groupId>com.sun.javaee.tck</groupId>
<artifactId>javatest</artifactId>
- <version>${jakartaee.tck.version}</version>
+ <version>${tck.version}</version>
<scope>system</scope>
- <systemPath>${jakartaee.cts.home}/lib/javatest.jar</systemPath>
+ <systemPath>${cts.home}/lib/javatest.jar</systemPath>
</dependency>
<dependency>
<groupId>com.sun.javaee.tck</groupId>
<artifactId>cts</artifactId>
- <version>${jakartaee.tck.version}</version>
+ <version>${tck.version}</version>
<scope>system</scope>
- <systemPath>${jakartaee.cts.home}/lib/cts.jar</systemPath>
+ <systemPath>${cts.home}/lib/cts.jar</systemPath>
</dependency>
<dependency>
<groupId>com.sun.javaee.tck</groupId>
<artifactId>whitebox</artifactId>
- <version>${jakartaee.tck.version}</version>
+ <version>${tck.version}</version>
<scope>system</scope>
- <systemPath>${jakartaee.cts.home}/dist/com/sun/ts/tests/common/connector/whitebox/whitebox.jar</systemPath>
+ <systemPath>${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>${jakartaee.tck.version}</version>
+ <version>${tck.version}</version>
<scope>system</scope>
- <systemPath>${jakartaee.cts.home}/lib/dbprocedures.jar</systemPath>
+ <systemPath>${cts.home}/lib/dbprocedures.jar</systemPath>
</dependency>
<dependency>
diff --git a/src/test/resources/testsuite.properties b/src/test/resources/testsuite.properties
index 499c2df..e16934f 100644
--- a/src/test/resources/testsuite.properties
+++ b/src/test/resources/testsuite.properties
@@ -141,9 +141,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=%jakartaee.ri.home%/modules/jersey-core.jar
-javaee.home.ri=%jakartaee.ri.home%
-javaee.home=%jakartaee.ri.home%
+jaxrs_impl_lib=%ri.home%/modules/jersey-core.jar
+javaee.home.ri=%ri.home%
+javaee.home=%ri.home%
javaee.level=%javaee.level%
#jdbc.db=hsql
diff --git a/src/test/script/openejb/tck/commands/CommandSupport.groovy b/src/test/script/openejb/tck/commands/CommandSupport.groovy
index c58a596..78ee90f 100644
--- a/src/test/script/openejb/tck/commands/CommandSupport.groovy
+++ b/src/test/script/openejb/tck/commands/CommandSupport.groovy
@@ -300,7 +300,7 @@ abstract class CommandSupport {
return;
}
- log.info("TCK pom version: " + require('jakartaee.tck.version'))
+ log.info("TCK pom version: " + require('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 4c3af88..084576b 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('jakartaee.cts.home')
- def javaeeRiHome = require('jakartaee.ri.home')
+ def javaeeCtsHome = require('cts.home')
+ def javaeeRiHome = require('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 5f99d8b..cda0a96 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('jakartaee.cts.home')
+ def javaeeCtsHome = requireDirectory('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 21fdfa6..57aee3a 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('jakartaee.cts.home')
+ def javaeeCtsHome = requireDirectory('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',
- 'jakartaee.ri.home',
+ '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('jakartaee.cts.home')
+ def javaeeCtsHome = requireDirectory('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('jakartaee.cts.home')
+ def javaeeCtsHome = get('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 9e20d8f..7aeb05b 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('jakartaee.cts.home')
+ def javaeeCtsHome = requireDirectory('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 f3a960e..eb7a95d 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 jakartaee.cts.home and jakartaee.ri.home are set to valid directories
- ['jakartaee.cts.home', 'jakartaee.ri.home'].each {
+ // Ensure that cts.home and ri.home are set to valid directories
+ ['cts.home', 'ri.home'].each {
def dir = requireDirectory(it)
//