Merge pull request #1608 from arjantijms/fix_com.sun.ts.tests.ejb30.m…

…isc.metadataComplete.warejb.ClientTest Add web.xml which was missing and instead wrong filename included
jakartaee · Oct 21, 2024 · 49f453f · 49f453f
2 parents bdb9f5f + da55a9d
commit 49f453f
Showing 1 changed file with 1 addition and 9 deletions.
diff --git a/ejb30/src/main/java/com/sun/ts/tests/ejb30/misc/metadataComplete/warejb/ClientTest.java b/ejb30/src/main/java/com/sun/ts/tests/ejb30/misc/metadataComplete/warejb/ClientTest.java
@@ -67,7 +67,7 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive
             com.sun.ts.tests.servlet.common.util.Data.class
             );
             // The web.xml descriptor
-            URL warResURL = Client.class.getResource("com/sun/ts/tests/ejb30/misc/metadataComplete/warejb/misc_metadataComplete_warejb_web.xml");
+            URL warResURL = Client.class.getResource("/com/sun/ts/tests/ejb30/misc/metadataComplete/warejb/misc_metadataComplete_warejb_web.xml");
             if(warResURL != null) {
               misc_metadataComplete_warejb_web.addAsWebInfResource(warResURL, "web.xml");
             }
@@ -77,14 +77,6 @@ public static EnterpriseArchive createDeployment(@ArquillianResource TestArchive
               misc_metadataComplete_warejb_web.addAsWebInfResource(warResURL, "sun-web.xml");
             }
 
-            // Any libraries added to the war
-
-            // Web content
-            warResURL = Client.class.getResource("/com/sun/ts/tests/ejb30/misc/metadataComplete/warejb/misc_metadataComplete_warejb_web.xml");
-            if(warResURL != null) {
-              misc_metadataComplete_warejb_web.addAsWebResource(warResURL, "//misc_metadataComplete_warejb_web.xml");
-            }
-
            // Call the archive processor
            archiveProcessor.processWebArchive(misc_metadataComplete_warejb_web, Client.class, warResURL);