From 5d78495786f0ead06be56720a1762c904a229b6a Mon Sep 17 00:00:00 2001 From: Alwin Joseph <44426046+alwin-joseph@users.noreply.github.com> Date: Sat, 9 Nov 2024 01:54:54 +0530 Subject: [PATCH] jms : add logging, remove unsuitable properties from ts.jte (#1642) --- .../jakartaeetck/bin/ts.jte | 14 +------------ .../jakartaeetck/logging.properties | 20 +++++++++++++++++++ .../test/resources/appclient-arquillian.xml | 1 + .../tests/jms/ee20/cditests/mdb/Client.java | 3 --- .../jms/ee20/cditests/usecases/Client.java | 3 --- 5 files changed, 22 insertions(+), 19 deletions(-) create mode 100644 glassfish-runner/messaging-platform-tck/jakartaeetck/logging.properties diff --git a/glassfish-runner/messaging-platform-tck/jakartaeetck/bin/ts.jte b/glassfish-runner/messaging-platform-tck/jakartaeetck/bin/ts.jte index 2dfeb5d731..4f7f137460 100644 --- a/glassfish-runner/messaging-platform-tck/jakartaeetck/bin/ts.jte +++ b/glassfish-runner/messaging-platform-tck/jakartaeetck/bin/ts.jte @@ -99,7 +99,7 @@ if.existing.work.report.dirs=auto # # Note that javatest.timeout.factor can be a positive real number, such as 1.5 ######################################################################## -javatest.timeout.factor=1 +javatest.timeout.factor=2.0 ######################################################################## ## Level of Vendor Java EE Implementation @@ -1668,18 +1668,6 @@ EJBServer2TxInteropEnabled=true ## JNDI name bindings. You should not change these. The TSDeploymentInterface ## will pass these values as a properties object. See the SunRIDeployment.java ## file for usage patterns. -whitebox-tx=java:comp/env/eis/whitebox-tx -whitebox-notx=java:comp/env/eis/whitebox-notx -whitebox-xa=java:comp/env/eis/whitebox-xa -whitebox-tx-param=java:comp/env/eis/whitebox-tx-param -whitebox-notx-param=java:comp/env/eis/whitebox-notx-param -whitebox-xa-param=java:comp/env/eis/whitebox-xa-param -whitebox-anno_no_md=java:comp/env/eis/whitebox-anno_no_md -whitebox-ibanno_no_md=java:comp/env/eis/whitebox-ibanno_no_md -whitebox-mixedmode=java:comp/env/eis/whitebox-mixedmode -whitebox-multianno=java:comp/env/eis/whitebox-multianno -whitebox-mdcomplete=java:comp/env/eis/whitebox-mdcomplete -whitebox-permissiondd=java:comp/env/eis/whitebox-permissiondd ## Embedded resource adapter property whitebox-embed=java:comp/env/eis/ejb_Deployment_whitebox-tx.rar diff --git a/glassfish-runner/messaging-platform-tck/jakartaeetck/logging.properties b/glassfish-runner/messaging-platform-tck/jakartaeetck/logging.properties new file mode 100644 index 0000000000..121c1ccb0d --- /dev/null +++ b/glassfish-runner/messaging-platform-tck/jakartaeetck/logging.properties @@ -0,0 +1,20 @@ +handlers=java.util.logging.FileHandler,java.util.logging.ConsoleHandler + +org.glassfish.level=ALL +com.sun.level=FINEST +jakarta.enterprise.level=ALL + + +tck.jakarta.platform.ant.level = FINER +org.glassfish.appclient.client.level = FINER + +java.util.logging.FileHandler.pattern = tck-run.log +java.util.logging.FileHandler.level = FINEST +#java.util.logging.FileHandler.formatter = tck.conversion.log.TestLogFormatter +java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter +# date(1), source(2), logger(3), level(4), message(5), thrown(6) +java.util.logging.SimpleFormatter.format = [%1$tH:%tM:%1$tS.%1$tL] %2$.12s/%4$s %5$s %n + +# Limit the message that are printed on the console to INFO and above. +java.util.logging.ConsoleHandler.level = FINEST +java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter \ No newline at end of file diff --git a/glassfish-runner/messaging-platform-tck/src/test/resources/appclient-arquillian.xml b/glassfish-runner/messaging-platform-tck/src/test/resources/appclient-arquillian.xml index 3473c6ec31..413216264c 100644 --- a/glassfish-runner/messaging-platform-tck/src/test/resources/appclient-arquillian.xml +++ b/glassfish-runner/messaging-platform-tck/src/test/resources/appclient-arquillian.xml @@ -46,6 +46,7 @@ -DwebServerHost.2=localhost \ -DwebServerPort.2=8080 \ -Ddeliverable.class=com.sun.ts.lib.deliverable.cts.CTSDeliverable \ + -Djava.util.logging.config.file=jakartaeetck/logging.properties \ -jar \ ${clientEarDir}/${clientAppArchive} diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/mdb/Client.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/mdb/Client.java index 21cbddb4d4..c707021a60 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/mdb/Client.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/mdb/Client.java @@ -22,7 +22,6 @@ import com.sun.ts.lib.harness.Status; import com.sun.ts.lib.harness.EETest; -import com.sun.ts.lib.porting.TSURL; import com.sun.ts.lib.util.TestUtil; import jakarta.ejb.EJB; @@ -35,8 +34,6 @@ public class Client extends EETest { private static final int PORTNUM = 8000; - private TSURL ctsurl = new TSURL(); - private Properties props = null; private String hostname = HOSTNAME; diff --git a/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/usecases/Client.java b/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/usecases/Client.java index 826e5e7650..1cb141aa6a 100644 --- a/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/usecases/Client.java +++ b/jms/src/main/java/com/sun/ts/tests/jms/ee20/cditests/usecases/Client.java @@ -22,7 +22,6 @@ import com.sun.ts.lib.harness.Status; import com.sun.ts.lib.harness.EETest; -import com.sun.ts.lib.porting.TSURL; import com.sun.ts.lib.util.TestUtil; import jakarta.ejb.EJB; @@ -35,8 +34,6 @@ public class Client extends EETest { private static final int PORTNUM = 8000; - private TSURL ctsurl = new TSURL(); - private Properties props = null; private String hostname = HOSTNAME;