Skip to content

Commit

Permalink
Use a more portable form of inplace sed editing
Browse files Browse the repository at this point in the history
Signed-off-by: Scott M Stark <starksm64@gmail.com>
  • Loading branch information
starksm64 committed Mar 10, 2022
1 parent 9db3fb6 commit c68f24a
Show file tree
Hide file tree
Showing 48 changed files with 411 additions and 411 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ https://github.com/eclipse-ee4j/jakartaee-tck/wiki/Jakarta-EE-TCK-Jenkins-jobs
```
git clone https://github.com/eclipse-ee4j/glassfish.git
git checkout -b EE4J_8
find . -name \pom.xml -exec sed -i "s/javax.transaction</jakarta.transaction</g" {} ;
find . -name \pom.xml -exec sed -i "s/javax.transaction-api</jakarta.transaction-api</g" {} ;
find . -name \pom.xml -exec sed -i.bak "s/javax.transaction</jakarta.transaction</g" {} ;
find . -name \pom.xml -exec sed -i.bak "s/javax.transaction-api</jakarta.transaction-api</g" {} ;
mvn clean install
```

Expand Down
12 changes: 6 additions & 6 deletions docker-images/cts-mailserver/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@ ADD james.log /logs
RUN chgrp -R 0 /root /logs /logs/james.log /var && \
chmod -R g=u /root /logs /logs/james.log /var && \
chmod +x /root/create_users.sh && \
sed -i s/:143/:1143/g /root/conf/imapserver.xml && \
sed -i s/:993/:1993/g /root/conf/imapserver.xml && \
sed -i s/:110/:1110/g /root/conf/pop3server.xml && \
sed -i s/:25/:1025/g /root/conf/smtpserver.xml && \
sed -i s/:465/:1465/g /root/conf/smtpserver.xml && \
sed -i s/:587/:1587/g /root/conf/smtpserver.xml
sed -i.bak s/:143/:1143/g /root/conf/imapserver.xml && \
sed -i.bak s/:993/:1993/g /root/conf/imapserver.xml && \
sed -i.bak s/:110/:1110/g /root/conf/pop3server.xml && \
sed -i.bak s/:25/:1025/g /root/conf/smtpserver.xml && \
sed -i.bak s/:465/:1465/g /root/conf/smtpserver.xml && \
sed -i.bak s/:587/:1587/g /root/conf/smtpserver.xml

#CMD /root/startup.sh
ENTRYPOINT cat
2 changes: 1 addition & 1 deletion docker/build_jakartaeetck.sh
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ sed -e "s#^javaee.home=.*#javaee.home=$JAKARTA_JARS#g" \
mv $BASEDIR/install/jakartaee/bin/ts.jte.new $BASEDIR/install/jakartaee/bin/ts.jte

#tools.jar from jdk8 has old apis
sed -i -e 's#tools\.jar=.*#tools.jar='${JAKARTA_JARS//\//\\\/}'\/modules\/webservices-tools.jar:'${JAKARTA_JARS//\//\\\/}'\/modules\/webservices-api.jar#g' $BASEDIR/install/jakartaee/bin/ts.jte
sed -i.bak -e 's#tools\.jar=.*#tools.jar='${JAKARTA_JARS//\//\\\/}'\/modules\/webservices-tools.jar:'${JAKARTA_JARS//\//\\\/}'\/modules\/webservices-api.jar#g' $BASEDIR/install/jakartaee/bin/ts.jte

echo "Contents of modified TS.JTE file"
cat $BASEDIR/install/jakartaee/bin/ts.jte
Expand Down
10 changes: 5 additions & 5 deletions docker/build_standalone-tcks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,11 @@ for tck in ${TCK_LIST[@]}; do
elif [ "jaxrs" == "$tck" ]
then
TCK_SPECIFIC_PROPS="-Djaxrs.classes=$JAKARTA_JARS/modules/jakarta.json-api.jar:$JAKARTA_JARS/modules/jakarta.json.bind-api.jar:$JAKARTA_JARS/modules/jsonp-jaxrs.jar:$JAKARTA_JARS/modules/jakarta.ws.rs-api.jar:$JAKARTA_JARS/modules/jsonp-jaxrs.jar:$JAKARTA_JARS/modules/jakarta.annotation-api.jar:$JAKARTA_JARS/modules/jakarta.ejb-api.jar:$JAKARTA_JARS/modules/jakarta.interceptor-api.jar:$JAKARTA_JARS/modules/jakarta.servlet-api.jar:$JAKARTA_JARS/modules/jakarta.enterprise.cdi-api.jar:$JAKARTA_JARS/modules/jakarta.inject-api.jar:$JAKARTA_JARS/modules/jakarta.validation-api.jar:$JAKARTA_JARS/modules/jakarta.xml.bind-api.jar:$JAKARTA_JARS/modules/jakarta.activation-api.jar:$JAKARTA_JARS/modules/webservices-api.jar:$JAKARTA_JARS/modules/glassfish-corba-omgapi.jar"
sed -i "s#impl\.vi\.deploy\.dir=.*#impl.vi.deploy.dir=$GF_HOME/$GF_TOPLEVEL_DIR/glassfish/domains/domain1/autodeploy#g" $BASEDIR/install/$tck/bin/ts.jte
sed -i "s#impl\.vi=.*#impl.vi=glassfish#g" $BASEDIR/install/$tck/bin/ts.jte
sed -i "s#jaxrs_impl_lib=.*#jaxrs_impl_lib=$GF_HOME/$GF_TOPLEVEL_DIR/glassfish/modules/jersey-container-servlet-core.jar#g" $BASEDIR/install/$tck/bin/ts.jte
sed -i "s#jaxrs_impl_name=.*#jaxrs_impl_name=jersey#g" $BASEDIR/install/$tck/bin/ts.jte
sed -i 's#servlet_adaptor=.*#servlet_adaptor=org\/glassfish\/jersey\/servlet\/ServletContainer.class#g' $BASEDIR/install/$tck/bin/ts.jte
sed -i.bak "s#impl\.vi\.deploy\.dir=.*#impl.vi.deploy.dir=$GF_HOME/$GF_TOPLEVEL_DIR/glassfish/domains/domain1/autodeploy#g" $BASEDIR/install/$tck/bin/ts.jte
sed -i.bak "s#impl\.vi=.*#impl.vi=glassfish#g" $BASEDIR/install/$tck/bin/ts.jte
sed -i.bak "s#jaxrs_impl_lib=.*#jaxrs_impl_lib=$GF_HOME/$GF_TOPLEVEL_DIR/glassfish/modules/jersey-container-servlet-core.jar#g" $BASEDIR/install/$tck/bin/ts.jte
sed -i.bak "s#jaxrs_impl_name=.*#jaxrs_impl_name=jersey#g" $BASEDIR/install/$tck/bin/ts.jte
sed -i.bak 's#servlet_adaptor=.*#servlet_adaptor=org\/glassfish\/jersey\/servlet\/ServletContainer.class#g' $BASEDIR/install/$tck/bin/ts.jte
DOC_SPECIFIC_PROPS=""
JAXWS_SPECIFIC_PROPS=""
elif [ "websocket" == "$tck" ]
Expand Down
8 changes: 4 additions & 4 deletions docker/cajtck.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@ export PATH=$JAVA_HOME/bin:$PATH
which java
java -version

sed -i "s#^build.level=.*#build.level=2#g" ts.jte
sed -i "s#^local.classes=.*#local.classes=$TCK_HOME/$GF_TOPLEVEL_DIR/glassfish/modules/jakarta.annotation-api.jar#g" ts.jte
sed -i "s#^report.dir=.*#report.dir=$TCK_HOME/${TCK_NAME}report/${TCK_NAME}#g" ts.jte
sed -i "s#^work.dir=.*#work.dir=$TCK_HOME/${TCK_NAME}work/${TCK_NAME}#g" ts.jte
sed -i.bak "s#^build.level=.*#build.level=2#g" ts.jte
sed -i.bak "s#^local.classes=.*#local.classes=$TCK_HOME/$GF_TOPLEVEL_DIR/glassfish/modules/jakarta.annotation-api.jar#g" ts.jte
sed -i.bak "s#^report.dir=.*#report.dir=$TCK_HOME/${TCK_NAME}report/${TCK_NAME}#g" ts.jte
sed -i.bak "s#^work.dir=.*#work.dir=$TCK_HOME/${TCK_NAME}work/${TCK_NAME}#g" ts.jte

mkdir -p $TCK_HOME/${TCK_NAME}report/${TCK_NAME}
mkdir -p $TCK_HOME/${TCK_NAME}work/${TCK_NAME}
Expand Down
8 changes: 4 additions & 4 deletions docker/concurrencytck.sh
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ export PATH=$JAVA_HOME/bin:$PATH
which java
java -version

sed -i "s#webcontainer\.home=.*#webcontainer.home=$TCK_HOME/$GF_TOPLEVEL_DIR/glassfish#g" ts.jte
sed -i 's#concurrency\.classes=.*#concurrency.classes=${webcontainer.home}/modules/jakarta.enterprise.concurrent-api.jar${pathsep}${webcontainer.home}/modules/jakarta.servlet-api.jar${pathsep}${webcontainer.home}/modules/jakarta.ejb-api.jar${pathsep}${webcontainer.home}/modules/jta.jar${pathsep}${webcontainer.home}/modules/jakarta.enterprise.deploy-api.jar#g' ts.jte
sed -i "s#^report.dir=.*#report.dir=$TCK_HOME/${TCK_NAME}report/${TCK_NAME}#g" ts.jte
sed -i "s#^work.dir=.*#work.dir=$TCK_HOME/${TCK_NAME}work/${TCK_NAME}#g" ts.jte
sed -i.bak "s#webcontainer\.home=.*#webcontainer.home=$TCK_HOME/$GF_TOPLEVEL_DIR/glassfish#g" ts.jte
sed -i.bak 's#concurrency\.classes=.*#concurrency.classes=${webcontainer.home}/modules/jakarta.enterprise.concurrent-api.jar${pathsep}${webcontainer.home}/modules/jakarta.servlet-api.jar${pathsep}${webcontainer.home}/modules/jakarta.ejb-api.jar${pathsep}${webcontainer.home}/modules/jta.jar${pathsep}${webcontainer.home}/modules/jakarta.enterprise.deploy-api.jar#g' ts.jte
sed -i.bak "s#^report.dir=.*#report.dir=$TCK_HOME/${TCK_NAME}report/${TCK_NAME}#g" ts.jte
sed -i.bak "s#^work.dir=.*#work.dir=$TCK_HOME/${TCK_NAME}work/${TCK_NAME}#g" ts.jte

if [[ "$PROFILE" == "web" || "$PROFILE" == "WEB" ]]; then
echo "javaee.level=web" >> ts.jte
Expand Down
10 changes: 5 additions & 5 deletions docker/connectortck.sh
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,11 @@ java -version



sed -i "s#^connector.home=.*#connector.home=$TCK_HOME/$GF_TOPLEVEL_DIR/glassfish#g" ts.jte
sed -i "s#^orb.host=.*#orb.host=localhost#g" ts.jte
sed -i "s#^webServerPort=.*#webServerPort=8080#g" ts.jte
sed -i "s#^report.dir=.*#report.dir=$TCK_HOME/${TCK_NAME}report/${TCK_NAME}#g" ts.jte
sed -i "s#^work.dir=.*#work.dir=$TCK_HOME/${TCK_NAME}work/${TCK_NAME}#g" ts.jte
sed -i.bak "s#^connector.home=.*#connector.home=$TCK_HOME/$GF_TOPLEVEL_DIR/glassfish#g" ts.jte
sed -i.bak "s#^orb.host=.*#orb.host=localhost#g" ts.jte
sed -i.bak "s#^webServerPort=.*#webServerPort=8080#g" ts.jte
sed -i.bak "s#^report.dir=.*#report.dir=$TCK_HOME/${TCK_NAME}report/${TCK_NAME}#g" ts.jte
sed -i.bak "s#^work.dir=.*#work.dir=$TCK_HOME/${TCK_NAME}work/${TCK_NAME}#g" ts.jte

mkdir -p $TCK_HOME/${TCK_NAME}report/${TCK_NAME}
mkdir -p $TCK_HOME/${TCK_NAME}work/${TCK_NAME}
Expand Down
8 changes: 4 additions & 4 deletions docker/eltck.sh
Original file line number Diff line number Diff line change
Expand Up @@ -67,16 +67,16 @@ export PATH=$JAVA_HOME/bin:$PATH
which java
java -version

sed -i "s#^el\.classes=.*#el.classes=$TS_HOME/lib/javatest.jar:$TCK_HOME/$GF_TOPLEVEL_DIR/glassfish/modules/jakarta.el.jar:$TCK_HOME/$GF_TOPLEVEL_DIR/glassfish/modules/jakarta.el-api.jar:$TCK_HOME/$GF_TOPLEVEL_DIR/glassfish/modules/expressly.jar#g" ts.jte
sed -i "s#^report.dir=.*#report.dir=$TCK_HOME/${TCK_NAME}report/${TCK_NAME}#g" ts.jte
sed -i "s#^work.dir=.*#work.dir=$TCK_HOME/${TCK_NAME}work/${TCK_NAME}#g" ts.jte
sed -i.bak "s#^el\.classes=.*#el.classes=$TS_HOME/lib/javatest.jar:$TCK_HOME/$GF_TOPLEVEL_DIR/glassfish/modules/jakarta.el.jar:$TCK_HOME/$GF_TOPLEVEL_DIR/glassfish/modules/jakarta.el-api.jar:$TCK_HOME/$GF_TOPLEVEL_DIR/glassfish/modules/expressly.jar#g" ts.jte
sed -i.bak "s#^report.dir=.*#report.dir=$TCK_HOME/${TCK_NAME}report/${TCK_NAME}#g" ts.jte
sed -i.bak "s#^work.dir=.*#work.dir=$TCK_HOME/${TCK_NAME}work/${TCK_NAME}#g" ts.jte

if [[ "$PROFILE" == "web" || "$PROFILE" == "WEB" ]]; then
echo "javaee.level=web" >> ts.jte
fi

#if [ ! -z "$TCK_BUNDLE_BASE_URL" ]; then
# sed -i 's#sigTestClasspath=.*#sigTestClasspath=\$\{el.classes\}\$\{pathsep\}\$\{JAVA_HOME\}/lib/rt.jar#g' ts.jte
# sed -i.bak 's#sigTestClasspath=.*#sigTestClasspath=\$\{el.classes\}\$\{pathsep\}\$\{JAVA_HOME\}/lib/rt.jar#g' ts.jte
#fi

mkdir -p $TCK_HOME/${TCK_NAME}report/${TCK_NAME}
Expand Down
56 changes: 28 additions & 28 deletions docker/fix_classpaths.sh
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
#!/bin/bash -x
sed -i 's/javax.annotation.jar/jakarta.annotation-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i 's/jaxb-api.jar/jakarta.xml.bind-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i 's/javax.annotation-api.jar/jakarta.annotation-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i 's/javax.ejb-api.jar/jakarta.ejb-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i 's/javax.el.jar/jakarta.el.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i 's/javax.enterprise.concurrent-api.jar/jakarta.enterprise.concurrent-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i 's/javax.enterprise.concurrent.jar/jakarta.enterprise.concurrent.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i 's/javax.faces.jar/jakarta.faces.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i 's/javax.inject.jar/jakarta.inject.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i 's/javax.interceptor-api.jar/jakarta.interceptor-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i 's/javax.jms-api.jar/jakarta.jms-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i 's/javax.json.bind-api.jar/jakarta.json.bind-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i 's/javax.json.jar/jakarta.json.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i 's/javax.json-api.jar/jakarta.json.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i 's/javax.mail.jar/jakarta.mail.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i 's/javax.persistence.jar/jakarta.persistence.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i 's/javax.resource-api.jar/jakarta.resource-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i 's/javax.security.auth.message-api.jar/jakarta.security.auth.message-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i 's/javax.security.enterprise-api.jar/jakarta.security.enterprise-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i 's/javax.security.enterprise.jar/jakarta.security.enterprise.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i 's/javax.security.jacc-api.jar/jakarta.security.jacc-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i 's/javax.servlet-api.jar/jakarta.servlet-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i 's/javax.servlet.jsp-api.jar/jakarta.servlet.jsp-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i 's/javax.servlet.jsp.jstl-api.jar/jakarta.servlet.jsp.jstl-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i 's/javax.transaction-api.jar/jakarta.transaction-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i 's/javax.websocket-api.jar/jakarta.websocket-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i 's/javax.xml.registry-api.jar/jakarta.xml.registry-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i 's/javax.ws.rs-api.jar/jakarta.ws.rs-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i.bak 's/javax.annotation.jar/jakarta.annotation-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i.bak 's/jaxb-api.jar/jakarta.xml.bind-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i.bak 's/javax.annotation-api.jar/jakarta.annotation-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i.bak 's/javax.ejb-api.jar/jakarta.ejb-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i.bak 's/javax.el.jar/jakarta.el.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i.bak 's/javax.enterprise.concurrent-api.jar/jakarta.enterprise.concurrent-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i.bak 's/javax.enterprise.concurrent.jar/jakarta.enterprise.concurrent.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i.bak 's/javax.faces.jar/jakarta.faces.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i.bak 's/javax.inject.jar/jakarta.inject.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i.bak 's/javax.interceptor-api.jar/jakarta.interceptor-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i.bak 's/javax.jms-api.jar/jakarta.jms-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i.bak 's/javax.json.bind-api.jar/jakarta.json.bind-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i.bak 's/javax.json.jar/jakarta.json.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i.bak 's/javax.json-api.jar/jakarta.json.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i.bak 's/javax.mail.jar/jakarta.mail.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i.bak 's/javax.persistence.jar/jakarta.persistence.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i.bak 's/javax.resource-api.jar/jakarta.resource-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i.bak 's/javax.security.auth.message-api.jar/jakarta.security.auth.message-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i.bak 's/javax.security.enterprise-api.jar/jakarta.security.enterprise-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i.bak 's/javax.security.enterprise.jar/jakarta.security.enterprise.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i.bak 's/javax.security.jacc-api.jar/jakarta.security.jacc-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i.bak 's/javax.servlet-api.jar/jakarta.servlet-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i.bak 's/javax.servlet.jsp-api.jar/jakarta.servlet.jsp-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i.bak 's/javax.servlet.jsp.jstl-api.jar/jakarta.servlet.jsp.jstl-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i.bak 's/javax.transaction-api.jar/jakarta.transaction-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i.bak 's/javax.websocket-api.jar/jakarta.websocket-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i.bak 's/javax.xml.registry-api.jar/jakarta.xml.registry-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte
sed -i.bak 's/javax.ws.rs-api.jar/jakarta.ws.rs-api.jar/g' ${CTS_HOME}/jakartaeetck/bin/ts.jte

echo "Fixed classpath properties in ts.jte successfully."
14 changes: 7 additions & 7 deletions docker/jacctck.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,16 @@ export PATH=$JAVA_HOME/bin:$PATH
which java
java -version

sed -i 's#orb\.port=.*#orb.port=3699#g' ts.jte
sed -i 's#javaee\.level=.*#javaee.level=full#g' ts.jte
sed -i "s#jacc\.home=.*#jacc.home=$TCK_HOME/$GF_TOPLEVEL_DIR/glassfish#g" ts.jte
sed -i 's#jacc\.host=.*#jacc.host=localhost#g' ts.jte
sed -i "s#^report.dir=.*#report.dir=$TCK_HOME/${TCK_NAME}report/${TCK_NAME}#g" ts.jte
sed -i "s#^work.dir=.*#work.dir=$TCK_HOME/${TCK_NAME}work/${TCK_NAME}#g" ts.jte
sed -i.bak 's#orb\.port=.*#orb.port=3699#g' ts.jte
sed -i.bak 's#javaee\.level=.*#javaee.level=full#g' ts.jte
sed -i.bak "s#jacc\.home=.*#jacc.home=$TCK_HOME/$GF_TOPLEVEL_DIR/glassfish#g" ts.jte
sed -i.bak 's#jacc\.host=.*#jacc.host=localhost#g' ts.jte
sed -i.bak "s#^report.dir=.*#report.dir=$TCK_HOME/${TCK_NAME}report/${TCK_NAME}#g" ts.jte
sed -i.bak "s#^work.dir=.*#work.dir=$TCK_HOME/${TCK_NAME}work/${TCK_NAME}#g" ts.jte

CONTENT='<property name="all.test.dir" value="com/sun/ts/tests/jacc/,com/sun/ts/tests/signaturetest/jacc,com/sun/ts/tests/common/vehicle/" />'
C=$(echo $CONTENT | sed 's/\//\\\//g')
sed -i "/<\/project>/ s/.*/${C}\n&/" $TS_HOME/bin/build.xml
sed -i.bak "/<\/project>/ s/.*/${C}\n&/" $TS_HOME/bin/build.xml

mkdir -p $TCK_HOME/${TCK_NAME}report/${TCK_NAME}
mkdir -p $TCK_HOME/${TCK_NAME}work/${TCK_NAME}
Expand Down
20 changes: 10 additions & 10 deletions docker/jaspictck.sh
Original file line number Diff line number Diff line change
Expand Up @@ -68,16 +68,16 @@ which java
java -version


sed -i 's#orb\.port=.*#orb.port=3700#g' ts.jte
sed -i "s#jaspic\.home=.*#jaspic.home=$TCK_HOME/$GF_TOPLEVEL_DIR/glassfish#g" ts.jte
sed -i 's#platform\.mode=.*#platform.mode=jakartaEE#g' ts.jte
sed -i 's#^deliverable\.class=.*#deliverable.class=com.sun.ts.lib.deliverable.cts.CTSDeliverable#g' ts.jte
sed -i 's#wsgen\.ant\.classname=.*#wsgen.ant.classname=com.sun.tools.ws.ant.WsGen#g' ts.jte
sed -i 's#wsimport\.ant\.classname=.*#wsimport.ant.classname=com.sun.tools.ws.ant.WsImport#g' ts.jte
sed -i 's#harness\.log\.traceflag=false.*#harness.log.traceflag=true#g' ts.jte
sed -i "s#tools\.jar=.*#tools.jar=$JAVA_HOME/lib/tools.jar#g" ts.jte
sed -i "s#^report.dir=.*#report.dir=$TCK_HOME/${TCK_NAME}report/${TCK_NAME}#g" ts.jte
sed -i "s#^work.dir=.*#work.dir=$TCK_HOME/${TCK_NAME}work/${TCK_NAME}#g" ts.jte
sed -i.bak 's#orb\.port=.*#orb.port=3700#g' ts.jte
sed -i.bak "s#jaspic\.home=.*#jaspic.home=$TCK_HOME/$GF_TOPLEVEL_DIR/glassfish#g" ts.jte
sed -i.bak 's#platform\.mode=.*#platform.mode=jakartaEE#g' ts.jte
sed -i.bak 's#^deliverable\.class=.*#deliverable.class=com.sun.ts.lib.deliverable.cts.CTSDeliverable#g' ts.jte
sed -i.bak 's#wsgen\.ant\.classname=.*#wsgen.ant.classname=com.sun.tools.ws.ant.WsGen#g' ts.jte
sed -i.bak 's#wsimport\.ant\.classname=.*#wsimport.ant.classname=com.sun.tools.ws.ant.WsImport#g' ts.jte
sed -i.bak 's#harness\.log\.traceflag=false.*#harness.log.traceflag=true#g' ts.jte
sed -i.bak "s#tools\.jar=.*#tools.jar=$JAVA_HOME/lib/tools.jar#g" ts.jte
sed -i.bak "s#^report.dir=.*#report.dir=$TCK_HOME/${TCK_NAME}report/${TCK_NAME}#g" ts.jte
sed -i.bak "s#^work.dir=.*#work.dir=$TCK_HOME/${TCK_NAME}work/${TCK_NAME}#g" ts.jte

if [[ "$PROFILE" == "web" || "$PROFILE" == "WEB" ]]; then
echo "javaee.level=web" >> ts.jte
Expand Down
Loading

0 comments on commit c68f24a

Please sign in to comment.