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.

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

Messaging : add logging, remove unsuitable properties from ts.jte #1642

Merged
merged 1 commit into from
Nov 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 1 addition & 13 deletions glassfish-runner/messaging-platform-tck/jakartaeetck/bin/ts.jte
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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}
</property>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
Loading