Skip to content

Commit

Permalink
remove concurrency from docker tests
Browse files Browse the repository at this point in the history
  • Loading branch information
KyleAure committed Mar 28, 2022
1 parent 4dd08c7 commit 23e31cb
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 172 deletions.
7 changes: 1 addition & 6 deletions docker/build_standalone-tcks.sh
Expand Up @@ -68,7 +68,7 @@ fi
echo "The option selected to build is $TCK_NAME TCK"

if [ "All" == "$TCK_NAME" ];then
TCK_LIST=( websocket el concurrency connector jacc jaspic caj jms jsp jstl jaxws saaj servlet jsf securityapi jpa jta )
TCK_LIST=( websocket el connector jacc jaspic caj jms jsp jstl jaxws saaj servlet jsf securityapi jpa jta )
else
TCK_LIST=( ${TCK_NAME} )
fi
Expand Down Expand Up @@ -141,11 +141,6 @@ for tck in ${TCK_LIST[@]}; do
TCK_SPECIFIC_PROPS="-Del.classes=$JAKARTA_JARS/modules/jakarta.el-api.jar:$JAKARTA_JARS/modules/glassfish-corba-omgapi.jar"
DOC_SPECIFIC_PROPS=""
JAXWS_SPECIFIC_PROPS=""
elif [ "concurrency" == "$tck" ]
then
TCK_SPECIFIC_PROPS="-Dconcurrency.classes=$JAKARTA_JARS/modules/jakarta.enterprise.concurrent-api.jar:$JAKARTA_JARS/modules/jakarta.transaction-api.jar:$JAKARTA_JARS/modules/jakarta.annotation-api.jar:$JAKARTA_JARS/modules/jakarta.servlet-api.jar:$JAKARTA_JARS/modules/jakarta.ejb-api.jar:$JAKARTA_JARS/modules/jta.jar:$JAKARTA_JARS/modules/jakarta.enterprise.deploy-api.jar:$JAKARTA_JARS/modules/glassfish-corba-omgapi.jar"
DOC_SPECIFIC_PROPS=""
JAXWS_SPECIFIC_PROPS=""
elif [ "connector" == "$tck" ]
then
TCK_SPECIFIC_PROPS="-Dconnector.home=$GF_HOME/$GF_TOPLEVEL_DIR/glassfish/"
Expand Down
94 changes: 0 additions & 94 deletions docker/concurrencytck.sh

This file was deleted.

37 changes: 18 additions & 19 deletions docker/scripts/tcks/README
Expand Up @@ -47,22 +47,21 @@ Note : The set of values accepted for TCK_NAME are given below and are case
sensitive.

1. caj (Common Annotations for Java v.1.3, JSR 250)
2. concurrency (Concurrency Utilities for Jakarta EE 1.0, JSR 236)
3. connector (Connector Architecture 1.7, JSR 322)
4. el (EL 3.0, JSR 341)
5. saaj (SAAJ 1.4, JSR 67)
6. securityapi (Jakarta EE Security API 1.0, JSR 375)
7. servlet (Servlet 4.0, JSR 369)
8. websocket (Web Sockets API 1.1, JSR 356)
9. jacc (JACC 1.5, JSR 115)
10. jaspic (JASPIC 1.1, JSR 196)
12. jaxrs (JAX-RS 2.1, JSR 370)
13. jaxws (JAX-WS 2.3, JSR 224)
14. jms (JMS 2.0, JSR 343)
15. jpa (JPA 2.2, JSR 338)
16. jsf (JSF 2.3, JSR 372)
17. jsonb (JSON-B 1.0, JSR 367)
18. jsonp (JSON-P 1.1, JSR 353)
19. jsp (JSP 2.3, JSR 340)
20. jstl (JSTL 1.3, JSR 52)
21. jta (JTA 1.2, JSR 907)
2. connector (Connector Architecture 1.7, JSR 322)
3. el (EL 3.0, JSR 341)
4. saaj (SAAJ 1.4, JSR 67)
5. securityapi (Jakarta EE Security API 1.0, JSR 375)
6. servlet (Servlet 4.0, JSR 369)
7. websocket (Web Sockets API 1.1, JSR 356)
8. jacc (JACC 1.5, JSR 115)
9. jaspic (JASPIC 1.1, JSR 196)
10. jaxrs (JAX-RS 2.1, JSR 370)
11. jaxws (JAX-WS 2.3, JSR 224)
12. jms (JMS 2.0, JSR 343)
13. jpa (JPA 2.2, JSR 338)
14. jsf (JSF 2.3, JSR 372)
15. jsonb (JSON-B 1.0, JSR 367)
16. jsonp (JSON-P 1.1, JSR 353)
17. jsp (JSP 2.3, JSR 340)
18. jstl (JSTL 1.3, JSR 52)
19. jta (JTA 1.2, JSR 907)
48 changes: 0 additions & 48 deletions docker/scripts/tcks/concurrencytck.sh

This file was deleted.

5 changes: 0 additions & 5 deletions docker/scripts/tcks/docker-entrypoint.sh
Expand Up @@ -114,11 +114,6 @@ if [ "$TCK_NAME" == "jstl" ];then
exit 0
fi

if [ "$TCK_NAME" == "concurrency" ];then
source concurrencytck.sh
exit 0
fi

if [ "$TCK_NAME" == "connector" ];then
source connectortck.sh
exit 0
Expand Down

0 comments on commit 23e31cb

Please sign in to comment.