WBRi-306, policy support, and remove remaining deployment types

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@3390 1c488680-804c-0410-94cd-c6b725194a0e

api/src/main/java/javax/enterprise/inject/Policy.java

@@ -17,6 +17,8 @@
 
 package javax.enterprise.inject;
 
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
@@ -31,7 +33,7 @@
  * @author Pete Muir
  */
 
-@Target(TYPE)
+@Target({TYPE, METHOD, FIELD})
 @Retention(RUNTIME)
 @Documented
 public @interface Policy

api/src/main/java/javax/enterprise/inject/spi/Bean.java

@@ -47,14 +47,6 @@ public interface Bean<T> extends Contextual<T>
     */
    public Class<? extends Annotation> getScopeType();
 
-   /**
-    * The deployment type of a bean
-    * @deprecated
-    * 
-    * @return the deployment type
-    */
-   public Class<? extends Annotation> getDeploymentType();
-
    /**
     * The name of a bean
     * 

api/src/main/java/javax/enterprise/inject/spi/BeanManager.java

@@ -28,7 +28,6 @@
 import javax.enterprise.context.spi.Context;
 import javax.enterprise.context.spi.Contextual;
 import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.event.Observer;
 import javax.enterprise.inject.AmbiguousResolutionException;
 import javax.enterprise.inject.UnsatisfiedResolutionException;
 
@@ -301,14 +300,6 @@ public interface BeanManager
    @Deprecated
    public void addBean(Bean<?> bean);
 
-   /**
-    * Exposes the list of enabled deployment types, in order of lower to higher
-    * precedence, This method may be used by portable extensions to discover
-    * information about the deployment.
-    */
-   @Deprecated
-   public List<Class<? extends Annotation>> getEnabledDeploymentTypes();
-
    /**
     * Associate a custom Context with a scope.
     *