You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rz...@apache.org on 2022/04/26 07:54:19 UTC
[tomee-tck] branch jakartaee9-tck updated: Enhances README and point to setup-tck91.sh Renames update91tck.sh to setup-tck91.sh (tck 9.1 is now promoted) Removes obsolete POM comment Updates Johnzon to 1.2.16
This is an automated email from the ASF dual-hosted git repository.
rzo1 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 af6abc8 Enhances README and point to setup-tck91.sh Renames update91tck.sh to setup-tck91.sh (tck 9.1 is now promoted) Removes obsolete POM comment Updates Johnzon to 1.2.16
af6abc8 is described below
commit af6abc8a26fd6f43463fb28ab6157c8c4ccc2a0b
Author: Richard Zowalla <rz...@apache.org>
AuthorDate: Tue Apr 26 09:54:12 2022 +0200
Enhances README and point to setup-tck91.sh
Renames update91tck.sh to setup-tck91.sh (tck 9.1 is now promoted)
Removes obsolete POM comment
Updates Johnzon to 1.2.16
---
README.adoc | 80 ++++++++++++++++++++++++++--------------
pom.xml | 5 +--
settings.xml.template | 16 ++++++++
update91tck.sh => setup-tck91.sh | 4 +-
4 files changed, 71 insertions(+), 34 deletions(-)
diff --git a/README.adoc b/README.adoc
index 629626c..06d61a1 100644
--- a/README.adoc
+++ b/README.adoc
@@ -1,6 +1,6 @@
-# TomEE-TCK
+= TomEE-TCK
-## GETTING SETUP
+== GETTING SETUP
This document and the OpenEJB TCK setup can be cloned from Git:
@@ -8,17 +8,41 @@ This document and the OpenEJB TCK setup can be cloned from Git:
In order to run the TCK, you will need both the TCK binary itself, and the Eclipse Glassfish RI.
-At present, we are building the TCK binary from source, following these steps:
+=== Use setup-tck9.sh
- wget https://download.eclipse.org/jakartaee/platform/8/jakarta-jakartaeetck-8.0.2.zip
- unzip jakarta-jakartaeetck-8.0.2.zip
- rm jakarta-jakartaeetck-8.0.2.zip
+Ensure, that you have a `profile` in your maven settings.xml like
+
+ <settings>
+ <profiles>
+ <profile>
+ <id>jakarta-tck-environment</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <jakartaee91.cts.home>/opt/dev/tcks/jakartaee91-tck</jakartaee91.cts.home>
+ <jakartaee91.ri.home>/opt/dev/tcks/glassfish6/glassfish</jakartaee91.ri.home>
+ </properties>
+ </profile>
+ </profiles>
+ </settings>
+
+You can copy & paste from `settings.xml.template`. Ensure, that the directories exist. Then just run `./setup-tck91.sh`.
+It will conduct the initial TCK setup.
+
+=== Semi Automated Way of Building the TCK from Source
+
+This is interesting, if you need to modify TCK source. To build from source, following these steps:
+
+ wget https://download.eclipse.org/ee4j/jakartaee-tck/jakartaee9-eftl/promoted/jakarta-jakartaeetck-9.1.0.zip
+ unzip jakarta-jakartaeetck-9.1.0.zip
+ rm jakarta-jakartaeetck-9.1.0.zip
cd jakartaeetck
export WORKSPACE=$(pwd)
- export GF_BUNDLE_URL=https://www.eclipse.org/downloads/download.php?file=/glassfish/glassfish-5.1.0.zip
+ export GF_BUNDLE_URL=https://download.eclipse.org/ee4j/glassfish/glassfish-6.2.5.zip
export GF_HOME=$WORKSPACE
export ANT_HOME=/home/jgallimore/Apps/apache-ant-1.10.5
- export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64
+ export JAVA_HOME=/usr/lib/jvm/java-1.11.0-openjdk-amd64/
export PATH=$JAVA_HOME/bin:$ANT_HOME/bin/:$PATH
$WORKSPACE/docker/build_jakartaeetck.sh
@@ -42,26 +66,26 @@ Once unpacked, they can be "hooked" up via your maven settings.xml file like so:
<settings>
<profiles>
<profile>
- <id>javaee-tck-environment</id>
+ <id>jakarta-tck-environment</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
- <javaee8.cts.home>/Users/jgallimore/dev/ee8tck/javaeetck</javaee8.cts.home>
- <javaee8.ri.home>/Users/jgallimore/dev/ee8tck/glassfish5/glassfish</javaee8.ri.home>
+ <jakartaee91.cts.home>/opt/dev/tcks/jakartaee91-tck</jakartaee91.cts.home>
+ <jakartaee91.ri.home>/opt/dev/tcks/glassfish6/glassfish</jakartaee91.ri.home>
</properties>
</profile>
</profiles>
</settings>
-## TEST RUN
+== TEST RUN
-To complete a test run against the latest TomEE 8.0.0-SNAPSHOT, from the tomee-tck folder, run
+To complete a test run against the latest TomEE 9.0.0-M8-SNAPSHOT, from the tomee-tck folder, run
./runtests --web tomee-plume com.sun.ts.tests.ejb30.bb.localaccess.statelessclient
-A successful execution should show and output similiar to:
+A successful execution should show and output similar to:
===============================================================================
1/-0/?0 - com/sun/ts/tests/ejb30/bb/localaccess/statelessclient/Client#java#exceptionTest1 - PASSED
@@ -88,7 +112,7 @@ A successful execution should show and output similiar to:
===============================================================================
-## MISC
+== MISC
The target directory is not cleaned out at the beginning of a test
run. There are a few thousand tests and sometimes multiple
@@ -101,7 +125,7 @@ On occasion some bad state will get into the server install in the
target/ directory. If you start getting weird maven or groovy
errors, clean out the target dir and try again.
-## TAB COMPLETION
+== TAB COMPLETION
There is a nice little script in the root directory called
runtests.completer which, when sourced, can give be a great
@@ -111,7 +135,7 @@ In bash just source the file like so:
source runtests.completer
-### ZSH
+=== ZSH
If you are using ZSH, you need to execute the follows commands:
@@ -121,7 +145,7 @@ If you are using ZSH, you need to execute the follows commands:
Then you will be able to have the completer working fine for you ZSH as well. :)
-## LOGS
+== LOGS
The TCK for the most part runs as a client in a separate vm. The
test results are sent to this vm and then logged here:
@@ -136,10 +160,10 @@ that log.
The server logs are in the usual place:
- target/apache-tomee-plume-8.0.0-SNAPSHOT/logs
- target/apache-tomee-plume-8.0.0-SNAPSHOT/logs
+ target/apache-tomee-plume-9.0.0-M8-SNAPSHOT/logs
+ target/apache-tomee-plume-9.0.0-M8-SNAPSHOT/logs
-## SELECTING TESTS
+== SELECTING TESTS
It is possible to select whole groups of tests or even individual
tests. The following are all valid ways to select which tests you'd
@@ -171,17 +195,17 @@ For the most part, you can copy and paste that test name as-is and use
it to run a test that failed... with one slight adjustment. You need
to delete the "#java" part and then it will work.
-### BAD
+=== BAD
./runtests --web tomee-plume com/sun/ts/tests/ejb30/lite/stateful/concurrency/accesstimeout/annotated/Client#java#beanClassLevel_from_ejbembed
-### GOOD
+=== GOOD
./runtests --web tomee-plume com/sun/ts/tests/ejb30/lite/stateful/concurrency/accesstimeout/annotated/Client#beanClassLevel_from_ejbembed
-## TEST DEBUG
+== TEST DEBUG
-The following are the flags the scrip `runtests` accept for debuggin purposes:
+The following are the flags the scrip `runtests` accept for debugging purposes:
-d,--debug Enable Server and TCK appclient debug options (5005 and 5003)
@@ -199,7 +223,7 @@ Example:
Depending on the IDE, you will need to attempt twice to connect to the exposed port.
-## WHAT TO TEST
+== WHAT TO TEST
The test that needs to be tested are the one having the following `keywords`:
@@ -207,7 +231,7 @@ The test that needs to be tested are the one having the following `keywords`:
For more information about TCK structure and tests attributes check the link:about_tck{outfilesuffix}[about_tck] documentation.
-## WHAT NEXT
+== WHAT NEXT
Getting from zero to passing is a long road. Failures and the
overall progress tends to go in three stages:
@@ -241,7 +265,7 @@ bit like working blind. You don't really know how many steps
backward you might be taking as a result of a change. It can be
done, but it is risky.
-## WORKING TOGETHER
+== WORKING TOGETHER
Communication:-
-Email:Make use of dev@tomee.apache.org
diff --git a/pom.xml b/pom.xml
index 38547c1..aa1ea6f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,9 +39,6 @@
<openejb.groupId>org.apache.tomee</openejb.groupId>
- <!-- A bit tricky because of the nature we create the 9.x version. Even if the zip is
- upgraded to 9.x, lib jars are still in the same old package and still using the base version
- For example, for 9.0.0-M2, we are using 8.0.4 as a base line, so it must be aligned -->
<openejb.inzip.version>9.0.0-M8-SNAPSHOT</openejb.inzip.version>
<tomee.inzip.version>9.0.0-M8-SNAPSHOT</tomee.inzip.version>
<tomee.zip.groupId>org.apache.tomee</tomee.zip.groupId>
@@ -49,7 +46,7 @@
<tomcat.version>10.0.20</tomcat.version>
- <johnzon.version>1.2.15</johnzon.version>
+ <johnzon.version>1.2.16</johnzon.version>
<derby.version>10.14.2.0</derby.version>
<!--
diff --git a/settings.xml.template b/settings.xml.template
new file mode 100644
index 0000000..ad06b4d
--- /dev/null
+++ b/settings.xml.template
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.1.0 http://maven.apache.org/xsd/settings-1.1.0.xsd" xmlns="http://maven.apache.org/SETTINGS/1.1.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <profiles>
+ <profile>
+ <id>jakarta-tck-environment</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <jakartaee91.cts.home>/opt/dev/tcks/jakartaee91-tck</jakartaee91.cts.home>
+ <jakartaee91.ri.home>/opt/dev/tcks/glassfish6/glassfish</jakartaee91.ri.home>
+ </properties>
+ </profile>
+ </profiles>
+</settings>
diff --git a/update91tck.sh b/setup-tck91.sh
similarity index 98%
rename from update91tck.sh
rename to setup-tck91.sh
index 14520a5..48569d9 100755
--- a/update91tck.sh
+++ b/setup-tck91.sh
@@ -22,7 +22,7 @@ grep -q -m 1 jakartaee91.ri.home ~/.m2/settings.xml || {
}
## Download the jakarta-jakartaeetckinfo.txt from Eclipse and get basic meta data
-TCKINFO="$(curl -s https://download.eclipse.org/ee4j/jakartaee-tck/jakartaee9-eftl/staged-910/jakarta-jakartaeetckinfo.txt)"
+TCKINFO="$(curl -s https://download.eclipse.org/ee4j/jakartaee-tck/jakartaee9-eftl/promoted/jakarta-jakartaee-tckinfo.txt)"
DATESTAMP="$(echo "$TCKINFO" | grep 'date:' | perl -pe 's,.*date: (\d\d\d\d-\d\d-\d\d) (\d\d):(\d\d).*,$1.$2$3,')"
URL="$(echo "$TCKINFO" | grep 'download.eclipse.org' | perl -pe 's,.*(://download.eclipse.org/[^ ]+\.zip).*,https$1,')"
SHA="$(echo "$TCKINFO" | grep 'SHA256SUM' | perl -pe 's,.*SHA256SUM: ([0-9a-f]+).*,$1,')"
@@ -38,7 +38,7 @@ RIDIR="$(dirname "$OLDRI")"
TCK="$NAME-$DATESTAMP"
-RI="glassfish-6.0.0"
+RI="glassfish-6.2.5"
RIURL="https://download.eclipse.org/ee4j/glassfish/$RI.zip"
echo "Latest TCK