From 05377d111bbefe3125851c7eedb2372e439c72a2 Mon Sep 17 00:00:00 2001 From: Aslak Knutsen Date: Tue, 10 Apr 2012 17:49:17 +0200 Subject: [PATCH] Update to Arquillian Core 1.0.0.Final --- cdi-ejb/pom.xml | 2 +- .../FireAndForgetUsingAlternativeBeanTestCase.java | 6 +++--- cdi/pom.xml | 2 +- .../cdi/decorator/AnnouncerDecoratorTestCase.java | 4 ++-- .../SynchronousPaymentProcessorTestCase.java | 7 +++---- extensions/weld-servlet/pom.xml | 5 +++-- .../cdi/WeldServletDeploymentAppender.java | 4 ++-- parent/pom.xml | 2 +- servlet/pom.xml | 2 +- .../servlet/RegisteredEchoServletTestCase.java | 14 +++++++++----- 10 files changed, 26 insertions(+), 22 deletions(-) diff --git a/cdi-ejb/pom.xml b/cdi-ejb/pom.xml index 568c4dd..2f1c2c5 100644 --- a/cdi-ejb/pom.xml +++ b/cdi-ejb/pom.xml @@ -31,7 +31,7 @@ org.jboss.shrinkwrap.descriptors - shrinkwrap-descriptors-impl + shrinkwrap-descriptors-impl-javaee org.jboss.arquillian.protocol 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 index ec3f852..57d2c00 100644 --- 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 index dc75679..b6d20d7 100644 --- a/cdi/pom.xml +++ b/cdi/pom.xml @@ -31,7 +31,7 @@ org.jboss.shrinkwrap.descriptors - shrinkwrap-descriptors-impl + shrinkwrap-descriptors-impl-javaee diff --git a/cdi/src/test/java/com/acme/cdi/decorator/AnnouncerDecoratorTestCase.java b/cdi/src/test/java/com/acme/cdi/decorator/AnnouncerDecoratorTestCase.java index d213153..729e99d 100644 --- 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 index 8934231..ab772d8 100644 --- 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 index 59fbae8..3181fc9 100644 --- a/extensions/weld-servlet/pom.xml +++ b/extensions/weld-servlet/pom.xml @@ -11,7 +11,7 @@ org.jboss.arquillian.extension.cdi - arquillian-weld-servlet-extension + arquillian-showcase-extension-weld-servlet Arquillian Showcase Extension: Weld Servlet 1.0.0-SNAPSHOT @@ -26,7 +26,8 @@ org.jboss.shrinkwrap.descriptors - shrinkwrap-descriptors-impl + shrinkwrap-descriptors-impl-javaee + compile org.jboss.shrinkwrap diff --git a/extensions/weld-servlet/src/main/java/org/jboss/arquillian/extension/cdi/WeldServletDeploymentAppender.java b/extensions/weld-servlet/src/main/java/org/jboss/arquillian/extension/cdi/WeldServletDeploymentAppender.java index dfa9292..2240020 100644 --- a/extensions/weld-servlet/src/main/java/org/jboss/arquillian/extension/cdi/WeldServletDeploymentAppender.java +++ b/extensions/weld-servlet/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("", "WeldServlet")), "web-fragment.xml"); } diff --git a/parent/pom.xml b/parent/pom.xml index 41a7474..e52ad69 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -14,7 +14,7 @@ UTF-8 - 1.0.0.CR7 + 1.0.0.Final 1.0.0.CR2 1.0.0.CR2 1.0.0.CR2 diff --git a/servlet/pom.xml b/servlet/pom.xml index 424ea2b..0a81df2 100644 --- a/servlet/pom.xml +++ b/servlet/pom.xml @@ -30,7 +30,7 @@ org.jboss.shrinkwrap.descriptors - shrinkwrap-descriptors-impl + shrinkwrap-descriptors-impl-javaee diff --git a/servlet/src/test/java/com/acme/servlet/RegisteredEchoServletTestCase.java b/servlet/src/test/java/com/acme/servlet/RegisteredEchoServletTestCase.java index 0daa8d8..3b319a6 100644 --- 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