Merge pull request #1680 from alwin-joseph/assembly_tck

Assembly TCK : fix 4 test failures

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;

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");

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,16 +162,14 @@ 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");
     }
 
 
     resURL = Client.class.getResource("assembly_compat_standalone_war_compat9_10_component_web.war.sun-web.xml");
     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;

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();

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");