diff --git a/assembly/src/main/java/com/sun/ts/tests/assembly/classpath/ejb/Client.java b/assembly/src/main/java/com/sun/ts/tests/assembly/classpath/ejb/Client.java index 0ce3228908..1bc174e3d4 100644 --- a/assembly/src/main/java/com/sun/ts/tests/assembly/classpath/ejb/Client.java +++ b/assembly/src/main/java/com/sun/ts/tests/assembly/classpath/ejb/Client.java @@ -103,7 +103,6 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if (resURL != null) { direct_classpath_util.addAsManifestResource(resURL, "ejb-jar.xml"); } - direct_classpath_util.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // archiveProcessor.processEjbArchive(direct_classpath_util, Client.class, resURL); JavaArchive indirect_classpath_util = ShrinkWrap.create(JavaArchive.class, "indirect_classpath_util.jar"); @@ -113,7 +112,6 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if (resURL != null) { indirect_classpath_util.addAsManifestResource(resURL, "ejb-jar.xml"); } - indirect_classpath_util.addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // archiveProcessor.processEjbArchive(indirect_classpath_util, Client.class, resURL); @@ -155,8 +153,6 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if(ejbResURL != null) { assembly_classpath_ejb_ejb.addAsManifestResource(ejbResURL, "sun-ejb-jar.xml"); } - assembly_classpath_ejb_ejb - .addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); archiveProcessor.processEjbArchive(assembly_classpath_ejb_ejb, Client.class, ejbResURL); EnterpriseArchive assembly_classpath_ejb_ear = ShrinkWrap.create(EnterpriseArchive.class, @@ -173,8 +169,6 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test if (earResURL != null) { assembly_classpath_ejb_ear.addAsManifestResource(earResURL, "application.xml"); } - assembly_classpath_ejb_ear - .addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); archiveProcessor.processEarArchive(assembly_classpath_ejb_ear, Client.class, earResURL); return assembly_classpath_ejb_ear; diff --git a/assembly/src/main/java/com/sun/ts/tests/assembly/compat/standalone/jar/compat9_10/Client.java b/assembly/src/main/java/com/sun/ts/tests/assembly/compat/standalone/jar/compat9_10/Client.java index 716ce5e85e..63dc78bd22 100644 --- a/assembly/src/main/java/com/sun/ts/tests/assembly/compat/standalone/jar/compat9_10/Client.java +++ b/assembly/src/main/java/com/sun/ts/tests/assembly/compat/standalone/jar/compat9_10/Client.java @@ -159,6 +159,9 @@ public static JavaArchive createEjbDeploymentVehicle(@ArquillianResource TestArc com.sun.ts.tests.assembly.compat.standalone.jar.compat9_10.TestBeanEJB.class, com.sun.ts.tests.common.ejb.wrappers.Stateless3xWrapper.class, com.sun.ts.lib.util.RemoteLoggingInitException.class, + com.sun.ts.lib.util.TSNamingContext.class, + com.sun.ts.lib.util.TestUtil.class, + com.sun.ts.lib.util.TestReportInfo.class, com.sun.ts.tests.assembly.compat.standalone.jar.compat9_10.Client.class); // The application-client.xml descriptor URL resURL = Client.class.getResource("ejb-jar.xml"); diff --git a/assembly/src/main/java/com/sun/ts/tests/assembly/compat/standalone/jar/compat9_10/application-client.xml b/assembly/src/main/java/com/sun/ts/tests/assembly/compat/standalone/jar/compat9_10/application-client.xml deleted file mode 100644 index 9cccb19bdd..0000000000 --- a/assembly/src/main/java/com/sun/ts/tests/assembly/compat/standalone/jar/compat9_10/application-client.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - client for TS assembly compat stand-alone compat9_10 ejb-jar test - assembly_compat_standalone_jar_compat9_10_client - - ejb/TestBean - Session - com.sun.ts.tests.assembly.compat.standalone.jar.compat9_10.TestBean - - diff --git a/assembly/src/main/java/com/sun/ts/tests/assembly/compat/standalone/jar/compat9_10/application.xml b/assembly/src/main/java/com/sun/ts/tests/assembly/compat/standalone/jar/compat9_10/application.xml deleted file mode 100644 index 1700079a9a..0000000000 --- a/assembly/src/main/java/com/sun/ts/tests/assembly/compat/standalone/jar/compat9_10/application.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - Application description - assembly_compat_standalone_jar_compat9_10 - - assembly_compat_standalone_jar_compat9_10_client.jar - - diff --git a/assembly/src/main/java/com/sun/ts/tests/assembly/compat/standalone/jar/compat9_10/assembly_compat_standalone_jar_compat9_10_client.jar.sun-application-client.xml b/assembly/src/main/java/com/sun/ts/tests/assembly/compat/standalone/jar/compat9_10/assembly_compat_standalone_jar_compat9_10_client.jar.sun-application-client.xml deleted file mode 100644 index 295f23cb92..0000000000 --- a/assembly/src/main/java/com/sun/ts/tests/assembly/compat/standalone/jar/compat9_10/assembly_compat_standalone_jar_compat9_10_client.jar.sun-application-client.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - ejb/TestBean - assembly_compat_standalone_jar_compat9_10_TestBean - - diff --git a/assembly/src/main/java/com/sun/ts/tests/assembly/compat/standalone/jar/compat9_10/assembly_compat_standalone_jar_compat9_10_component_ejb.jar.sun-ejb-jar.xml b/assembly/src/main/java/com/sun/ts/tests/assembly/compat/standalone/jar/compat9_10/assembly_compat_standalone_jar_compat9_10_component_ejb.jar.sun-ejb-jar.xml deleted file mode 100644 index e549a4c807..0000000000 --- a/assembly/src/main/java/com/sun/ts/tests/assembly/compat/standalone/jar/compat9_10/assembly_compat_standalone_jar_compat9_10_component_ejb.jar.sun-ejb-jar.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - 0 - - TestBean - assembly_compat_standalone_jar_compat9_10_TestBean - false - - - supported - supported - supported - supported - - - username_password - default - false - - - supported - - - false - -1 - - - - diff --git a/assembly/src/main/java/com/sun/ts/tests/assembly/compat/standalone/war/compat9_10/Client.java b/assembly/src/main/java/com/sun/ts/tests/assembly/compat/standalone/war/compat9_10/Client.java index 14aa76fd43..107d808c01 100644 --- a/assembly/src/main/java/com/sun/ts/tests/assembly/compat/standalone/war/compat9_10/Client.java +++ b/assembly/src/main/java/com/sun/ts/tests/assembly/compat/standalone/war/compat9_10/Client.java @@ -147,9 +147,6 @@ public static EnterpriseArchive createDeploymentVehicle(@ArquillianResource Test assembly_compat_standalone_war_compat9_10_ear.addAsManifestResource(earResURL, "application.xml"); } - assembly_compat_standalone_war_compat9_10_ear - .addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); - return assembly_compat_standalone_war_compat9_10_ear; } @@ -165,7 +162,7 @@ public static WebArchive createWarDeploymentVehicle(@ArquillianResource TestArch } URL jspURL = Client.class.getResource("test.jsp"); if(jspURL != null) { - assembly_compat_standalone_war_compat9_10_component_web.addAsWebResource(resURL, "test.jsp"); + assembly_compat_standalone_war_compat9_10_component_web.addAsWebResource(jspURL, "test.jsp"); } @@ -173,8 +170,6 @@ public static WebArchive createWarDeploymentVehicle(@ArquillianResource TestArch if(resURL != null) { assembly_compat_standalone_war_compat9_10_component_web.addAsWebInfResource(resURL, "sun-web.xml"); } - assembly_compat_standalone_war_compat9_10_component_web - .addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); archiveProcessor.processWebArchive(assembly_compat_standalone_war_compat9_10_component_web, Client.class, resURL); return assembly_compat_standalone_war_compat9_10_component_web; diff --git a/assembly/src/main/java/com/sun/ts/tests/assembly/compat/standalone/war/compat9_10/application-client.xml b/assembly/src/main/java/com/sun/ts/tests/assembly/compat/standalone/war/compat9_10/application-client.xml deleted file mode 100644 index d9a9715181..0000000000 --- a/assembly/src/main/java/com/sun/ts/tests/assembly/compat/standalone/war/compat9_10/application-client.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - TS compat standalone compat9_10 war file test - assembly_compat_standalone_war_compat9_10_client - - url/myURL - java.net.URL - Application - Shareable - - diff --git a/assembly/src/main/java/com/sun/ts/tests/assembly/compat/standalone/war/compat9_10/application.xml b/assembly/src/main/java/com/sun/ts/tests/assembly/compat/standalone/war/compat9_10/application.xml deleted file mode 100644 index 90a1ab9229..0000000000 --- a/assembly/src/main/java/com/sun/ts/tests/assembly/compat/standalone/war/compat9_10/application.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - Application description - assembly_compat_standalone_war_compat9_10 - - assembly_compat_standalone_war_compat9_10_client.jar - - diff --git a/assembly/src/main/java/com/sun/ts/tests/assembly/compat/standalone/war/compat9_10/assembly_compat_standalone_war_compat9_10_client.jar.sun-application-client.xml b/assembly/src/main/java/com/sun/ts/tests/assembly/compat/standalone/war/compat9_10/assembly_compat_standalone_war_compat9_10_client.jar.sun-application-client.xml deleted file mode 100644 index ab57c97a8b..0000000000 --- a/assembly/src/main/java/com/sun/ts/tests/assembly/compat/standalone/war/compat9_10/assembly_compat_standalone_war_compat9_10_client.jar.sun-application-client.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - url/myURL - http://localhost:8080/dep_assembly_compat_standalone_war_compat9_10/test.jsp - - diff --git a/assembly/src/main/java/com/sun/ts/tests/assembly/compat/standalone/war/compat9_10/assembly_compat_standalone_war_compat9_10_component_web.war.sun-web.xml b/assembly/src/main/java/com/sun/ts/tests/assembly/compat/standalone/war/compat9_10/assembly_compat_standalone_war_compat9_10_component_web.war.sun-web.xml deleted file mode 100644 index 2c1cfd8f50..0000000000 --- a/assembly/src/main/java/com/sun/ts/tests/assembly/compat/standalone/war/compat9_10/assembly_compat_standalone_war_compat9_10_component_web.war.sun-web.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - dep_assembly_compat_standalone_war_compat9_10 - diff --git a/assembly/src/main/java/com/sun/ts/tests/assembly/compat/standalone/war/compat9_10/test.jsp b/assembly/src/main/java/com/sun/ts/tests/assembly/compat/standalone/war/compat9_10/test.jsp index b77fcd7b26..20ac9de2b1 100644 --- a/assembly/src/main/java/com/sun/ts/tests/assembly/compat/standalone/war/compat9_10/test.jsp +++ b/assembly/src/main/java/com/sun/ts/tests/assembly/compat/standalone/war/compat9_10/test.jsp @@ -21,8 +21,6 @@ --> <%@ page import="java.util.*" %> -<%@ page import="com.sun.ts.lib.util.*" %> -<%@ page import="com.sun.ts.lib.porting.*" %> <% StringBuffer lep = new StringBuffer(); 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..082e9c60ca 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,9 @@ 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.TSNamingContext.class, + com.sun.ts.lib.util.TestUtil.class, + com.sun.ts.lib.util.TestReportInfo.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/assembly/src/main/java/com/sun/ts/tests/assembly/standalone/jar/assembly_standalone_jar_client.jar.sun-application-client.xml b/assembly/src/main/java/com/sun/ts/tests/assembly/standalone/jar/assembly_standalone_jar_client.jar.sun-application-client.xml deleted file mode 100644 index 6d607aeb1d..0000000000 --- a/assembly/src/main/java/com/sun/ts/tests/assembly/standalone/jar/assembly_standalone_jar_client.jar.sun-application-client.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - ejb/TestBean - assembly_standalone_jar_TestBean - - diff --git a/assembly/src/main/java/com/sun/ts/tests/assembly/standalone/jar/assembly_standalone_jar_client.xml b/assembly/src/main/java/com/sun/ts/tests/assembly/standalone/jar/assembly_standalone_jar_client.xml deleted file mode 100644 index 6361a453e3..0000000000 --- a/assembly/src/main/java/com/sun/ts/tests/assembly/standalone/jar/assembly_standalone_jar_client.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - client for TS assembly classpath test for EJB's - assembly_standalone_jar_client - - ejb/TestBean - Session - com.sun.ts.tests.assembly.standalone.jar.TestBean - - diff --git a/assembly/src/main/java/com/sun/ts/tests/assembly/standalone/jar/assembly_standalone_jar_component_ejb.jar.sun-ejb-jar.xml b/assembly/src/main/java/com/sun/ts/tests/assembly/standalone/jar/assembly_standalone_jar_component_ejb.jar.sun-ejb-jar.xml deleted file mode 100644 index 56561cf1b1..0000000000 --- a/assembly/src/main/java/com/sun/ts/tests/assembly/standalone/jar/assembly_standalone_jar_component_ejb.jar.sun-ejb-jar.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - 0 - - TestBean - assembly_standalone_jar_TestBean - false - - - supported - supported - supported - supported - - - username_password - default - false - - - supported - - - false - -1 - - - - diff --git a/assembly/src/main/java/com/sun/ts/tests/assembly/standalone/jar/assembly_standalone_jar_component_ejb.xml b/assembly/src/main/java/com/sun/ts/tests/assembly/standalone/jar/assembly_standalone_jar_component_ejb.xml deleted file mode 100644 index d4bc1239a6..0000000000 --- a/assembly/src/main/java/com/sun/ts/tests/assembly/standalone/jar/assembly_standalone_jar_component_ejb.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - - Ejb1 - - - TestBean - com.sun.ts.tests.assembly.standalone.jar.TestBean - com.sun.ts.tests.assembly.standalone.jar.TestBeanEJB - Stateless - Container - - - - - - - - - TestBean - Remote - initLogging - - java.util.Properties - - - Required - - - - TestBean - Remote - ping - - Required - - - diff --git a/assembly/src/main/java/com/sun/ts/tests/assembly/standalone/war/Client.java b/assembly/src/main/java/com/sun/ts/tests/assembly/standalone/war/Client.java index 241ce017b8..380d293618 100644 --- a/assembly/src/main/java/com/sun/ts/tests/assembly/standalone/war/Client.java +++ b/assembly/src/main/java/com/sun/ts/tests/assembly/standalone/war/Client.java @@ -138,8 +138,6 @@ public static EnterpriseArchive createEarDeploymentVehicle(@ArquillianResource T EnterpriseArchive assembly_standalone_war_ear = ShrinkWrap.create(EnterpriseArchive.class, "assembly_standalone_war.ear"); assembly_standalone_war_ear.addAsModule(assembly_standalone_war_client); - assembly_standalone_war_ear - .addAsManifestResource(new StringAsset("Main-Class: " + Client.class.getName() + "\n"), "MANIFEST.MF"); // archiveProcessor.processEarArchive(assembly_standalone_war_ear, Client.class, resURL); return assembly_standalone_war_ear; @@ -160,7 +158,7 @@ public static WebArchive createWarDeploymentVehicle(@ArquillianResource TestArch } URL jspURL = Client.class.getResource("webFiles/test.jsp"); if(jspURL != null) { - assembly_standalone_war_component_web.addAsWebResource(resURL, "test.jsp"); + assembly_standalone_war_component_web.addAsWebResource(jspURL, "test.jsp"); } resURL = Client.class.getResource("assembly_standalone_war_component_web.war.sun-web.xml"); diff --git a/assembly/src/main/java/com/sun/ts/tests/assembly/standalone/war/assembly_standalone_war_client.jar.sun-application-client.xml b/assembly/src/main/java/com/sun/ts/tests/assembly/standalone/war/assembly_standalone_war_client.jar.sun-application-client.xml deleted file mode 100644 index cae0672cea..0000000000 --- a/assembly/src/main/java/com/sun/ts/tests/assembly/standalone/war/assembly_standalone_war_client.jar.sun-application-client.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - url/myURL - http://localhost:8080/dep_assembly_standalone_war/test.jsp - - diff --git a/assembly/src/main/java/com/sun/ts/tests/assembly/standalone/war/assembly_standalone_war_client.xml b/assembly/src/main/java/com/sun/ts/tests/assembly/standalone/war/assembly_standalone_war_client.xml deleted file mode 100644 index b7a3486ba0..0000000000 --- a/assembly/src/main/java/com/sun/ts/tests/assembly/standalone/war/assembly_standalone_war_client.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - TS standalone war file test - assembly_standalone_war_client - - url/myURL - java.net.URL - Application - Shareable - - diff --git a/assembly/src/main/java/com/sun/ts/tests/assembly/standalone/war/assembly_standalone_war_component_web.war.sun-web.xml b/assembly/src/main/java/com/sun/ts/tests/assembly/standalone/war/assembly_standalone_war_component_web.war.sun-web.xml deleted file mode 100644 index 671b81096b..0000000000 --- a/assembly/src/main/java/com/sun/ts/tests/assembly/standalone/war/assembly_standalone_war_component_web.war.sun-web.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - dep_assembly_standalone_war - - diff --git a/assembly/src/main/java/com/sun/ts/tests/assembly/standalone/war/assembly_standalone_war_component_web.xml b/assembly/src/main/java/com/sun/ts/tests/assembly/standalone/war/assembly_standalone_war_component_web.xml deleted file mode 100644 index fb9db20a21..0000000000 --- a/assembly/src/main/java/com/sun/ts/tests/assembly/standalone/war/assembly_standalone_war_component_web.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - assembly_standalone_war_web - - test - /test.jsp - 0 - - - 54 - - diff --git a/assembly/src/main/java/com/sun/ts/tests/assembly/standalone/war/webFiles/test.jsp b/assembly/src/main/java/com/sun/ts/tests/assembly/standalone/war/webFiles/test.jsp deleted file mode 100644 index c990caa474..0000000000 --- a/assembly/src/main/java/com/sun/ts/tests/assembly/standalone/war/webFiles/test.jsp +++ /dev/null @@ -1,39 +0,0 @@ -<%-- - - Copyright (c) 2006, 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 - ---%> - -<%@ page import="java.util.*" %> -<%@ page import="com.sun.ts.lib.util.*" %> -<%@ page import="com.sun.ts.lib.porting.*" %> - -<% - StringBuffer lep = new StringBuffer(); - Properties myProps = new Properties(); - java.util.Enumeration key; - String propName; - - myProps.setProperty("standalone_war", "" + "true"); - - key = myProps.keys(); - while (key.hasMoreElements()) { - propName = (String) key.nextElement(); - lep.append(propName + "=" + myProps.getProperty(propName) + "\n"); - } -%> - -<%= lep.toString() %> - diff --git a/assembly/src/main/resources/com/sun/ts/tests/assembly/compat/standalone/war/compat9_10/test.jsp b/assembly/src/main/resources/com/sun/ts/tests/assembly/compat/standalone/war/compat9_10/test.jsp index b77fcd7b26..20ac9de2b1 100644 --- a/assembly/src/main/resources/com/sun/ts/tests/assembly/compat/standalone/war/compat9_10/test.jsp +++ b/assembly/src/main/resources/com/sun/ts/tests/assembly/compat/standalone/war/compat9_10/test.jsp @@ -21,8 +21,6 @@ --> <%@ page import="java.util.*" %> -<%@ page import="com.sun.ts.lib.util.*" %> -<%@ page import="com.sun.ts.lib.porting.*" %> <% StringBuffer lep = new StringBuffer(); diff --git a/assembly/src/main/resources/com/sun/ts/tests/assembly/standalone/war/webFiles/test.jsp b/assembly/src/main/resources/com/sun/ts/tests/assembly/standalone/war/webFiles/test.jsp index c990caa474..039644f982 100644 --- a/assembly/src/main/resources/com/sun/ts/tests/assembly/standalone/war/webFiles/test.jsp +++ b/assembly/src/main/resources/com/sun/ts/tests/assembly/standalone/war/webFiles/test.jsp @@ -17,8 +17,6 @@ --%> <%@ page import="java.util.*" %> -<%@ page import="com.sun.ts.lib.util.*" %> -<%@ page import="com.sun.ts.lib.porting.*" %> <% StringBuffer lep = new StringBuffer(); 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 f7eec6b54d..7511603c35 100644 --- a/glassfish-runner/assembly-tck/src/test/resources/appclient-arquillian.xml +++ b/glassfish-runner/assembly-tck/src/test/resources/appclient-arquillian.xml @@ -46,7 +46,6 @@ -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}