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/10 11:20:41 UTC
[tomee-tck] 08/10: Make sure CTS and RI home are more generic so we
don't have to use different names for Jakarta on
This is an automated email from the ASF dual-hosted git repository.
jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee-tck.git
commit 1e718637a82a3f71c9632a25346dc82eebcd3d6a
Author: Jean-Louis Monteiro <je...@gmail.com>
AuthorDate: Tue Nov 10 12:01:50 2020 +0100
Make sure CTS and RI home are more generic so we don't have to use different names for Jakarta on
---
src/test/script/openejb/tck/commands/ReverseSetupCommand.groovy | 2 +-
src/test/script/openejb/tck/commands/SetupCommand.groovy | 8 ++++----
src/test/script/openejb/tck/commands/TsAntCommand.groovy | 2 +-
src/test/script/openejb/tck/commands/ValidateCommand.groovy | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/test/script/openejb/tck/commands/ReverseSetupCommand.groovy b/src/test/script/openejb/tck/commands/ReverseSetupCommand.groovy
index 52b5489..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('javaee.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 47a3194..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('javaee.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',
- 'javaee.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('javaee.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('javaee.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 d525ed0..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('javaee.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 9c57dde..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 javaee.cts.home and javaee.ri.home are set to valid directories
- ['javaee.cts.home', 'javaee.ri.home'].each {
+ // Ensure that cts.home and ri.home are set to valid directories
+ ['cts.home', 'ri.home'].each {
def dir = requireDirectory(it)
//