Don't parasite on domain's logging.properties

- two standalone JVM should not use the same configuration and same log files Signed-off-by: David Matějček <david.matejcek@omnifish.ee>
jakartaee · Aug 12, 2022 · 5457c58 · 5457c58
1 parent 0007ccf
commit 5457c58
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 8 deletions.
diff --git a/docker/run_jakartaeetck.sh b/docker/run_jakartaeetck.sh
@@ -361,7 +361,9 @@ sed -i.bak 's/^javatest.timeout.factor=.*/javatest.timeout.factor=2.0/g' ts.jte
 sed -i.bak 's/^test.ejb.stateful.timeout.wait.seconds=.*/test.ejb.stateful.timeout.wait.seconds=480/g' ts.jte
 sed -i.bak 's/^harness.log.traceflag=.*/harness.log.traceflag=false/g' ts.jte
 sed -i.bak 's/^impl\.deploy\.timeout\.multiplier=240/impl\.deploy\.timeout\.multiplier=480/g' ts.jte
-
+if [ ! -z "${CLIENT_LOGGING_CFG}" ]; then
+  sed -i.bak "s#-Djava\.util\.logging\.config\.file=\${TS_HOME}/bin/client-logging.properties#-Djava\.util\.logging\.config\.file=${CLIENT_LOGGING_CFG}#g" ts.jte
+fi
 if [ "servlet" == "${test_suite}" ]; then
   sed -i.bak 's/s1as\.java\.endorsed\.dirs=.*/s1as.java.endorsed.dirs=\$\{endorsed.dirs\}\$\{pathsep\}\$\{ts.home\}\/endorsedlib/g' ts.jte
 fi

diff --git a/install/connector/bin/ts.jte b/install/connector/bin/ts.jte
@@ -325,12 +325,11 @@ command.testExecute=com.sun.ts.lib.harness.ExecTSTestCmd \
         -Djavax.net.ssl.trustStore=${s1as.domain}/${sjsas.instance.config.dir}/cacerts.jks \
         -Dcom.sun.aas.installRoot=${connector.home} \
         -Dcom.sun.aas.configRoot=${connector.home}/config \
-        -Djava.util.logging.config.file=${bin.dir}/logging.properties \
+        -Djava.util.logging.config.file=${TS_HOME}/bin/client-logging.properties \
         -Dlogical.hostname.servlet=${logical.hostname.servlet} \
         -Ddeliverable.class=${deliverable.class} $testExecuteClass $testExecuteArgs
 
 
-
 #########################################################################
 ## Environment for ts_unix
 ## 3 test execution commands inherit from common environment

diff --git a/install/j2eemgmt/bin/ts.jte b/install/j2eemgmt/bin/ts.jte
@@ -66,7 +66,7 @@ env.ts_unix.command.testExecuteAppClient=com.sun.ts.lib.harness.ExecTSTestCmd DI
         LD_LIBRARY_PATH=${J2EE_HOME}/nativelib \
 	TZ=${TZ} \
         ${JAVA_HOME}/bin/java -Dorg.omg.CORBA.ORBInitialHost=${ORB_HOST} \
-		${JAVA_OPTIONS} -Djava.security.policy=${TS_HOME}/bin/java.policy -Djava.util.logging.config.file=${J2EE_HOME}/config/client_logging.properties \
+		${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 \
          -Dorg.xml.sax.parser=org.xml.sax.helpers.XMLReaderAdapter \
@@ -83,7 +83,7 @@ env.ts_unix.command.testExecuteAppClient2=com.sun.ts.lib.harness.ExecTSTestCmd D
         LD_LIBRARY_PATH=${J2EE_HOME_RI}/nativelib \
 	TZ=${TZ} \
         ${JAVA_HOME}/bin/java -Dorg.omg.CORBA.ORBInitialHost=${ORB_HOST_RI} \
-		${JAVA_OPTIONS} -Djava.security.policy=${TS_HOME}/bin/java.policy -Djava.util.logging.config.file=${J2EE_HOME}/config/client_logging.properties \
+		${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 \
          -Dorg.xml.sax.parser=org.xml.sax.helpers.XMLReaderAdapter \
@@ -122,7 +122,7 @@ env.ts_win32.command.testExecuteAppClient=com.sun.ts.lib.harness.ExecTSTestCmd \
 	PATH=${J2EE_HOME}\\nativelib \
         ${JAVA_HOME}\\bin\\java ${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=${J2EE_HOME}\\config\\client_logging.properties \
+		-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 \
         -Dorg.xml.sax.parser=org.xml.sax.helpers.XMLReaderAdapter \
 	-Dorg.omg.CORBA.ORBInitialPort=${ORB_PORT} -Djms.home=${J2EE_HOME} -Djms\
@@ -139,7 +139,7 @@ env.ts_win32.command.testExecuteAppClient2=com.sun.ts.lib.harness.ExecTSTestCmd
 	PATH=${J2EE_HOME_RI}\\nativelib \
         ${JAVA_HOME}\\bin\\java ${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=${J2EE_HOME}\\config\\client_logging.properties \
+		-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 \
         -Dorg.xml.sax.parser=org.xml.sax.helpers.XMLReaderAdapter \
 	-Dorg.omg.CORBA.ORBInitialPort=${ORB_PORT_RI} -Djms.home=${J2EE_HOME_RI} -Djms\

diff --git a/install/jakartaee/bin/client-logging.properties b/install/jakartaee/bin/client-logging.properties
@@ -0,0 +1,8 @@
+handlers=org.glassfish.main.jul.handler.SimpleLogHandler
+
+org.glassfish.main.jul.handler.SimpleLogHandler.level=ALL
+org.glassfish.main.jul.handler.SimpleLogHandler.formatter.printSource=true
+org.glassfish.main.jul.handler.SimpleLogHandler.useErrorStream=false
+
+.level=INFO
+
diff --git a/install/jakartaee/bin/ts.jte b/install/jakartaee/bin/ts.jte
@@ -1245,7 +1245,7 @@ command.testExecuteEjbEmbed=com.sun.ts.lib.harness.ExecTSTestCmd \
         ${JAVA_HOME}/bin/java \
         ${JVMOPTS_RUNTESTCOMMAND} \
         -Dcts.tmp=$harness.temp.directory \
-        -Djava.util.logging.config.file=${javaee.home}/domains/domain1/config/logging.properties \
+        -Djava.util.logging.config.file=${TS_HOME}/bin/client-logging.properties \
         -Dtest.ejb.stateful.timeout.wait.seconds=${test.ejb.stateful.timeout.wait.seconds} \
         -Ddeliverable.class=${deliverable.class} $testExecuteClass $testExecuteArgs