You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2021/05/01 23:08:50 UTC

[tomee-tck] branch jakartaee9-tck updated (b95dbf0 -> 85d31b7)

This is an automated email from the ASF dual-hosted git repository.

jgallimore pushed a change to branch jakartaee9-tck
in repository https://gitbox.apache.org/repos/asf/tomee-tck.git.


    from b95dbf0  Ensure jasper is in the ejbembed classpath for hibernate It needs an el impl
     new 8a0a934  Setup to get the signature tests running
     new 85d31b7  Setup classpath for sigtests

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/test/resources/testsuite.properties                     | 7 +++++--
 src/test/script/openejb/tck/commands/JavaTestCommand.groovy | 2 ++
 src/test/script/openejb/tck/commands/SetupCommand.groovy    | 4 ++++
 3 files changed, 11 insertions(+), 2 deletions(-)

[tomee-tck] 02/02: Setup classpath for sigtests

Posted by jg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jgallimore pushed a commit to branch jakartaee9-tck
in repository https://gitbox.apache.org/repos/asf/tomee-tck.git

commit 85d31b724374e78140825eac0a024fc031f21a9f
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Sat May 1 23:55:30 2021 +0100

    Setup classpath for sigtests
---
 src/test/resources/testsuite.properties                  | 3 ++-
 src/test/script/openejb/tck/commands/SetupCommand.groovy | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/test/resources/testsuite.properties b/src/test/resources/testsuite.properties
index 53a647b..397fc54 100644
--- a/src/test/resources/testsuite.properties
+++ b/src/test/resources/testsuite.properties
@@ -201,7 +201,8 @@ porting.ts.login.class.1=org.apache.openejb.cts.LoginContextImpl
 porting.ts.url.class.1=org.apache.openejb.cts.URLImpl
 
 jimage.dir=${ts.home}/tmp/jdk-bundles
-sigTestClasspath=${s1as.modules}/javax.servlet.jar${pathsep}${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.jsp.jar${pathsep}${s1as.mo [...]
+#sigTestClasspath=${s1as.modules}/javax.servlet.jar${pathsep}${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.jsp.jar${pathsep}${s1as.m [...]
+sigTestClasspath=%openejb.jee.classes%
 
 ts.run.classpath=%ts.run.classpath%
 openejb.embedded.classpath=%openejb.embedded.classpath%
diff --git a/src/test/script/openejb/tck/commands/SetupCommand.groovy b/src/test/script/openejb/tck/commands/SetupCommand.groovy
index 9370b87..6c889b9 100644
--- a/src/test/script/openejb/tck/commands/SetupCommand.groovy
+++ b/src/test/script/openejb/tck/commands/SetupCommand.groovy
@@ -51,6 +51,7 @@ class SetupCommand
                     'ts.run.classpath',
                     'ts.run.classpath.ri.suffix',
                     'ts.harness.classpath',
+                    'openejb.jee.classes',
                     'openejb.embedded.classpath',
                     'geronimo.specs.classpath',
                     'geronimo.porting.classes'

[tomee-tck] 01/02: Setup to get the signature tests running

Posted by jg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

jgallimore pushed a commit to branch jakartaee9-tck
in repository https://gitbox.apache.org/repos/asf/tomee-tck.git

commit 8a0a934d17e0a1b67ad1b37ee8a2dfdb0fd5580f
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Sat May 1 23:17:40 2021 +0100

    Setup to get the signature tests running
---
 src/test/resources/testsuite.properties                     | 4 +++-
 src/test/script/openejb/tck/commands/JavaTestCommand.groovy | 2 ++
 src/test/script/openejb/tck/commands/SetupCommand.groovy    | 3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/test/resources/testsuite.properties b/src/test/resources/testsuite.properties
index e6382f0..53a647b 100644
--- a/src/test/resources/testsuite.properties
+++ b/src/test/resources/testsuite.properties
@@ -50,6 +50,7 @@ command.testExecute=com.sun.ts.lib.harness.ExecTSTestCmd \
         -Ddeliverable.class=${deliverable.class} \
         -Dopenejb.validation.output.level=3 \
         -Djava.security.egd=file:/dev/./urandom \
+        -Dbin.dir=%bin_dir% \
         $testExecuteClass \
         $testExecuteArgs
 
@@ -240,4 +241,5 @@ provider.configuration.file=%basedir%/%openejb.home%/conf/ProviderConfiguration.
 j2eelogin.name=j2ee
 j2eelogin.password=j2ee
 servlet.is.jsr115.compatible=false
-logical.hostname.servlet=Catalina/localhost
\ No newline at end of file
+logical.hostname.servlet=Catalina/localhost
+bin.dir=%bin_dir%
diff --git a/src/test/script/openejb/tck/commands/JavaTestCommand.groovy b/src/test/script/openejb/tck/commands/JavaTestCommand.groovy
index 16f6f55..db01a0d 100644
--- a/src/test/script/openejb/tck/commands/JavaTestCommand.groovy
+++ b/src/test/script/openejb/tck/commands/JavaTestCommand.groovy
@@ -341,6 +341,8 @@ class JavaTestCommand
                     sysproperty(key: "SYSTEMROOT", value: System.getenv('SystemRoot'))
                 }
 
+                sysproperty(key: "bin.dir", value: "${javaeeCtsHome}/bin")
+
                 // Include system properties
                 arg(value: "-EsysProps")
 
diff --git a/src/test/script/openejb/tck/commands/SetupCommand.groovy b/src/test/script/openejb/tck/commands/SetupCommand.groovy
index 87c03b4..9370b87 100644
--- a/src/test/script/openejb/tck/commands/SetupCommand.groovy
+++ b/src/test/script/openejb/tck/commands/SetupCommand.groovy
@@ -79,6 +79,9 @@ class SetupCommand
                     map['javaee.level'] = 'web'
                 }
 
+                log.info("Setting bin.dir to " + javaeeCtsHome.getAbsolutePath() + "/bin")
+                map['bin_dir'] = javaeeCtsHome.getAbsolutePath() + "/bin"
+
                 // map['servlet_adaptor'] = 'org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet'
                 map['servlet_adaptor'] = 'org.apache.openejb.server.rest.OpenEJBRestServlet'
                 map['jaxrs_impl_name'] = 'cxf'