You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/06/03 22:21:53 UTC
svn commit: r1345765 - in /openejb/trunk/openejb/arquillian: ./
arquillian-openejb-embedded-4/ arquillian-tomee-embedded/
arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/embedded/
arquillian-tomee-moviefun-example/ arquillian-tome...
Author: rmannibucau
Date: Sun Jun 3 20:21:52 2012
New Revision: 1345765
URL: http://svn.apache.org/viewvc?rev=1345765&view=rev
Log:
TOMEE-214 arquillian and shrinkwrap version updates
Modified:
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/pom.xml
openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/pom.xml
openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainerTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-moviefun-example/pom.xml
openejb/trunk/openejb/arquillian/arquillian-tomee-remote/pom.xml
openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/TomEEContainerTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/session/SessionScopeTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/pom.xml
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/TestSetup.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/constructor/ServletCdiConstructorInjectionTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/inject/ServletCdiInjectionTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/producer/ServletCdiProducerTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/enventry/ServletEnvEntryInjectionTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ext/enventries/StratocasterTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filtercdiinject/ServletFilterCdiInjectionTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/ServletFilterEnvEntryInjectionTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterlocalinject/ServletFilterEjbLocalInjectionTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterpersistence/ServletFilterPersistenceInjectionTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterremote/ServletFilterEjbRemoteInjectionTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/getresources/GetResourcesTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/dd/JAXWSDDTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/JSFInjectionTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/ServletListenerEnvEntryInjectionTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/ServletListenerEjbLocalInjectionTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerpersistence/ServletListenerPersistenceInjectionTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerremote/ServletListenerEjbRemoteTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/localinject/ServletEjbLocalInjectionTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/myfaces/extcdi/start/MyFacesExtCdiDeploymentTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/persistence/ServletPersistenceInjectionTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/persistence/multiple/MultiplePersistenceTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/remote/ServletEjbRemoteTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/requestdispose/ServletDisposeRequestScopeTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/sharedenv/SharedEnvironmentTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/pom.xml
openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/src/test/java/org/apache/openejb/arquillian/TomEEContainerTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/src/test/java/org/apache/openejb/arquillian/session/SessionScopeTest.java
openejb/trunk/openejb/arquillian/pom.xml
Modified: openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/pom.xml?rev=1345765&r1=1345764&r2=1345765&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/pom.xml (original)
+++ openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/pom.xml Sun Jun 3 20:21:52 2012
@@ -39,12 +39,12 @@
<dependency>
<groupId>org.jboss.shrinkwrap.descriptors</groupId>
- <artifactId>shrinkwrap-descriptors-impl</artifactId>
+ <artifactId>shrinkwrap-descriptors-impl-javaee</artifactId>
<version>${version.shrinkwrap.descriptor}</version>
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap.descriptors</groupId>
- <artifactId>shrinkwrap-descriptors-api</artifactId>
+ <artifactId>shrinkwrap-descriptors-api-javaee</artifactId>
<version>${version.shrinkwrap.descriptor}</version>
</dependency>
<dependency>
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/pom.xml?rev=1345765&r1=1345764&r2=1345765&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/pom.xml (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/pom.xml Sun Jun 3 20:21:52 2012
@@ -96,14 +96,14 @@
</dependency>
<dependency>
- <groupId>org.jboss.shrinkwrap.descriptors</groupId>
- <artifactId>shrinkwrap-descriptors-impl</artifactId>
- <version>${version.shrinkwrap.descriptor}</version>
+ <groupId>org.jboss.shrinkwrap.descriptors</groupId>
+ <artifactId>shrinkwrap-descriptors-impl-javaee</artifactId>
+ <version>${version.shrinkwrap.descriptor}</version>
</dependency>
<dependency>
- <groupId>org.jboss.shrinkwrap.descriptors</groupId>
- <artifactId>shrinkwrap-descriptors-api</artifactId>
- <version>${version.shrinkwrap.descriptor}</version>
+ <groupId>org.jboss.shrinkwrap.descriptors</groupId>
+ <artifactId>shrinkwrap-descriptors-api-javaee</artifactId>
+ <version>${version.shrinkwrap.descriptor}</version>
</dependency>
<dependency>
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainerTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainerTest.java?rev=1345765&r1=1345764&r2=1345765&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainerTest.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-embedded/src/test/java/org/apache/openejb/arquillian/embedded/EmbeddedTomEEContainerTest.java Sun Jun 3 20:21:52 2012
@@ -25,13 +25,12 @@ import org.jboss.shrinkwrap.api.ShrinkWr
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.Test;
import org.junit.runner.RunWith;
import javax.ejb.EJB;
import java.net.URL;
-import java.util.concurrent.CountDownLatch;
import static junit.framework.Assert.assertEquals;
import static junit.framework.Assert.assertNotNull;
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-moviefun-example/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-moviefun-example/pom.xml?rev=1345765&r1=1345764&r2=1345765&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-moviefun-example/pom.xml (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-moviefun-example/pom.xml Sun Jun 3 20:21:52 2012
@@ -184,7 +184,7 @@
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap.descriptors</groupId>
- <artifactId>shrinkwrap-descriptors-impl</artifactId>
+ <artifactId>shrinkwrap-descriptors-impl-javaee</artifactId>
<version>${version.shrinkwrap.descriptor}</version>
</dependency>
<dependency>
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-remote/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-remote/pom.xml?rev=1345765&r1=1345764&r2=1345765&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-remote/pom.xml (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-remote/pom.xml Sun Jun 3 20:21:52 2012
@@ -118,7 +118,7 @@
<dependency>
<groupId>org.jboss.shrinkwrap.descriptors</groupId>
- <artifactId>shrinkwrap-descriptors-impl</artifactId>
+ <artifactId>shrinkwrap-descriptors-impl-javaee</artifactId>
<version>${version.shrinkwrap.descriptor}</version>
</dependency>
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/TomEEContainerTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/TomEEContainerTest.java?rev=1345765&r1=1345764&r2=1345765&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/TomEEContainerTest.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/TomEEContainerTest.java Sun Jun 3 20:21:52 2012
@@ -19,20 +19,15 @@ package org.apache.openejb.arquillian;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.net.URL;
-import java.util.Map;
-import java.util.TreeMap;
-
import javax.ejb.EJB;
-
import junit.framework.Assert;
-
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
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.Test;
import org.junit.runner.RunWith;
@@ -42,15 +37,18 @@ public class TomEEContainerTest {
@Deployment
public static WebArchive createDeployment() {
return ShrinkWrap.create(WebArchive.class, "test.war").addClass(TestServlet.class).addClass(TestEjb.class).addClass(TomEEContainerTest.class)
- .setWebXML(new StringAsset(Descriptors.create(WebAppDescriptor.class).version("3.0").servlet(TestServlet.class, "/ejb").exportAsString()));
+ .setWebXML(new StringAsset(Descriptors.create(WebAppDescriptor.class).version("3.0")
+ .createServlet().servletName("servlet").servletClass(TestServlet.class.getName()).up()
+ .createServletMapping().servletName("servlet").urlPattern("/ejb").up()
+ .exportAsString()));
}
@EJB
private TestEjb ejb;
-
- @Test
+
+ @Test
public void testEjbIsNotNull() throws Exception {
- Assert.assertNotNull(ejb);
+ Assert.assertNotNull(ejb);
}
@Test
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/session/SessionScopeTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/session/SessionScopeTest.java?rev=1345765&r1=1345764&r2=1345765&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/session/SessionScopeTest.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-remote/src/test/java/org/apache/openejb/arquillian/session/SessionScopeTest.java Sun Jun 3 20:21:52 2012
@@ -20,6 +20,7 @@ package org.apache.openejb.arquillian.se
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpMethod;
import org.apache.commons.httpclient.methods.GetMethod;
+import org.apache.openejb.arquillian.TestServlet;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.ArchivePaths;
@@ -28,7 +29,7 @@ import org.jboss.shrinkwrap.api.asset.Em
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.Test;
import org.junit.runner.RunWith;
@@ -49,7 +50,8 @@ public class SessionScopeTest {
.addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"))
.setWebXML(new StringAsset(Descriptors.create(WebAppDescriptor.class)
.version("3.0")
- .servlet(PojoSessionScopedServletWrapper.class, "/session")
+ .createServlet().servletName("servlet").servletClass(PojoSessionScopedServletWrapper.class.getName()).up()
+ .createServletMapping().servletName("servlet").urlPattern("/session").up()
.exportAsString()));
}
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/pom.xml?rev=1345765&r1=1345764&r2=1345765&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/pom.xml (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/pom.xml Sun Jun 3 20:21:52 2012
@@ -78,12 +78,12 @@
<dependency>
<groupId>org.jboss.shrinkwrap.descriptors</groupId>
- <artifactId>shrinkwrap-descriptors-impl</artifactId>
+ <artifactId>shrinkwrap-descriptors-impl-javaee</artifactId>
<version>${version.shrinkwrap.descriptor}</version>
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap.descriptors</groupId>
- <artifactId>shrinkwrap-descriptors-api</artifactId>
+ <artifactId>shrinkwrap-descriptors-api-javaee</artifactId>
<version>${version.shrinkwrap.descriptor}</version>
</dependency>
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/TestSetup.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/TestSetup.java?rev=1345765&r1=1345764&r2=1345765&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/TestSetup.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/TestSetup.java Sun Jun 3 20:21:52 2012
@@ -28,7 +28,7 @@ import org.jboss.shrinkwrap.api.asset.Em
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.Test;
import static junit.framework.Assert.assertNotNull;
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/constructor/ServletCdiConstructorInjectionTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/constructor/ServletCdiConstructorInjectionTest.java?rev=1345765&r1=1345764&r2=1345765&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/constructor/ServletCdiConstructorInjectionTest.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/constructor/ServletCdiConstructorInjectionTest.java Sun Jun 3 20:21:52 2012
@@ -28,7 +28,7 @@ import org.jboss.shrinkwrap.api.asset.Em
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.Test;
import org.junit.runner.RunWith;
@@ -57,7 +57,8 @@ public class ServletCdiConstructorInject
WebAppDescriptor descriptor = Descriptors.create(WebAppDescriptor.class)
.version("3.0")
- .servlet(SimpleServlet.class, "/" + TEST_NAME);
+ .createServlet().servletName("servlet").servletClass(SimpleServlet.class.getName()).up()
+ .createServletMapping().servletName("servlet").urlPattern("/" + TEST_NAME).up();
WebArchive archive = ShrinkWrap.create(WebArchive.class, TEST_NAME + ".war")
.addClass(TestRun.class)
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/inject/ServletCdiInjectionTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/inject/ServletCdiInjectionTest.java?rev=1345765&r1=1345764&r2=1345765&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/inject/ServletCdiInjectionTest.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/inject/ServletCdiInjectionTest.java Sun Jun 3 20:21:52 2012
@@ -16,6 +16,10 @@
*/
package org.apache.openejb.arquillian.tests.cdi.inject;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
import org.apache.openejb.arquillian.tests.TestRun;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
@@ -26,15 +30,10 @@ import org.jboss.shrinkwrap.api.asset.Em
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.Test;
import org.junit.runner.RunWith;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
import static junit.framework.Assert.assertNotNull;
import static junit.framework.Assert.assertTrue;
@@ -60,8 +59,8 @@ public class ServletCdiInjectionTest {
public static WebArchive createDeployment() {
WebAppDescriptor descriptor = Descriptors.create(WebAppDescriptor.class)
- .version("3.0")
- .servlet(SimpleServlet.class, "/" + TEST_NAME);
+ .createServlet().servletName("servlet").servletClass(SimpleServlet.class.getName()).up()
+ .createServletMapping().servletName("servlet").urlPattern("/" + TEST_NAME).up();
WebArchive archive = ShrinkWrap.create(WebArchive.class, TEST_NAME + ".war")
.addClass(TestRun.class)
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/producer/ServletCdiProducerTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/producer/ServletCdiProducerTest.java?rev=1345765&r1=1345764&r2=1345765&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/producer/ServletCdiProducerTest.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/cdi/producer/ServletCdiProducerTest.java Sun Jun 3 20:21:52 2012
@@ -29,7 +29,7 @@ import org.jboss.shrinkwrap.api.asset.Em
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.Test;
import org.junit.runner.RunWith;
@@ -59,8 +59,8 @@ public class ServletCdiProducerTest {
public static WebArchive createDeployment() {
WebAppDescriptor descriptor = Descriptors.create(WebAppDescriptor.class)
- .version("3.0")
- .servlet(SimpleServlet.class, "/" + TEST_NAME);
+ .createServlet().servletName("servlet").servletClass(SimpleServlet.class.getName()).up()
+ .createServletMapping().servletName("servlet").urlPattern("/" + TEST_NAME).up();
WebArchive archive = ShrinkWrap.create(WebArchive.class, TEST_NAME + ".war")
.addClass(TestRun.class)
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/enventry/ServletEnvEntryInjectionTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/enventry/ServletEnvEntryInjectionTest.java?rev=1345765&r1=1345764&r2=1345765&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/enventry/ServletEnvEntryInjectionTest.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/enventry/ServletEnvEntryInjectionTest.java Sun Jun 3 20:21:52 2012
@@ -23,7 +23,7 @@ import org.jboss.shrinkwrap.api.ShrinkWr
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.jboss.shrinkwrap.descriptor.spi.node.Node;
import org.jboss.shrinkwrap.descriptor.spi.node.NodeDescriptor;
import org.junit.Test;
@@ -111,8 +111,8 @@ public class ServletEnvEntryInjectionTes
@Deployment(testable = false)
public static WebArchive createDeployment() {
WebAppDescriptor descriptor = Descriptors.create(WebAppDescriptor.class)
- .version("3.0")
- .servlet(PojoServlet.class, "/" + TEST_NAME);
+ .createServlet().servletName("servlet").servletClass(PojoServlet.class.getName()).up()
+ .createServletMapping().servletName("servlet").urlPattern("/" + TEST_NAME).up();
addEnvEntry(descriptor, "returnEmail", "java.lang.String", "tomee@apache.org");
addEnvEntry(descriptor, "connectionPool", "java.lang.Integer", "20");
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ext/enventries/StratocasterTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ext/enventries/StratocasterTest.java?rev=1345765&r1=1345764&r2=1345765&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ext/enventries/StratocasterTest.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/ext/enventries/StratocasterTest.java Sun Jun 3 20:21:52 2012
@@ -29,7 +29,7 @@ import org.jboss.shrinkwrap.api.ShrinkWr
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.jboss.shrinkwrap.descriptor.spi.node.Node;
import org.jboss.shrinkwrap.descriptor.spi.node.NodeDescriptor;
import org.junit.Test;
@@ -54,8 +54,8 @@ public class StratocasterTest {
@Deployment(testable = false)
public static WebArchive createDeployment() {
WebAppDescriptor descriptor = Descriptors.create(WebAppDescriptor.class)
- .version("3.0")
- .servlet(Stratocaster.class, "/" + TEST_NAME);
+ .createServlet().servletName("servlet").servletClass(Stratocaster.class.getName()).up()
+ .createServletMapping().servletName("servlet").urlPattern("/" + TEST_NAME).up();
addEnvEntry(descriptor, "guitarStringGuages", "java.lang.String", "E1=0.052\nA=0.042\nD=0.030\nG=0.017\nB=0.013\nE=0.010");
addEnvEntry(descriptor, "certificateOfAuthenticity", "java.lang.String", "/tmp/strat-certificate.txt");
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filtercdiinject/ServletFilterCdiInjectionTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filtercdiinject/ServletFilterCdiInjectionTest.java?rev=1345765&r1=1345764&r2=1345765&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filtercdiinject/ServletFilterCdiInjectionTest.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filtercdiinject/ServletFilterCdiInjectionTest.java Sun Jun 3 20:21:52 2012
@@ -21,7 +21,7 @@ import org.apache.openejb.arquillian.tes
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.descriptor.api.spec.servlet.web.WebAppDescriptor;
+import org.jboss.shrinkwrap.descriptor.api.webapp30.WebAppDescriptor;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -42,7 +42,11 @@ public class ServletFilterCdiInjectionTe
}
protected void decorateDescriptor(WebAppDescriptor descriptor) {
- descriptor.filter(PojoServletFilter.class, "/" + getTestContextName());
+ descriptor
+ .createFilter()
+ .filterName("filter").filterClass(PojoServletFilter.class.getName()).up()
+ .createFilterMapping()
+ .filterName("filter").urlPattern("/" + getTestContextName());
}
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/ServletFilterEnvEntryInjectionTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/ServletFilterEnvEntryInjectionTest.java?rev=1345765&r1=1345764&r2=1345765&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/ServletFilterEnvEntryInjectionTest.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterenventry/ServletFilterEnvEntryInjectionTest.java Sun Jun 3 20:21:52 2012
@@ -25,7 +25,7 @@ import org.jboss.shrinkwrap.api.asset.Em
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.jboss.shrinkwrap.descriptor.spi.node.Node;
import org.jboss.shrinkwrap.descriptor.spi.node.NodeDescriptor;
import org.junit.Test;
@@ -122,8 +122,10 @@ public class ServletFilterEnvEntryInject
@Deployment(testable = false)
public static WebArchive createDeployment() {
WebAppDescriptor descriptor = Descriptors.create(WebAppDescriptor.class)
- .version("3.0")
- .filter(PojoServletFilter.class, "/" + TEST_NAME);
+ .createFilter()
+ .filterName("filter").filterClass(PojoServletFilter.class.getName()).up()
+ .createFilterMapping()
+ .filterName("filter").urlPattern("/" + TEST_NAME).up();
addEnvEntry(descriptor, "returnEmail", "java.lang.String", "tomee@apache.org");
addEnvEntry(descriptor, "connectionPool", "java.lang.Integer", "20");
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterlocalinject/ServletFilterEjbLocalInjectionTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterlocalinject/ServletFilterEjbLocalInjectionTest.java?rev=1345765&r1=1345764&r2=1345765&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterlocalinject/ServletFilterEjbLocalInjectionTest.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterlocalinject/ServletFilterEjbLocalInjectionTest.java Sun Jun 3 20:21:52 2012
@@ -21,7 +21,7 @@ import org.apache.openejb.arquillian.tes
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.descriptor.api.spec.servlet.web.WebAppDescriptor;
+import org.jboss.shrinkwrap.descriptor.api.webapp30.WebAppDescriptor;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -47,7 +47,11 @@ public class ServletFilterEjbLocalInject
}
protected void decorateDescriptor(WebAppDescriptor descriptor) {
- descriptor.filter(PojoServletFilter.class, "/" + getTestContextName());
+ descriptor
+ .createFilter()
+ .filterName("filter").filterClass(PojoServletFilter.class.getName()).up()
+ .createFilterMapping()
+ .filterName("filter").urlPattern("/" + getTestContextName());
}
}
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterpersistence/ServletFilterPersistenceInjectionTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterpersistence/ServletFilterPersistenceInjectionTest.java?rev=1345765&r1=1345764&r2=1345765&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterpersistence/ServletFilterPersistenceInjectionTest.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterpersistence/ServletFilterPersistenceInjectionTest.java Sun Jun 3 20:21:52 2012
@@ -22,7 +22,7 @@ import org.jboss.arquillian.container.te
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.ArchivePaths;
import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.descriptor.api.spec.servlet.web.WebAppDescriptor;
+import org.jboss.shrinkwrap.descriptor.api.webapp30.WebAppDescriptor;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -53,7 +53,11 @@ public class ServletFilterPersistenceInj
}
protected void decorateDescriptor(WebAppDescriptor descriptor) {
- descriptor.filter(PersistenceServletFilter.class, "/" + getTestContextName());
+ descriptor
+ .createFilter()
+ .filterName("filter").filterClass(PersistenceServletFilter.class.getName()).up()
+ .createFilterMapping()
+ .filterName("filter").urlPattern("/" + getTestContextName());
}
public void decorateArchive(WebArchive archive) {
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterremote/ServletFilterEjbRemoteInjectionTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterremote/ServletFilterEjbRemoteInjectionTest.java?rev=1345765&r1=1345764&r2=1345765&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterremote/ServletFilterEjbRemoteInjectionTest.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/filterremote/ServletFilterEjbRemoteInjectionTest.java Sun Jun 3 20:21:52 2012
@@ -21,7 +21,7 @@ import org.apache.openejb.arquillian.tes
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.descriptor.api.spec.servlet.web.WebAppDescriptor;
+import org.jboss.shrinkwrap.descriptor.api.webapp30.WebAppDescriptor;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -40,7 +40,11 @@ public class ServletFilterEjbRemoteInjec
}
protected void decorateDescriptor(WebAppDescriptor descriptor) {
- descriptor.filter(RemoteServletFilter.class, "/" + getTestContextName());
+ descriptor
+ .createFilter()
+ .filterName("filter").filterClass(RemoteServletFilter.class.getName()).up()
+ .createFilterMapping()
+ .filterName("filter").urlPattern("/" + getTestContextName());
}
}
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/getresources/GetResourcesTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/getresources/GetResourcesTest.java?rev=1345765&r1=1345764&r2=1345765&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/getresources/GetResourcesTest.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/getresources/GetResourcesTest.java Sun Jun 3 20:21:52 2012
@@ -27,7 +27,7 @@ import org.jboss.shrinkwrap.api.ShrinkWr
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.Test;
import org.junit.runner.RunWith;
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/dd/JAXWSDDTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/dd/JAXWSDDTest.java?rev=1345765&r1=1345764&r2=1345765&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/dd/JAXWSDDTest.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/dd/JAXWSDDTest.java Sun Jun 3 20:21:52 2012
@@ -29,7 +29,7 @@ import org.jboss.shrinkwrap.api.asset.Cl
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.Test;
import org.junit.runner.RunWith;
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/JSFInjectionTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/JSFInjectionTest.java?rev=1345765&r1=1345764&r2=1345765&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/JSFInjectionTest.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jsf/JSFInjectionTest.java Sun Jun 3 20:21:52 2012
@@ -29,7 +29,7 @@ import org.jboss.shrinkwrap.api.asset.Cl
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.Test;
import org.junit.runner.RunWith;
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/ServletListenerEnvEntryInjectionTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/ServletListenerEnvEntryInjectionTest.java?rev=1345765&r1=1345764&r2=1345765&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/ServletListenerEnvEntryInjectionTest.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerenventry/ServletListenerEnvEntryInjectionTest.java Sun Jun 3 20:21:52 2012
@@ -25,7 +25,7 @@ import org.jboss.shrinkwrap.api.asset.Em
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.jboss.shrinkwrap.descriptor.spi.node.Node;
import org.jboss.shrinkwrap.descriptor.spi.node.NodeDescriptor;
import org.junit.Test;
@@ -195,9 +195,14 @@ public class ServletListenerEnvEntryInje
public static WebArchive createDeployment() {
final WebAppDescriptor descriptor = Descriptors.create(WebAppDescriptor.class)
.version("3.0")
- .listener(PojoServletContextListener.class)
- .listener(PojoServletSessionListener.class)
- .servlet(ServletToCheckListener.class, "/" + TEST_NAME);
+ .createListener()
+ .listenerClass(PojoServletContextListener.class.getName()).up()
+ .createListener()
+ .listenerClass(PojoServletSessionListener.class.getName()).up()
+ .createServlet()
+ .servletName("check").servletClass(ServletToCheckListener.class.getName()).up()
+ .createServletMapping()
+ .servletName("check").urlPattern("/" + TEST_NAME).up();
addEnvEntry(descriptor, "returnEmail", "java.lang.String", "tomee@apache.org");
addEnvEntry(descriptor, "connectionPool", "java.lang.Integer", "20");
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/ServletListenerEjbLocalInjectionTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/ServletListenerEjbLocalInjectionTest.java?rev=1345765&r1=1345764&r2=1345765&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/ServletListenerEjbLocalInjectionTest.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerlocalinject/ServletListenerEjbLocalInjectionTest.java Sun Jun 3 20:21:52 2012
@@ -25,7 +25,7 @@ import org.jboss.shrinkwrap.api.asset.Em
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.jboss.shrinkwrap.descriptor.spi.node.Node;
import org.jboss.shrinkwrap.descriptor.spi.node.NodeDescriptor;
import org.junit.Test;
@@ -59,7 +59,7 @@ public class ServletListenerEjbLocalInje
validateTest(expectedOutput);
}
-// @Test
+ // @Test
public void pojoInjectionShouldSucceedInCtxtListener() throws Exception {
final String expectedOutput = "Context: OpenEJB is on the wheel of a 2011 Lexus IS 350";
validateTest(expectedOutput);
@@ -77,7 +77,7 @@ public class ServletListenerEjbLocalInje
validateTest(expectedOutput);
}
-// @Test
+ // @Test
public void longTypeEnvEntryInjectionShouldSucceedInCtxtListener() throws Exception {
final String expectedOutput = "Context: Start Count: 200000";
validateTest(expectedOutput);
@@ -107,13 +107,13 @@ public class ServletListenerEjbLocalInje
validateTest(expectedOutput);
}
-// @Test
+ // @Test
public void classEnvEntryInjectionShouldSucceedInCtxtListener() throws Exception {
final String expectedOutput = "Context: java.lang.String";
validateTest(expectedOutput);
}
-// @Test
+ // @Test
public void enumEnvEntryInjectionShouldSucceedInCtxtListener() throws Exception {
final String expectedOutput = "Context: DefaultCode: OK";
validateTest(expectedOutput);
@@ -131,7 +131,7 @@ public class ServletListenerEjbLocalInje
validateTest(expectedOutput);
}
-// @Test
+ // @Test
public void pojoInjectionShouldSucceedInSessionListener() throws Exception {
final String expectedOutput = "Session: OpenEJB is on the wheel of a 2011 Lexus IS 350";
validateTest(expectedOutput);
@@ -149,7 +149,7 @@ public class ServletListenerEjbLocalInje
validateTest(expectedOutput);
}
-// @Test
+ // @Test
public void longTypeEnvEntryInjectionShouldSucceedInSessionListener() throws Exception {
final String expectedOutput = "Session: Start Count: 200000";
validateTest(expectedOutput);
@@ -179,13 +179,13 @@ public class ServletListenerEjbLocalInje
validateTest(expectedOutput);
}
-// @Test
+ // @Test
public void classEnvEntryInjectionShouldSucceedInSessionListener() throws Exception {
final String expectedOutput = "Session: java.lang.String";
validateTest(expectedOutput);
}
-// @Test
+ // @Test
public void enumEnvEntryInjectionShouldSucceedInSessionListener() throws Exception {
final String expectedOutput = "Session: DefaultCode: OK";
validateTest(expectedOutput);
@@ -195,9 +195,14 @@ public class ServletListenerEjbLocalInje
public static WebArchive createDeployment() {
final WebAppDescriptor descriptor = Descriptors.create(WebAppDescriptor.class)
.version("3.0")
- .listener(PojoServletContextListener.class)
- .listener(PojoServletSessionListener.class)
- .servlet(ServletToCheckListener.class, "/" + TEST_NAME);
+ .createListener()
+ .listenerClass(PojoServletContextListener.class.getName()).up()
+ .createListener()
+ .listenerClass(PojoServletSessionListener.class.getName()).up()
+ .createServlet()
+ .servletName("check").servletClass(ServletToCheckListener.class.getName()).up()
+ .createServletMapping()
+ .servletName("check").urlPattern("/" + TEST_NAME).up();
addEnvEntry(descriptor, "returnEmail", "java.lang.String", "tomee@apache.org");
addEnvEntry(descriptor, "connectionPool", "java.lang.Integer", "20");
@@ -224,7 +229,6 @@ public class ServletListenerEjbLocalInje
.addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"));
-
return archive;
}
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerpersistence/ServletListenerPersistenceInjectionTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerpersistence/ServletListenerPersistenceInjectionTest.java?rev=1345765&r1=1345764&r2=1345765&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerpersistence/ServletListenerPersistenceInjectionTest.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerpersistence/ServletListenerPersistenceInjectionTest.java Sun Jun 3 20:21:52 2012
@@ -25,7 +25,7 @@ import org.jboss.shrinkwrap.api.asset.Em
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.Test;
import org.junit.runner.RunWith;
@@ -85,9 +85,14 @@ public class ServletListenerPersistenceI
public static WebArchive createDeployment() {
WebAppDescriptor descriptor = Descriptors.create(WebAppDescriptor.class)
.version("3.0")
- .listener(PersistenceServletContextListener.class)
- .listener(PersistenceServletSessionListener.class)
- .servlet(ServletToCheckListener.class, "/" + TEST_NAME);
+ .createListener()
+ .listenerClass(PersistenceServletContextListener.class.getName()).up()
+ .createListener()
+ .listenerClass(PersistenceServletSessionListener.class.getName()).up()
+ .createServlet()
+ .servletName("check").servletClass(ServletToCheckListener.class.getName()).up()
+ .createServletMapping()
+ .servletName("check").urlPattern("/" + TEST_NAME).up();
WebArchive archive = ShrinkWrap.create(WebArchive.class, TEST_NAME + ".war")
.addClass(PersistenceServletContextListener.class)
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerremote/ServletListenerEjbRemoteTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerremote/ServletListenerEjbRemoteTest.java?rev=1345765&r1=1345764&r2=1345765&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerremote/ServletListenerEjbRemoteTest.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/listenerremote/ServletListenerEjbRemoteTest.java Sun Jun 3 20:21:52 2012
@@ -25,7 +25,7 @@ import org.jboss.shrinkwrap.api.asset.Em
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.Test;
import org.junit.runner.RunWith;
@@ -61,9 +61,14 @@ public class ServletListenerEjbRemoteTes
public static WebArchive createDeployment() {
WebAppDescriptor descriptor = Descriptors.create(WebAppDescriptor.class)
.version("3.0")
- .listener(RemoteServletContextListener.class)
- .listener(RemoteServletSessionListener.class)
- .servlet(ServletToCheckListener.class, "/" + TEST_NAME);
+ .createListener()
+ .listenerClass(RemoteServletContextListener.class.getName()).up()
+ .createListener()
+ .listenerClass(RemoteServletSessionListener.class.getName()).up()
+ .createServlet()
+ .servletName("check").servletClass(ServletToCheckListener.class.getName()).up()
+ .createServletMapping()
+ .servletName("check").urlPattern("/" + TEST_NAME).up();
WebArchive archive = ShrinkWrap.create(WebArchive.class, TEST_NAME + ".war")
.addClass(RemoteServletContextListener.class)
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/localinject/ServletEjbLocalInjectionTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/localinject/ServletEjbLocalInjectionTest.java?rev=1345765&r1=1345764&r2=1345765&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/localinject/ServletEjbLocalInjectionTest.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/localinject/ServletEjbLocalInjectionTest.java Sun Jun 3 20:21:52 2012
@@ -23,7 +23,7 @@ import org.jboss.shrinkwrap.api.ShrinkWr
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.Test;
import org.junit.runner.RunWith;
@@ -58,8 +58,10 @@ public class ServletEjbLocalInjectionTes
@Deployment(testable = false)
public static WebArchive createDeployment() {
WebAppDescriptor descriptor = Descriptors.create(WebAppDescriptor.class)
- .version("3.0")
- .servlet(PojoServlet.class, "/" + TEST_NAME);
+ .createServlet()
+ .servletName("check").servletClass(PojoServlet.class.getName()).up()
+ .createServletMapping()
+ .servletName("check").urlPattern("/" + TEST_NAME).up();
return ShrinkWrap.create(WebArchive.class, TEST_NAME + ".war")
.addClass(PojoServlet.class)
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/myfaces/extcdi/start/MyFacesExtCdiDeploymentTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/myfaces/extcdi/start/MyFacesExtCdiDeploymentTest.java?rev=1345765&r1=1345764&r2=1345765&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/myfaces/extcdi/start/MyFacesExtCdiDeploymentTest.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/myfaces/extcdi/start/MyFacesExtCdiDeploymentTest.java Sun Jun 3 20:21:52 2012
@@ -27,7 +27,7 @@ import org.jboss.shrinkwrap.api.asset.Em
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.Test;
import org.junit.runner.RunWith;
@@ -43,8 +43,7 @@ public class MyFacesExtCdiDeploymentTest
@Deployment(testable = true)
public static WebArchive getArchive() {
- final WebAppDescriptor descriptor = Descriptors.create(WebAppDescriptor.class)
- .version("3.0");
+ final WebAppDescriptor descriptor = Descriptors.create(WebAppDescriptor.class);
// web.xml params is not supported by default
// descriptor.contextParam(ProjectStage.PROJECT_STAGE_PARAM_NAME, ProjectStage.SystemTest.name());
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/persistence/ServletPersistenceInjectionTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/persistence/ServletPersistenceInjectionTest.java?rev=1345765&r1=1345764&r2=1345765&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/persistence/ServletPersistenceInjectionTest.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/persistence/ServletPersistenceInjectionTest.java Sun Jun 3 20:21:52 2012
@@ -30,7 +30,7 @@ import org.jboss.shrinkwrap.api.ShrinkWr
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.Test;
import org.junit.runner.RunWith;
@@ -67,7 +67,10 @@ public class ServletPersistenceInjection
public static WebArchive createDeployment() {
WebAppDescriptor descriptor = Descriptors.create(WebAppDescriptor.class)
.version("3.0")
- .servlet(PersistenceServlet.class, "/" + TEST_NAME);
+ .createServlet()
+ .servletName("check").servletClass(PersistenceServlet.class.getName()).up()
+ .createServletMapping()
+ .servletName("check").urlPattern("/" + TEST_NAME).up();
WebArchive archive = ShrinkWrap.create(WebArchive.class, TEST_NAME + ".war")
.addClass(PersistenceServlet.class)
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/persistence/multiple/MultiplePersistenceTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/persistence/multiple/MultiplePersistenceTest.java?rev=1345765&r1=1345764&r2=1345765&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/persistence/multiple/MultiplePersistenceTest.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/persistence/multiple/MultiplePersistenceTest.java Sun Jun 3 20:21:52 2012
@@ -26,7 +26,7 @@ import org.jboss.shrinkwrap.api.asset.Cl
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.Test;
import org.junit.runner.RunWith;
@@ -59,8 +59,10 @@ public class MultiplePersistenceTest {
@Deployment(testable = false)
public static WebArchive createDeployment() {
WebAppDescriptor descriptor = Descriptors.create(WebAppDescriptor.class)
- .version("3.0")
- .servlet(MultiplePUServlet.class, "/" + TEST_NAME);
+ .createServlet()
+ .servletName("check").servletClass(MultiplePUServlet.class.getName()).up()
+ .createServletMapping()
+ .servletName("check").urlPattern("/" + TEST_NAME).up();
WebArchive archive = ShrinkWrap.create(WebArchive.class, TEST_NAME + ".war")
.addClass(MultiplePUServlet.class)
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/remote/ServletEjbRemoteTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/remote/ServletEjbRemoteTest.java?rev=1345765&r1=1345764&r2=1345765&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/remote/ServletEjbRemoteTest.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/remote/ServletEjbRemoteTest.java Sun Jun 3 20:21:52 2012
@@ -23,7 +23,7 @@ import org.jboss.shrinkwrap.api.ShrinkWr
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.Test;
import org.junit.runner.RunWith;
@@ -52,8 +52,10 @@ public class ServletEjbRemoteTest {
@Deployment(testable = false)
public static WebArchive createDeployment() {
WebAppDescriptor descriptor = Descriptors.create(WebAppDescriptor.class)
- .version("3.0")
- .servlet(RemoteServlet.class, "/" + TEST_NAME);
+ .createServlet()
+ .servletName("check").servletClass(RemoteServlet.class.getName()).up()
+ .createServletMapping()
+ .servletName("check").urlPattern("/" + TEST_NAME).up();
WebArchive archive = ShrinkWrap.create(WebArchive.class, TEST_NAME + ".war")
.addClass(RemoteServlet.class)
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/requestdispose/ServletDisposeRequestScopeTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/requestdispose/ServletDisposeRequestScopeTest.java?rev=1345765&r1=1345764&r2=1345765&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/requestdispose/ServletDisposeRequestScopeTest.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/requestdispose/ServletDisposeRequestScopeTest.java Sun Jun 3 20:21:52 2012
@@ -25,7 +25,7 @@ import org.jboss.shrinkwrap.api.asset.Em
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.Test;
import org.junit.runner.RunWith;
@@ -55,8 +55,7 @@ public class ServletDisposeRequestScopeT
public static WebArchive createDeployment() {
return new WebModule(ServletDisposeRequestScopeTest.class, ServletDisposeRequestScopeTest.class)
.getArchive()
- .setWebXML(new StringAsset(Descriptors.create(WebAppDescriptor.class)
- .version("3.0").exportAsString()))
+ .setWebXML(new StringAsset(Descriptors.create(WebAppDescriptor.class).exportAsString()))
.addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"));
}
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/sharedenv/SharedEnvironmentTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/sharedenv/SharedEnvironmentTest.java?rev=1345765&r1=1345764&r2=1345765&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/sharedenv/SharedEnvironmentTest.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/sharedenv/SharedEnvironmentTest.java Sun Jun 3 20:21:52 2012
@@ -22,7 +22,7 @@ import org.jboss.arquillian.container.te
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.exporter.ExplodedExporter;
import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.descriptor.api.spec.servlet.web.WebAppDescriptor;
+import org.jboss.shrinkwrap.descriptor.api.webapp30.WebAppDescriptor;
import org.jboss.shrinkwrap.descriptor.spi.node.Node;
import org.jboss.shrinkwrap.descriptor.spi.node.NodeDescriptor;
import org.junit.Test;
@@ -60,7 +60,12 @@ public class SharedEnvironmentTest exten
}
protected void decorateDescriptor(WebAppDescriptor descriptor) {
- descriptor.filter(PojoServletFilter.class, "/" + getTestContextName());
+ descriptor
+ .createFilter()
+ .filterName("filter").filterClass(PojoServletFilter.class.getName()).up()
+ .createFilterMapping()
+ .filterName("filter").urlPattern("/" + getTestContextName());
+
addEnvEntry(descriptor, "returnEmail", "java.lang.String", "tomee@apache.org");
addEnvEntry(descriptor, "connectionPool", "java.lang.Integer", "20");
addEnvEntry(descriptor, "startCount", "java.lang.Long", "200000");
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/pom.xml?rev=1345765&r1=1345764&r2=1345765&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/pom.xml (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/pom.xml Sun Jun 3 20:21:52 2012
@@ -280,7 +280,7 @@
</dependency>
<dependency>
<groupId>org.jboss.shrinkwrap.descriptors</groupId>
- <artifactId>shrinkwrap-descriptors-impl</artifactId>
+ <artifactId>shrinkwrap-descriptors-impl-javaee</artifactId>
<version>${version.shrinkwrap.descriptor}</version>
</dependency>
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/src/test/java/org/apache/openejb/arquillian/TomEEContainerTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/src/test/java/org/apache/openejb/arquillian/TomEEContainerTest.java?rev=1345765&r1=1345764&r2=1345765&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/src/test/java/org/apache/openejb/arquillian/TomEEContainerTest.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/src/test/java/org/apache/openejb/arquillian/TomEEContainerTest.java Sun Jun 3 20:21:52 2012
@@ -26,12 +26,11 @@ import junit.framework.Assert;
import org.jboss.arquillian.container.test.api.Deployment;
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.Test;
import org.junit.runner.RunWith;
@@ -45,7 +44,10 @@ public class TomEEContainerTest {
.addClass(TestServlet.class).addClass(TestEjb.class).addClass(TomEEContainerTest.class)
.setWebXML(new StringAsset(
Descriptors.create(WebAppDescriptor.class)
- .version("3.0").servlet(TestServlet.class, "/ejb").exportAsString()));
+ .version("3.0")
+ .createServlet().servletName("servlet-ejb").servletClass(TestServlet.class.getName()).up()
+ .createServletMapping().servletName("servlet-ejb").urlPattern("/ejb").up()
+ .exportAsString()));
}
@EJB
@@ -61,7 +63,7 @@ public class TomEEContainerTest {
InputStream is = new URL("http://localhost:" + System.getProperty("tomee.httpPort", "10080") + "/test/ejb").openStream();
ByteArrayOutputStream os = new ByteArrayOutputStream();
- int bytesRead = -1;
+ int bytesRead;
byte[] buffer = new byte[8192];
while ((bytesRead = is.read(buffer)) > -1) {
os.write(buffer, 0, bytesRead);
Modified: openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/src/test/java/org/apache/openejb/arquillian/session/SessionScopeTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/src/test/java/org/apache/openejb/arquillian/session/SessionScopeTest.java?rev=1345765&r1=1345764&r2=1345765&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/src/test/java/org/apache/openejb/arquillian/session/SessionScopeTest.java (original)
+++ openejb/trunk/openejb/arquillian/arquillian-tomee-webapp-remote/src/test/java/org/apache/openejb/arquillian/session/SessionScopeTest.java Sun Jun 3 20:21:52 2012
@@ -28,7 +28,7 @@ import org.jboss.shrinkwrap.api.asset.Em
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.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -44,7 +44,12 @@ public class SessionScopeTest {
@Deployment
public static WebArchive createDeployment() {
- return ShrinkWrap.create(WebArchive.class, "test.war").addClass(PojoSessionScoped.class).addClass(PojoSessionScopedServletWrapper.class).addAsLibraries(new File("target/test-libs/commons-httpclient.jar")).addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml")).setWebXML(new StringAsset(Descriptors.create(WebAppDescriptor.class).version("3.0").servlet(PojoSessionScopedServletWrapper.class, "/session").exportAsString()));
+ return ShrinkWrap.create(WebArchive.class, "test.war").addClass(PojoSessionScoped.class).addClass(PojoSessionScopedServletWrapper.class).addAsLibraries(new File("target/test-libs/commons-httpclient.jar")).addAsWebInfResource(EmptyAsset.INSTANCE, ArchivePaths.create("beans.xml"))
+ .setWebXML(new StringAsset(
+ Descriptors.create(WebAppDescriptor.class).version("3.0")
+ .createServlet().servletName("servlet").servletClass(PojoSessionScopedServletWrapper.class.getName()).up()
+ .createServletMapping().servletName("servlet").urlPattern("/session").up()
+ .exportAsString()));
}
@Test
Modified: openejb/trunk/openejb/arquillian/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/pom.xml?rev=1345765&r1=1345764&r2=1345765&view=diff
==============================================================================
--- openejb/trunk/openejb/arquillian/pom.xml (original)
+++ openejb/trunk/openejb/arquillian/pom.xml Sun Jun 3 20:21:52 2012
@@ -32,11 +32,12 @@
<name>OpenEJB :: Arquillian Adaptors Parent</name>
<properties>
- <version.arquillian>1.0.0.Final</version.arquillian>
<version.cdi-api>1.0</version.cdi-api>
<version.openejb>${openejb.version}</version.openejb>
<version.tomee>1.1.0-SNAPSHOT</version.tomee>
- <version.shrinkwrap.descriptor>1.1.0-beta-1</version.shrinkwrap.descriptor>
+ <version.arquillian>1.0.1.Final</version.arquillian>
+ <version.shrinkwrap.descriptor>2.0.0-alpha-3</version.shrinkwrap.descriptor>
+ <version.shrinkwrap.shrinkwrap>1.0.1</version.shrinkwrap.shrinkwrap>
</properties>
<modules>