create util package

weld · Oct 29, 2009 · 12e0f77 · 12e0f77
1 parent 1813072
commit 12e0f77
Show file tree

Hide file tree

Showing 28 changed files with 28 additions and 28 deletions.
diff --git a/impl/src/main/java/org/jboss/weld/bean/builtin/facade/EventBean.java b/impl/src/main/java/org/jboss/weld/bean/builtin/facade/EventBean.java
@@ -23,7 +23,7 @@
 import java.util.Set;
 
 import javax.enterprise.event.Event;
-import javax.enterprise.inject.TypeLiteral;
+import javax.enterprise.util.TypeLiteral;
 
 import org.jboss.weld.BeanManagerImpl;
 import org.jboss.weld.event.EventImpl;

diff --git a/impl/src/main/java/org/jboss/weld/bean/builtin/facade/InstanceBean.java b/impl/src/main/java/org/jboss/weld/bean/builtin/facade/InstanceBean.java
@@ -24,7 +24,7 @@
 
 import javax.enterprise.inject.Any;
 import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.TypeLiteral;
+import javax.enterprise.util.TypeLiteral;
 import javax.inject.Provider;
 
 import org.jboss.weld.BeanManagerImpl;

diff --git a/impl/src/main/java/org/jboss/weld/bean/builtin/facade/InstanceImpl.java b/impl/src/main/java/org/jboss/weld/bean/builtin/facade/InstanceImpl.java
@@ -27,8 +27,8 @@
 import java.util.Set;
 
 import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.TypeLiteral;
 import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.TypeLiteral;
 
 import org.jboss.weld.BeanManagerImpl;
 import org.jboss.weld.resolution.ResolvableWeldClass;

diff --git a/impl/src/main/java/org/jboss/weld/event/EventImpl.java b/impl/src/main/java/org/jboss/weld/event/EventImpl.java
@@ -23,7 +23,7 @@
 import java.util.Set;
 
 import javax.enterprise.event.Event;
-import javax.enterprise.inject.TypeLiteral;
+import javax.enterprise.util.TypeLiteral;
 
 import org.jboss.weld.BeanManagerImpl;
 import org.jboss.weld.bean.builtin.facade.AbstractFacade;

diff --git a/impl/src/main/java/org/jboss/weld/jsf/FacesUrlTransformer.java b/impl/src/main/java/org/jboss/weld/jsf/FacesUrlTransformer.java
@@ -18,7 +18,7 @@
 
 import static org.jboss.weld.jsf.JsfHelper.getModuleBeanManager;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 import javax.faces.context.FacesContext;
 
 import org.jboss.weld.conversation.ConversationIdName;

diff --git a/impl/src/main/java/org/jboss/weld/jsf/JsfHelper.java b/impl/src/main/java/org/jboss/weld/jsf/JsfHelper.java
@@ -21,7 +21,7 @@
 import static org.jboss.weld.util.log.Categories.JSF;
 import static org.jboss.weld.util.log.LoggerFactory.loggerFactory;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 import javax.faces.context.FacesContext;
 import javax.servlet.ServletContext;
 import javax.servlet.http.HttpSession;

diff --git a/impl/src/main/java/org/jboss/weld/literal/AnyLiteral.java b/impl/src/main/java/org/jboss/weld/literal/AnyLiteral.java
@@ -16,8 +16,8 @@
  */
 package org.jboss.weld.literal;
 
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.Any;
+import javax.enterprise.util.AnnotationLiteral;
 
 public class AnyLiteral extends AnnotationLiteral<Any> implements Any
 {

diff --git a/impl/src/main/java/org/jboss/weld/literal/BindingTypeLiteral.java b/impl/src/main/java/org/jboss/weld/literal/BindingTypeLiteral.java
@@ -16,7 +16,7 @@
  */
 package org.jboss.weld.literal;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 import javax.inject.Qualifier;
 
 public class BindingTypeLiteral extends AnnotationLiteral<Qualifier> implements Qualifier

diff --git a/impl/src/main/java/org/jboss/weld/literal/DefaultLiteral.java b/impl/src/main/java/org/jboss/weld/literal/DefaultLiteral.java
@@ -16,8 +16,8 @@
  */
 package org.jboss.weld.literal;
 
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.Default;
+import javax.enterprise.util.AnnotationLiteral;
 
 /**
  * Annotation literal for @Current

diff --git a/impl/src/main/java/org/jboss/weld/literal/InjectLiteral.java b/impl/src/main/java/org/jboss/weld/literal/InjectLiteral.java
@@ -16,7 +16,7 @@
  */
 package org.jboss.weld.literal;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 import javax.inject.Inject;
 
 /**

diff --git a/impl/src/main/java/org/jboss/weld/literal/InterceptorBindingTypeLiteral.java b/impl/src/main/java/org/jboss/weld/literal/InterceptorBindingTypeLiteral.java
@@ -16,7 +16,7 @@
  */
 package org.jboss.weld.literal;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 import javax.interceptor.InterceptorBinding;
 
 public class InterceptorBindingTypeLiteral extends AnnotationLiteral<InterceptorBinding> implements InterceptorBinding

diff --git a/impl/src/main/java/org/jboss/weld/literal/NewLiteral.java b/impl/src/main/java/org/jboss/weld/literal/NewLiteral.java
@@ -16,8 +16,8 @@
  */
 package org.jboss.weld.literal;
 
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.New;
+import javax.enterprise.util.AnnotationLiteral;
 
 /**
  * Annotation literal for @Current

diff --git a/impl/src/main/java/org/jboss/weld/literal/NormalScopeLiteral.java b/impl/src/main/java/org/jboss/weld/literal/NormalScopeLiteral.java
@@ -17,7 +17,7 @@
 package org.jboss.weld.literal;
 
 import javax.enterprise.context.NormalScope;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 
 public class NormalScopeLiteral extends AnnotationLiteral<NormalScope> implements NormalScope
 {

diff --git a/impl/src/main/java/org/jboss/weld/literal/ScopeLiteral.java b/impl/src/main/java/org/jboss/weld/literal/ScopeLiteral.java
@@ -16,7 +16,7 @@
  */
 package org.jboss.weld.literal;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 import javax.inject.Scope;
 
 public class ScopeLiteral extends AnnotationLiteral<Scope> implements Scope {}
diff --git a/impl/src/main/java/org/jboss/weld/literal/StereotypeLiteral.java b/impl/src/main/java/org/jboss/weld/literal/StereotypeLiteral.java
@@ -16,8 +16,8 @@
  */
 package org.jboss.weld.literal;
 
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.Stereotype;
+import javax.enterprise.util.AnnotationLiteral;
 
 public class StereotypeLiteral extends AnnotationLiteral<Stereotype> implements Stereotype
 {

diff --git a/impl/src/main/java/org/jboss/weld/metadata/cache/BindingTypeModel.java b/impl/src/main/java/org/jboss/weld/metadata/cache/BindingTypeModel.java
@@ -20,7 +20,7 @@
 import java.lang.reflect.InvocationTargetException;
 import java.util.Set;
 
-import javax.enterprise.inject.Nonbinding;
+import javax.enterprise.util.Nonbinding;
 import javax.inject.Qualifier;
 
 import org.jboss.weld.DefinitionException;

diff --git a/impl/src/main/java/org/jboss/weld/metadata/cache/InterceptorBindingModel.java b/impl/src/main/java/org/jboss/weld/metadata/cache/InterceptorBindingModel.java
@@ -29,7 +29,7 @@
 import java.lang.reflect.InvocationTargetException;
 import java.util.Set;
 
-import javax.enterprise.inject.Nonbinding;
+import javax.enterprise.util.Nonbinding;
 import javax.interceptor.InterceptorBinding;
 
 import org.jboss.weld.DefinitionException;

diff --git a/impl/src/main/java/org/jboss/weld/resolution/ResolvableWeldClass.java b/impl/src/main/java/org/jboss/weld/resolution/ResolvableWeldClass.java
@@ -27,8 +27,8 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.enterprise.inject.TypeLiteral;
 import javax.enterprise.inject.spi.InjectionPoint;
+import javax.enterprise.util.TypeLiteral;
 
 import org.jboss.weld.BeanManagerImpl;
 import org.jboss.weld.bean.AbstractClassBean;

diff --git a/impl/src/main/java/org/jboss/weld/servlet/ConversationPropagationFilter.java b/impl/src/main/java/org/jboss/weld/servlet/ConversationPropagationFilter.java
@@ -20,7 +20,7 @@
 
 import java.io.IOException;
 
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
 import javax.faces.context.FacesContext;
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;

diff --git a/tests/src/main/java/org/jboss/weld/test/AbstractWeldTest.java b/tests/src/main/java/org/jboss/weld/test/AbstractWeldTest.java
@@ -14,8 +14,8 @@
 import java.util.Set;
 
 import javax.el.ELContext;
-import javax.enterprise.inject.TypeLiteral;
 import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.TypeLiteral;
 import javax.servlet.ServletContext;
 
 import org.jboss.testharness.AbstractTest;

diff --git a/tests/src/test/java/org/jboss/weld/test/unit/activities/ActivitiesTest.java b/tests/src/test/java/org/jboss/weld/test/unit/activities/ActivitiesTest.java
@@ -11,12 +11,12 @@
 import javax.enterprise.context.spi.Context;
 import javax.enterprise.context.spi.Contextual;
 import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.UnsatisfiedResolutionException;
 import javax.enterprise.inject.spi.Annotated;
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.BeanManager;
 import javax.enterprise.inject.spi.InjectionPoint;
+import javax.enterprise.util.AnnotationLiteral;
 
 import org.jboss.testharness.impl.packaging.Artifact;
 import org.jboss.weld.bean.ForwardingBean;

diff --git a/.../test/java/org/jboss/weld/test/unit/activities/child/SameBeanTypeInChildActivityTest.java b/.../test/java/org/jboss/weld/test/unit/activities/child/SameBeanTypeInChildActivityTest.java
@@ -8,11 +8,11 @@
 
 import javax.enterprise.context.Dependent;
 import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.InjectionException;
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.BeanManager;
 import javax.enterprise.inject.spi.InjectionPoint;
+import javax.enterprise.util.AnnotationLiteral;
 
 import org.jboss.testharness.impl.packaging.Artifact;
 import org.jboss.weld.literal.DefaultLiteral;

diff --git a/tests/src/test/java/org/jboss/weld/test/unit/activities/current/ELCurrentActivityTest.java b/tests/src/test/java/org/jboss/weld/test/unit/activities/current/ELCurrentActivityTest.java
@@ -10,10 +10,10 @@
 import javax.enterprise.context.spi.Context;
 import javax.enterprise.context.spi.Contextual;
 import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.BeanManager;
 import javax.enterprise.inject.spi.InjectionPoint;
+import javax.enterprise.util.AnnotationLiteral;
 
 import org.jboss.testharness.impl.packaging.Artifact;
 import org.jboss.weld.manager.api.WeldManager;

diff --git a/...rc/test/java/org/jboss/weld/test/unit/activities/current/InstanceCurrentActivityTest.java b/...rc/test/java/org/jboss/weld/test/unit/activities/current/InstanceCurrentActivityTest.java
@@ -10,10 +10,10 @@
 import javax.enterprise.context.spi.Context;
 import javax.enterprise.context.spi.Contextual;
 import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.BeanManager;
 import javax.enterprise.inject.spi.InjectionPoint;
+import javax.enterprise.util.AnnotationLiteral;
 
 import org.jboss.testharness.impl.packaging.Artifact;
 import org.jboss.weld.manager.api.WeldManager;

diff --git a/...s/src/test/java/org/jboss/weld/test/unit/environments/servlet/ServletEnvironmentTest.java b/...s/src/test/java/org/jboss/weld/test/unit/environments/servlet/ServletEnvironmentTest.java
@@ -5,8 +5,8 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
 
 import org.jboss.weld.BeanManagerImpl;
 import org.jboss.weld.bean.ManagedBean;

diff --git a/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/SimpleEventTest.java b/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/SimpleEventTest.java
@@ -2,8 +2,8 @@
 
 import javax.enterprise.event.Event;
 import javax.enterprise.event.Observes;
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.Any;
+import javax.enterprise.util.AnnotationLiteral;
 import javax.inject.Inject;
 
 import org.jboss.testharness.impl.packaging.Artifact;

diff --git a/...c/test/java/org/jboss/weld/test/unit/implementation/exceptions/ExceptionHandlingTest.java b/...c/test/java/org/jboss/weld/test/unit/implementation/exceptions/ExceptionHandlingTest.java
@@ -1,7 +1,7 @@
 package org.jboss.weld.test.unit.implementation.exceptions;
 
-import javax.enterprise.inject.AnnotationLiteral;
 import javax.enterprise.inject.CreationException;
+import javax.enterprise.util.AnnotationLiteral;
 
 import org.jboss.testharness.impl.packaging.Artifact;
 import org.jboss.weld.test.AbstractWeldTest;

diff --git a/tests/src/test/java/org/jboss/weld/test/unit/lookup/LookupInstanceTest.java b/tests/src/test/java/org/jboss/weld/test/unit/lookup/LookupInstanceTest.java
@@ -3,7 +3,7 @@
 import java.util.List;
 
 import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.TypeLiteral;
+import javax.enterprise.util.TypeLiteral;
 
 import org.jboss.testharness.impl.packaging.Artifact;
 import org.jboss.weld.literal.DefaultLiteral;