From f6d235af9d7cc89cea9cd27350a798dc9f3095ea Mon Sep 17 00:00:00 2001 From: Alwin Joseph Date: Fri, 8 Nov 2024 18:00:54 +0530 Subject: [PATCH] update based on S Starks comment - fix CP issue --- assembly/pom.xml | 2 +- .../tests/assembly/standalone/jar/Client.java | 2 + .../jakartaeetck/logging.properties | 20 ++++++++ glassfish-runner/assembly-tck/pom.xml | 8 +++- .../test/resources/appclient-arquillian.xml | 5 +- .../com/sun/ts/lib/util/TestReportInfo.java | 48 +++++++++++++++++++ .../java/com/sun/ts/lib/util/TestUtil.java | 17 ------- 7 files changed, 81 insertions(+), 21 deletions(-) create mode 100644 glassfish-runner/assembly-tck/jakartaeetck/logging.properties create mode 100644 libutil/src/main/java/com/sun/ts/lib/util/TestReportInfo.java diff --git a/assembly/pom.xml b/assembly/pom.xml index 121e9bb3cf..96d6fb2817 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -36,7 +36,7 @@ 1.9.1.Final 11.0.0-M2 5.10.2 - 1.0.0-M17 + ${project.version} diff --git a/assembly/src/main/java/com/sun/ts/tests/assembly/standalone/jar/Client.java b/assembly/src/main/java/com/sun/ts/tests/assembly/standalone/jar/Client.java index 5780ce8620..4f517f2f77 100644 --- a/assembly/src/main/java/com/sun/ts/tests/assembly/standalone/jar/Client.java +++ b/assembly/src/main/java/com/sun/ts/tests/assembly/standalone/jar/Client.java @@ -145,6 +145,8 @@ public static JavaArchive createEjbDeploymentVehicle(@ArquillianResource TestArc com.sun.ts.tests.assembly.standalone.jar.TestBeanEJB.class, com.sun.ts.tests.common.ejb.wrappers.Stateless3xWrapper.class, com.sun.ts.lib.util.RemoteLoggingInitException.class, + com.sun.ts.lib.util.TestReportInfo.class, + com.sun.ts.lib.util.TestUtil.class, com.sun.ts.tests.assembly.standalone.jar.Client.class); // The application-client.xml descriptor URL resURL = Client.class.getResource("assembly_standalone_jar_component_ejb.xml"); diff --git a/glassfish-runner/assembly-tck/jakartaeetck/logging.properties b/glassfish-runner/assembly-tck/jakartaeetck/logging.properties new file mode 100644 index 0000000000..121c1ccb0d --- /dev/null +++ b/glassfish-runner/assembly-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/assembly-tck/pom.xml b/glassfish-runner/assembly-tck/pom.xml index c95ff051dd..7cd19d0c00 100644 --- a/glassfish-runner/assembly-tck/pom.xml +++ b/glassfish-runner/assembly-tck/pom.xml @@ -40,7 +40,7 @@ 5.10.2 assembly-tck 11.0.0-SNAPSHOT - /jakartaeetck + ./jakartaeetck 11.0.0-SNAPSHOT 1.0.0-M17 @@ -224,6 +224,12 @@ + + + true + src/test/resources + + org.apache.maven.plugins diff --git a/glassfish-runner/assembly-tck/src/test/resources/appclient-arquillian.xml b/glassfish-runner/assembly-tck/src/test/resources/appclient-arquillian.xml index 393c4b9dd0..4154e47d6e 100644 --- a/glassfish-runner/assembly-tck/src/test/resources/appclient-arquillian.xml +++ b/glassfish-runner/assembly-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} @@ -53,8 +54,8 @@ - PATH=${env.PATH};LD_LIBRARY_PATH=${glassfish.home}/lib;AS_DEBUG=true; - APPCPATH=target/lib/arquillian-protocol-lib.jar:target/lib/tck-porting-lib.jar:target/appclient/lib/arquillian-core.jar:target/appclient/lib/arquillian-junit5.jar:${glassfish.home}/glassfish/modules/security.jar:${glassfish.home}/glassfish/lib/gf-client.jar + AS_JAVA=${env.JAVA_HOME};PATH=${env.PATH};LD_LIBRARY_PATH=${glassfish.home}/lib;AS_DEBUG=true; + APPCPATH=target/lib/arquillian-protocol-lib.jar:target/lib/tck-porting-lib.jar:target/appclient/lib/arquillian-core.jar:target/appclient/lib/arquillian-junit5.jar:${glassfish.home}/glassfish/modules/security.jar:${glassfish.home}/glassfish/lib/gf-client.jar ${project.basedir} /tmp jakartaeetck/bin/ts.jte diff --git a/libutil/src/main/java/com/sun/ts/lib/util/TestReportInfo.java b/libutil/src/main/java/com/sun/ts/lib/util/TestReportInfo.java new file mode 100644 index 0000000000..80fa81b12a --- /dev/null +++ b/libutil/src/main/java/com/sun/ts/lib/util/TestReportInfo.java @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2007, 2018 Oracle and/or its affiliates. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v. 2.0, which is available at + * http://www.eclipse.org/legal/epl-2.0. + * + * This Source Code may also be made available under the following Secondary + * Licenses when the conditions for such availability set forth in the + * Eclipse Public License v. 2.0 are satisfied: GNU General Public License, + * version 2 with the GNU Classpath Exception, which is available at + * https://www.gnu.org/software/classpath/license.html. + * + * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 + */ + +/* + * $Id$ + */ + +package com.sun.ts.lib.util; + +import java.io.*; +import java.util.*; +import java.net.*; +import java.text.SimpleDateFormat; + + + + +public class TestReportInfo implements Serializable { + public int iDebugLevel = TestUtil.NORMAL_OUTPUT_LEVEL; + + public String sOutput = ""; // Constants.EMPTY_STRING; + + public Throwable exception = null; + + public int iStream = TestUtil.OUTPUT_STREAM; + + public TestReportInfo(String output, int stream, int level, Throwable e) { + if (sOutput != null) + sOutput = output; + iDebugLevel = level; + exception = e; + iStream = stream; + } +} + diff --git a/libutil/src/main/java/com/sun/ts/lib/util/TestUtil.java b/libutil/src/main/java/com/sun/ts/lib/util/TestUtil.java index 1f807d7b83..c440435a59 100644 --- a/libutil/src/main/java/com/sun/ts/lib/util/TestUtil.java +++ b/libutil/src/main/java/com/sun/ts/lib/util/TestUtil.java @@ -1111,23 +1111,6 @@ public void run() { } } -class TestReportInfo implements Serializable { - public int iDebugLevel = TestUtil.NORMAL_OUTPUT_LEVEL; - - public String sOutput = ""; // Constants.EMPTY_STRING; - - public Throwable exception = null; - - public int iStream = TestUtil.OUTPUT_STREAM; - - public TestReportInfo(String output, int stream, int level, Throwable e) { - if (sOutput != null) - sOutput = output; - iDebugLevel = level; - exception = e; - iStream = stream; - } -} class SocketReader extends Thread { private Socket outputSocket = null;