update based on S Starks comment - fix CP issue

jakartaee · Nov 8, 2024 · f6d235a · f6d235a
1 parent e760ff7
commit f6d235a
Show file tree

Hide file tree

Showing 7 changed files with 81 additions and 21 deletions.
diff --git a/assembly/pom.xml b/assembly/pom.xml
@@ -36,7 +36,7 @@
         <arquillian.junit>1.9.1.Final</arquillian.junit>
         <jakarta.platform.version>11.0.0-M2</jakarta.platform.version>
         <junit.jupiter.version>5.10.2</junit.jupiter.version>
-        <version.jakarta.tck.arquillian>1.0.0-M17</version.jakarta.tck.arquillian>
+        <version.jakarta.tck.arquillian>${project.version}</version.jakarta.tck.arquillian>
     </properties>
 
     <dependencyManagement>

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
@@ -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
@@ -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
diff --git a/glassfish-runner/assembly-tck/pom.xml b/glassfish-runner/assembly-tck/pom.xml
@@ -40,7 +40,7 @@
         <junit.jupiter.version>5.10.2</junit.jupiter.version>
         <tck.artifactId>assembly-tck</tck.artifactId>
         <tck.version>11.0.0-SNAPSHOT</tck.version>
-        <ts.home>/jakartaeetck</ts.home>
+        <ts.home>./jakartaeetck</ts.home>
         <version.jakarta.tck>11.0.0-SNAPSHOT</version.jakarta.tck>
         <version.jakarta.tck.arquillian>1.0.0-M17</version.jakarta.tck.arquillian>
     </properties>
@@ -224,6 +224,12 @@
     </dependencies>
 
     <build>
+        <testResources>
+            <testResource>
+                <filtering>true</filtering>
+                <directory>src/test/resources</directory>
+            </testResource>
+        </testResources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

diff --git a/glassfish-runner/assembly-tck/src/test/resources/appclient-arquillian.xml b/glassfish-runner/assembly-tck/src/test/resources/appclient-arquillian.xml
@@ -46,15 +46,16 @@
                 -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>
             <property name="cmdLineArgSeparator">\\</property>
             <!-- Pass ENV vars here -->
             <!-- <property name="clientEnvString">PATH=${env.PATH};LD_LIBRARY_PATH=${glassfish.home}/lib;AS_DEBUG=true;
                 APPCPATH=${glassfish.home}/glassfish/lib/arquillian-protocol-lib.jar:${glassfish.home}/glassfish/lib/tck-porting-lib.jar:target/appclient/lib/arquillian-core.jar:target/appclient/lib/arquillian-junit5.jar:${glassfish.home}/glassfish/modules/security.jar</property> -->
-            <property name="clientEnvString">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</property>
+            <property name="clientEnvString">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</property>
             <property name="clientDir">${project.basedir}</property>
             <property name="workDir">/tmp</property>
             <property name="tsJteFile">jakartaeetck/bin/ts.jte</property>

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
@@ -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
@@ -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;