fix CP with derby jars

scottmarlow · Feb 27, 2021 · de44e53 · de44e53
1 parent 6fab7dd
commit de44e53
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/docker/jpatck.sh b/docker/jpatck.sh
@@ -65,7 +65,7 @@ which java
 java -version
 
 sed -i "s#^jpa.classes=.*#jpa.classes=$TCK_HOME/$GF_TOPLEVEL_DIR/glassfish/modules/jakarta.persistence-api.jar:$TCK_HOME/$GF_TOPLEVEL_DIR/glassfish/modules/org.eclipse.persistence.jpa.jar:$TCK_HOME/$GF_TOPLEVEL_DIR/glassfish/modules/jakarta.servlet-api.jar:$TCK_HOME/$GF_TOPLEVEL_DIR/glassfish/modules/jakarta.transaction-api.jar:$TCK_HOME/$GF_TOPLEVEL_DIR/glassfish/modules/jakarta.ejb-api.jar:$TCK_HOME/$GF_TOPLEVEL_DIR/glassfish/modules/org.eclipse.persistence.antlr.jar:$TCK_HOME/$GF_TOPLEVEL_DIR/glassfish/modules/org.eclipse.persistence.asm.jar:$TCK_HOME/$GF_TOPLEVEL_DIR/glassfish/modules/org.eclipse.persistence.core.jar:$TCK_HOME/$GF_TOPLEVEL_DIR/glassfish/modules/org.eclipse.persistence.dbws.jar:$TCK_HOME/$GF_TOPLEVEL_DIR/glassfish/modules/org.eclipse.persistence.jpa.jpql.jar:$TCK_HOME/$GF_TOPLEVEL_DIR/glassfish/modules/org.eclipse.persistence.jpa.modelgen.processor.jar:$TCK_HOME/$GF_TOPLEVEL_DIR/glassfish/modules/org.eclipse.persistence.moxy.jar:$TCK_HOME/$GF_TOPLEVEL_DIR/glassfish/modules/org.eclipse.persistence.oracle.jar#g" ts.jte
-sed -i "s#jdbc\.driver\.classes=.*#jdbc.driver.classes=$TCK_HOME/$GF_TOPLEVEL_DIR/javadb/lib/derbyclient.jar:$TS_HOME/lib/dbprocedures.jar#g" ts.jte
+sed -i "s#jdbc\.driver\.classes=.*#jdbc.driver.classes=$TCK_HOME/$GF_TOPLEVEL_DIR/javadb/lib/derbyclient.jar:$TCK_HOME/$GF_TOPLEVEL_DIR/javadb/lib/derbyshared.jar:$TCK_HOME/$GF_TOPLEVEL_DIR/javadb/lib/derbytools.jar:$TS_HOME/lib/dbprocedures.jar#g" ts.jte
 sed -i "s#jdbc\.db=.*#jdbc.db=derby#g" ts.jte
 sed -i "s#jakarta.persistence.provider=.*#jakarta.persistence.provider=org.eclipse.persistence.jpa.PersistenceProvider#g" ts.jte
 sed -i "s#jakarta.persistence.jdbc.driver=.*#jakarta.persistence.jdbc.driver=org.apache.derby.jdbc.ClientDriver#g" ts.jte

diff --git a/docker/jstltck.sh b/docker/jstltck.sh
@@ -69,7 +69,6 @@ sed -i 's#webServerPort=.*#webServerPort=8080#g' ts.jte
 sed -i 's#impl\.vi=.*#impl.vi=glassfish#g' ts.jte
 sed -i "s#impl\.vi\.deploy\.dir=.*#impl.vi.deploy.dir=$TCK_HOME/$GF_TOPLEVEL_DIR/glassfish/domains/domain1/autodeploy#g" ts.jte
 sed -i 's#impl\.deploy\.timeout\.multiplier=.*#impl.deploy.timeout.multiplier=20#g' ts.jte
-sed -i 's#jdbc.classes=.*#jdbc.classes=\$\{webServerHome\}/../javadb/lib/derbyclient.jar#g' ts.jte
 sed -i 's#webServerHost=.*#webServerHost=localhost#g' ts.jte
 sed -i 's#jstl\.db\.name=.*#jstl.db.name=derbyDB#g' ts.jte
 sed -i 's#jstl\.db\.server=.*#jstl.db.server=localhost#g' ts.jte

diff --git a/install/jstl/bin/ts.jte.jdk11 b/install/jstl/bin/ts.jte.jdk11
@@ -112,7 +112,7 @@ jstl.db.password=cts1
 #    				${webServerHome}/modules/jakarta.servlet.jsp.jstl.jar
 #
 ########################################################
-jdbc.classes=${webServerHome}/../javadb/lib/derbyclient.jar
+jdbc.classes=${webServerHome}/../javadb/lib/derbyclient.jar${pathsep}${webServerHome}/../javadb/lib/derbyshared.jar.jar${pathsep}${webServerHome}/../javadb/lib/derbytools.jar
 jspservlet.classes=${webServerHome}/modules/jakarta.servlet-api.jar${pathsep}${webServerHome}/modules/jakarta.servlet.jsp.jar${pathsep}${webServerHome}/modules/jakarta.servlet.jsp-api.jar${pathsep}${webServerHome}/modules/jakarta.el-api.jar${pathsep}${webServerHome}/modules/jakarta.el.jar
 jstl.classes=${webServerHome}/modules/jakarta.servlet.jsp.jstl.jar${pathsep}${webServerHome}/modules/jakarta.servlet.jsp.jstl-api.jar
 

diff --git a/install/securityapi/bin/ts.jte.jdk11 b/install/securityapi/bin/ts.jte.jdk11
@@ -459,7 +459,7 @@ derby.driver=org.apache.derby.jdbc.ClientDriver
 derby.home=${javaee.home}/../javadb
 derby.system.home=${derby.home}/databases
 derby.classpath=${ts.home}/lib/dbprocedures.jar${pathsep}${derby.home}/lib/derbynet.jar
-derby.classes=${derby.home}/lib/derbyclient.jar
+derby.classes=${derby.home}/lib/derbyclient.jar${pathsep}${derby.home}/lib/derbyshared.jar${pathsep}${derby.home}/lib/derbytools.jar
 derby.poolName=cts-derby-pool
 derby.dataSource=org.apache.derby.jdbc.ClientDataSource
 derby.properties=DatabaseName\=\"${derby.dbName}\":user\=${derby.user}:password\=${derby.passwd}:serverName\=${derby.server}:portNumber=${derby.port}