Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added GlassFish's bootstrap modulepath #1685

Draft
wants to merge 1 commit into
base: 10.0.x
Choose a base branch
from
Draft

Added GlassFish's bootstrap modulepath #1685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions install/caj/bin/ts.jte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ command.testExecute=com.sun.ts.lib.harness.ExecTSTestCmd \
windir=${windir} \
SYSTEMROOT=${SYSTEMROOT} \
${JAVA_HOME}/bin/java \
--module-path ${J2EE_HOME}/lib/bootstrap --add-modules ALL-MODULE-PATH \
-Djava.security.policy="${bin.dir}/harness.policy" \
-Djava.security.manager \
-Ddeliverable.class=${deliverable.class} \
Expand Down
1 change: 1 addition & 0 deletions install/connector/bin/ts.jte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,7 @@ command.testExecute=com.sun.ts.lib.harness.ExecTSTestCmd \
SYSTEMROOT=${SYSTEMROOT} \
PATH="${connector.home}/nativelib" \
${JAVA_HOME}/bin/java \
--module-path ${J2EE_HOME}/lib/bootstrap --add-modules ALL-MODULE-PATH \
-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=9008 \
-Dcts.tmp=$harness.temp.directory \
-DnoSecurityManager=true \
Expand Down
24 changes: 18 additions & 6 deletions install/j2eemgmt/bin/ts.jte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@ env.ts_unix.command.testExecute=com.sun.ts.lib.harness.ExecTSTestCmd \
DISPLAY=:0.0 \
HOME=${user.home} \
LD_LIBRARY_PATH=${J2EE_HOME}/nativelib \
${JAVA_HOME}/bin/java ${JAVA_OPTIONS} -Dorg.omg.CORBA.ORBInitialHost=${ORB_HOST} \
${JAVA_HOME}/bin/java \
--module-path ${J2EE_HOME}/lib/bootstrap --add-modules ALL-MODULE-PATH \
${JAVA_OPTIONS} -Dorg.omg.CORBA.ORBInitialHost=${ORB_HOST} \
-Dcts.tmp=$harness.temp.directory \
-Djava.security.auth.login.config=${TS_HOME}/bin/login.config \
-Djava.security.auth.policy=${TS_HOME}/bin/java.security.auth.policy \
Expand All @@ -65,7 +67,9 @@ env.ts_unix.command.testExecute=com.sun.ts.lib.harness.ExecTSTestCmd \
env.ts_unix.command.testExecuteAppClient=com.sun.ts.lib.harness.ExecTSTestCmd DISPLAY=:0.0 HOME=${user.home} \
LD_LIBRARY_PATH=${J2EE_HOME}/nativelib \
TZ=${TZ} \
${JAVA_HOME}/bin/java -Dorg.omg.CORBA.ORBInitialHost=${ORB_HOST} \
${JAVA_HOME}/bin/java \
--module-path ${J2EE_HOME}/lib/bootstrap --add-modules ALL-MODULE-PATH \
-Dorg.omg.CORBA.ORBInitialHost=${ORB_HOST} \
${JAVA_OPTIONS} -Djava.security.policy=${TS_HOME}/bin/java.policy -Djava.util.logging.config.file=${TS_HOME}/bin/client-logging.properties \
-Dcts.tmp=$harness.temp.directory \
-Dorg.xml.sax.driver=org.apache.crimson.parser.XMLReaderImpl \
Expand All @@ -82,7 +86,9 @@ env.ts_unix.command.testExecuteAppClient=com.sun.ts.lib.harness.ExecTSTestCmd DI
env.ts_unix.command.testExecuteAppClient2=com.sun.ts.lib.harness.ExecTSTestCmd DISPLAY=:0.0 HOME=${user.home} \
LD_LIBRARY_PATH=${J2EE_HOME_RI}/nativelib \
TZ=${TZ} \
${JAVA_HOME}/bin/java -Dorg.omg.CORBA.ORBInitialHost=${ORB_HOST_RI} \
${JAVA_HOME}/bin/java \
--module-path ${J2EE_HOME_RI}/lib/bootstrap --add-modules ALL-MODULE-PATH \
-Dorg.omg.CORBA.ORBInitialHost=${ORB_HOST_RI} \
${JAVA_OPTIONS} -Djava.security.policy=${TS_HOME}/bin/java.policy -Djava.util.logging.config.file=${TS_HOME}/bin/client-logging.properties \
-Dcts.tmp=$harness.temp.directory \
-Dorg.xml.sax.driver=org.apache.crimson.parser.XMLReaderImpl \
Expand Down Expand Up @@ -111,7 +117,9 @@ env.ts_win32.command.testExecute=com.sun.ts.lib.harness.ExecTSTestCmd \
windir=${windir} \
SYSTEMROOT=${SYSTEMROOT} \
PATH=${J2EE_HOME}\\nativelib \
${JAVA_HOME}\\bin\\java ${JAVA_OPTIONS} -Dorg.omg.CORBA.ORBInitialHost=${ORB_HOST} \
${JAVA_HOME}\\bin\\java \
--module-path ${J2EE_HOME}\\lib\\bootstrap --add-modules ALL-MODULE-PATH \
${JAVA_OPTIONS} -Dorg.omg.CORBA.ORBInitialHost=${ORB_HOST} \
-Dcts.tmp=$harness.temp.directory \
-Djava.security.auth.login.config=${TS_HOME}\\bin\\login.config \
-Djava.security.auth.policy=${TS_HOME}\\bin\\java.security.auth.policy \
Expand All @@ -120,7 +128,9 @@ env.ts_win32.command.testExecute=com.sun.ts.lib.harness.ExecTSTestCmd \
env.ts_win32.command.testExecuteAppClient=com.sun.ts.lib.harness.ExecTSTestCmd \
windir=${windir} SYSTEMROOT=${SYSTEMROOT} \
PATH=${J2EE_HOME}\\nativelib \
${JAVA_HOME}\\bin\\java ${JAVA_OPTIONS} -Dorg.omg.CORBA.ORBInitialHost=${ORB_HOST} \
${JAVA_HOME}\\bin\\java \
--module-path ${J2EE_HOME}\\lib\\bootstrap --add-modules ALL-MODULE-PATH \
${JAVA_OPTIONS} -Dorg.omg.CORBA.ORBInitialHost=${ORB_HOST} \
-Dcts.tmp=$harness.temp.directory \
-Djava.security.policy=${TS_HOME}\\bin\\java.policy -Djava.util.logging.config.file=${TS_HOME}/bin/client-logging.properties \
-Dorg.xml.sax.driver=org.apache.crimson.parser.XMLReaderImpl \
Expand All @@ -137,7 +147,9 @@ env.ts_win32.command.testExecuteAppClient=com.sun.ts.lib.harness.ExecTSTestCmd \
env.ts_win32.command.testExecuteAppClient2=com.sun.ts.lib.harness.ExecTSTestCmd \
windir=${windir} SYSTEMROOT=${SYSTEMROOT} \
PATH=${J2EE_HOME_RI}\\nativelib \
${JAVA_HOME}\\bin\\java ${JAVA_OPTIONS} -Dorg.omg.CORBA.ORBInitialHost=${ORB_HOST_RI} \
${JAVA_HOME}\\bin\\java \
--module-path ${J2EE_HOME_RI}\\lib\\bootstrap --add-modules ALL-MODULE-PATH \
${JAVA_OPTIONS} -Dorg.omg.CORBA.ORBInitialHost=${ORB_HOST_RI} \
-Dcts.tmp=$harness.temp.directory \
-Djava.security.policy=${TS_HOME}\\bin\\java.policy -Djava.util.logging.config.file=${TS_HOME}/bin/client-logging.properties \
-Dorg.xml.sax.driver=org.apache.crimson.parser.XMLReaderImpl \
Expand Down
1 change: 1 addition & 0 deletions install/jacc/bin/ts.jte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,7 @@ command.testExecute=com.sun.ts.lib.harness.ExecTSTestCmd \
windir=${windir} \
SYSTEMROOT=${SYSTEMROOT} \
${JAVA_HOME}/bin/java \
--module-path ${jacc.home}/lib/bootstrap --add-modules ALL-MODULE-PATH \
-Dcts.tmp=$harness.temp.directory \
-Dlog.file.location=${log.file.location} \
-Djava.security.policy=${bin.dir}/harness.policy \
Expand Down
4 changes: 4 additions & 0 deletions install/jakartaee/bin/ts.jte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1133,6 +1133,7 @@ command.testExecute=com.sun.ts.lib.harness.ExecTSTestCmd \
SYSTEMROOT=${SYSTEMROOT} \
PATH="${javaee.home}/nativelib" \
${JAVA_HOME}/bin/java \
--module-path ${javaee.home}/lib/bootstrap --add-modules ALL-MODULE-PATH \
${JVMOPTS_RUNTESTCOMMAND} \
-Xss2048k \
-Dcts.tmp=$harness.temp.directory \
Expand Down Expand Up @@ -1172,6 +1173,7 @@ command.testExecuteAppClient= \
APPCPATH=${ts.home}/lib/tsharness.jar${pathsep}${ts.home}/lib/cts.jar${pathsep}${ts.home}/lib/glassfishporting.jar${pathsep}${javaee.home}/lib/jpa_alternate_provider.jar${pathsep}${ts.home}/lib/tssv.jar${pathsep}${javaee.home}/modules/weld-osgi-bundle.jar${pathsep}${javaee.home}/modules/jakarta.enterprise.cdi-api.jar \
TZ=${tz} \
${JAVA_HOME}/bin/java \
--module-path ${javaee.home}/lib/bootstrap --add-modules ALL-MODULE-PATH \
${JVMOPTS_RUNTESTCOMMAND} \
-Djava.system.class.loader=org.glassfish.appclient.client.acc.agent.ACCAgentClassLoader \
-Djava.security.policy=${javaee.home}/lib/appclient/client.policy \
Expand Down Expand Up @@ -1243,6 +1245,7 @@ command.testExecuteEjbEmbed=com.sun.ts.lib.harness.ExecTSTestCmd \
windir=${windir} \
SYSTEMROOT=${SYSTEMROOT} \
${JAVA_HOME}/bin/java \
--module-path ${javaee.home}/lib/bootstrap --add-modules ALL-MODULE-PATH \
${JVMOPTS_RUNTESTCOMMAND} \
-Dcts.tmp=$harness.temp.directory \
-Djava.util.logging.config.file=${TS_HOME}/bin/client-logging.properties \
Expand All @@ -1263,6 +1266,7 @@ command.testExecuteAppClient2= \
APPCPATH=${ts.home}/lib/tsharness.jar${pathsep}${ts.home}/lib/cts.jar${pathsep}${ts.home}/lib/glassfishporting.jar${pathsep}${ts.home}/lib/riinterceptors.jar \
TZ=${tz} \
${RI_JAVA_HOME}/bin/java \
--module-path ${javaee.home.ri}/lib/bootstrap --add-modules ALL-MODULE-PATH \
${JVMOPTS_RUNTESTCOMMAND} \
-Djava.system.class.loader=org.glassfish.appclient.client.acc.agent.ACCAgentClassLoader \
-Djava.security.policy=${javaee.home.ri}/lib/appclient/client.policy \
Expand Down
1 change: 1 addition & 0 deletions install/jms/ra/bin/ts.jte.glassfish
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ command.testExecute=com.sun.ts.lib.harness.ExecTSTestCmd \
windir=${windir} \
SYSTEMROOT=${SYSTEMROOT} \
${JAVA_HOME}/bin/java \
--module-path ${glassfish.home}/lib/bootstrap --add-modules ALL-MODULE-PATH \
-Djava.security.policy="${bin.dir}/harness.policy" \
-Djava.security.manager -Dgenericra.inAppClientContainer=true \
-Ddeliverable.class=${deliverable.class} \
Expand Down