[webbeans-commits] Webbeans SVN: r2834 - in ri/trunk: impl/src/main/java/org/jboss/webbeans and 8 other directories.

Author: pete.muir(a)jboss.org Date: 2009-06-15 12:24:34 -0400 (Mon, 15 Jun 2009) New Revision: 2834 Modified: ri/trunk/api/src/main/java/javax/enterprise/inject/Current.java ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ForwardingBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/FacadeBeanResolvableTransformer.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/InstanceBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployerEnvironment.java ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractWBMember.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractWBType.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/ConstructorSignatureImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/MethodSignatureImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBAnnotationImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBClassImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBConstructorImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBParameterImpl.java ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/current/Dusk.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/ServletEnvironmentTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/ELResolverTest.java Log: tidy up imports Modified: ri/trunk/api/src/main/java/javax/enterprise/inject/Current.java =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/Current.java 2009-06-15 15:50:27 UTC (rev 2833) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/Current.java 2009-06-15 16:24:34 UTC (rev 2834) @@ -17,10 +17,10 @@ package javax.enterprise.inject; +import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.ElementType.PARAMETER; import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Documented; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java 2009-06-15 15:50:27 UTC (rev 2833) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java 2009-06-15 16:24:34 UTC (rev 2834) @@ -80,8 +80,8 @@ import org.jboss.webbeans.event.EventObserver; import org.jboss.webbeans.event.ObserverImpl; import org.jboss.webbeans.injection.NonContextualInjector; +import org.jboss.webbeans.injection.resolution.ResolvableFactory; import org.jboss.webbeans.injection.resolution.ResolvableWBClass; -import org.jboss.webbeans.injection.resolution.ResolvableFactory; import org.jboss.webbeans.injection.resolution.Resolver; import org.jboss.webbeans.introspector.WBAnnotated; import org.jboss.webbeans.log.Log; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ForwardingBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ForwardingBean.java 2009-06-15 15:50:27 UTC (rev 2833) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ForwardingBean.java 2009-06-15 16:24:34 UTC (rev 2834) @@ -22,7 +22,6 @@ import javax.enterprise.context.spi.CreationalContext; import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.BeanManager; import javax.enterprise.inject.spi.InjectionPoint; /** Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2009-06-15 15:50:27 UTC (rev 2833) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2009-06-15 16:24:34 UTC (rev 2834) @@ -32,11 +32,11 @@ import org.jboss.webbeans.context.DependentStorageRequest; import org.jboss.webbeans.ejb.EJBApiAbstraction; import org.jboss.webbeans.ejb.spi.EjbServices; -import org.jboss.webbeans.injection.WBInjectionPoint; import org.jboss.webbeans.injection.ConstructorInjectionPoint; import org.jboss.webbeans.injection.FieldInjectionPoint; import org.jboss.webbeans.injection.MethodInjectionPoint; import org.jboss.webbeans.injection.ParameterInjectionPoint; +import org.jboss.webbeans.injection.WBInjectionPoint; import org.jboss.webbeans.introspector.WBClass; import org.jboss.webbeans.introspector.WBConstructor; import org.jboss.webbeans.introspector.WBField; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/FacadeBeanResolvableTransformer.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/FacadeBeanResolvableTransformer.java 2009-06-15 15:50:27 UTC (rev 2833) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/FacadeBeanResolvableTransformer.java 2009-06-15 16:24:34 UTC (rev 2834) @@ -24,8 +24,8 @@ import java.util.Set; import org.jboss.webbeans.injection.resolution.ForwardingResolvable; +import org.jboss.webbeans.injection.resolution.Resolvable; import org.jboss.webbeans.injection.resolution.ResolvableTransformer; -import org.jboss.webbeans.injection.resolution.Resolvable; /** * AnnotatedItem transformer which can be used for FacadeBeans Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/InstanceBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/InstanceBean.java 2009-06-15 15:50:27 UTC (rev 2833) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/InstanceBean.java 2009-06-15 16:24:34 UTC (rev 2834) @@ -26,8 +26,8 @@ import javax.enterprise.inject.TypeLiteral; import javax.inject.Obtains; +import org.jboss.webbeans.BeanManagerImpl; import org.jboss.webbeans.InstanceImpl; -import org.jboss.webbeans.BeanManagerImpl; import org.jboss.webbeans.injection.resolution.ResolvableTransformer; import org.jboss.webbeans.literal.ObtainsLiteral; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployerEnvironment.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployerEnvironment.java 2009-06-15 15:50:27 UTC (rev 2833) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployerEnvironment.java 2009-06-15 16:24:34 UTC (rev 2834) @@ -36,8 +36,8 @@ import org.jboss.webbeans.event.ObserverImpl; import org.jboss.webbeans.injection.resolution.ResolvableFactory; import org.jboss.webbeans.injection.resolution.Resolver; +import org.jboss.webbeans.introspector.WBAnnotated; import org.jboss.webbeans.introspector.WBClass; -import org.jboss.webbeans.introspector.WBAnnotated; import org.jboss.webbeans.introspector.WBMethod; public class BeanDeployerEnvironment Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventImpl.java 2009-06-15 15:50:27 UTC (rev 2833) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventImpl.java 2009-06-15 16:24:34 UTC (rev 2834) @@ -23,8 +23,8 @@ import javax.event.Event; import javax.event.Observer; +import org.jboss.webbeans.BeanManagerImpl; import org.jboss.webbeans.FacadeImpl; -import org.jboss.webbeans.BeanManagerImpl; import org.jboss.webbeans.literal.AnyLiteral; import org.jboss.webbeans.util.Strings; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractWBMember.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractWBMember.java 2009-06-15 15:50:27 UTC (rev 2833) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractWBMember.java 2009-06-15 16:24:34 UTC (rev 2834) @@ -20,9 +20,9 @@ import java.lang.reflect.Modifier; import java.lang.reflect.Type; -import org.jboss.webbeans.introspector.WBMember; import org.jboss.webbeans.introspector.AnnotationStore; import org.jboss.webbeans.introspector.ForwardingWBMember; +import org.jboss.webbeans.introspector.WBMember; import org.jboss.webbeans.util.Reflections; /** Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractWBType.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractWBType.java 2009-06-15 15:50:27 UTC (rev 2833) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractWBType.java 2009-06-15 16:24:34 UTC (rev 2834) @@ -19,9 +19,9 @@ import java.lang.reflect.Modifier; import java.lang.reflect.Type; +import org.jboss.webbeans.introspector.AnnotationStore; import org.jboss.webbeans.introspector.WBClass; import org.jboss.webbeans.introspector.WBType; -import org.jboss.webbeans.introspector.AnnotationStore; import org.jboss.webbeans.resources.ClassTransformer; import org.jboss.webbeans.util.Reflections; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/ConstructorSignatureImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/ConstructorSignatureImpl.java 2009-06-15 15:50:27 UTC (rev 2833) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/ConstructorSignatureImpl.java 2009-06-15 16:24:34 UTC (rev 2834) @@ -18,9 +18,9 @@ import java.util.Arrays; -import org.jboss.webbeans.introspector.WBConstructor; import org.jboss.webbeans.introspector.ConstructorSignature; import org.jboss.webbeans.introspector.MethodSignature; +import org.jboss.webbeans.introspector.WBConstructor; public class ConstructorSignatureImpl implements ConstructorSignature { Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/MethodSignatureImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/MethodSignatureImpl.java 2009-06-15 15:50:27 UTC (rev 2833) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/MethodSignatureImpl.java 2009-06-15 16:24:34 UTC (rev 2834) @@ -19,8 +19,8 @@ import java.lang.reflect.Method; import java.util.Arrays; +import org.jboss.webbeans.introspector.MethodSignature; import org.jboss.webbeans.introspector.WBMethod; -import org.jboss.webbeans.introspector.MethodSignature; public class MethodSignatureImpl implements MethodSignature { Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBAnnotationImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBAnnotationImpl.java 2009-06-15 15:50:27 UTC (rev 2833) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBAnnotationImpl.java 2009-06-15 16:24:34 UTC (rev 2834) @@ -24,10 +24,10 @@ import java.util.Map; import java.util.Set; +import org.jboss.webbeans.introspector.AnnotationStore; import org.jboss.webbeans.introspector.WBAnnotation; import org.jboss.webbeans.introspector.WBClass; import org.jboss.webbeans.introspector.WBMethod; -import org.jboss.webbeans.introspector.AnnotationStore; import org.jboss.webbeans.resources.ClassTransformer; import org.jboss.webbeans.util.collections.multi.SetHashMultiMap; import org.jboss.webbeans.util.collections.multi.SetMultiMap; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBClassImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBClassImpl.java 2009-06-15 15:50:27 UTC (rev 2833) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBClassImpl.java 2009-06-15 16:24:34 UTC (rev 2834) @@ -29,13 +29,13 @@ import java.util.Map; import java.util.Set; +import org.jboss.webbeans.introspector.AnnotationStore; +import org.jboss.webbeans.introspector.ConstructorSignature; +import org.jboss.webbeans.introspector.MethodSignature; import org.jboss.webbeans.introspector.WBClass; import org.jboss.webbeans.introspector.WBConstructor; import org.jboss.webbeans.introspector.WBField; import org.jboss.webbeans.introspector.WBMethod; -import org.jboss.webbeans.introspector.AnnotationStore; -import org.jboss.webbeans.introspector.ConstructorSignature; -import org.jboss.webbeans.introspector.MethodSignature; import org.jboss.webbeans.resources.ClassTransformer; import org.jboss.webbeans.util.Names; import org.jboss.webbeans.util.Reflections; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBConstructorImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBConstructorImpl.java 2009-06-15 15:50:27 UTC (rev 2833) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBConstructorImpl.java 2009-06-15 16:24:34 UTC (rev 2834) @@ -25,11 +25,11 @@ import java.util.List; import org.jboss.webbeans.BeanManagerImpl; +import org.jboss.webbeans.introspector.AnnotationStore; +import org.jboss.webbeans.introspector.ConstructorSignature; import org.jboss.webbeans.introspector.WBConstructor; import org.jboss.webbeans.introspector.WBParameter; import org.jboss.webbeans.introspector.WBType; -import org.jboss.webbeans.introspector.AnnotationStore; -import org.jboss.webbeans.introspector.ConstructorSignature; import org.jboss.webbeans.util.Names; import org.jboss.webbeans.util.collections.multi.ListHashMultiMap; import org.jboss.webbeans.util.collections.multi.ListMultiMap; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBParameterImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBParameterImpl.java 2009-06-15 15:50:27 UTC (rev 2833) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBParameterImpl.java 2009-06-15 16:24:34 UTC (rev 2834) @@ -20,9 +20,9 @@ import java.lang.reflect.Type; import java.util.Set; +import org.jboss.webbeans.introspector.AnnotationStore; import org.jboss.webbeans.introspector.WBMember; import org.jboss.webbeans.introspector.WBParameter; -import org.jboss.webbeans.introspector.AnnotationStore; /** * Represents a parameter Modified: ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/current/Dusk.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/current/Dusk.java 2009-06-15 15:50:27 UTC (rev 2833) +++ ri/trunk/tests/src/test/java/org/jboss/jsr299/tck/tests/activities/current/Dusk.java 2009-06-15 16:24:34 UTC (rev 2834) @@ -1,8 +1,8 @@ package org.jboss.jsr299.tck.tests.activities.current; +import javax.enterprise.inject.Any; import javax.enterprise.inject.Initializer; import javax.event.Event; -import javax.enterprise.inject.Any; class Dusk { Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/ServletEnvironmentTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/ServletEnvironmentTest.java 2009-06-15 15:50:27 UTC (rev 2833) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/bootstrap/environments/ServletEnvironmentTest.java 2009-06-15 16:24:34 UTC (rev 2834) @@ -8,8 +8,8 @@ import javax.enterprise.inject.AnnotationLiteral; import javax.enterprise.inject.spi.Bean; +import org.jboss.webbeans.BeanManagerImpl; import org.jboss.webbeans.CurrentManager; -import org.jboss.webbeans.BeanManagerImpl; import org.jboss.webbeans.bean.RIBean; import org.jboss.webbeans.bean.SimpleBean; import org.jboss.webbeans.mock.MockServletLifecycle; Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/ELResolverTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/ELResolverTest.java 2009-06-15 15:50:27 UTC (rev 2833) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/definition/ELResolverTest.java 2009-06-15 16:24:34 UTC (rev 2834) @@ -1,6 +1,6 @@ package org.jboss.webbeans.test.unit.definition; -import static org.testng.Assert.*; +import static org.testng.Assert.assertEquals; import javax.el.ELContext; import javax.el.ExpressionFactory;