Author: rmannibucau
Date: Wed Jun 6 06:56:09 2012
New Revision: 1346762
URL: http://svn.apache.org/viewvc?rev=1346762&view=rev
Log:
specifying version on web.xml
Modified:
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/filterenventry/ServletFilterEnvEntryInjectionTest.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/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
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=1346762&r1=1346761&r2=1346762&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
Wed Jun 6 06:56:09 2012
@@ -31,6 +31,7 @@ import org.jboss.shrinkwrap.api.asset.St
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.shrinkwrap.descriptor.api.Descriptors;
import org.jboss.shrinkwrap.descriptor.api.webapp30.WebAppDescriptor;
+import org.jboss.shrinkwrap.descriptor.api.webcommon30.WebAppVersionType;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -59,6 +60,7 @@ public class ServletCdiInjectionTest {
public static WebArchive createDeployment() {
WebAppDescriptor descriptor =
Descriptors.create(WebAppDescriptor.class)
+ .version(WebAppVersionType._3_0)
.createServlet().servletName("servlet").servletClass(SimpleServlet.class.getName()).up()
.createServletMapping().servletName("servlet").urlPattern("/"
+ TEST_NAME).up();
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=1346762&r1=1346761&r2=1346762&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
Wed Jun 6 06:56:09 2012
@@ -30,6 +30,7 @@ import org.jboss.shrinkwrap.api.asset.St
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.shrinkwrap.descriptor.api.Descriptors;
import org.jboss.shrinkwrap.descriptor.api.webapp30.WebAppDescriptor;
+import org.jboss.shrinkwrap.descriptor.api.webcommon30.WebAppVersionType;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -59,6 +60,7 @@ public class ServletCdiProducerTest {
public static WebArchive createDeployment() {
WebAppDescriptor descriptor =
Descriptors.create(WebAppDescriptor.class)
+ .version(WebAppVersionType._3_0)
.createServlet().servletName("servlet").servletClass(SimpleServlet.class.getName()).up()
.createServletMapping().servletName("servlet").urlPattern("/"
+ TEST_NAME).up();
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=1346762&r1=1346761&r2=1346762&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
Wed Jun 6 06:56:09 2012
@@ -24,6 +24,7 @@ import org.jboss.shrinkwrap.api.asset.St
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.shrinkwrap.descriptor.api.Descriptors;
import org.jboss.shrinkwrap.descriptor.api.webapp30.WebAppDescriptor;
+import org.jboss.shrinkwrap.descriptor.api.webcommon30.WebAppVersionType;
import org.jboss.shrinkwrap.descriptor.spi.node.Node;
import org.jboss.shrinkwrap.descriptor.spi.node.NodeDescriptor;
import org.junit.Test;
@@ -111,6 +112,7 @@ public class ServletEnvEntryInjectionTes
@Deployment(testable = false)
public static WebArchive createDeployment() {
WebAppDescriptor descriptor =
Descriptors.create(WebAppDescriptor.class)
+ .version(WebAppVersionType._3_0)
.createServlet().servletName("servlet").servletClass(PojoServlet.class.getName()).up()
.createServletMapping().servletName("servlet").urlPattern("/"
+ TEST_NAME).up();
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=1346762&r1=1346761&r2=1346762&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
Wed Jun 6 06:56:09 2012
@@ -30,6 +30,7 @@ import org.jboss.shrinkwrap.api.asset.St
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.shrinkwrap.descriptor.api.Descriptors;
import org.jboss.shrinkwrap.descriptor.api.webapp30.WebAppDescriptor;
+import org.jboss.shrinkwrap.descriptor.api.webcommon30.WebAppVersionType;
import org.jboss.shrinkwrap.descriptor.spi.node.Node;
import org.jboss.shrinkwrap.descriptor.spi.node.NodeDescriptor;
import org.junit.Test;
@@ -54,6 +55,7 @@ public class StratocasterTest {
@Deployment(testable = false)
public static WebArchive createDeployment() {
WebAppDescriptor descriptor =
Descriptors.create(WebAppDescriptor.class)
+ .version(WebAppVersionType._3_0)
.createServlet().servletName("servlet").servletClass(Stratocaster.class.getName()).up()
.createServletMapping().servletName("servlet").urlPattern("/"
+ TEST_NAME).up();
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=1346762&r1=1346761&r2=1346762&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
Wed Jun 6 06:56:09 2012
@@ -26,6 +26,7 @@ import org.jboss.shrinkwrap.api.asset.St
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.shrinkwrap.descriptor.api.Descriptors;
import org.jboss.shrinkwrap.descriptor.api.webapp30.WebAppDescriptor;
+import org.jboss.shrinkwrap.descriptor.api.webcommon30.WebAppVersionType;
import org.jboss.shrinkwrap.descriptor.spi.node.Node;
import org.jboss.shrinkwrap.descriptor.spi.node.NodeDescriptor;
import org.junit.Test;
@@ -122,6 +123,7 @@ public class ServletFilterEnvEntryInject
@Deployment(testable = false)
public static WebArchive createDeployment() {
WebAppDescriptor descriptor =
Descriptors.create(WebAppDescriptor.class)
+ .version(WebAppVersionType._3_0)
.createFilter()
.filterName("filter").filterClass(PojoServletFilter.class.getName()).up()
.createFilterMapping()
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=1346762&r1=1346761&r2=1346762&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
Wed Jun 6 06:56:09 2012
@@ -24,6 +24,7 @@ import org.jboss.shrinkwrap.api.asset.St
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.shrinkwrap.descriptor.api.Descriptors;
import org.jboss.shrinkwrap.descriptor.api.webapp30.WebAppDescriptor;
+import org.jboss.shrinkwrap.descriptor.api.webcommon30.WebAppVersionType;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -58,6 +59,7 @@ public class ServletEjbLocalInjectionTes
@Deployment(testable = false)
public static WebArchive createDeployment() {
WebAppDescriptor descriptor =
Descriptors.create(WebAppDescriptor.class)
+ .version(WebAppVersionType._3_0)
.createServlet()
.servletName("check").servletClass(PojoServlet.class.getName()).up()
.createServletMapping()
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=1346762&r1=1346761&r2=1346762&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
Wed Jun 6 06:56:09 2012
@@ -28,6 +28,7 @@ import org.jboss.shrinkwrap.api.asset.St
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.shrinkwrap.descriptor.api.Descriptors;
import org.jboss.shrinkwrap.descriptor.api.webapp30.WebAppDescriptor;
+import org.jboss.shrinkwrap.descriptor.api.webcommon30.WebAppVersionType;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -43,7 +44,7 @@ public class MyFacesExtCdiDeploymentTest
@Deployment(testable = true)
public static WebArchive getArchive() {
- final WebAppDescriptor descriptor =
Descriptors.create(WebAppDescriptor.class);
+ final WebAppDescriptor descriptor =
Descriptors.create(WebAppDescriptor.class).version(WebAppVersionType._3_0);
// 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/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=1346762&r1=1346761&r2=1346762&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
Wed Jun 6 06:56:09 2012
@@ -27,6 +27,7 @@ import org.jboss.shrinkwrap.api.asset.St
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.shrinkwrap.descriptor.api.Descriptors;
import org.jboss.shrinkwrap.descriptor.api.webapp30.WebAppDescriptor;
+import org.jboss.shrinkwrap.descriptor.api.webcommon30.WebAppVersionType;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -59,6 +60,7 @@ public class MultiplePersistenceTest {
@Deployment(testable = false)
public static WebArchive createDeployment() {
WebAppDescriptor descriptor =
Descriptors.create(WebAppDescriptor.class)
+ .version(WebAppVersionType._3_0)
.createServlet()
.servletName("check").servletClass(MultiplePUServlet.class.getName()).up()
.createServletMapping()
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=1346762&r1=1346761&r2=1346762&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
Wed Jun 6 06:56:09 2012
@@ -24,6 +24,7 @@ import org.jboss.shrinkwrap.api.asset.St
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.shrinkwrap.descriptor.api.Descriptors;
import org.jboss.shrinkwrap.descriptor.api.webapp30.WebAppDescriptor;
+import org.jboss.shrinkwrap.descriptor.api.webcommon30.WebAppVersionType;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -52,6 +53,7 @@ public class ServletEjbRemoteTest {
@Deployment(testable = false)
public static WebArchive createDeployment() {
WebAppDescriptor descriptor =
Descriptors.create(WebAppDescriptor.class)
+ .version(WebAppVersionType._3_0)
.createServlet()
.servletName("check").servletClass(RemoteServlet.class.getName()).up()
.createServletMapping()
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=1346762&r1=1346761&r2=1346762&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
Wed Jun 6 06:56:09 2012
@@ -26,6 +26,7 @@ import org.jboss.shrinkwrap.api.asset.St
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.shrinkwrap.descriptor.api.Descriptors;
import org.jboss.shrinkwrap.descriptor.api.webapp30.WebAppDescriptor;
+import org.jboss.shrinkwrap.descriptor.api.webcommon30.WebAppVersionType;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -55,7 +56,7 @@ public class ServletDisposeRequestScopeT
public static WebArchive createDeployment() {
return new WebModule(ServletDisposeRequestScopeTest.class,
ServletDisposeRequestScopeTest.class)
.getArchive()
- .setWebXML(new
StringAsset(Descriptors.create(WebAppDescriptor.class).exportAsString()))
+ .setWebXML(new
StringAsset(Descriptors.create(WebAppDescriptor.class).version(WebAppVersionType._3_0).exportAsString()))
.addAsWebInfResource(EmptyAsset.INSTANCE,
ArchivePaths.create("beans.xml"));
}
