Fix changes in ShrinkWrap WebArchive API

weld · Aug 25, 2011 · 0321a3f · 0321a3f
1 parent e279644
commit 0321a3f
Show file tree

Hide file tree

Showing 14 changed files with 55 additions and 46 deletions.
diff --git a/...rquillian/src/test/java/org/jboss/weld/tests/beanManager/serializability/ManagerTest.java b/...rquillian/src/test/java/org/jboss/weld/tests/beanManager/serializability/ManagerTest.java
@@ -49,7 +49,7 @@ public static Archive<?> deploy()
       return ShrinkWrap.create(WebArchive.class, "test.war")
                .addPackage(ManagerTest.class.getPackage())
                .addClass(Utils.class)
-               .addAsWebResource(EmptyAsset.INSTANCE, "beans.xml");
+               .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
    }
 
    private static final Set<Annotation> DEFAULT_QUALIFIERS = Collections.<Annotation>singleton(DefaultLiteral.INSTANCE);

diff --git a/...c/test/java/org/jboss/weld/tests/contexts/conversation/ClientConversationContextTest.java b/...c/test/java/org/jboss/weld/tests/contexts/conversation/ClientConversationContextTest.java
@@ -74,16 +74,16 @@ public static WebArchive createDeployment()
    {
       return ShrinkWrap.create(WebArchive.class, "test.war")
                .addClasses(ConversationTestPhaseListener.class, Cloud.class, Thunderstorm.class, Hailstorm.class, Hurricane.class, Snowstorm.class, LockingIssueBean.class, Tornado.class)
-               .addAsWebResource(ClientConversationContextTest.class.getPackage(), "web.xml", "web.xml")
-               .addAsWebResource(ClientConversationContextTest.class.getPackage(), "faces-config.xml", "faces-config.xml")
-               .addAsResource(ClientConversationContextTest.class.getPackage(), "cloud.xhtml", "cloud.xhtml")
-               .addAsResource(ClientConversationContextTest.class.getPackage(), "tornado.xhtml", "tornado.xhtml")
-               .addAsResource(ClientConversationContextTest.class.getPackage(), "thunderstorm.xhtml", "thunderstorm.xhtml")
-               .addAsResource(ClientConversationContextTest.class.getPackage(), "snowstorm.xhtml", "/winter/snowstorm.xhtml")
-               .addAsResource(ClientConversationContextTest.class.getPackage(), "hailstorm.xhtml", "hailstorm.xhtml")
-               .addAsResource(ClientConversationContextTest.class.getPackage(), "locking-issue.xhtml", "locking-issue.xhtml")
-               .addAsResource(ClientConversationContextTest.class.getPackage(), "blizzard.xhtml", "blizzard.xhtml")
-               .addAsWebResource(EmptyAsset.INSTANCE, "beans.xml");
+               .addAsWebInfResource(ClientConversationContextTest.class.getPackage(), "web.xml", "web.xml")
+               .addAsWebInfResource(ClientConversationContextTest.class.getPackage(), "faces-config.xml", "faces-config.xml")
+               .addAsWebResource(ClientConversationContextTest.class.getPackage(), "cloud.xhtml", "cloud.xhtml")
+               .addAsWebResource(ClientConversationContextTest.class.getPackage(), "tornado.xhtml", "tornado.xhtml")
+               .addAsWebResource(ClientConversationContextTest.class.getPackage(), "thunderstorm.xhtml", "thunderstorm.xhtml")
+               .addAsWebResource(ClientConversationContextTest.class.getPackage(), "snowstorm.xhtml", "/winter/snowstorm.xhtml")
+               .addAsWebResource(ClientConversationContextTest.class.getPackage(), "hailstorm.xhtml", "hailstorm.xhtml")
+               .addAsWebResource(ClientConversationContextTest.class.getPackage(), "locking-issue.xhtml", "locking-issue.xhtml")
+               .addAsWebResource(ClientConversationContextTest.class.getPackage(), "blizzard.xhtml", "blizzard.xhtml")
+               .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
    }
 
    @Test

diff --git a/tests-arquillian/src/test/java/org/jboss/weld/tests/contexts/errorpage/ErrorPageTest.java b/tests-arquillian/src/test/java/org/jboss/weld/tests/contexts/errorpage/ErrorPageTest.java
@@ -53,11 +53,11 @@ public static WebArchive createDeployment()
    {
       return ShrinkWrap.create(WebArchive.class, "test.war")
                .addClasses(Storm.class, Rain.class)
-               .addAsWebResource(ErrorPageTest.class.getPackage(), "web.xml", "web.xml")
-               .addAsWebResource(ErrorPageTest.class.getPackage(), "faces-config.xml", "faces-config.xml")
-               .addAsResource(ErrorPageTest.class.getPackage(), "error.jsf", "error.jspx")
-               .addAsResource(ErrorPageTest.class.getPackage(), "storm.jsf", "storm.jspx")
-               .addAsWebResource(EmptyAsset.INSTANCE, "beans.xml");
+               .addAsWebInfResource(ErrorPageTest.class.getPackage(), "web.xml", "web.xml")
+               .addAsWebInfResource(ErrorPageTest.class.getPackage(), "faces-config.xml", "faces-config.xml")
+               .addAsWebResource(ErrorPageTest.class.getPackage(), "error.jsf", "error.jspx")
+               .addAsWebResource(ErrorPageTest.class.getPackage(), "storm.jsf", "storm.jspx")
+               .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
    }
 
    /*

diff --git a/...rc/test/java/org/jboss/weld/tests/contexts/sessionInvalidation/InvalidateSessionTest.java b/...rc/test/java/org/jboss/weld/tests/contexts/sessionInvalidation/InvalidateSessionTest.java
@@ -55,10 +55,10 @@ public static WebArchive createDeployment()
    {
       return ShrinkWrap.create(WebArchive.class, "test.war")
                .addClasses(Storm.class, SomeBean.class)
-               .addAsWebResource(InvalidateSessionTest.class.getPackage(), "web.xml", "web.xml")
-               .addAsWebResource(InvalidateSessionTest.class.getPackage(), "faces-config.xml", "faces-config.xml")
-               .addAsResource(InvalidateSessionTest.class.getPackage(), "storm.jsf", "storm.jspx")
-               .addAsWebResource(EmptyAsset.INSTANCE, "beans.xml");
+               .addAsWebInfResource(InvalidateSessionTest.class.getPackage(), "web.xml", "web.xml")
+               .addAsWebInfResource(InvalidateSessionTest.class.getPackage(), "faces-config.xml", "faces-config.xml")
+               .addAsWebResource(InvalidateSessionTest.class.getPackage(), "storm.jsf", "storm.jspx")
+               .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
    }
 
    /*

diff --git a/...est/java/org/jboss/weld/tests/enterprise/lifecycle/EnterpriseBeanLifecycleRemoteTest.java b/...est/java/org/jboss/weld/tests/enterprise/lifecycle/EnterpriseBeanLifecycleRemoteTest.java
@@ -66,7 +66,7 @@ public static Archive<?> deploy()
       EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "test.ear");
       ear.addAsModule(ShrinkWrap.create(WebArchive.class, "test.war")
             .addClass(RemoteClient.class)
-            .addAsWebResource(EmptyAsset.INSTANCE, "beans.xml")
+            .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml")
       );
       ear.addAsModule(ShrinkWrap.create(BeanArchive.class, "test.jar")
             .addClasses(KleinStadt.class, Kassel.class, GrossStadt.class, FrankfurtAmMain.class, SchoeneStadt.class)

diff --git a/tests-arquillian/src/test/java/org/jboss/weld/tests/event/tx/TxEventTest.java b/tests-arquillian/src/test/java/org/jboss/weld/tests/event/tx/TxEventTest.java
@@ -17,41 +17,50 @@
 package org.jboss.weld.tests.event.tx;
 
 
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
+import java.net.URL;
+
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.RunAsClient;
 import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.test.api.ArquillianResource;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.formatter.Formatters;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.jboss.weld.tests.category.Integration;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
+
 @Category(Integration.class)
 @RunWith(Arquillian.class)
 @RunAsClient
 public class TxEventTest extends AbstractHtmlUnit
 {
-   @Deployment
+   @Deployment(testable = false)
    public static WebArchive createDeployment()
    {
-      return ShrinkWrap.create(WebArchive.class, "test.war")
+      WebArchive war = ShrinkWrap.create(WebArchive.class, "test.war")
                .addClasses(Foo.class, Updated.class)
                .addAsWebResource(TxEventTest.class.getPackage(), "web.xml", "web.xml")
                .addAsWebResource(TxEventTest.class.getPackage(), "faces-config.xml", "faces-config.xml")
                .addAsResource(TxEventTest.class.getPackage(), "home.xhtml", "home.xhtml")
-               .addAsWebResource(EmptyAsset.INSTANCE, "beans.xml");
+               .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
+
+      war.toString(Formatters.VERBOSE);
+
+      return war;
    }
 
    /*
     * description = "WBRI-401"
     */
    @Test
-   public void testRequestContextLifecycle() throws Exception
+   public void testRequestContextLifecycle) throws Exception
    {
       WebClient webClient = new WebClient();
       HtmlPage home = webClient.getPage(getPath("/home.jsf"));

diff --git a/tests-arquillian/src/test/java/org/jboss/weld/tests/jsf/JsfTest.java b/tests-arquillian/src/test/java/org/jboss/weld/tests/jsf/JsfTest.java
@@ -18,9 +18,9 @@ public static WebArchive deployment()
    {
       return ShrinkWrap.create(WebArchive.class, "test.war")
          .addPackage(JsfTest.class.getPackage())
-         .addAsWebResource(JsfTest.class.getPackage(), "faces-config.xml", "faces-config.xml")
-         .addAsWebResource(JsfTest.class.getPackage(), "web.xml", "web.xml")
-         .addAsWebResource(new ByteArrayAsset(new byte[0]), "beans.xml");
+         .addAsWebInfResource(JsfTest.class.getPackage(), "faces-config.xml", "faces-config.xml")
+         .addAsWebInfResource(JsfTest.class.getPackage(), "web.xml", "web.xml")
+         .addAsWebInfResource(new ByteArrayAsset(new byte[0]), "beans.xml");
    }
 
    @Test

diff --git a/tests-arquillian/src/test/java/org/jboss/weld/tests/jsp/JspTest.java b/tests-arquillian/src/test/java/org/jboss/weld/tests/jsp/JspTest.java
@@ -64,7 +64,7 @@ public static WebArchive createDeployment()
                .addAsWebResource(JspTest.class.getPackage(), "faces-config.xml", "faces-config.xml")
                .addAsResource(JspTest.class.getPackage(), "index.jsp", "index.jsp")
                .addAsResource(JspTest.class.getPackage(), "home.jspx", "home.jspx")
-               .addAsWebResource(EmptyAsset.INSTANCE, "beans.xml");
+               .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
    }
 
    @Test

diff --git a/tests-arquillian/src/test/java/org/jboss/weld/tests/nonContextual/ServletListenerTest.java b/tests-arquillian/src/test/java/org/jboss/weld/tests/nonContextual/ServletListenerTest.java
@@ -38,9 +38,9 @@ public static Archive<?> deploy()
    {
       return ShrinkWrap.create(WebArchive.class, "test.war")
          .addClasses(ServletContextListenerImpl.class, LogManager.class)
-         .addAsWebResource(
+         .addAsWebInfResource(
                ServletListenerTest.class.getPackage(), "web.xml", ArchivePaths.create("web.xml"))
-         .addAsWebResource(
+         .addAsWebInfResource(
                EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"));
 
    }

diff --git a/...arquillian/src/test/java/org/jboss/weld/tests/producer/field/named/NamedProducerTest.java b/...arquillian/src/test/java/org/jboss/weld/tests/producer/field/named/NamedProducerTest.java
@@ -48,16 +48,16 @@
 @RunAsClient
 public class NamedProducerTest
 {
-   @Deployment
+   @Deployment(testable = false)
    public static WebArchive createDeployment()
    {
       return ShrinkWrap.create(WebArchive.class, "test.war")
                .addClasses(User.class, NewUserAction.class, Employee.class, SaveAction.class)
-               .addAsWebResource(NamedProducerTest.class.getPackage(), "web.xml", "web.xml")
-               .addAsWebResource(NamedProducerTest.class.getPackage(), "faces-config.xml", "faces-config.xml")
-               .addAsResource(NamedProducerTest.class.getPackage(), "view.xhtml", "view.xhtml")
-               .addAsResource(NamedProducerTest.class.getPackage(), "home.xhtml", "home.xhtml")
-               .addAsWebResource(EmptyAsset.INSTANCE, "beans.xml");
+               .addAsWebInfResource(NamedProducerTest.class.getPackage(), "web.xml", "web.xml")
+               .addAsWebInfResource(NamedProducerTest.class.getPackage(), "faces-config.xml", "faces-config.xml")
+               .addAsWebResource(NamedProducerTest.class.getPackage(), "view.xhtml", "view.xhtml")
+               .addAsWebResource(NamedProducerTest.class.getPackage(), "home.xhtml", "home.xhtml")
+               .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
    }
 
    /*

diff --git a/tests-arquillian/src/test/java/org/jboss/weld/tests/proxy/weld56/ProxyTest.java b/tests-arquillian/src/test/java/org/jboss/weld/tests/proxy/weld56/ProxyTest.java
@@ -39,8 +39,8 @@ public static Archive<?> deploy()
    {
       return ShrinkWrap.create(WebArchive.class, "test.war")
                .addPackage(ProxyTest.class.getPackage())
-               .addAsWebResource(EmptyAsset.INSTANCE, "beans.xml")
-               .addAsWebResource(EmptyAsset.INSTANCE, "classes/META-INF/org.jboss.weld.enableUnsafeProxies");
+               .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml")
+               .addAsResource(EmptyAsset.INSTANCE, "META-INF/org.jboss.weld.enableUnsafeProxies");
    }
 
    @Test

diff --git a/tests-arquillian/src/test/java/org/jboss/weld/tests/resources/EMFFactoryTest.java b/tests-arquillian/src/test/java/org/jboss/weld/tests/resources/EMFFactoryTest.java
@@ -49,8 +49,8 @@ public static Archive<?> deploy()
          .addClasses(JPAResourceProducerSingletonEJB_StaticField.class, ProducedViaStaticFieldOnEJB.class, EMFConsumer1.class)
          .addClasses(JPAResourceProducerManagedBean_InstanceField.class, ProducedViaInstanceFieldOnManagedBean.class, EMFConsumer2.class)
          .addClasses(JPAResourceProducerManagedBean_StaticField.class, ProducedViaStaticFieldOnManagedBean.class, EMFConsumer3.class)
-         .addAsManifestResource(PERSISTENCE_XML, "persistence.xml")
-         .addAsWebResource(EMPTY_BEANS_XML, "beans.xml");
+         .addAsResource(PERSISTENCE_XML, "META-INF/persistence.xml")
+         .addAsWebInfResource(EMPTY_BEANS_XML, "beans.xml");
    }
 
    /*

diff --git a/tests-arquillian/src/test/java/org/jboss/weld/tests/scope/RemoteScopeTest.java b/tests-arquillian/src/test/java/org/jboss/weld/tests/scope/RemoteScopeTest.java
@@ -51,7 +51,7 @@ public static Archive<?> deploy()
       return ShrinkWrap.create(WebArchive.class, "test.war")
          .addClasses(Bar.class, Foo.class, RemoteClient.class, Special.class, Temp.class, TempConsumer.class, TempProducer.class, Useless.class)
          .addClasses(Utils.class, Assert.class, Description.class, SelfDescribing.class, ComparisonFailure.class)
-         .addAsWebResource(EmptyAsset.INSTANCE, "beans.xml");
+         .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
    }
 
    /*

diff --git a/tests-arquillian/src/test/java/org/jboss/weld/tests/stress/JsfStressTest.java b/tests-arquillian/src/test/java/org/jboss/weld/tests/stress/JsfStressTest.java
@@ -76,7 +76,7 @@ public static WebArchive createDeployment()
                .addAsResource(JsfStressTest.class.getPackage(), "home.xhtml", "home.xhtml")
                .addAsResource(JsfStressTest.class.getPackage(), "index.html", "index.html")
                .addAsResource(JsfStressTest.class.getPackage(), "template.xhtml", "template.xhtml")
-               .addAsWebResource(EmptyAsset.INSTANCE, "beans.xml");
+               .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
    }
 
    // WELD-676