[jboss-svn-commits] JBoss Common SVN: r4722 - in arquillian/trunk/containers: jbossas-managed-5.1/src/test/java/org/jboss/arquillian/container/jbossas/managed_5_1 and 3 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: aslak
Date: 2010-07-12 05:58:29 -0400 (Mon, 12 Jul 2010)
New Revision: 4722

Modified:
   arquillian/trunk/containers/glassfish-remote-3/src/test/java/org/jboss/arquillian/container/glassfish/remote_3/GlassFishJSR88RemoteContainerEARTestCase.java
   arquillian/trunk/containers/jbossas-managed-5.1/src/test/java/org/jboss/arquillian/container/jbossas/managed_5_1/JBossASIntegrationTestCase.java
   arquillian/trunk/containers/jbossas-managed-6/src/test/java/org/jboss/arquillian/container/jbossas/managed_6/JBossASIntegrationTestCase.java
   arquillian/trunk/containers/jsr88-remote-1.2/src/test/java/org/jboss/arquillian/container/jsr88/remote_1_2/JSR88RemoteContainerEARTestCase.java
   arquillian/trunk/containers/osgi-embedded-4.2/src/test/java/org/jboss/arquillian/container/osgi/embedded_4_2/OSGiEmbeddedFrameworkTestCase.java
Log:
ARQ-206 Updated to follow new ShrinkWrap API

Modified: arquillian/trunk/containers/glassfish-remote-3/src/test/java/org/jboss/arquillian/container/glassfish/remote_3/GlassFishJSR88RemoteContainerEARTestCase.java
===================================================================
--- arquillian/trunk/containers/glassfish-remote-3/src/test/java/org/jboss/arquillian/container/glassfish/remote_3/GlassFishJSR88RemoteContainerEARTestCase.java	2010-07-12 09:53:50 UTC (rev 4721)
+++ arquillian/trunk/containers/glassfish-remote-3/src/test/java/org/jboss/arquillian/container/glassfish/remote_3/GlassFishJSR88RemoteContainerEARTestCase.java	2010-07-12 09:58:29 UTC (rev 4722)
@@ -22,14 +22,13 @@
 import java.io.InputStream;
 import java.net.URL;
 import java.util.logging.Logger;
+
 import javax.servlet.annotation.WebServlet;
 
 import org.jboss.arquillian.api.Deployment;
 import org.jboss.arquillian.api.Run;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.ArchivePath;
-import org.jboss.shrinkwrap.api.ArchivePaths;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
@@ -61,15 +60,14 @@
    @Deployment
    public static Archive<?> getTestArchive()
    {
-      ArchivePath root = ArchivePaths.create("/");
       final WebArchive war = ShrinkWrap.create(WebArchive.class, "test.war")
             .addClasses(GreeterServlet.class);
       final JavaArchive ejb = ShrinkWrap.create(JavaArchive.class, "test.jar")
             .addClass(Greeter.class);
       final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "test.ear")
             .setApplicationXML("application.xml")
-            .add(war, root)
-            .add(ejb, root);
+            .addModule(war)
+            .addModule(ejb);
       log.info(ear.toString(true));
       return ear;
    }

Modified: arquillian/trunk/containers/jbossas-managed-5.1/src/test/java/org/jboss/arquillian/container/jbossas/managed_5_1/JBossASIntegrationTestCase.java
===================================================================
--- arquillian/trunk/containers/jbossas-managed-5.1/src/test/java/org/jboss/arquillian/container/jbossas/managed_5_1/JBossASIntegrationTestCase.java	2010-07-12 09:53:50 UTC (rev 4721)
+++ arquillian/trunk/containers/jbossas-managed-5.1/src/test/java/org/jboss/arquillian/container/jbossas/managed_5_1/JBossASIntegrationTestCase.java	2010-07-12 09:58:29 UTC (rev 4722)
@@ -43,7 +43,7 @@
    @Deployment
    public static JavaArchive createDeployment() throws Exception 
    {
-      return ShrinkWrap.create("test.jar", JavaArchive.class)
+      return ShrinkWrap.create(JavaArchive.class, "test.jar")
                .addClasses(
                      JBossASIntegrationTestCase.class,
                      MyEjb.class, MyEjbBean.class);

Modified: arquillian/trunk/containers/jbossas-managed-6/src/test/java/org/jboss/arquillian/container/jbossas/managed_6/JBossASIntegrationTestCase.java
===================================================================
--- arquillian/trunk/containers/jbossas-managed-6/src/test/java/org/jboss/arquillian/container/jbossas/managed_6/JBossASIntegrationTestCase.java	2010-07-12 09:53:50 UTC (rev 4721)
+++ arquillian/trunk/containers/jbossas-managed-6/src/test/java/org/jboss/arquillian/container/jbossas/managed_6/JBossASIntegrationTestCase.java	2010-07-12 09:58:29 UTC (rev 4722)
@@ -40,7 +40,7 @@
    @Deployment
    public static JavaArchive createDeployment() throws Exception 
    {
-      return ShrinkWrap.create("test.jar", JavaArchive.class)
+      return ShrinkWrap.create(JavaArchive.class, "test.jar")
                .addClasses(
                      JBossASIntegrationTestCase.class,
                      MyEjb.class);

Modified: arquillian/trunk/containers/jsr88-remote-1.2/src/test/java/org/jboss/arquillian/container/jsr88/remote_1_2/JSR88RemoteContainerEARTestCase.java
===================================================================
--- arquillian/trunk/containers/jsr88-remote-1.2/src/test/java/org/jboss/arquillian/container/jsr88/remote_1_2/JSR88RemoteContainerEARTestCase.java	2010-07-12 09:53:50 UTC (rev 4721)
+++ arquillian/trunk/containers/jsr88-remote-1.2/src/test/java/org/jboss/arquillian/container/jsr88/remote_1_2/JSR88RemoteContainerEARTestCase.java	2010-07-12 09:58:29 UTC (rev 4722)
@@ -22,14 +22,13 @@
 import java.io.InputStream;
 import java.net.URL;
 import java.util.logging.Logger;
+
 import javax.servlet.annotation.WebServlet;
 
 import org.jboss.arquillian.api.Deployment;
 import org.jboss.arquillian.api.Run;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.ArchivePath;
-import org.jboss.shrinkwrap.api.ArchivePaths;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
@@ -62,15 +61,14 @@
    @Deployment
    public static Archive<?> getTestArchive()
    {
-      ArchivePath root = ArchivePaths.create("/");
       final WebArchive war = ShrinkWrap.create(WebArchive.class, "test.war")
             .addClasses(GreeterServlet.class);
       final JavaArchive ejb = ShrinkWrap.create(JavaArchive.class, "test.jar")
             .addClass(Greeter.class);
       final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, "test.ear")
             .setApplicationXML("application.xml")
-            .add(war, root)
-            .add(ejb, root);
+            .addModule(war)
+            .addModule(ejb);
       log.info(ear.toString(true));
       return ear;
    }

Modified: arquillian/trunk/containers/osgi-embedded-4.2/src/test/java/org/jboss/arquillian/container/osgi/embedded_4_2/OSGiEmbeddedFrameworkTestCase.java
===================================================================
--- arquillian/trunk/containers/osgi-embedded-4.2/src/test/java/org/jboss/arquillian/container/osgi/embedded_4_2/OSGiEmbeddedFrameworkTestCase.java	2010-07-12 09:53:50 UTC (rev 4721)
+++ arquillian/trunk/containers/osgi-embedded-4.2/src/test/java/org/jboss/arquillian/container/osgi/embedded_4_2/OSGiEmbeddedFrameworkTestCase.java	2010-07-12 09:58:29 UTC (rev 4722)
@@ -54,7 +54,7 @@
    @Deployment
    public static JavaArchive createdeployment()
    {
-      final JavaArchive archive = ShrinkWrap.create("test.jar", JavaArchive.class);
+      final JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "test.jar");
       archive.setManifest(new Asset()
       {
          public InputStream openStream()