Update to Arquillian Core 1.0.0.Final

aslakknutsen · Apr 10, 2012 · 05377d1 · 05377d1
1 parent 750910f
commit 05377d1
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 22 deletions.
diff --git a/cdi-ejb/pom.xml b/cdi-ejb/pom.xml
@@ -31,7 +31,7 @@
         </dependency>
         <dependency>
             <groupId>org.jboss.shrinkwrap.descriptors</groupId>
-            <artifactId>shrinkwrap-descriptors-impl</artifactId>
+            <artifactId>shrinkwrap-descriptors-impl-javaee</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jboss.arquillian.protocol</groupId>

diff --git a/cdi-ejb/src/test/java/com/acme/cdiejb/async/FireAndForgetUsingAlternativeBeanTestCase.java b/cdi-ejb/src/test/java/com/acme/cdiejb/async/FireAndForgetUsingAlternativeBeanTestCase.java
@@ -14,7 +14,7 @@
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.jboss.shrinkwrap.descriptor.api.Descriptors;
-import org.jboss.shrinkwrap.descriptor.api.spec.cdi.beans.BeansDescriptor;
+import org.jboss.shrinkwrap.descriptor.api.beans10.BeansDescriptor;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -28,7 +28,7 @@ public static JavaArchive createDeployment() {
         return ShrinkWrap.create(JavaArchive.class)
                 .addClasses(FireAndForget.class, FireAndForgetBean.class, BlockingFireAndForgetAlternativeBean.class)
                 .addAsManifestResource(
-                        new StringAsset(beansXml.alternativeClass(BlockingFireAndForgetAlternativeBean.class).exportAsString()),
+                        new StringAsset(beansXml.createAlternatives().clazz(BlockingFireAndForgetAlternativeBean.class.getName()).up().exportAsString()),
                         beansXml.getDescriptorName());
     }
 
@@ -40,7 +40,7 @@ public static WebArchive createDeploymentForGlassFish() {
         return ShrinkWrap.create(WebArchive.class)
                 .addClasses(FireAndForget.class, FireAndForgetBean.class, BlockingFireAndForgetAlternativeBean.class)
                 .addAsWebInfResource(
-                        new StringAsset(beansXml.alternativeClass(BlockingFireAndForgetAlternativeBean.class).exportAsString()),
+                        new StringAsset(beansXml.createAlternatives().clazz(BlockingFireAndForgetAlternativeBean.class.getName()).up().exportAsString()),
                         beansXml.getDescriptorName());
     }
 

diff --git a/cdi/pom.xml b/cdi/pom.xml
@@ -31,7 +31,7 @@
         </dependency>
         <dependency>
             <groupId>org.jboss.shrinkwrap.descriptors</groupId>
-            <artifactId>shrinkwrap-descriptors-impl</artifactId>
+            <artifactId>shrinkwrap-descriptors-impl-javaee</artifactId>
         </dependency>
     </dependencies>
 

diff --git a/cdi/src/test/java/com/acme/cdi/decorator/AnnouncerDecoratorTestCase.java b/cdi/src/test/java/com/acme/cdi/decorator/AnnouncerDecoratorTestCase.java
@@ -11,7 +11,7 @@
 import org.jboss.shrinkwrap.api.asset.StringAsset;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.jboss.shrinkwrap.descriptor.api.Descriptors;
-import org.jboss.shrinkwrap.descriptor.api.spec.cdi.beans.BeansDescriptor;
+import org.jboss.shrinkwrap.descriptor.api.beans10.BeansDescriptor;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -27,7 +27,7 @@ public static Archive<?> createArchive() {
         return ShrinkWrap.create(JavaArchive.class)
                 .addPackage(Announcer.class.getPackage())
                 .addAsManifestResource(
-                        new StringAsset(beansXml.decorator(AnnouncerDecorator.class).exportAsString()),
+                        new StringAsset(beansXml.createDecorators().clazz(AnnouncerDecorator.class.getName()).up().exportAsString()),
                         beansXml.getDescriptorName());
     }
 

diff --git a/cdi/src/test/java/com/acme/cdi/payment/SynchronousPaymentProcessorTestCase.java b/cdi/src/test/java/com/acme/cdi/payment/SynchronousPaymentProcessorTestCase.java
@@ -27,7 +27,7 @@
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.jboss.shrinkwrap.descriptor.api.Descriptors;
-import org.jboss.shrinkwrap.descriptor.api.spec.cdi.beans.BeansDescriptor;
+import org.jboss.shrinkwrap.descriptor.api.beans10.BeansDescriptor;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -39,9 +39,8 @@ public static JavaArchive createDeployment() {
 
         return ShrinkWrap.create(JavaArchive.class)
                 .addAsManifestResource(
-                        new StringAsset(beansXml.alternativeClass(MockPaymentProcessor.class).exportAsString()),
+                        new StringAsset(beansXml.createAlternatives().clazz(MockPaymentProcessor.class.getName()).up().exportAsString()),
                         beansXml.getDescriptorName())
-                // .addAsManifestResource(SynchronousPaymentProcessorTestCase.class.getPackage(), "beans.xml", "beans.xml")
                 .addPackage(Synchronous.class.getPackage());
     }
 
@@ -77,7 +76,7 @@ public static WebArchive createDeploymentForGlassFish() {
         BeansDescriptor beansXml = Descriptors.create(BeansDescriptor.class);
 
         return ShrinkWrap.create(WebArchive.class)
-                .addAsWebInfResource(new StringAsset(beansXml.alternativeClass(MockPaymentProcessor.class).exportAsString()),
+                .addAsWebInfResource(new StringAsset(beansXml.createAlternatives().clazz(MockPaymentProcessor.class.getName()).up().exportAsString()),
                         beansXml.getDescriptorName()).addPackage(Synchronous.class.getPackage());
     }
 

diff --git a/extensions/weld-servlet/pom.xml b/extensions/weld-servlet/pom.xml
@@ -11,7 +11,7 @@
     </parent>
 
     <groupId>org.jboss.arquillian.extension.cdi</groupId>
-    <artifactId>arquillian-weld-servlet-extension</artifactId>
+    <artifactId>arquillian-showcase-extension-weld-servlet</artifactId>
     <name>Arquillian Showcase Extension: Weld Servlet</name>
     <version>1.0.0-SNAPSHOT</version>
 
@@ -26,7 +26,8 @@
         </dependency>
         <dependency>
             <groupId>org.jboss.shrinkwrap.descriptors</groupId>
-            <artifactId>shrinkwrap-descriptors-impl</artifactId>
+            <artifactId>shrinkwrap-descriptors-impl-javaee</artifactId>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.jboss.shrinkwrap</groupId>

diff --git a/...rvlet/src/main/java/org/jboss/arquillian/extension/cdi/WeldServletDeploymentAppender.java b/...rvlet/src/main/java/org/jboss/arquillian/extension/cdi/WeldServletDeploymentAppender.java
@@ -28,7 +28,7 @@
 import org.jboss.shrinkwrap.api.asset.StringAsset;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.jboss.shrinkwrap.descriptor.api.Descriptors;
-import org.jboss.shrinkwrap.descriptor.api.spec.servlet.web.WebAppDescriptor;
+import org.jboss.shrinkwrap.descriptor.api.webapp30.WebAppDescriptor;
 import org.jboss.shrinkwrap.resolver.api.DependencyResolvers;
 import org.jboss.shrinkwrap.resolver.api.maven.MavenDependencyResolver;
 
@@ -82,7 +82,7 @@ public Archive<?> createAuxiliaryArchive() {
                 .resolveAs(JavaArchive.class).iterator().next();
         WebAppDescriptor webFragmentXml = Descriptors.create(WebAppDescriptor.class);
         return weldServlet.addAsManifestResource(new StringAsset(
-                webFragmentXml.listener("org.jboss.weld.environment.servlet.Listener").exportAsString()
+                webFragmentXml.createListener().listenerClass("org.jboss.weld.environment.servlet.Listener").up().exportAsString()
                 .replaceAll("web-app", "web-fragment").replace("<listener>", "<name>WeldServlet</name><listener>")),
                 "web-fragment.xml");
     }

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -14,7 +14,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<version.arquillian_core>1.0.0.CR7</version.arquillian_core>
+		<version.arquillian_core>1.0.0.Final</version.arquillian_core>
 		<version.arquillian_container_glassfish>1.0.0.CR2</version.arquillian_container_glassfish>
 		<version.arquillian_container_openwebbeans>1.0.0.CR2</version.arquillian_container_openwebbeans>
 		<version.arquillian_container_jbossas>1.0.0.CR2</version.arquillian_container_jbossas>

diff --git a/servlet/pom.xml b/servlet/pom.xml
@@ -30,7 +30,7 @@
         </dependency>
         <dependency>
             <groupId>org.jboss.shrinkwrap.descriptors</groupId>
-            <artifactId>shrinkwrap-descriptors-impl</artifactId>
+            <artifactId>shrinkwrap-descriptors-impl-javaee</artifactId>
         </dependency>
     </dependencies>
 

diff --git a/servlet/src/test/java/com/acme/servlet/RegisteredEchoServletTestCase.java b/servlet/src/test/java/com/acme/servlet/RegisteredEchoServletTestCase.java
@@ -18,28 +18,32 @@
 
 import java.net.URL;
 
-import org.jboss.arquillian.test.api.ArquillianResource;
 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.StringAsset;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.jboss.shrinkwrap.descriptor.api.Descriptors;
-import org.jboss.shrinkwrap.descriptor.api.spec.servlet.web.WebAppDescriptor;
+import org.jboss.shrinkwrap.descriptor.api.webapp30.WebAppDescriptor;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(Arquillian.class)
-@RunAsClient
 public class RegisteredEchoServletTestCase {
     @Deployment(testable = false)
     public static WebArchive getTestArchive() {
         return ShrinkWrap.create(WebArchive.class, "servlet-test.war")
                 .addClass(EchoServlet.class)
                 .setWebXML(new StringAsset(Descriptors.create(WebAppDescriptor.class).metadataComplete(true).version("2.5")
-                        .servlet(EchoServlet.class, EchoServlet.URL_PATTERN).exportAsString()));
+                        .createServlet()
+                            .servletName(EchoServlet.class.getSimpleName())
+                            .servletClass(EchoServlet.class.getName()).up()
+                        .createServletMapping()
+                            .servletName(EchoServlet.class.getSimpleName())
+                            .urlPattern(EchoServlet.URL_PATTERN).up()
+                        .exportAsString()));
     }
 
     @ArquillianResource