Index: resteasy-cdi-war/src/test/java/org/jboss/resteasy/cdi/test/ResteasyCdiTest.java
===================================================================
--- resteasy-cdi-war/src/test/java/org/jboss/resteasy/cdi/test/ResteasyCdiTest.java	(revision 0)
+++ resteasy-cdi-war/src/test/java/org/jboss/resteasy/cdi/test/ResteasyCdiTest.java	(revision 0)
@@ -0,0 +1,34 @@
+package org.jboss.resteasy.cdi.test;
+
+
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.methods.GetMethod;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertTrue;
+
+public class ResteasyCdiTest
+{
+   private HttpClient client = new HttpClient();
+   public static final String BASE_URI = "http://localhost:8080/resteasy-cdi/";
+   
+   public void testPlainTextReadonlyResource(String uri, String body)
+   {
+      GetMethod get = new GetMethod(uri);
+      get.addRequestHeader("Accept", "text/plain");
+      try
+      {
+         int status = client.executeMethod(get);
+         assertEquals(status, 200);
+         assertTrue(get.getResponseBodyAsString().contains(body));
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException(e);
+      }
+   }
+   
+   public void testPlainTextReadonlyResource(String uri, boolean body)
+   {
+      testPlainTextReadonlyResource(uri, String.valueOf(body));
+   }
+}
Index: resteasy-cdi-war/src/test/java/org/jboss/resteasy/cdi/test/ResourceTest.java
===================================================================
--- resteasy-cdi-war/src/test/java/org/jboss/resteasy/cdi/test/ResourceTest.java	(revision 0)
+++ resteasy-cdi-war/src/test/java/org/jboss/resteasy/cdi/test/ResourceTest.java	(revision 0)
@@ -0,0 +1,53 @@
+package org.jboss.resteasy.cdi.test;
+
+import org.testng.annotations.Test;
+
+public class ResourceTest extends ResteasyCdiTest
+{
+   protected String getTestPrefix()
+   {
+      return "resource/";
+   }
+   
+   @Test
+   public void testCdiFieldInjection()
+   {
+      testPlainTextReadonlyResource(BASE_URI + getTestPrefix() + "fieldInjection", true);
+   }
+   
+   @Test
+   public void testCdiConstructorInjection()
+   {
+      testPlainTextReadonlyResource(BASE_URI + getTestPrefix() + "constructorInjection", true);
+   }
+   
+   @Test
+   public void testCdiInitializerInjection()
+   {
+      testPlainTextReadonlyResource(BASE_URI + getTestPrefix() + "initializerInjection", true);
+   }
+   
+   @Test
+   public void testJaxrsFieldInjection()
+   {
+      testPlainTextReadonlyResource(BASE_URI + getTestPrefix() + "jaxrsFieldInjection", true);
+   }
+   
+   @Test
+   public void testJaxrsFieldInjection2()
+   {
+      testPlainTextReadonlyResource(BASE_URI + getTestPrefix() + "jaxrsFieldInjection2?foo=bar", "bar");
+   }
+   
+   @Test
+   public void testJaxrsSetterInjection()
+   {
+      testPlainTextReadonlyResource(BASE_URI + getTestPrefix() + "jaxrsSetterInjection", true);
+   }
+   
+   @Test
+   public void testJaxrsMethodInjection()
+   {
+      testPlainTextReadonlyResource(BASE_URI + getTestPrefix() + "jaxrsMethodInjection?foo=bar", "bar");
+   }
+}
Index: resteasy-cdi-war/src/test/java/org/jboss/resteasy/cdi/test/ProviderTest.java
===================================================================
--- resteasy-cdi-war/src/test/java/org/jboss/resteasy/cdi/test/ProviderTest.java	(revision 0)
+++ resteasy-cdi-war/src/test/java/org/jboss/resteasy/cdi/test/ProviderTest.java	(revision 0)
@@ -0,0 +1,30 @@
+package org.jboss.resteasy.cdi.test;
+
+import org.testng.annotations.Test;
+
+public class ProviderTest extends ResteasyCdiTest
+{
+   @Test
+   public void testCdiFieldInjection()
+   {
+      testPlainTextReadonlyResource(BASE_URI + "resource/providers", "CDI field injection: true");
+   }
+   
+   @Test
+   public void testCdiConstructorInjection()
+   {
+      testPlainTextReadonlyResource(BASE_URI + "resource/providers", "CDI constructor injection: true");
+   }
+   
+   @Test
+   public void testCdiInitializerInjection()
+   {
+      testPlainTextReadonlyResource(BASE_URI + "resource/providers", "CDI initializer injection: true");
+   }
+   
+   @Test
+   public void testJaxrsFieldInjection()
+   {
+      testPlainTextReadonlyResource(BASE_URI + "resource/providers", "JAX-RS field injection: true");
+   }
+}
Index: resteasy-cdi-war/src/test/java/org/jboss/resteasy/cdi/test/InterceptorTest.java
===================================================================
--- resteasy-cdi-war/src/test/java/org/jboss/resteasy/cdi/test/InterceptorTest.java	(revision 0)
+++ resteasy-cdi-war/src/test/java/org/jboss/resteasy/cdi/test/InterceptorTest.java	(revision 0)
@@ -0,0 +1,12 @@
+package org.jboss.resteasy.cdi.test;
+
+import org.testng.annotations.Test;
+
+public class InterceptorTest extends ResteasyCdiTest
+{
+   @Test
+   public void testInterceptor()
+   {
+      testPlainTextReadonlyResource(BASE_URI + "interceptor", true);
+   }
+}
Index: resteasy-cdi-war/src/test/java/org/jboss/resteasy/cdi/test/AlternativeTest.java
===================================================================
--- resteasy-cdi-war/src/test/java/org/jboss/resteasy/cdi/test/AlternativeTest.java	(revision 0)
+++ resteasy-cdi-war/src/test/java/org/jboss/resteasy/cdi/test/AlternativeTest.java	(revision 0)
@@ -0,0 +1,12 @@
+package org.jboss.resteasy.cdi.test;
+
+import org.testng.annotations.Test;
+
+public class AlternativeTest extends ResteasyCdiTest
+{
+   @Test
+   public void testAlternative()
+   {
+      testPlainTextReadonlyResource(BASE_URI + "alternative", "MockResource");
+   }
+}
Index: resteasy-cdi-war/src/test/java/org/jboss/resteasy/cdi/test/DependentResourceTest.java
===================================================================
--- resteasy-cdi-war/src/test/java/org/jboss/resteasy/cdi/test/DependentResourceTest.java	(revision 0)
+++ resteasy-cdi-war/src/test/java/org/jboss/resteasy/cdi/test/DependentResourceTest.java	(revision 0)
@@ -0,0 +1,10 @@
+package org.jboss.resteasy.cdi.test;
+
+public class DependentResourceTest extends ResourceTest
+{
+   @Override
+   protected String getTestPrefix()
+   {
+      return "dependentResource/";
+   }
+}
Index: resteasy-cdi-war/src/test/resources/testng.xml
===================================================================
--- resteasy-cdi-war/src/test/resources/testng.xml	(revision 0)
+++ resteasy-cdi-war/src/test/resources/testng.xml	(revision 0)
@@ -0,0 +1,24 @@
+<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
+<suite name="RESTEasy-CDI Tests" verbose="0" thread-count="5">
+	<test name="RESTEasy-CDI Tests">
+		<packages>
+			<package name="org.jboss.resteasy.cdi.test"/>
+		</packages>
+		
+		<classes>
+			<!-- WELD-436 -->
+			<class name="org.jboss.resteasy.cdi.test.ResourceTest">
+				<methods>
+					<exclude name="testJaxrsFieldInjection"/>
+					<exclude name="testJaxrsFieldInjection2"/>
+				</methods>
+			</class>
+			<class name="org.jboss.resteasy.cdi.test.ProviderTest">
+				<methods>
+					<exclude name="testJaxrsFieldInjection"/>
+				</methods>
+			</class>
+			
+		</classes>
+	</test>
+</suite>
\ No newline at end of file
Index: resteasy-cdi-war/src/main/java/org/jboss/resteasy/cdi/test/basic/Foo.java
===================================================================
--- resteasy-cdi-war/src/main/java/org/jboss/resteasy/cdi/test/basic/Foo.java	(revision 0)
+++ resteasy-cdi-war/src/main/java/org/jboss/resteasy/cdi/test/basic/Foo.java	(revision 0)
@@ -0,0 +1,22 @@
+package org.jboss.resteasy.cdi.test.basic;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.UriInfo;
+
+@Path("foo")
+@Produces("text/plain")
+public class Foo
+{
+
+   @Context
+   private UriInfo info;
+   
+   @GET
+   public String foo()
+   {
+      return String.valueOf(info);
+   }
+}
Index: resteasy-cdi-war/src/main/java/org/jboss/resteasy/cdi/test/basic/TestResource.java
===================================================================
--- resteasy-cdi-war/src/main/java/org/jboss/resteasy/cdi/test/basic/TestResource.java	(revision 0)
+++ resteasy-cdi-war/src/main/java/org/jboss/resteasy/cdi/test/basic/TestResource.java	(revision 0)
@@ -0,0 +1,113 @@
+package org.jboss.resteasy.cdi.test.basic;
+
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.UriInfo;
+
+import org.jboss.resteasy.cdi.test.Cat;
+import org.jboss.resteasy.cdi.test.Dog;
+
+
+@Path("/resource")
+@Produces("text/plain")
+public class TestResource
+{
+   @Inject
+   private Cat cat;
+   private Cat constructorCat;
+   private Cat initializerCat;
+   @Context
+   private UriInfo uriInfo;
+   @QueryParam("foo") String fieldQuery;
+   private UriInfo setterUriInfo;
+   
+   public TestResource()
+   {
+   }
+
+   @Inject
+   public TestResource(Cat cat)
+   {
+      constructorCat = cat;
+   }
+   
+   @Inject
+   public void init(Cat cat)
+   {
+      initializerCat = cat;
+   }
+
+   @GET
+   @Path("/fieldInjection")
+   public boolean fieldInjection()
+   {
+      return cat != null;
+   }
+   
+   @GET
+   @Path("/jaxrsFieldInjection")
+   public boolean jaxrsFieldInjection()
+   {
+      return uriInfo != null;
+   }
+   
+   @GET
+   @Path("/jaxrsFieldInjection2")
+   public String jaxrsFieldInjection2()
+   {
+      return fieldQuery;
+   }
+   
+   @GET
+   @Path("/jaxrsSetterInjection")
+   public boolean jaxrsSetterInjection()
+   {
+      return setterUriInfo != null;
+   }
+   
+   @GET
+   @Path("/constructorInjection")
+   public boolean constructorInjection()
+   {
+      return constructorCat != null;
+   }
+   
+   @GET
+   @Path("/initializerInjection")
+   public boolean initializerInjection()
+   {
+      return initializerCat != null;
+   }
+   
+   @GET
+   @Path("/jaxrsMethodInjection")
+   public String jaxrsMethodInjection(@QueryParam("foo") String query)
+   {
+      return query;
+   }
+   
+   @GET
+   @Path("/toString")
+   @Override
+   public String toString()
+   {
+      return super.toString();
+   }
+   
+   @GET
+   @Path("/providers")
+   public Dog testProviders()
+   {
+      return new Dog();
+   }
+   
+   @Context
+   public void setSetterUriInfo(UriInfo setterUriInfo)
+   {
+      this.setterUriInfo = setterUriInfo;
+   }
+}
Index: resteasy-cdi-war/src/main/java/org/jboss/resteasy/cdi/test/basic/TestProvider.java
===================================================================
--- resteasy-cdi-war/src/main/java/org/jboss/resteasy/cdi/test/basic/TestProvider.java	(revision 0)
+++ resteasy-cdi-war/src/main/java/org/jboss/resteasy/cdi/test/basic/TestProvider.java	(revision 0)
@@ -0,0 +1,71 @@
+package org.jboss.resteasy.cdi.test.basic;
+
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+
+import javax.inject.Inject;
+import javax.ws.rs.Produces;
+import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.ext.MessageBodyWriter;
+import javax.ws.rs.ext.Provider;
+import javax.ws.rs.ext.Providers;
+
+import org.jboss.resteasy.cdi.test.Cat;
+import org.jboss.resteasy.cdi.test.Dog;
+
+@Provider
+@Produces("text/plain")
+public class TestProvider implements MessageBodyWriter<Dog>
+{
+
+   @Inject
+   private Cat cat;
+   private Cat constructorCat;
+   private Cat initializerCat;
+   @Context
+   private Providers providers;
+   
+   public TestProvider()
+   {
+   }
+
+   @Inject
+   public TestProvider(Cat cat)
+   {
+      constructorCat = cat;
+   }
+   
+   @Inject
+   public void init(Cat cat)
+   {
+      initializerCat = cat;
+   }
+   
+   public long getSize(Dog t, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType)
+   {
+      return -1;
+   }
+
+   public boolean isWriteable(Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType)
+   {
+      return type.isAssignableFrom(Dog.class);
+   }
+
+   public void writeTo(Dog t, Class<?> type, Type genericType, Annotation[] annotations, MediaType mediaType, MultivaluedMap<String, Object> httpHeaders, OutputStream entityStream) throws IOException, WebApplicationException
+   {
+      BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(entityStream));
+      bw.write("CDI field injection: " + (cat != null));
+      bw.write("\nCDI constructor injection: " + (constructorCat != null));
+      bw.write("\nCDI initializer injection: " + (initializerCat != null));
+      bw.write("\nJAX-RS field injection: " + (providers != null));
+      bw.write("\nProvider toString(): " + toString());
+      bw.flush();
+   }
+}
Index: resteasy-cdi-war/src/main/java/org/jboss/resteasy/cdi/test/basic/DependentTestResource.java
===================================================================
--- resteasy-cdi-war/src/main/java/org/jboss/resteasy/cdi/test/basic/DependentTestResource.java	(revision 0)
+++ resteasy-cdi-war/src/main/java/org/jboss/resteasy/cdi/test/basic/DependentTestResource.java	(revision 0)
@@ -0,0 +1,115 @@
+package org.jboss.resteasy.cdi.test.basic;
+
+import javax.enterprise.context.Dependent;
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.UriInfo;
+
+import org.jboss.resteasy.cdi.test.Cat;
+import org.jboss.resteasy.cdi.test.Dog;
+
+
+@Path("/dependentResource")
+@Produces("text/plain")
+@Dependent
+public class DependentTestResource
+{
+   @Inject
+   private Cat cat;
+   private Cat constructorCat;
+   private Cat initializerCat;
+   @Context
+   private UriInfo uriInfo;
+   @QueryParam("foo") String fieldQuery;
+   private UriInfo setterUriInfo;
+   
+   public DependentTestResource()
+   {
+   }
+
+   @Inject
+   public DependentTestResource(Cat cat)
+   {
+      constructorCat = cat;
+   }
+   
+   @Inject
+   public void init(Cat cat)
+   {
+      initializerCat = cat;
+   }
+
+   @GET
+   @Path("/fieldInjection")
+   public boolean fieldInjection()
+   {
+      return cat != null;
+   }
+   
+   @GET
+   @Path("/jaxrsFieldInjection")
+   public boolean jaxrsFieldInjection()
+   {
+      return uriInfo != null;
+   }
+   
+   @GET
+   @Path("/jaxrsFieldInjection2")
+   public String jaxrsFieldInjection2()
+   {
+      return fieldQuery;
+   }
+   
+   @GET
+   @Path("/jaxrsSetterInjection")
+   public boolean jaxrsSetterInjection()
+   {
+      return setterUriInfo != null;
+   }
+   
+   @GET
+   @Path("/constructorInjection")
+   public boolean constructorInjection()
+   {
+      return constructorCat != null;
+   }
+   
+   @GET
+   @Path("/initializerInjection")
+   public boolean initializerInjection()
+   {
+      return initializerCat != null;
+   }
+   
+   @GET
+   @Path("/jaxrsMethodInjection")
+   public String jaxrsMethodInjection(@QueryParam("foo") String query)
+   {
+      return query;
+   }
+   
+   @GET
+   @Path("/toString")
+   @Override
+   public String toString()
+   {
+      return super.toString();
+   }
+   
+   @GET
+   @Path("/providers")
+   public Dog testProviders()
+   {
+      return new Dog();
+   }
+   
+   @Context
+   public void setSetterUriInfo(UriInfo setterUriInfo)
+   {
+      this.setterUriInfo = setterUriInfo;
+   }
+}
Index: resteasy-cdi-war/src/main/java/org/jboss/resteasy/cdi/test/Cat.java
===================================================================
--- resteasy-cdi-war/src/main/java/org/jboss/resteasy/cdi/test/Cat.java	(revision 0)
+++ resteasy-cdi-war/src/main/java/org/jboss/resteasy/cdi/test/Cat.java	(revision 0)
@@ -0,0 +1,6 @@
+package org.jboss.resteasy.cdi.test;
+
+public class Cat
+{
+
+}
Index: resteasy-cdi-war/src/main/java/org/jboss/resteasy/cdi/test/Dog.java
===================================================================
--- resteasy-cdi-war/src/main/java/org/jboss/resteasy/cdi/test/Dog.java	(revision 0)
+++ resteasy-cdi-war/src/main/java/org/jboss/resteasy/cdi/test/Dog.java	(revision 0)
@@ -0,0 +1,6 @@
+package org.jboss.resteasy.cdi.test;
+
+public class Dog
+{
+
+}
Index: resteasy-cdi-war/src/main/java/org/jboss/resteasy/cdi/test/alternative/MockResource.java
===================================================================
--- resteasy-cdi-war/src/main/java/org/jboss/resteasy/cdi/test/alternative/MockResource.java	(revision 0)
+++ resteasy-cdi-war/src/main/java/org/jboss/resteasy/cdi/test/alternative/MockResource.java	(revision 0)
@@ -0,0 +1,17 @@
+package org.jboss.resteasy.cdi.test.alternative;
+
+import javax.enterprise.inject.Alternative;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+
+@Path("/alternative")
+@Alternative
+public class MockResource extends ProductionResource
+{
+   @Override
+   @GET
+   public String getValue()
+   {
+      return "MockResource";
+   }
+}
Index: resteasy-cdi-war/src/main/java/org/jboss/resteasy/cdi/test/alternative/ProductionResource.java
===================================================================
--- resteasy-cdi-war/src/main/java/org/jboss/resteasy/cdi/test/alternative/ProductionResource.java	(revision 0)
+++ resteasy-cdi-war/src/main/java/org/jboss/resteasy/cdi/test/alternative/ProductionResource.java	(revision 0)
@@ -0,0 +1,16 @@
+package org.jboss.resteasy.cdi.test.alternative;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+
+@Path("/alternative")
+@Produces("text/plain")
+public class ProductionResource
+{
+   @GET
+   public String getValue()
+   {
+      return "ProductionResource";
+   }
+}
Index: resteasy-cdi-war/src/main/java/org/jboss/resteasy/cdi/test/interceptor/TestResource.java
===================================================================
--- resteasy-cdi-war/src/main/java/org/jboss/resteasy/cdi/test/interceptor/TestResource.java	(revision 0)
+++ resteasy-cdi-war/src/main/java/org/jboss/resteasy/cdi/test/interceptor/TestResource.java	(revision 0)
@@ -0,0 +1,17 @@
+package org.jboss.resteasy.cdi.test.interceptor;
+
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+
+@Path("/interceptor")
+@Produces("text/plain")
+@TestInterceptorBinding
+public class TestResource
+{
+   @GET
+   public boolean getValue()
+   {
+      return false;
+   }
+}
Index: resteasy-cdi-war/src/main/java/org/jboss/resteasy/cdi/test/interceptor/TestInterceptorBinding.java
===================================================================
--- resteasy-cdi-war/src/main/java/org/jboss/resteasy/cdi/test/interceptor/TestInterceptorBinding.java	(revision 0)
+++ resteasy-cdi-war/src/main/java/org/jboss/resteasy/cdi/test/interceptor/TestInterceptorBinding.java	(revision 0)
@@ -0,0 +1,19 @@
+package org.jboss.resteasy.cdi.test.interceptor;
+
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.Target;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.ElementType.METHOD;
+
+import javax.interceptor.InterceptorBinding;
+
+
+@InterceptorBinding
+@Target( { TYPE, METHOD } )
+@Retention(RUNTIME)
+@Inherited
+public @interface TestInterceptorBinding
+{
+}
Index: resteasy-cdi-war/src/main/java/org/jboss/resteasy/cdi/test/interceptor/TestInterceptor.java
===================================================================
--- resteasy-cdi-war/src/main/java/org/jboss/resteasy/cdi/test/interceptor/TestInterceptor.java	(revision 0)
+++ resteasy-cdi-war/src/main/java/org/jboss/resteasy/cdi/test/interceptor/TestInterceptor.java	(revision 0)
@@ -0,0 +1,17 @@
+package org.jboss.resteasy.cdi.test.interceptor;
+
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+
+@Interceptor
+@TestInterceptorBinding
+public class TestInterceptor
+{
+   @AroundInvoke
+   public Object intercept(InvocationContext ctx) throws Exception
+   {
+      // Do a negation
+      return !((Boolean) ctx.proceed());
+   }
+}
Index: resteasy-cdi-war/src/main/webapp/WEB-INF/beans.xml
===================================================================
--- resteasy-cdi-war/src/main/webapp/WEB-INF/beans.xml	(revision 0)
+++ resteasy-cdi-war/src/main/webapp/WEB-INF/beans.xml	(revision 0)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+   The contents of this file is permitted to be empty.
+   The schema definition is provided for your convenience.
+-->
+<beans xmlns="http://java.sun.com/xml/ns/javaee"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="
+      http://java.sun.com/xml/ns/javaee 
+      http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
+      
+	<alternatives>
+		<class>org.jboss.resteasy.cdi.test.alternative.MockResource</class>
+	</alternatives>
+	<interceptors>
+		<class>org.jboss.resteasy.cdi.test.interceptor.TestInterceptor</class>
+	</interceptors>
+      
+</beans>
Index: resteasy-cdi-war/src/main/webapp/WEB-INF/web.xml
===================================================================
--- resteasy-cdi-war/src/main/webapp/WEB-INF/web.xml	(revision 0)
+++ resteasy-cdi-war/src/main/webapp/WEB-INF/web.xml	(revision 0)
@@ -0,0 +1,33 @@
+<!DOCTYPE web-app PUBLIC
+        "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+        "http://java.sun.com/dtd/web-app_2_3.dtd" >
+
+<web-app>
+    <display-name>RESTEasy-CDI testing application</display-name>
+
+    <context-param>
+        <param-name>resteasy.scan</param-name>
+        <param-value>true</param-value>
+    </context-param>
+
+    <context-param>
+    	<param-name>resteasy.use.deployment.sensitive.factory</param-name>
+    	<param-value>true</param-value>
+    </context-param>
+
+    <listener>
+        <listener-class>org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap</listener-class>
+    </listener>
+
+    <servlet>
+        <servlet-name>Resteasy</servlet-name>
+        <servlet-class>org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher</servlet-class>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>Resteasy</servlet-name>
+        <url-pattern>/*</url-pattern>
+    </servlet-mapping>
+
+
+</web-app>
Index: resteasy-cdi-war/pom.xml
===================================================================
--- resteasy-cdi-war/pom.xml	(revision 0)
+++ resteasy-cdi-war/pom.xml	(revision 0)
@@ -0,0 +1,172 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.jboss.resteasy</groupId>
+		<artifactId>resteasy-jaxrs-all</artifactId>
+		<version>2.0-beta-2-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>resteasy-cdi-war</artifactId>
+	<packaging>war</packaging>
+	<name>RESTEasy-CDI testing application</name>
+
+	<dependencies>
+
+		<dependency>
+			<groupId>org.jboss.resteasy</groupId>
+			<artifactId>jaxrs-api</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.jboss.resteasy</groupId>
+			<artifactId>resteasy-jaxrs</artifactId>
+			<version>${project.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>javassist</groupId>
+					<artifactId>javassist</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.apache.httpcomponents</groupId>
+					<artifactId>httpclient</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>javax.activation</groupId>
+					<artifactId>activation</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>net.jcip</groupId>
+					<artifactId>jcip-annotations</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+		<dependency>
+			<groupId>org.jboss.resteasy</groupId>
+			<artifactId>resteasy-cdi</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>javax.enterprise</groupId>
+			<artifactId>cdi-api</artifactId>
+			<version>1.0</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>javax.annotation</groupId>
+			<artifactId>jsr250-api</artifactId>
+			<version>1.0</version>
+			<scope>provided</scope>
+		</dependency>
+
+		<!-- HTTP Client -->
+		<dependency>
+			<groupId>commons-httpclient</groupId>
+			<artifactId>commons-httpclient</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>jcl-over-slf4j</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-simple</artifactId>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.testng</groupId>
+			<artifactId>testng</artifactId>
+			<classifier>jdk15</classifier>
+			<version>5.10</version>
+			<scope>test</scope>
+		</dependency>
+
+	</dependencies>
+
+	<build>
+		<finalName>resteasy-cdi</finalName>
+		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>jboss-maven-plugin</artifactId>
+				<version>1.4</version>
+				<configuration>
+					<jbossHome>${jboss.home}</jbossHome>
+				</configuration>
+				<executions>
+					<execution>
+						<id>jboss-deploy</id>
+						<phase>pre-integration-test</phase>
+						<goals>
+							<goal>deploy</goal>
+						</goals>
+						<configuration>
+							<fileNames>
+								<fileName>${basedir}/target/${build.finalName}.war</fileName>
+							</fileNames>
+						</configuration>
+					</execution>
+					<execution>
+						<id>jboss-undeploy</id>
+						<phase>post-integration-test</phase>
+						<goals>
+							<goal>undeploy</goal>
+						</goals>
+						<configuration>
+							<fileNames>
+								<fileName>${basedir}/target/${build.finalName}.war</fileName>
+							</fileNames>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+				<executions>
+					<execution>
+						<id>surefire-it</id>
+						<phase>integration-test</phase>
+						<goals>
+							<goal>test</goal>
+						</goals>
+						<configuration>
+							<skip>false</skip>
+							<suiteXmlFiles>
+								<suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile>
+							</suiteXmlFiles>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.5</source>
+					<target>1.5</target>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>