Index: resteasy-cdi/src/main/java/org/jboss/resteasy/cdi/AnnotatedTypeWrapper.java
===================================================================
--- resteasy-cdi/src/main/java/org/jboss/resteasy/cdi/AnnotatedTypeWrapper.java	(revision 0)
+++ resteasy-cdi/src/main/java/org/jboss/resteasy/cdi/AnnotatedTypeWrapper.java	(revision 0)
@@ -0,0 +1,80 @@
+package org.jboss.resteasy.cdi;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Type;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.enterprise.inject.spi.AnnotatedConstructor;
+import javax.enterprise.inject.spi.AnnotatedField;
+import javax.enterprise.inject.spi.AnnotatedMethod;
+import javax.enterprise.inject.spi.AnnotatedType;
+
+/**
+ * This wrapper allows additional metadata to be added during bootstrap.
+ * 
+ * @author Jozef Hartinger
+ * 
+ * @see org.jboss.resteasy.cdi.stereotype.ApplicationScopedJaxrsComponent
+ * @see org.jboss.resteasy.cdi.stereotype.RequestScopedJaxrsComponent
+ *
+ */
+public class AnnotatedTypeWrapper<TYPE> implements AnnotatedType<TYPE>
+{
+
+   private AnnotatedType<TYPE> delegate;
+   private Set<Annotation> annotations = new HashSet<Annotation>();
+   
+   public AnnotatedTypeWrapper(AnnotatedType<TYPE> delegate, Annotation scope)
+   {
+      this.delegate = delegate;
+      this.annotations.addAll(delegate.getAnnotations());
+      this.annotations.add(scope);
+   }
+
+   public Set<AnnotatedConstructor<TYPE>> getConstructors()
+   {
+      return delegate.getConstructors();
+   }
+
+   public Set<AnnotatedField<? super TYPE>> getFields()
+   {
+      return delegate.getFields();
+   }
+
+   public Class<TYPE> getJavaClass()
+   {
+      return delegate.getJavaClass();
+   }
+
+   public Set<AnnotatedMethod<? super TYPE>> getMethods()
+   {
+      return delegate.getMethods();
+   }
+
+   public <T extends Annotation> T getAnnotation(Class<T> annotationType)
+   {
+      return delegate.getAnnotation(annotationType);
+   }
+
+   public Set<Annotation> getAnnotations()
+   {
+      return Collections.unmodifiableSet(annotations);
+   }
+
+   public Type getBaseType()
+   {
+      return delegate.getBaseType();
+   }
+
+   public Set<Type> getTypeClosure()
+   {
+      return delegate.getTypeClosure();
+   }
+
+   public boolean isAnnotationPresent(Class<? extends Annotation> annotationType)
+   {
+      return delegate.isAnnotationPresent(annotationType);
+   }
+}
Index: resteasy-cdi/src/main/java/org/jboss/resteasy/cdi/CdiConstructorInjector.java
===================================================================
--- resteasy-cdi/src/main/java/org/jboss/resteasy/cdi/CdiConstructorInjector.java	(revision 0)
+++ resteasy-cdi/src/main/java/org/jboss/resteasy/cdi/CdiConstructorInjector.java	(revision 0)
@@ -0,0 +1,82 @@
+package org.jboss.resteasy.cdi;
+
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
+import javax.enterprise.context.spi.CreationalContext;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.ws.rs.WebApplicationException;
+
+import org.jboss.resteasy.spi.ApplicationException;
+import org.jboss.resteasy.spi.ConstructorInjector;
+import org.jboss.resteasy.spi.Failure;
+import org.jboss.resteasy.spi.HttpRequest;
+import org.jboss.resteasy.spi.HttpResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * This ConstructorInjector implementation uses CDI's BeanManager to obtain
+ * a contextual instance of a bean.
+ * 
+ * @author Jozef Hartinger
+ *
+ */
+public class CdiConstructorInjector implements ConstructorInjector
+{
+
+   private BeanManager manager;
+   private Class<?> clazz;
+   private static final Logger log = LoggerFactory.getLogger(CdiConstructorInjector.class);
+
+   public CdiConstructorInjector(Class<?> clazz, BeanManager manager)
+   {
+      this.clazz = clazz;
+      this.manager = manager;
+   }
+
+   public Object construct()
+   {
+      Set<Bean<?>> beans = manager.getBeans(clazz);
+      
+      if (beans.size() > 1)
+      {
+         Set<Bean<?>> modifiableBeans = new HashSet<Bean<?>>();
+         modifiableBeans.addAll(beans);
+         // Ambiguous dependency may occur if a resource has subclasses
+         // Therefore we remove those beans
+         for (Iterator<Bean<?>> iterator = modifiableBeans.iterator(); iterator.hasNext();)
+         {
+            if (!iterator.next().getBeanClass().equals(clazz))
+            {
+               // remove Beans that have clazz in their type closure but not as a base class
+               iterator.remove(); 
+            }
+         }
+         beans = modifiableBeans;
+      }
+      
+      log.debug("Beans found for class {} : {}", clazz.getCanonicalName(), beans);
+      
+      Bean<?> bean = manager.resolve(beans);
+      CreationalContext<?> context = manager.createCreationalContext(bean);
+      return manager.getReference(bean, clazz, context);
+   }
+
+   public Object construct(HttpRequest request, HttpResponse response) throws Failure, WebApplicationException, ApplicationException
+   {
+      return construct();
+   }
+
+   public Object[] injectableArguments()
+   {
+      return new Object[0];
+   }
+
+   public Object[] injectableArguments(HttpRequest request, HttpResponse response) throws Failure
+   {
+      return injectableArguments();
+   }
+}
Index: resteasy-cdi/src/main/java/org/jboss/resteasy/cdi/stereotype/RequestScopedJaxrsComponent.java
===================================================================
--- resteasy-cdi/src/main/java/org/jboss/resteasy/cdi/stereotype/RequestScopedJaxrsComponent.java	(revision 0)
+++ resteasy-cdi/src/main/java/org/jboss/resteasy/cdi/stereotype/RequestScopedJaxrsComponent.java	(revision 0)
@@ -0,0 +1,20 @@
+package org.jboss.resteasy.cdi.stereotype;
+
+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 javax.enterprise.context.RequestScoped;
+import javax.enterprise.inject.Stereotype;
+
+import org.jboss.resteasy.cdi.JaxrsFieldInjectionInterceptorBinding;
+
+@Target( { TYPE } )
+@Retention(RUNTIME)
+@RequestScoped
+@JaxrsFieldInjectionInterceptorBinding
+@Stereotype
+public @interface RequestScopedJaxrsComponent
+{
+}
Index: resteasy-cdi/src/main/java/org/jboss/resteasy/cdi/stereotype/ApplicationScopedJaxrsComponent.java
===================================================================
--- resteasy-cdi/src/main/java/org/jboss/resteasy/cdi/stereotype/ApplicationScopedJaxrsComponent.java	(revision 0)
+++ resteasy-cdi/src/main/java/org/jboss/resteasy/cdi/stereotype/ApplicationScopedJaxrsComponent.java	(revision 0)
@@ -0,0 +1,20 @@
+package org.jboss.resteasy.cdi.stereotype;
+
+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 javax.enterprise.context.ApplicationScoped;
+import javax.enterprise.inject.Stereotype;
+
+import org.jboss.resteasy.cdi.JaxrsFieldInjectionInterceptorBinding;
+
+@Target( { TYPE } )
+@Retention(RUNTIME)
+@ApplicationScoped
+@JaxrsFieldInjectionInterceptorBinding
+@Stereotype
+public @interface ApplicationScopedJaxrsComponent
+{
+}
Index: resteasy-cdi/src/main/java/org/jboss/resteasy/cdi/CdiInjectorFactory.java
===================================================================
--- resteasy-cdi/src/main/java/org/jboss/resteasy/cdi/CdiInjectorFactory.java	(revision 0)
+++ resteasy-cdi/src/main/java/org/jboss/resteasy/cdi/CdiInjectorFactory.java	(revision 0)
@@ -0,0 +1,64 @@
+package org.jboss.resteasy.cdi;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AccessibleObject;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.lang.reflect.Type;
+
+import javax.enterprise.inject.spi.BeanManager;
+import org.jboss.resteasy.core.ValueInjector;
+import org.jboss.resteasy.spi.ConstructorInjector;
+import org.jboss.resteasy.spi.InjectorFactory;
+import org.jboss.resteasy.spi.MethodInjector;
+import org.jboss.resteasy.spi.PropertyInjector;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * 
+ * @author Jozef Hartinger
+ *
+ */
+public class CdiInjectorFactory implements InjectorFactory
+{
+   private static final Logger log = LoggerFactory.getLogger(CdiInjectorFactory.class);
+   private InjectorFactory delegate;
+   private BeanManager manager;
+
+   public CdiInjectorFactory(InjectorFactory delegate, BeanManager manager)
+   {
+      this.manager = manager;
+      this.delegate = delegate;
+   }
+
+   public ConstructorInjector createConstructor(Constructor constructor)
+   {
+      if (manager.getBeans(constructor.getDeclaringClass()).isEmpty())
+      {
+         log.debug("No CDI beans found for {}. Using default ConstructorInjector.", constructor.getDeclaringClass());
+         return delegate.createConstructor(constructor);
+      }
+      else
+      {
+         return new CdiConstructorInjector(constructor.getDeclaringClass(), manager);
+      }
+   }
+
+   public MethodInjector createMethodInjector(Class root, Method method)
+   {
+      return delegate.createMethodInjector(root, method);
+   }
+
+   public PropertyInjector createPropertyInjector(Class resourceClass)
+   {
+      // TODO This is currently called twice for CDI beans. Firstly by JaxrsFieldInjectionInterceptor
+      // and the other time by RESTEasy's injection mechanism.
+      return delegate.createPropertyInjector(resourceClass);
+   }
+
+   public ValueInjector createParameterExtractor(Class injectTargetClass, AccessibleObject injectTarget, Class type, Type genericType, Annotation[] annotations)
+   {
+      return delegate.createParameterExtractor(injectTargetClass, injectTarget, type, genericType, annotations);
+   }
+}
Index: resteasy-cdi/src/main/java/org/jboss/resteasy/cdi/JaxrsFieldInjectionInterceptorBinding.java
===================================================================
--- resteasy-cdi/src/main/java/org/jboss/resteasy/cdi/JaxrsFieldInjectionInterceptorBinding.java	(revision 0)
+++ resteasy-cdi/src/main/java/org/jboss/resteasy/cdi/JaxrsFieldInjectionInterceptorBinding.java	(revision 0)
@@ -0,0 +1,24 @@
+package org.jboss.resteasy.cdi;
+
+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 javax.interceptor.InterceptorBinding;
+
+/**
+ * Interceptor binding for JaxrsFieldInjectionInterceptor. This interceptor binding
+ * is added to JAX-RS components by default.
+ * @author Jozef Hartinger
+ *
+ * @see JaxrsFieldInjectionInterceptor
+ */
+@InterceptorBinding
+@Target( { TYPE } )
+@Retention(RUNTIME)
+@Inherited
+public @interface JaxrsFieldInjectionInterceptorBinding
+{
+}
Index: resteasy-cdi/src/main/java/org/jboss/resteasy/cdi/JaxrsFieldInjectionInterceptor.java
===================================================================
--- resteasy-cdi/src/main/java/org/jboss/resteasy/cdi/JaxrsFieldInjectionInterceptor.java	(revision 0)
+++ resteasy-cdi/src/main/java/org/jboss/resteasy/cdi/JaxrsFieldInjectionInterceptor.java	(revision 0)
@@ -0,0 +1,50 @@
+package org.jboss.resteasy.cdi;
+
+import javax.annotation.PostConstruct;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+
+import org.jboss.resteasy.spi.HttpRequest;
+import org.jboss.resteasy.spi.HttpResponse;
+import org.jboss.resteasy.spi.PropertyInjector;
+import org.jboss.resteasy.spi.ResteasyProviderFactory;
+
+/**
+ * RESTEasy property injection does not work for CDI proxies. It injects these proxies
+ * instead of an underlying objects. Therefore this interceptor , which performs JAX-RS
+ * property injection, is needed.  
+ *
+ * @author Jozef Hartinger
+ */
+@Interceptor
+@JaxrsFieldInjectionInterceptorBinding
+public class JaxrsFieldInjectionInterceptor
+{
+   @PostConstruct
+   public void intercept(InvocationContext ctx)
+   {
+      Object target = ctx.getTarget();
+      ResteasyProviderFactory factory = ResteasyProviderFactory.getInstance();
+      PropertyInjector injector = factory.getInjectorFactory().createPropertyInjector(target.getClass());
+
+      HttpRequest request = ResteasyProviderFactory.getContextData(HttpRequest.class);
+      HttpResponse response = ResteasyProviderFactory.getContextData(HttpResponse.class);
+
+      if ((request != null) && (response != null))
+      {
+         injector.inject(request, response, target);
+      }
+      else
+      {
+         injector.inject(target);
+      }
+      try
+      {
+         ctx.proceed();
+      }
+      catch (Exception e)
+      {
+         throw new RuntimeException();
+      }
+   }
+}
Index: resteasy-cdi/src/main/java/org/jboss/resteasy/cdi/Bootstrap.java
===================================================================
--- resteasy-cdi/src/main/java/org/jboss/resteasy/cdi/Bootstrap.java	(revision 0)
+++ resteasy-cdi/src/main/java/org/jboss/resteasy/cdi/Bootstrap.java	(revision 0)
@@ -0,0 +1,90 @@
+package org.jboss.resteasy.cdi;
+
+import java.lang.annotation.Annotation;
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.AfterBeanDiscovery;
+import javax.enterprise.inject.spi.AnnotatedType;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.Extension;
+import javax.enterprise.inject.spi.ProcessAnnotatedType;
+import javax.enterprise.util.AnnotationLiteral;
+import javax.ws.rs.core.Application;
+import javax.ws.rs.ext.Provider;
+
+import org.jboss.resteasy.cdi.stereotype.ApplicationScopedJaxrsComponent;
+import org.jboss.resteasy.cdi.stereotype.RequestScopedJaxrsComponent;
+import org.jboss.resteasy.spi.InjectorFactory;
+import org.jboss.resteasy.spi.ResteasyProviderFactory;
+import org.jboss.resteasy.util.GetRestful;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * This Extension registers CdiInjectorFactory with RESTEasy and adds
+ * a default scoped and interceptor binding to discovered JAX-RS resources,
+ * providers and Application subclasses.
+ * 
+ * @author Jozef Hartinger
+ * 
+ */
+public class Bootstrap implements Extension
+{
+   public static final Logger log = LoggerFactory.getLogger(Bootstrap.class);
+   
+   // Stereotypes
+   public static final Annotation requestScopedJaxrsComponentStereotype = new AnnotationLiteral<RequestScopedJaxrsComponent>()
+   {
+      private static final long serialVersionUID = -4530734209482668662L;
+   };
+   public static final Annotation applicationScopedJaxrsComponentStereotype = new AnnotationLiteral<ApplicationScopedJaxrsComponent>()
+   {
+      private static final long serialVersionUID = -5697607605643346819L;
+   };
+
+   /**
+    * Register CdiInjectorFactory with RESTEasy
+    * 
+    */
+   public void observeAfterBeanDiscovery(@Observes AfterBeanDiscovery afterBeanDiscovery, BeanManager manager)
+   {
+      log.debug("Registering CdiInjectorFactory.");
+      ResteasyProviderFactory providerFactory = ResteasyProviderFactory.getInstance();
+      InjectorFactory delegate = providerFactory.getInjectorFactory();
+
+      InjectorFactory injectorFactory = new CdiInjectorFactory(delegate, manager);
+      providerFactory.setInjectorFactory(injectorFactory);
+   }
+
+   /**
+    * Add a default scope and an interceptor binding for each CDI bean which is
+    * a JAX-RS Resource, Provider or Application subclass.
+    * 
+    */
+   public <T> void observeResources(@Observes ProcessAnnotatedType<T> event)
+   {
+      AnnotatedType<T> type = event.getAnnotatedType();
+
+      Provider providerAnnotation = type.getAnnotation(Provider.class);
+
+      if (providerAnnotation != null)
+      {
+         log.debug("Discovered CDI bean which is a JAX-RS provider {}. Adding @ApplicationScopedJaxrsComponent stereotype.", type.getJavaClass().getCanonicalName());
+         event.setAnnotatedType(wrapAnnotatedType(type, applicationScopedJaxrsComponentStereotype));
+      }
+      else if (GetRestful.isRootResource(type.getJavaClass()))
+      {
+         log.debug("Discovered CDI bean which is a JAX-RS resource {}. Adding @RequestScopedJaxrsComponent stereotype.", type.getJavaClass().getCanonicalName());
+         event.setAnnotatedType(wrapAnnotatedType(type, requestScopedJaxrsComponentStereotype));
+      }
+      else if (Application.class.isAssignableFrom(type.getJavaClass()))
+      {
+         log.debug("Discovered CDI bean which is javax.ws.rs.core.Application subclass {}. Adding @ApplicationScopedJaxrsComponent stereotype.", type.getJavaClass().getCanonicalName());
+         event.setAnnotatedType(wrapAnnotatedType(type, applicationScopedJaxrsComponentStereotype));
+      }
+   }
+
+   protected <T> AnnotatedType<T> wrapAnnotatedType(AnnotatedType<T> type, Annotation stereotype)
+   {
+      return new AnnotatedTypeWrapper<T>(type, stereotype);
+   }
+}
Index: resteasy-cdi/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension
===================================================================
--- resteasy-cdi/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension	(revision 0)
+++ resteasy-cdi/src/main/resources/META-INF/services/javax.enterprise.inject.spi.Extension	(revision 0)
@@ -0,0 +1 @@
+org.jboss.resteasy.cdi.Bootstrap
\ No newline at end of file
Index: resteasy-cdi/src/main/resources/META-INF/beans.xml
===================================================================
--- resteasy-cdi/src/main/resources/META-INF/beans.xml	(revision 0)
+++ resteasy-cdi/src/main/resources/META-INF/beans.xml	(revision 0)
@@ -0,0 +1,13 @@
+<?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">
+	<interceptors>
+		<class>org.jboss.resteasy.cdi.JaxrsFieldInjectionInterceptor</class>
+	</interceptors>
+</beans>
Index: resteasy-cdi/pom.xml
===================================================================
--- resteasy-cdi/pom.xml	(revision 0)
+++ resteasy-cdi/pom.xml	(revision 0)
@@ -0,0 +1,46 @@
+<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</artifactId>
+	<name>RESTEasy CDI integration</name>
+	<packaging>jar</packaging>
+	<dependencies>
+		<dependency>
+			<groupId>org.jboss.resteasy</groupId>
+			<artifactId>jaxrs-api</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>javax.enterprise</groupId>
+			<artifactId>cdi-api</artifactId>
+			<scope>provided</scope>
+			<version>1.0</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.jboss.resteasy</groupId>
+			<artifactId>resteasy-jaxrs</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+	</dependencies>
+
+</project>
+