config fixes for jsf, jpa tcks in jdk11

scottmarlow · Mar 3, 2021 · c8eb7a8 · c8eb7a8
1 parent 9e75474
commit c8eb7a8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/docker/jsftck.sh b/docker/jsftck.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -xe
 
-# Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
 #
 # This program and the accompanying materials are made available under the
 # terms of the Eclipse Public License v. 2.0, which is available at
@@ -51,9 +51,6 @@ unzip -q ${TCK_HOME}/latest-glassfish.zip -d ${TCK_HOME}
 TS_HOME=$TCK_HOME/$TCK_NAME
 echo "TS_HOME $TS_HOME"
 
-cd $TCK_HOME/$GF_TOPLEVEL_DIR/bin
-./asadmin start-domain
-
 cd $TS_HOME/bin
 if [[ "$JDK" == "JDK11" || "$JDK" == "jdk11" ]];then
   export JAVA_HOME=${JDK11_HOME}
@@ -64,6 +61,11 @@ fi
 which java
 java -version
 
+cd $TCK_HOME/$GF_TOPLEVEL_DIR/bin
+./asadmin start-domain
+
+cd $TS_HOME/bin
+
 webServerHome=$TCK_HOME/$GF_TOPLEVEL_DIR/glassfish
 
 sed -i "s#webServerHome=.*#webServerHome=$TCK_HOME/$GF_TOPLEVEL_DIR/glassfish#g" ts.jte

diff --git a/release/tools/jpa.xml b/release/tools/jpa.xml
@@ -1,6 +1,6 @@
 <!--
 
-    Copyright (c) 2018, 2020 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 2018, 2021 Oracle and/or its affiliates. All rights reserved.
 
     This program and the accompanying materials are made available under the
     terms of the Eclipse Public License v. 2.0, which is available at
@@ -46,7 +46,7 @@
         <copy todir="${deliverable.bundle.dir}/bin" includeEmptyDirs="no">
             <fileset dir="${ts.home}/install/${deliverable.name.lower}/bin"
                      includes="**/*"
-                     excludes="ts.jte.*, **/workspace.xml, **/*.log, **/out"/>
+                     excludes="**/workspace.xml, **/*.log, **/out"/>
         </copy>
         <copy todir="${deliverable.bundle.dir}/lib">
             <fileset dir="${ts.home}/lib"