Weld SVN: r4421 - api/trunk/cdi/src/main/java/javax/decorator.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-29 16:01:08 -0400 (Thu, 29 Oct 2009)
New Revision: 4421
Added:
api/trunk/cdi/src/main/java/javax/decorator/Delegate.java
Removed:
api/trunk/cdi/src/main/java/javax/decorator/Decorates.java
Modified:
api/trunk/cdi/src/main/java/javax/decorator/Decorator.java
api/trunk/cdi/src/main/java/javax/decorator/package-info.java
Log:
@Decorates -> @Delegate
Deleted: api/trunk/cdi/src/main/java/javax/decorator/Decorates.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/decorator/Decorates.java 2009-10-29 19:38:03 UTC (rev 4420)
+++ api/trunk/cdi/src/main/java/javax/decorator/Decorates.java 2009-10-29 20:01:08 UTC (rev 4421)
@@ -1,87 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package javax.decorator;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * <p>Identifies the delegate injection point of a decorator.
- * May be applied to a field, bean constructor parameter or
- * initializer method parameter of a decorator bean class.</p>
- *
- * <pre>
- * @Decorator
- * class TimestampLogger implements Logger {
- * @Decorates @Any Logger logger;
- * ...
- * }
- * </pre>
- * <pre>
- * @Decorator
- * class TimestampLogger implements Logger {
- * private Logger logger;
- *
- * public TimestampLogger(@Decorates @Debug Logger logger) {
- * this.logger=logger;
- * }
- * ...
- * }
- * </pre>
- *
- * <p>A decorator must have exactly one delegate injection point. The
- * delegate injection point must be an injected field, initializer
- * method parameter or bean constructor method parameter.</p>
- *
- * <p>The container injects a delegate object to the delegate injection
- * point. The delegate object implements the delegate type and delegates
- * method invocations along the decorator stack. When the container calls
- * a decorator during business method interception, the decorator may
- * invoke any method of the delegate object. If a decorator invokes the
- * delegate object at any other time, the invoked method throws an
- * {@link java.lang.IllegalStateException}.</p>
- *
- * <pre>
- * @Decorator
- * class TimestampLogger implements Logger {
- * @Decorates @Any Logger logger;
- *
- * void log(String message) {
- * logger.log( timestamp() + ": " + message );
- * }
- * ...
- * }
- * </pre>
- *
- * @see javax.decorator.Decorator @Decorator specifies that a
- * class is a decorator.
- *
- * @author Gavin King
- * @author Pete Muir
- */
-@Target({FIELD, PARAMETER})
-@Retention(RUNTIME)
-@Documented
-public @interface Decorates
-{
-}
Modified: api/trunk/cdi/src/main/java/javax/decorator/Decorator.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/decorator/Decorator.java 2009-10-29 19:38:03 UTC (rev 4420)
+++ api/trunk/cdi/src/main/java/javax/decorator/Decorator.java 2009-10-29 20:01:08 UTC (rev 4421)
@@ -41,7 +41,7 @@
* for instance passivation and conversational state defined by the
* EJB specification.</p>
*
- * @see javax.decorator.Decorates @Decorates identifies the
+ * @see javax.decorator.Delegate @Decorates identifies the
* delegate injection point of a decorator.
*
* @author Gavin King
Copied: api/trunk/cdi/src/main/java/javax/decorator/Delegate.java (from rev 4406, api/trunk/cdi/src/main/java/javax/decorator/Decorates.java)
===================================================================
--- api/trunk/cdi/src/main/java/javax/decorator/Delegate.java (rev 0)
+++ api/trunk/cdi/src/main/java/javax/decorator/Delegate.java 2009-10-29 20:01:08 UTC (rev 4421)
@@ -0,0 +1,87 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.decorator;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * <p>Identifies the delegate injection point of a decorator.
+ * May be applied to a field, bean constructor parameter or
+ * initializer method parameter of a decorator bean class.</p>
+ *
+ * <pre>
+ * @Decorator
+ * class TimestampLogger implements Logger {
+ * @Decorates @Any Logger logger;
+ * ...
+ * }
+ * </pre>
+ * <pre>
+ * @Decorator
+ * class TimestampLogger implements Logger {
+ * private Logger logger;
+ *
+ * public TimestampLogger(@Decorates @Debug Logger logger) {
+ * this.logger=logger;
+ * }
+ * ...
+ * }
+ * </pre>
+ *
+ * <p>A decorator must have exactly one delegate injection point. The
+ * delegate injection point must be an injected field, initializer
+ * method parameter or bean constructor method parameter.</p>
+ *
+ * <p>The container injects a delegate object to the delegate injection
+ * point. The delegate object implements the delegate type and delegates
+ * method invocations along the decorator stack. When the container calls
+ * a decorator during business method interception, the decorator may
+ * invoke any method of the delegate object. If a decorator invokes the
+ * delegate object at any other time, the invoked method throws an
+ * {@link java.lang.IllegalStateException}.</p>
+ *
+ * <pre>
+ * @Decorator
+ * class TimestampLogger implements Logger {
+ * @Decorates @Any Logger logger;
+ *
+ * void log(String message) {
+ * logger.log( timestamp() + ": " + message );
+ * }
+ * ...
+ * }
+ * </pre>
+ *
+ * @see javax.decorator.Decorator @Decorator specifies that a
+ * class is a decorator.
+ *
+ * @author Gavin King
+ * @author Pete Muir
+ */
+@Target({FIELD, PARAMETER})
+@Retention(RUNTIME)
+@Documented
+public @interface Delegate
+{
+}
Property changes on: api/trunk/cdi/src/main/java/javax/decorator/Delegate.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Modified: api/trunk/cdi/src/main/java/javax/decorator/package-info.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/decorator/package-info.java 2009-10-29 19:38:03 UTC (rev 4420)
+++ api/trunk/cdi/src/main/java/javax/decorator/package-info.java 2009-10-29 20:01:08 UTC (rev 4421)
@@ -37,9 +37,9 @@
* <h3>Delegate injection points</h3>
*
* <p>All decorators have a
- * {@linkplain javax.decorator.Decorates delegate injection point}.
+ * {@linkplain javax.decorator.Delegate delegate injection point}.
* A delegate injection point is an injection point of the bean
- * class annotated {@link javax.decorator.Decorates @Decorates}.</p>
+ * class annotated {@link javax.decorator.Delegate @Decorates}.</p>
*
* <p>The type of the delegate injection point must implement or
* extend every decorated type. A decorator is not required to
@@ -76,7 +76,7 @@
* @see javax.enterprise.inject
*
* @see javax.decorator.Decorator
- * @see javax.decorator.Decorates
+ * @see javax.decorator.Delegate
*
*/
package javax.decorator;
14 years, 5 months
- 1
- 0
Weld SVN: r4420 - in core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities: child and 1 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-29 15:38:03 -0400 (Thu, 29 Oct 2009)
New Revision: 4420
Modified:
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/ActivitiesTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/child/SameBeanTypeInChildActivityTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/ELCurrentActivityTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/InstanceCurrentActivityTest.java
Log:
remove deprecated method from BeanManager
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/ActivitiesTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/ActivitiesTest.java 2009-10-29 19:35:18 UTC (rev 4419)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/ActivitiesTest.java 2009-10-29 19:38:03 UTC (rev 4420)
@@ -19,6 +19,7 @@
import javax.enterprise.util.AnnotationLiteral;
import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.BeanManagerImpl;
import org.jboss.weld.bean.ForwardingBean;
import org.jboss.weld.literal.DefaultLiteral;
import org.jboss.weld.test.AbstractWeldTest;
@@ -190,7 +191,7 @@
{
assert getBeans(Cow.class).size() == 1;
Contextual<?> bean = getBeans(Cow.class).iterator().next();
- BeanManager childActivity = getCurrentManager().createActivity();
+ BeanManagerImpl childActivity = getCurrentManager().createActivity();
Bean<?> dummyBean = createDummyBean(childActivity, Cow.class);
childActivity.addBean(dummyBean);
assert childActivity.getInjectableReference(dummyBean.getInjectionPoints().iterator().next(), childActivity.createCreationalContext(dummyBean)) != null;
@@ -237,7 +238,7 @@
public void testBeanBelongingToChildActivityCannotBeInjectedIntoParentActivityBean()
{
assert getBeans(Cow.class).size() == 1;
- BeanManager childActivity = getCurrentManager().createActivity();
+ BeanManagerImpl childActivity = getCurrentManager().createActivity();
Bean<?> dummyBean = createDummyBean(childActivity, Cow.class);
childActivity.addBean(dummyBean);
assert getBeans(Object.class, new AnnotationLiteral<Tame>() {}).size() == 0;
@@ -250,7 +251,7 @@
getCurrentManager().addContext(dummyContext);
assert getBeans(Cow.class).size() == 1;
final Bean<Cow> bean = getBeans(Cow.class).iterator().next();
- BeanManager childActivity = getCurrentManager().createActivity();
+ BeanManagerImpl childActivity = getCurrentManager().createActivity();
final Set<Annotation> bindingTypes = new HashSet<Annotation>();
bindingTypes.add(new AnnotationLiteral<Tame>() {});
childActivity.addBean(new ForwardingBean<Cow>()
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/child/SameBeanTypeInChildActivityTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/child/SameBeanTypeInChildActivityTest.java 2009-10-29 19:35:18 UTC (rev 4419)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/child/SameBeanTypeInChildActivityTest.java 2009-10-29 19:38:03 UTC (rev 4420)
@@ -15,8 +15,8 @@
import javax.enterprise.util.AnnotationLiteral;
import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.weld.BeanManagerImpl;
import org.jboss.weld.literal.DefaultLiteral;
-import org.jboss.weld.manager.api.WeldManager;
import org.jboss.weld.test.AbstractWeldTest;
import org.testng.annotations.Test;
@@ -107,7 +107,7 @@
@Test(groups = { "broken" }, expectedExceptions = { InjectionException.class })
public void testSameBeanTypeInChildAsParentInjection()
{
- BeanManager childActivity = getCurrentManager().createActivity();
+ BeanManagerImpl childActivity = getCurrentManager().createActivity();
Bean<?> anotherMyBean = createDummyBean(childActivity);
childActivity.addBean(anotherMyBean);
}
@@ -115,8 +115,8 @@
@Test(groups = { "broken" }, expectedExceptions = { InjectionException.class })
public void testSameBeanTypeInChildAsIndirectParentInjection()
{
- WeldManager childActivity = getCurrentManager().createActivity();
- WeldManager grandChildActivity = childActivity.createActivity();
+ BeanManagerImpl childActivity = getCurrentManager().createActivity();
+ BeanManagerImpl grandChildActivity = childActivity.createActivity();
Bean<?> anotherMyBean = createDummyBean(grandChildActivity);
grandChildActivity.addBean(anotherMyBean);
}
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/ELCurrentActivityTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/ELCurrentActivityTest.java 2009-10-29 19:35:18 UTC (rev 4419)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/ELCurrentActivityTest.java 2009-10-29 19:38:03 UTC (rev 4420)
@@ -16,7 +16,7 @@
import javax.enterprise.util.AnnotationLiteral;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.manager.api.WeldManager;
+import org.jboss.weld.BeanManagerImpl;
import org.jboss.weld.test.AbstractWeldTest;
import org.testng.annotations.Test;
@@ -150,7 +150,7 @@
Context dummyContext = new DummyContext();
getCurrentManager().addContext(dummyContext);
assert getBeans(Cow.class).size() == 1;
- WeldManager childActivity = getCurrentManager().createActivity();
+ BeanManagerImpl childActivity = getCurrentManager().createActivity();
childActivity.addBean(new Daisy(childActivity));
childActivity.setCurrent(dummyContext.getScope());
assert evaluateValueExpression("#{daisy}", Cow.class) != null;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/InstanceCurrentActivityTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/InstanceCurrentActivityTest.java 2009-10-29 19:35:18 UTC (rev 4419)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/InstanceCurrentActivityTest.java 2009-10-29 19:38:03 UTC (rev 4420)
@@ -16,7 +16,7 @@
import javax.enterprise.util.AnnotationLiteral;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.weld.manager.api.WeldManager;
+import org.jboss.weld.BeanManagerImpl;
import org.jboss.weld.test.AbstractWeldTest;
import org.testng.annotations.Test;
@@ -158,7 +158,7 @@
Context dummyContext = new DummyContext();
getCurrentManager().addContext(dummyContext);
assert getBeans(Cow.class).size() == 1;
- WeldManager childActivity = getCurrentManager().createActivity();
+ BeanManagerImpl childActivity = getCurrentManager().createActivity();
childActivity.addBean(new Daisy(childActivity));
childActivity.setCurrent(dummyContext.getScope());
assert createContextualInstance(Field.class).get() != null;
14 years, 5 months
- 1
- 0
Weld SVN: r4419 - in cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context: passivating and 1 other directory.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-29 15:35:18 -0400 (Thu, 29 Oct 2009)
New Revision: 4419
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextDestroysBeansTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java
Log:
disable tests which use deprecated api on BeanManager for now
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextDestroysBeansTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextDestroysBeansTest.java 2009-10-29 19:34:25 UTC (rev 4418)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/ContextDestroysBeansTest.java 2009-10-29 19:35:18 UTC (rev 4419)
@@ -22,7 +22,7 @@
public class ContextDestroysBeansTest extends AbstractJSR299Test
{
- @Test(groups = { "contexts", "rewrite" })
+ @Test(groups = { "contexts", "broken" })
@SpecAssertions( {
@SpecAssertion(section = "6.2", id = "p"),
@SpecAssertion(section = "6.3", id = "d")
@@ -32,7 +32,7 @@
MyContextual bean = new MyContextual(getCurrentManager());
bean.setShouldReturnNullInstances(false);
// TODO Remove use of this deprecated API
- getCurrentManager().addBean(bean);
+ //getCurrentManager().addBean(bean);
Context sessionContext = getCurrentManager().getContext(SessionScoped.class);
CreationalContext<MySessionBean> creationalContext = getCurrentManager().createCreationalContext(bean);
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java 2009-10-29 19:34:25 UTC (rev 4418)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/NormalContextTest.java 2009-10-29 19:35:18 UTC (rev 4419)
@@ -43,7 +43,7 @@
assert fourth.getId() == 10;
}
- @Test(groups = { "contexts", "rewrite" })
+ @Test(groups = { "contexts", "broken" })
@SpecAssertions( {
@SpecAssertion(section = "6.2", id = "l")
} )
@@ -52,7 +52,7 @@
MyContextual bean = new MyContextual(getCurrentManager());
bean.setShouldReturnNullInstances(false);
// TODO Remove use of this deprecated API
- getCurrentManager().addBean(bean);
+ //getCurrentManager().addBean(bean);
CreationalContext<MySessionBean> creationalContext = new MockCreationalContext<MySessionBean>();
MySessionBean newBean = getCurrentManager().getContext(SessionScoped.class).get(bean, creationalContext);
@@ -60,7 +60,7 @@
assert bean.isCreateCalled();
}
- @Test(groups = { "contexts" , "rewrite"})
+ @Test(groups = { "contexts" , "broken"})
@SpecAssertion(section = "6.2", id = "nb")
public void testGetMayNotReturnNullUnlessContextualCreateReturnsNull()
{
@@ -69,7 +69,7 @@
MyContextual bean = new MyContextual(getCurrentManager());
bean.setShouldReturnNullInstances(true);
// TODO Remove use of this deprecated API
- getCurrentManager().addBean(bean);
+ //getCurrentManager().addBean(bean);
CreationalContext<MySessionBean> creationalContext = new MockCreationalContext<MySessionBean>();
assert getCurrentManager().getContext(SessionScoped.class).get(bean, creationalContext) == null;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java 2009-10-29 19:34:25 UTC (rev 4418)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/passivating/PassivatingContextTest.java 2009-10-29 19:35:18 UTC (rev 4419)
@@ -98,17 +98,6 @@
assert instance.getTheNumber() == 100;
}
- @SuppressWarnings("unchecked")
- private <T> boolean testSerialize(Bean<T> bean) throws IOException, ClassNotFoundException
- {
- getCurrentManager().addBean(bean);
- T instance = getCurrentManager().getContext(bean.getScope()).get(bean);
- byte[] data = serialize(instance);
- T resurrected = (T) deserialize(data);
- assert resurrected != null;
- return resurrected.toString().equals(instance.toString());
- }
-
@Test(groups = { "contexts", "passivation" })
@SpecAssertion(section = "6.6.4", id = "aaba")
public void testBeanWithNonSerializableImplementationInjectedIntoTransientFieldOK()
14 years, 5 months
- 1
- 0
Weld SVN: r4418 - api/trunk/cdi/src/main/java/javax/enterprise/inject/spi.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-29 15:34:25 -0400 (Thu, 29 Oct 2009)
New Revision: 4418
Modified:
api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/BeanManager.java
Log:
remove deprecated method
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/BeanManager.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/BeanManager.java 2009-10-29 19:05:21 UTC (rev 4417)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/BeanManager.java 2009-10-29 19:34:25 UTC (rev 4418)
@@ -366,15 +366,4 @@
*/
public <T> InjectionTarget<T> createInjectionTarget(AnnotatedType<T> type);
- /**
- * Allows a new bean to be registered. This fires a ProcessBean event and
- * then registers a new bean with the container, thereby making it available
- * for injection into other beans. This method may be called at any time in
- * the applications lifecycle.
- *
- * @param bean the bean to register
- */
- @Deprecated
- public void addBean(Bean<?> bean);
-
}
14 years, 5 months
- 1
- 0
Weld SVN: r4417 - in cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck: impl and 50 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-29 15:05:21 -0400 (Thu, 29 Oct 2009)
New Revision: 4417
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/OldSPIBridge.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/AnyLiteral.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/DefaultLiteral.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/InjectLiteral.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/NamedLiteral.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/NewLiteral.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/RetentionLiteral.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/TargetLiteral.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/RoomBinding.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/ChunkyQualifier.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/HairyQualifier.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/SynchronousQualifier.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/TameQualifier.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/WhitefishQualifier.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/enterprise/HairlessQualifier.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/enterprise/HairyQualifier.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/enterprise/SkinnyQualifier.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ExtensionsTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/RoleBinding.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/TameAnnotationLiteral.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/EventBindingTypesTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/TameAnnotationLiteral.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/WildAnnotationLiteral.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/FireEventTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/MiniBar.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/AnimalStereotypeAnnotationLiteral.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/HonorsLiteral.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/ImplicitEventTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/RoleBinding.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/ResolveEventObserversTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/RoleBinding.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/TameAnnotationLiteral.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/runtimeException/TameAnnotationLiteral.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/TransactionalObserversTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeABinding.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeBBinding.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeCBinding.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/AnimalStereotypeAnnotationLiteral.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/SelectEventTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/CheapLiteral.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/ExpensiveLiteral.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/GroceryWrapper.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/bean/bytype/NonBindingTypeLiteral.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/bean/bytype/TameLiteral.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/EnterpriseProducerFieldDefinitionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/EnvInjectionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/MultipleInterceptorBindingsTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/PayByBinding.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/builtin/BuiltinInstanceTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalStereotypeAnnotationLiteral.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ChunkyLiteral.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Expensive.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ExpensiveLiteral.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java
Log:
move classes to util package
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/AbstractJSR299Test.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -15,10 +15,10 @@
import javax.enterprise.context.spi.Context;
import javax.enterprise.inject.AmbiguousResolutionException;
-import javax.enterprise.inject.TypeLiteral;
import javax.enterprise.inject.UnsatisfiedResolutionException;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.util.TypeLiteral;
import org.jboss.jsr299.tck.api.JSR299Configuration;
import org.jboss.jsr299.tck.impl.OldSPIBridge;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/OldSPIBridge.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/OldSPIBridge.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/impl/OldSPIBridge.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -5,10 +5,10 @@
import java.util.Set;
import javax.enterprise.inject.AmbiguousResolutionException;
-import javax.enterprise.inject.TypeLiteral;
import javax.enterprise.inject.UnsatisfiedResolutionException;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.util.TypeLiteral;
public class OldSPIBridge
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/AnyLiteral.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/AnyLiteral.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/AnyLiteral.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.literals;
-import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.Any;
+import javax.enterprise.util.AnnotationLiteral;
public class AnyLiteral extends AnnotationLiteral<Any> implements Any
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/DefaultLiteral.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/DefaultLiteral.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/DefaultLiteral.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.literals;
-import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.Default;
+import javax.enterprise.util.AnnotationLiteral;
/**
* Annotation literal for @Current
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/InjectLiteral.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/InjectLiteral.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/InjectLiteral.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.literals;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
import javax.inject.Inject;
/**
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/NamedLiteral.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/NamedLiteral.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/NamedLiteral.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.literals;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
import javax.inject.Named;
public class NamedLiteral extends AnnotationLiteral<Named> implements Named
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/NewLiteral.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/NewLiteral.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/NewLiteral.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.literals;
-import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.New;
+import javax.enterprise.util.AnnotationLiteral;
public abstract class NewLiteral extends AnnotationLiteral<New> implements New
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/RetentionLiteral.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/RetentionLiteral.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/RetentionLiteral.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -18,7 +18,7 @@
import java.lang.annotation.Retention;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
/**
* @author pmuir
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/TargetLiteral.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/TargetLiteral.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/literals/TargetLiteral.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -18,7 +18,7 @@
import java.lang.annotation.Target;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
/**
* @author pmuir
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/DependentContextTest.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -6,8 +6,8 @@
import javax.enterprise.context.Dependent;
import javax.enterprise.context.spi.Context;
import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.jsr299.tck.impl.MockCreationalContext;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/RoomBinding.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/RoomBinding.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/RoomBinding.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.context.dependent;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
class RoomBinding extends AnnotationLiteral<Room> implements Room
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/decorators/definition/DecoratorDefinitionTest.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -23,9 +23,9 @@
import java.util.List;
import javax.decorator.Decorates;
-import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.Default;
import javax.enterprise.inject.spi.Decorator;
+import javax.enterprise.util.AnnotationLiteral;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/bean/BeanDefinitionTest.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -4,8 +4,8 @@
import java.util.Set;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/ChunkyQualifier.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/ChunkyQualifier.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/ChunkyQualifier.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.definition.qualifier;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
class ChunkyQualifier extends AnnotationLiteral<Chunky> implements Chunky
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/HairyQualifier.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/HairyQualifier.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/HairyQualifier.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.definition.qualifier;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
public class HairyQualifier extends AnnotationLiteral<Hairy> implements Hairy
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/SynchronousQualifier.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/SynchronousQualifier.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/SynchronousQualifier.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.definition.qualifier;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
class SynchronousQualifier extends AnnotationLiteral<Synchronous> implements Synchronous
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/TameQualifier.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/TameQualifier.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/TameQualifier.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.definition.qualifier;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
class TameQualifier extends AnnotationLiteral<Tame> implements Tame
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/WhitefishQualifier.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/WhitefishQualifier.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/WhitefishQualifier.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.definition.qualifier;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
class WhitefishQualifier extends AnnotationLiteral<Whitefish> implements Whitefish
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/enterprise/HairlessQualifier.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/enterprise/HairlessQualifier.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/enterprise/HairlessQualifier.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.definition.qualifier.enterprise;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
public class HairlessQualifier extends AnnotationLiteral<Hairless> implements Hairless
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/enterprise/HairyQualifier.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/enterprise/HairyQualifier.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/enterprise/HairyQualifier.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.definition.qualifier.enterprise;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
public class HairyQualifier extends AnnotationLiteral<Hairy> implements Hairy
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/enterprise/SkinnyQualifier.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/enterprise/SkinnyQualifier.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/qualifier/enterprise/SkinnyQualifier.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.definition.qualifier.enterprise;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
public class SkinnyQualifier extends AnnotationLiteral<Skinny> implements Skinny
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/definition/stereotype/StereotypeDefinitionTest.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -6,8 +6,8 @@
import javax.enterprise.context.Dependent;
import javax.enterprise.context.RequestScoped;
import javax.enterprise.context.SessionScoped;
-import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ExtensionsTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ExtensionsTest.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/deployment/lifecycle/ExtensionsTest.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -16,8 +16,8 @@
*/
package org.jboss.jsr299.tck.tests.deployment.lifecycle;
-import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/RoleBinding.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/RoleBinding.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/RoleBinding.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.event;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
class RoleBinding extends AnnotationLiteral<Role> implements Role
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/TameAnnotationLiteral.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/TameAnnotationLiteral.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/TameAnnotationLiteral.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.event;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
class TameAnnotationLiteral extends AnnotationLiteral<Tame> implements Tame
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/EventBindingTypesTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/EventBindingTypesTest.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/EventBindingTypesTest.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,9 +1,9 @@
package org.jboss.jsr299.tck.tests.event.bindingTypes;
import javax.enterprise.event.Event;
-import javax.enterprise.inject.AnnotationLiteral;
-import javax.enterprise.inject.TypeLiteral;
import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
+import javax.enterprise.util.TypeLiteral;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.jsr299.tck.literals.AnyLiteral;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/TameAnnotationLiteral.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/TameAnnotationLiteral.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/TameAnnotationLiteral.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.event.bindingTypes;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
class TameAnnotationLiteral extends AnnotationLiteral<Tame> implements Tame
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/WildAnnotationLiteral.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/WildAnnotationLiteral.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/bindingTypes/WildAnnotationLiteral.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.event.bindingTypes;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
class WildAnnotationLiteral extends AnnotationLiteral<Wild> implements Wild
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/FireEventTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/FireEventTest.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/FireEventTest.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -9,10 +9,10 @@
import javax.enterprise.context.spi.CreationalContext;
import javax.enterprise.event.Event;
-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.jsr299.tck.AbstractJSR299Test;
import org.jboss.jsr299.tck.literals.AnyLiteral;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/MiniBar.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/MiniBar.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/MiniBar.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -4,8 +4,8 @@
import java.util.Set;
import javax.enterprise.event.Event;
-import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.Any;
+import javax.enterprise.util.AnnotationLiteral;
import javax.inject.Inject;
class MiniBar
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/AnimalStereotypeAnnotationLiteral.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/AnimalStereotypeAnnotationLiteral.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/fires/nonbinding/AnimalStereotypeAnnotationLiteral.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.event.fires.nonbinding;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
class AnimalStereotypeAnnotationLiteral extends AnnotationLiteral<AnimalStereotype> implements AnimalStereotype
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/HonorsLiteral.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/HonorsLiteral.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/HonorsLiteral.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.event.implicit;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
class HonorsLiteral extends AnnotationLiteral<Honors>
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/ImplicitEventTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/ImplicitEventTest.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/implicit/ImplicitEventTest.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -5,7 +5,7 @@
import javax.enterprise.context.Dependent;
import javax.enterprise.event.Event;
-import javax.enterprise.inject.TypeLiteral;
+import javax.enterprise.util.TypeLiteral;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.jsr299.tck.literals.AnyLiteral;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/RoleBinding.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/RoleBinding.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/RoleBinding.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.event.observer;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
class RoleBinding extends AnnotationLiteral<Role> implements Role
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/ResolveEventObserversTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/ResolveEventObserversTest.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/ResolveEventObserversTest.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -5,8 +5,8 @@
import java.util.Set;
import javax.enterprise.event.Observes;
-import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.spi.ObserverMethod;
+import javax.enterprise.util.AnnotationLiteral;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/RoleBinding.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/RoleBinding.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/RoleBinding.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.event.observer.resolve;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
class RoleBinding extends AnnotationLiteral<Role> implements Role
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/TameAnnotationLiteral.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/TameAnnotationLiteral.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/resolve/TameAnnotationLiteral.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.event.observer.resolve;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
class TameAnnotationLiteral extends AnnotationLiteral<Tame> implements Tame
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/runtimeException/TameAnnotationLiteral.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/runtimeException/TameAnnotationLiteral.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/runtimeException/TameAnnotationLiteral.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.event.observer.runtimeException;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
class TameAnnotationLiteral extends AnnotationLiteral<Tame> implements Tame
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/TransactionalObserversTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/TransactionalObserversTest.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/observer/transactional/TransactionalObserversTest.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -20,7 +20,7 @@
import java.lang.annotation.Annotation;
import java.math.BigInteger;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeABinding.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeABinding.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeABinding.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.event.resolve.binding;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
class BindingTypeABinding extends AnnotationLiteral<BindingTypeA> implements BindingTypeA
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeBBinding.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeBBinding.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeBBinding.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.event.resolve.binding;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
class BindingTypeBBinding extends AnnotationLiteral<BindingTypeB> implements BindingTypeB
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeCBinding.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeCBinding.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/binding/BindingTypeCBinding.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.event.resolve.binding;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
class BindingTypeCBinding extends AnnotationLiteral<BindingTypeC> implements BindingTypeC
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/AnimalStereotypeAnnotationLiteral.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/AnimalStereotypeAnnotationLiteral.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/resolve/nonbinding/AnimalStereotypeAnnotationLiteral.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.event.resolve.nonbinding;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
class AnimalStereotypeAnnotationLiteral extends AnnotationLiteral<AnimalStereotype> implements AnimalStereotype
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/SelectEventTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/SelectEventTest.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/select/SelectEventTest.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,7 +1,7 @@
package org.jboss.jsr299.tck.tests.event.select;
-import javax.enterprise.inject.AnnotationLiteral;
-import javax.enterprise.inject.TypeLiteral;
+import javax.enterprise.util.AnnotationLiteral;
+import javax.enterprise.util.TypeLiteral;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/CheapLiteral.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/CheapLiteral.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/CheapLiteral.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.extensions.alternative.metadata;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
class CheapLiteral extends AnnotationLiteral<Cheap> implements Cheap
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/ExpensiveLiteral.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/ExpensiveLiteral.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/ExpensiveLiteral.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.extensions.alternative.metadata;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
class ExpensiveLiteral extends AnnotationLiteral<Expensive> implements Expensive
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/GroceryWrapper.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/GroceryWrapper.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/alternative/metadata/GroceryWrapper.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -11,13 +11,13 @@
import javax.enterprise.event.Reception;
import javax.enterprise.event.Observes;
import javax.enterprise.event.TransactionPhase;
-import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.Produces;
import javax.enterprise.inject.spi.AnnotatedConstructor;
import javax.enterprise.inject.spi.AnnotatedField;
import javax.enterprise.inject.spi.AnnotatedMethod;
import javax.enterprise.inject.spi.AnnotatedParameter;
import javax.enterprise.inject.spi.AnnotatedType;
+import javax.enterprise.util.AnnotationLiteral;
import org.jboss.jsr299.tck.literals.InjectLiteral;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/bean/bytype/NonBindingTypeLiteral.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/bean/bytype/NonBindingTypeLiteral.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/bean/bytype/NonBindingTypeLiteral.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.extensions.bean.bytype;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
public class NonBindingTypeLiteral extends AnnotationLiteral<NonBindingType> implements NonBindingType
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/bean/bytype/TameLiteral.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/bean/bytype/TameLiteral.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/bean/bytype/TameLiteral.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.extensions.bean.bytype;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
class TameLiteral extends AnnotationLiteral<Tame> implements Tame
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/beanManager/BeanManagerTest.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -35,7 +35,6 @@
import javax.enterprise.context.RequestScoped;
import javax.enterprise.context.SessionScoped;
import javax.enterprise.inject.AmbiguousResolutionException;
-import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.InjectionException;
import javax.enterprise.inject.Specializes;
import javax.enterprise.inject.Stereotype;
@@ -44,6 +43,7 @@
import javax.enterprise.inject.spi.InjectionPoint;
import javax.enterprise.inject.spi.PassivationCapable;
import javax.enterprise.inject.spi.InterceptionType;
+import javax.enterprise.util.AnnotationLiteral;
import javax.inject.Qualifier;
import org.jboss.jsr299.tck.AbstractJSR299Test;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerTest.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerTest.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,11 +1,11 @@
package org.jboss.jsr299.tck.tests.extensions.producer;
import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.InjectionPoint;
import javax.enterprise.inject.spi.InjectionTarget;
import javax.enterprise.inject.spi.Producer;
+import javax.enterprise.util.AnnotationLiteral;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/disposal/method/definition/DisposalMethodDefinitionTest.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -3,8 +3,8 @@
import java.lang.annotation.Annotation;
import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/definition/EnterpriseBeanDefinitionTest.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -4,8 +4,8 @@
import javax.enterprise.context.Dependent;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -8,8 +8,8 @@
import javax.enterprise.context.RequestScoped;
import javax.enterprise.context.spi.Context;
import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanICTest.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -3,8 +3,8 @@
import java.util.Set;
import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/newBean/NewEnterpriseBeanTest.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -5,9 +5,9 @@
import javax.enterprise.context.Dependent;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.New;
import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.jsr299.tck.literals.AnyLiteral;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/ProducerFieldDefinitionTest.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -4,8 +4,8 @@
import java.util.Set;
import javax.enterprise.context.RequestScoped;
-import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.jsr299.tck.literals.DefaultLiteral;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/EnterpriseProducerFieldDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/EnterpriseProducerFieldDefinitionTest.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/definition/enterprise/EnterpriseProducerFieldDefinitionTest.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.implementation.producer.field.definition.enterprise;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/field/lifecycle/ProducerFieldLifecycleTest.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -3,7 +3,7 @@
import javax.enterprise.inject.IllegalProductException;
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
import javax.enterprise.context.spi.CreationalContext;
import org.jboss.jsr299.tck.AbstractJSR299Test;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/ProducerMethodDefinitionTest.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -4,10 +4,10 @@
import javax.enterprise.context.RequestScoped;
import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.IllegalProductException;
-import javax.enterprise.inject.TypeLiteral;
import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
+import javax.enterprise.util.TypeLiteral;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.jsr299.tck.literals.AnyLiteral;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/EnterpriseProducerMethodDefinitionTest.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -2,8 +2,8 @@
import java.util.Set;
-import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/lifecycle/ProducerMethodLifecycleTest.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -4,10 +4,10 @@
import javax.enterprise.context.RequestScoped;
import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.CreationException;
import javax.enterprise.inject.IllegalProductException;
import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/lifecycle/SimpleBeanLifecycleTest.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -7,10 +7,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.CreationException;
import javax.enterprise.inject.Specializes;
import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.jsr299.tck.impl.MockCreationalContext;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/newSimpleBean/NewSimpleBeanTest.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -12,10 +12,10 @@
import javax.enterprise.context.Dependent;
import javax.enterprise.context.RequestScoped;
import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.New;
-import javax.enterprise.inject.TypeLiteral;
import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
+import javax.enterprise.util.TypeLiteral;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.jsr299.tck.literals.AnyLiteral;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/EnvInjectionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/EnvInjectionTest.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/env/EnvInjectionTest.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -17,8 +17,8 @@
package org.jboss.jsr299.tck.tests.implementation.simple.resource.env;
import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/persistenceContext/PersistenceContextInjectionTest.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,9 +1,9 @@
package org.jboss.jsr299.tck.tests.implementation.simple.resource.persistenceContext;
import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.Any;
import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
import javax.persistence.EntityManager;
import org.jboss.jsr299.tck.AbstractJSR299Test;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,9 +1,9 @@
package org.jboss.jsr299.tck.tests.implementation.simple.resource.resource;
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.util.AnnotationLiteral;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationIntegrationTest.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -2,8 +2,8 @@
import java.lang.annotation.Annotation;
-import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/enterprise/EnterpriseBeanSpecializationTest.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -2,9 +2,9 @@
import java.lang.annotation.Annotation;
-import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.Any;
import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
import javax.inject.Named;
import org.jboss.jsr299.tck.AbstractJSR299Test;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/producer/method/ProducerMethodSpecializationTest.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -2,8 +2,8 @@
import java.lang.annotation.Annotation;
-import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.Any;
+import javax.enterprise.util.AnnotationLiteral;
import javax.inject.Named;
import org.jboss.jsr299.tck.AbstractJSR299Test;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/inheritance/specialization/simple/SimpleBeanSpecializationTest.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -2,9 +2,9 @@
import java.lang.annotation.Annotation;
-import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.Any;
import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
import javax.inject.Named;
import org.jboss.jsr299.tck.AbstractJSR299Test;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/InterceptorDefinitionTest.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -27,9 +27,9 @@
import java.util.List;
import java.util.Set;
-import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.spi.InterceptionType;
import javax.enterprise.inject.spi.Interceptor;
+import javax.enterprise.util.AnnotationLiteral;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/MultipleInterceptorBindingsTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/MultipleInterceptorBindingsTest.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/interceptors/definition/multipleBindings/MultipleInterceptorBindingsTest.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.interceptors.definition.multipleBindings;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/DynamicLookupTest.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -20,9 +20,9 @@
import java.util.Iterator;
import javax.enterprise.inject.AmbiguousResolutionException;
-import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.Instance;
import javax.enterprise.inject.UnsatisfiedResolutionException;
+import javax.enterprise.util.AnnotationLiteral;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.jsr299.tck.literals.AnyLiteral;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/PayByBinding.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/PayByBinding.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/PayByBinding.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.lookup.dynamic;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
abstract class PayByBinding extends AnnotationLiteral<PayBy> implements PayBy
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/builtin/BuiltinInstanceTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/builtin/BuiltinInstanceTest.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/dynamic/builtin/BuiltinInstanceTest.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -18,8 +18,8 @@
import javax.enterprise.context.Dependent;
import javax.enterprise.inject.Instance;
-import javax.enterprise.inject.TypeLiteral;
import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.TypeLiteral;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalStereotypeAnnotationLiteral.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalStereotypeAnnotationLiteral.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/AnimalStereotypeAnnotationLiteral.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.lookup.injectionpoint;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
class AnimalStereotypeAnnotationLiteral extends AnnotationLiteral<AnimalStereotype> implements AnimalStereotype
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ChunkyLiteral.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ChunkyLiteral.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ChunkyLiteral.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
class ChunkyLiteral extends AnnotationLiteral<Chunky> implements Chunky
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Expensive.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Expensive.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/Expensive.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -10,7 +10,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.Nonbinding;
+import javax.enterprise.util.Nonbinding;
import javax.inject.Qualifier;
@Target( { TYPE, METHOD, PARAMETER, FIELD })
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ExpensiveLiteral.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ExpensiveLiteral.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ExpensiveLiteral.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -1,6 +1,6 @@
package org.jboss.jsr299.tck.tests.lookup.typesafe.resolution;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
abstract class ExpensiveLiteral extends AnnotationLiteral<Expensive> implements Expensive
{
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -23,9 +23,9 @@
import java.util.List;
import java.util.Set;
-import javax.enterprise.inject.AnnotationLiteral;
-import javax.enterprise.inject.TypeLiteral;
import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
+import javax.enterprise.util.TypeLiteral;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.jsr299.tck.literals.AnyLiteral;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/parameterized/AssignabilityOfRawAndParameterizedTypesTest.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -20,8 +20,8 @@
import java.util.Map;
import java.util.Set;
-import javax.enterprise.inject.TypeLiteral;
import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.TypeLiteral;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java
===================================================================
--- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java 2009-10-29 19:05:01 UTC (rev 4416)
+++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/policy/PolicyAvailabilityTest.java 2009-10-29 19:05:21 UTC (rev 4417)
@@ -20,8 +20,8 @@
import java.util.HashSet;
import java.util.Set;
-import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.util.AnnotationLiteral;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.test.audit.annotations.SpecAssertion;
14 years, 5 months
- 1
- 0
Weld SVN: r4416 - in extensions/trunk: se/src/test/java/org/jboss/weld/environment/se/test and 1 other directory.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-29 15:05:01 -0400 (Thu, 29 Oct 2009)
New Revision: 4416
Modified:
extensions/trunk/logger/src/main/java/org/jboss/weld/log/Logger.java
extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/StartMainTest.java
Log:
use util package
Modified: extensions/trunk/logger/src/main/java/org/jboss/weld/log/Logger.java
===================================================================
--- extensions/trunk/logger/src/main/java/org/jboss/weld/log/Logger.java 2009-10-29 19:04:44 UTC (rev 4415)
+++ extensions/trunk/logger/src/main/java/org/jboss/weld/log/Logger.java 2009-10-29 19:05:01 UTC (rev 4416)
@@ -10,7 +10,7 @@
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.enterprise.inject.Nonbinding;
+import javax.enterprise.util.Nonbinding;
import javax.inject.Qualifier;
/**
Modified: extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/StartMainTest.java
===================================================================
--- extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/StartMainTest.java 2009-10-29 19:04:44 UTC (rev 4415)
+++ extensions/trunk/se/src/test/java/org/jboss/weld/environment/se/test/StartMainTest.java 2009-10-29 19:05:01 UTC (rev 4416)
@@ -16,8 +16,8 @@
*/
package org.jboss.weld.environment.se.test;
-import javax.enterprise.inject.AnnotationLiteral;
import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.util.AnnotationLiteral;
import org.jboss.weld.environment.se.StartMain;
import org.jboss.weld.environment.se.events.Shutdown;
14 years, 5 months
- 1
- 0
Weld SVN: r4415 - extensions/trunk/bom.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-29 15:04:44 -0400 (Thu, 29 Oct 2009)
New Revision: 4415
Modified:
extensions/trunk/bom/pom.xml
Log:
use snapshots of api and core
Modified: extensions/trunk/bom/pom.xml
===================================================================
--- extensions/trunk/bom/pom.xml 2009-10-29 19:04:00 UTC (rev 4414)
+++ extensions/trunk/bom/pom.xml 2009-10-29 19:04:44 UTC (rev 4415)
@@ -32,8 +32,8 @@
</developers>
<properties>
- <weld.api.version>1.0-CR1</weld.api.version>
- <weld.core.version>1.0.0-CR1</weld.core.version>
+ <weld.api.version>1.0-SNAPSHOT</weld.api.version>
+ <weld.core.version>1.0.0-SNAPSHOT</weld.core.version>
<!-- Use JSF 2 for all extensions support, despite core using JSF 1.2 -->
<jsf.version>2.0.0-RC</jsf.version>
<wicket.version>1.4.1</wicket.version>
14 years, 5 months
- 1
- 0
Weld SVN: r4414 - extensions/trunk/parent.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-29 15:04:00 -0400 (Thu, 29 Oct 2009)
New Revision: 4414
Modified:
extensions/trunk/parent/pom.xml
Log:
use testng 5.10
Modified: extensions/trunk/parent/pom.xml
===================================================================
--- extensions/trunk/parent/pom.xml 2009-10-29 19:02:41 UTC (rev 4413)
+++ extensions/trunk/parent/pom.xml 2009-10-29 19:04:00 UTC (rev 4414)
@@ -54,7 +54,7 @@
<properties>
<!-- Testing deps -->
- <testng.version>5.9</testng.version>
+ <testng.version>5.10</testng.version>
<jboss.test.harness.version>1.1.0-CR1</jboss.test.harness.version>
<apache.httpclient.version>3.1</apache.httpclient.version>
<junit.version>4.7</junit.version>
14 years, 5 months
- 1
- 0
Weld SVN: r4413 - in core/trunk: impl/src/main/java/org/jboss/weld/event and 13 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-29 15:02:41 -0400 (Thu, 29 Oct 2009)
New Revision: 4413
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/facade/EventBean.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/facade/InstanceBean.java
core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/facade/InstanceImpl.java
core/trunk/impl/src/main/java/org/jboss/weld/event/EventImpl.java
core/trunk/impl/src/main/java/org/jboss/weld/jsf/FacesUrlTransformer.java
core/trunk/impl/src/main/java/org/jboss/weld/jsf/JsfHelper.java
core/trunk/impl/src/main/java/org/jboss/weld/literal/AnyLiteral.java
core/trunk/impl/src/main/java/org/jboss/weld/literal/BindingTypeLiteral.java
core/trunk/impl/src/main/java/org/jboss/weld/literal/DefaultLiteral.java
core/trunk/impl/src/main/java/org/jboss/weld/literal/InjectLiteral.java
core/trunk/impl/src/main/java/org/jboss/weld/literal/InterceptorBindingTypeLiteral.java
core/trunk/impl/src/main/java/org/jboss/weld/literal/NewLiteral.java
core/trunk/impl/src/main/java/org/jboss/weld/literal/NormalScopeLiteral.java
core/trunk/impl/src/main/java/org/jboss/weld/literal/ScopeLiteral.java
core/trunk/impl/src/main/java/org/jboss/weld/literal/StereotypeLiteral.java
core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/BindingTypeModel.java
core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/InterceptorBindingModel.java
core/trunk/impl/src/main/java/org/jboss/weld/resolution/ResolvableWeldClass.java
core/trunk/impl/src/main/java/org/jboss/weld/servlet/ConversationPropagationFilter.java
core/trunk/tests/src/main/java/org/jboss/weld/test/AbstractWeldTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/ActivitiesTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/child/SameBeanTypeInChildActivityTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/ELCurrentActivityTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/InstanceCurrentActivityTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/ServletEnvironmentTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/SimpleEventTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/ExceptionHandlingTest.java
core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/LookupInstanceTest.java
Log:
create util package
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/facade/EventBean.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/facade/EventBean.java 2009-10-29 19:01:24 UTC (rev 4412)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/facade/EventBean.java 2009-10-29 19:02:41 UTC (rev 4413)
@@ -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;
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/facade/InstanceBean.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/facade/InstanceBean.java 2009-10-29 19:01:24 UTC (rev 4412)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/facade/InstanceBean.java 2009-10-29 19:02:41 UTC (rev 4413)
@@ -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;
Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/facade/InstanceImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/facade/InstanceImpl.java 2009-10-29 19:01:24 UTC (rev 4412)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/facade/InstanceImpl.java 2009-10-29 19:02:41 UTC (rev 4413)
@@ -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;
Modified: core/trunk/impl/src/main/java/org/jboss/weld/event/EventImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/event/EventImpl.java 2009-10-29 19:01:24 UTC (rev 4412)
+++ core/trunk/impl/src/main/java/org/jboss/weld/event/EventImpl.java 2009-10-29 19:02:41 UTC (rev 4413)
@@ -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;
Modified: core/trunk/impl/src/main/java/org/jboss/weld/jsf/FacesUrlTransformer.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/jsf/FacesUrlTransformer.java 2009-10-29 19:01:24 UTC (rev 4412)
+++ core/trunk/impl/src/main/java/org/jboss/weld/jsf/FacesUrlTransformer.java 2009-10-29 19:02:41 UTC (rev 4413)
@@ -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;
Modified: core/trunk/impl/src/main/java/org/jboss/weld/jsf/JsfHelper.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/jsf/JsfHelper.java 2009-10-29 19:01:24 UTC (rev 4412)
+++ core/trunk/impl/src/main/java/org/jboss/weld/jsf/JsfHelper.java 2009-10-29 19:02:41 UTC (rev 4413)
@@ -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;
Modified: core/trunk/impl/src/main/java/org/jboss/weld/literal/AnyLiteral.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/literal/AnyLiteral.java 2009-10-29 19:01:24 UTC (rev 4412)
+++ core/trunk/impl/src/main/java/org/jboss/weld/literal/AnyLiteral.java 2009-10-29 19:02:41 UTC (rev 4413)
@@ -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
{
Modified: core/trunk/impl/src/main/java/org/jboss/weld/literal/BindingTypeLiteral.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/literal/BindingTypeLiteral.java 2009-10-29 19:01:24 UTC (rev 4412)
+++ core/trunk/impl/src/main/java/org/jboss/weld/literal/BindingTypeLiteral.java 2009-10-29 19:02:41 UTC (rev 4413)
@@ -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
Modified: core/trunk/impl/src/main/java/org/jboss/weld/literal/DefaultLiteral.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/literal/DefaultLiteral.java 2009-10-29 19:01:24 UTC (rev 4412)
+++ core/trunk/impl/src/main/java/org/jboss/weld/literal/DefaultLiteral.java 2009-10-29 19:02:41 UTC (rev 4413)
@@ -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
Modified: core/trunk/impl/src/main/java/org/jboss/weld/literal/InjectLiteral.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/literal/InjectLiteral.java 2009-10-29 19:01:24 UTC (rev 4412)
+++ core/trunk/impl/src/main/java/org/jboss/weld/literal/InjectLiteral.java 2009-10-29 19:02:41 UTC (rev 4413)
@@ -16,7 +16,7 @@
*/
package org.jboss.weld.literal;
-import javax.enterprise.inject.AnnotationLiteral;
+import javax.enterprise.util.AnnotationLiteral;
import javax.inject.Inject;
/**
Modified: core/trunk/impl/src/main/java/org/jboss/weld/literal/InterceptorBindingTypeLiteral.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/literal/InterceptorBindingTypeLiteral.java 2009-10-29 19:01:24 UTC (rev 4412)
+++ core/trunk/impl/src/main/java/org/jboss/weld/literal/InterceptorBindingTypeLiteral.java 2009-10-29 19:02:41 UTC (rev 4413)
@@ -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
Modified: core/trunk/impl/src/main/java/org/jboss/weld/literal/NewLiteral.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/literal/NewLiteral.java 2009-10-29 19:01:24 UTC (rev 4412)
+++ core/trunk/impl/src/main/java/org/jboss/weld/literal/NewLiteral.java 2009-10-29 19:02:41 UTC (rev 4413)
@@ -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
Modified: core/trunk/impl/src/main/java/org/jboss/weld/literal/NormalScopeLiteral.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/literal/NormalScopeLiteral.java 2009-10-29 19:01:24 UTC (rev 4412)
+++ core/trunk/impl/src/main/java/org/jboss/weld/literal/NormalScopeLiteral.java 2009-10-29 19:02:41 UTC (rev 4413)
@@ -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
{
Modified: core/trunk/impl/src/main/java/org/jboss/weld/literal/ScopeLiteral.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/literal/ScopeLiteral.java 2009-10-29 19:01:24 UTC (rev 4412)
+++ core/trunk/impl/src/main/java/org/jboss/weld/literal/ScopeLiteral.java 2009-10-29 19:02:41 UTC (rev 4413)
@@ -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 {}
\ No newline at end of file
Modified: core/trunk/impl/src/main/java/org/jboss/weld/literal/StereotypeLiteral.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/literal/StereotypeLiteral.java 2009-10-29 19:01:24 UTC (rev 4412)
+++ core/trunk/impl/src/main/java/org/jboss/weld/literal/StereotypeLiteral.java 2009-10-29 19:02:41 UTC (rev 4413)
@@ -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
{
Modified: core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/BindingTypeModel.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/BindingTypeModel.java 2009-10-29 19:01:24 UTC (rev 4412)
+++ core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/BindingTypeModel.java 2009-10-29 19:02:41 UTC (rev 4413)
@@ -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;
Modified: core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/InterceptorBindingModel.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/InterceptorBindingModel.java 2009-10-29 19:01:24 UTC (rev 4412)
+++ core/trunk/impl/src/main/java/org/jboss/weld/metadata/cache/InterceptorBindingModel.java 2009-10-29 19:02:41 UTC (rev 4413)
@@ -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;
Modified: core/trunk/impl/src/main/java/org/jboss/weld/resolution/ResolvableWeldClass.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/resolution/ResolvableWeldClass.java 2009-10-29 19:01:24 UTC (rev 4412)
+++ core/trunk/impl/src/main/java/org/jboss/weld/resolution/ResolvableWeldClass.java 2009-10-29 19:02:41 UTC (rev 4413)
@@ -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;
Modified: core/trunk/impl/src/main/java/org/jboss/weld/servlet/ConversationPropagationFilter.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/servlet/ConversationPropagationFilter.java 2009-10-29 19:01:24 UTC (rev 4412)
+++ core/trunk/impl/src/main/java/org/jboss/weld/servlet/ConversationPropagationFilter.java 2009-10-29 19:02:41 UTC (rev 4413)
@@ -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;
Modified: core/trunk/tests/src/main/java/org/jboss/weld/test/AbstractWeldTest.java
===================================================================
--- core/trunk/tests/src/main/java/org/jboss/weld/test/AbstractWeldTest.java 2009-10-29 19:01:24 UTC (rev 4412)
+++ core/trunk/tests/src/main/java/org/jboss/weld/test/AbstractWeldTest.java 2009-10-29 19:02:41 UTC (rev 4413)
@@ -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;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/ActivitiesTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/ActivitiesTest.java 2009-10-29 19:01:24 UTC (rev 4412)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/ActivitiesTest.java 2009-10-29 19:02:41 UTC (rev 4413)
@@ -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;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/child/SameBeanTypeInChildActivityTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/child/SameBeanTypeInChildActivityTest.java 2009-10-29 19:01:24 UTC (rev 4412)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/child/SameBeanTypeInChildActivityTest.java 2009-10-29 19:02:41 UTC (rev 4413)
@@ -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;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/ELCurrentActivityTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/ELCurrentActivityTest.java 2009-10-29 19:01:24 UTC (rev 4412)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/ELCurrentActivityTest.java 2009-10-29 19:02:41 UTC (rev 4413)
@@ -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;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/InstanceCurrentActivityTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/InstanceCurrentActivityTest.java 2009-10-29 19:01:24 UTC (rev 4412)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/activities/current/InstanceCurrentActivityTest.java 2009-10-29 19:02:41 UTC (rev 4413)
@@ -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;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/ServletEnvironmentTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/ServletEnvironmentTest.java 2009-10-29 19:01:24 UTC (rev 4412)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/environments/servlet/ServletEnvironmentTest.java 2009-10-29 19:02:41 UTC (rev 4413)
@@ -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;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/SimpleEventTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/SimpleEventTest.java 2009-10-29 19:01:24 UTC (rev 4412)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/event/SimpleEventTest.java 2009-10-29 19:02:41 UTC (rev 4413)
@@ -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;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/ExceptionHandlingTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/ExceptionHandlingTest.java 2009-10-29 19:01:24 UTC (rev 4412)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/implementation/exceptions/ExceptionHandlingTest.java 2009-10-29 19:02:41 UTC (rev 4413)
@@ -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;
Modified: core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/LookupInstanceTest.java
===================================================================
--- core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/LookupInstanceTest.java 2009-10-29 19:01:24 UTC (rev 4412)
+++ core/trunk/tests/src/test/java/org/jboss/weld/test/unit/lookup/LookupInstanceTest.java 2009-10-29 19:02:41 UTC (rev 4413)
@@ -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;
14 years, 5 months
- 1
- 0
Weld SVN: r4412 - in api/trunk/cdi/src/main/java/javax/enterprise: event and 2 other directories.
by weld-commits＠lists.jboss.org
Author: pete.muir(a)jboss.org
Date: 2009-10-29 15:01:24 -0400 (Thu, 29 Oct 2009)
New Revision: 4412
Added:
api/trunk/cdi/src/main/java/javax/enterprise/util/
api/trunk/cdi/src/main/java/javax/enterprise/util/AnnotationLiteral.java
api/trunk/cdi/src/main/java/javax/enterprise/util/Nonbinding.java
api/trunk/cdi/src/main/java/javax/enterprise/util/TypeLiteral.java
Removed:
api/trunk/cdi/src/main/java/javax/enterprise/inject/AnnotationLiteral.java
api/trunk/cdi/src/main/java/javax/enterprise/inject/Nonbinding.java
api/trunk/cdi/src/main/java/javax/enterprise/inject/TypeLiteral.java
Modified:
api/trunk/cdi/src/main/java/javax/enterprise/event/Event.java
api/trunk/cdi/src/main/java/javax/enterprise/inject/Instance.java
Log:
create util package
Modified: api/trunk/cdi/src/main/java/javax/enterprise/event/Event.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/event/Event.java 2009-10-29 18:57:24 UTC (rev 4411)
+++ api/trunk/cdi/src/main/java/javax/enterprise/event/Event.java 2009-10-29 19:01:24 UTC (rev 4412)
@@ -19,7 +19,7 @@
import java.lang.annotation.Annotation;
-import javax.enterprise.inject.TypeLiteral;
+import javax.enterprise.util.TypeLiteral;
/**
* <p>Allows the application to fire events of a particular type.</p>
@@ -113,7 +113,7 @@
* additional required qualifiers.</p>
*
* @param <U> the specified type
- * @param subtype a {@link javax.enterprise.inject.TypeLiteral} representing the specified type
+ * @param subtype a {@link javax.enterprise.util.TypeLiteral} representing the specified type
* @param qualifiers the additional specified qualifiers
* @return the child <tt>Event</tt>
* @throws IllegalArgumentException if passed two instances of the
Deleted: api/trunk/cdi/src/main/java/javax/enterprise/inject/AnnotationLiteral.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/AnnotationLiteral.java 2009-10-29 18:57:24 UTC (rev 4411)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/AnnotationLiteral.java 2009-10-29 19:01:24 UTC (rev 4412)
@@ -1,196 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2008, Red Hat Middleware LLC, and individual contributors
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-* http://www.apache.org/licenses/LICENSE-2.0
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-package javax.enterprise.inject;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.Arrays;
-
-
-/**
- * <p>Supports inline instantiation of annotation type instances.</p>
- *
- * <p>An instance of an annotation type may be obtained by subclassing
- * <tt>AnnotationLiteral</tt>.</p>
- *
- * <pre>
- * public abstract class PayByQualifier
- * extends AnnotationLiteral<PayBy>
- * implements PayBy {}
- * </pre>
- *
- * <pre>
- * PayBy payby = new PayByQualifier() { public value() { return CHEQUE; } };
- * </pre>
- *
- * @author Pete Muir
- * @author Gavin King
- *
- * @param <T> the annotation type
- *
- * @see javax.enterprise.inject.Instance#select(Annotation...)
- * @see javax.enterprise.event.Event#select(Annotation...)
- *
- */
-public abstract class AnnotationLiteral<T extends Annotation> implements
- Annotation
-{
-
- private Class<T> annotationType;
- private Method[] members;
-
- protected AnnotationLiteral()
- {
- Class<?> annotationLiteralSubclass = getAnnotationLiteralSubclass(this.getClass());
- if (annotationLiteralSubclass == null)
- {
- throw new RuntimeException(getClass() + "is not a subclass of AnnotationLiteral ");
- }
-
- annotationType = getTypeParameter(annotationLiteralSubclass);
-
- if (annotationType == null)
- {
- throw new RuntimeException(getClass() + " is missing type parameter in AnnotationLiteral");
- }
-
- this.members = annotationType.getDeclaredMethods();
- }
-
- private static Class<?> getAnnotationLiteralSubclass(Class<?> clazz)
- {
- Class<?> superclass = clazz.getSuperclass();
- if (superclass.equals(AnnotationLiteral.class))
- {
- return clazz;
- }
- else if (superclass.equals(Object.class))
- {
- return null;
- }
- else
- {
- return (getAnnotationLiteralSubclass(superclass));
- }
- }
-
- @SuppressWarnings("unchecked")
- private static <T> Class<T> getTypeParameter(Class<?> annotationLiteralSuperclass)
- {
- Type type = annotationLiteralSuperclass.getGenericSuperclass();
- if (type instanceof ParameterizedType)
- {
- ParameterizedType parameterizedType = (ParameterizedType) type;
- if (parameterizedType.getActualTypeArguments().length == 1)
- {
- return (Class<T>) parameterizedType
- .getActualTypeArguments()[0];
- }
- }
- return null;
- }
-
- public Class<? extends Annotation> annotationType()
- {
- return annotationType;
- }
-
- @Override
- public String toString()
- {
- String string = "@" + annotationType().getName() + "(";
- for (int i = 0; i < members.length; i++)
- {
- string += members[i].getName() + "=";
- string += invoke(members[i], this);
- if (i < members.length - 1)
- {
- string += ",";
- }
- }
- return string + ")";
- }
-
- @Override
- public boolean equals(Object other)
- {
- if (other instanceof Annotation)
- {
- Annotation that = (Annotation) other;
- if (this.annotationType().equals(that.annotationType()))
- {
- for (Method member : members)
- {
- Object thisValue = invoke(member, this);
- Object thatValue = invoke(member, that);
- if (thisValue.getClass().isArray() && thatValue.getClass().isArray())
- {
- if (!Arrays.equals(Object[].class.cast(thisValue), Object[].class.cast(thatValue)))
- {
- return false;
- }
- }
- else if (!thisValue.equals(thatValue))
- {
- return false;
- }
- }
- return true;
- }
- }
- return false;
- }
-
- @Override
- public int hashCode()
- {
- int hashCode = 0;
- for (Method member : members)
- {
- int memberNameHashCode = 127 * member.getName().hashCode();
- Object value = invoke(member, this);
- int memberValueHashCode = value.getClass().isArray() ? Arrays.hashCode(Object[].class.cast(value)) : value.hashCode();
- hashCode += memberNameHashCode ^ memberValueHashCode;
- }
- return hashCode;
- }
-
- private static Object invoke(Method method, Object instance)
- {
- try
- {
- method.setAccessible(true);
- return method.invoke(instance);
- }
- catch (IllegalArgumentException e)
- {
- throw new RuntimeException("Error checking value of member method " + method.getName() + " on " + method.getDeclaringClass(), e);
- }
- catch (IllegalAccessException e)
- {
- throw new RuntimeException("Error checking value of member method " + method.getName() + " on " + method.getDeclaringClass(), e);
- }
- catch (InvocationTargetException e)
- {
- throw new RuntimeException("Error checking value of member method " + method.getName() + " on " + method.getDeclaringClass(), e);
- }
- }
-}
Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/Instance.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/Instance.java 2009-10-29 18:57:24 UTC (rev 4411)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/Instance.java 2009-10-29 19:01:24 UTC (rev 4412)
@@ -19,6 +19,7 @@
import java.lang.annotation.Annotation;
+import javax.enterprise.util.TypeLiteral;
import javax.inject.Provider;
@@ -95,8 +96,8 @@
*
* @see javax.inject.Provider#get()
* @see java.lang.Iterable#iterator()
- * @see javax.enterprise.inject.AnnotationLiteral
- * @see javax.enterprise.inject.TypeLiteral
+ * @see javax.enterprise.util.AnnotationLiteral
+ * @see javax.enterprise.util.TypeLiteral
*
* @author Gavin King
*
@@ -137,7 +138,7 @@
* additional required qualifiers.</p>
*
* @param <U> the required type
- * @param subtype a {@link javax.enterprise.inject.TypeLiteral} representing the required type
+ * @param subtype a {@link javax.enterprise.util.TypeLiteral} representing the required type
* @param qualifiers the additional required qualifiers
* @return the child <tt>Instance</tt>
* @throws IllegalArgumentException if passed two instances of the
Deleted: api/trunk/cdi/src/main/java/javax/enterprise/inject/Nonbinding.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/Nonbinding.java 2009-10-29 18:57:24 UTC (rev 4411)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/Nonbinding.java 2009-10-29 19:01:24 UTC (rev 4412)
@@ -1,53 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package javax.enterprise.inject;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * <p>Excludes a member of an annotation type (such as a
- * {@linkplain javax.inject.Qualifier qualifier type} or
- * {@linkplain javax.interceptor interceptor binding type})
- * from consideration when the container compares two
- * annotation instances.</p>
- *
- * <pre>
- * @Qualifier
- * @Retention(RUNTIME)
- * @Target({METHOD, FIELD, PARAMETER, TYPE})
- * public @interface PayBy {
- * PaymentMethod value();
- * @Nonbinding String comment();
- * }
- * </pre>
- *
- * @author Gavin King
- *
- * @see javax.inject.Qualifier @Qualifier
- * @see javax.interceptor.InterceptorBinding @InterceptorBinding
- *
- */
-@Retention(RUNTIME)
-@Target(METHOD)
-public @interface Nonbinding
-{
-}
Deleted: api/trunk/cdi/src/main/java/javax/enterprise/inject/TypeLiteral.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/TypeLiteral.java 2009-10-29 18:57:24 UTC (rev 4411)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/TypeLiteral.java 2009-10-29 19:01:24 UTC (rev 4412)
@@ -1,127 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2008, Red Hat Middleware LLC, and individual contributors
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-* http://www.apache.org/licenses/LICENSE-2.0
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-
-package javax.enterprise.inject;
-
-import java.lang.reflect.GenericArrayType;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-
-/**
- * <p>Supports inline instantiation of objects that represent parameterized types
- * with actual type parameters.</p>
- *
- * <p>An object that represents any parameterized type may be obtained by
- * subclassing <tt>TypeLiteral</tt>.</p>
- *
- * <pre>
- * TypeLiteral<List<String>> type = new TypeLiteral<List<String>>() {};
- * </pre>
- *
- * @author Gavin King
- * @author Pete Muir
- *
- * @param <T> the type, including all actual type parameters
- *
- * @see javax.enterprise.inject.Instance#select(TypeLiteral, Annotation...)
- * @see javax.enterprise.event.Event#select(TypeLiteral, Annotation...)
- *
- */
-public abstract class TypeLiteral<T>
-{
-
- private Type actualType;
-
- protected TypeLiteral()
- {
- Class<?> typeLiteralSubclass = getTypeLiteralSubclass(this.getClass());
- if (typeLiteralSubclass == null)
- {
- throw new RuntimeException(getClass() + " is not a subclass of TypeLiteral");
- }
- actualType = getTypeParameter(typeLiteralSubclass);
- if (actualType == null)
- {
- throw new RuntimeException(getClass() + " is missing type parameter in TypeLiteral");
- }
- }
-
- /**
- * @return the actual type represented by type literal
- */
- public final Type getType()
- {
- return actualType;
- }
-
- /**
- * @return the raw type represented by the type literal
- */
- @SuppressWarnings("unchecked")
- public final Class<T> getRawType() {
- Type type = getType();
- if (type instanceof Class)
- {
- return (Class<T>) type;
- }
- else if (type instanceof ParameterizedType)
- {
- return (Class<T>) ((ParameterizedType) type).getRawType();
- }
- else if (type instanceof GenericArrayType)
- {
- return (Class<T>) Object[].class;
- }
- else
- {
- throw new RuntimeException("Illegal type");
- }
- }
-
- private static Class<?> getTypeLiteralSubclass(Class<?> clazz)
- {
- Class<?> superclass = clazz.getSuperclass();
- if (superclass.equals(TypeLiteral.class))
- {
- return clazz;
- }
- else if (superclass.equals(Object.class))
- {
- return null;
- }
- else
- {
- return (getTypeLiteralSubclass(superclass));
- }
- }
-
- private static Type getTypeParameter(Class<?> superclass)
- {
- Type type = superclass.getGenericSuperclass();
- if (type instanceof ParameterizedType)
- {
- ParameterizedType parameterizedType = (ParameterizedType) type;
- if (parameterizedType.getActualTypeArguments().length == 1)
- {
- return parameterizedType.getActualTypeArguments()[0];
- }
- }
- return null;
- }
-
- // TODO: equals(), hashCode()
-}
Copied: api/trunk/cdi/src/main/java/javax/enterprise/util/AnnotationLiteral.java (from rev 4406, api/trunk/cdi/src/main/java/javax/enterprise/inject/AnnotationLiteral.java)
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/util/AnnotationLiteral.java (rev 0)
+++ api/trunk/cdi/src/main/java/javax/enterprise/util/AnnotationLiteral.java 2009-10-29 19:01:24 UTC (rev 4412)
@@ -0,0 +1,198 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, Red Hat Middleware LLC, and individual contributors
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package javax.enterprise.util;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.Arrays;
+
+import javax.enterprise.inject.Instance;
+
+
+/**
+ * <p>Supports inline instantiation of annotation type instances.</p>
+ *
+ * <p>An instance of an annotation type may be obtained by subclassing
+ * <tt>AnnotationLiteral</tt>.</p>
+ *
+ * <pre>
+ * public abstract class PayByQualifier
+ * extends AnnotationLiteral<PayBy>
+ * implements PayBy {}
+ * </pre>
+ *
+ * <pre>
+ * PayBy payby = new PayByQualifier() { public value() { return CHEQUE; } };
+ * </pre>
+ *
+ * @author Pete Muir
+ * @author Gavin King
+ *
+ * @param <T> the annotation type
+ *
+ * @see javax.enterprise.inject.Instance#select(Annotation...)
+ * @see javax.enterprise.event.Event#select(Annotation...)
+ *
+ */
+public abstract class AnnotationLiteral<T extends Annotation> implements
+ Annotation
+{
+
+ private Class<T> annotationType;
+ private Method[] members;
+
+ protected AnnotationLiteral()
+ {
+ Class<?> annotationLiteralSubclass = getAnnotationLiteralSubclass(this.getClass());
+ if (annotationLiteralSubclass == null)
+ {
+ throw new RuntimeException(getClass() + "is not a subclass of AnnotationLiteral ");
+ }
+
+ annotationType = getTypeParameter(annotationLiteralSubclass);
+
+ if (annotationType == null)
+ {
+ throw new RuntimeException(getClass() + " is missing type parameter in AnnotationLiteral");
+ }
+
+ this.members = annotationType.getDeclaredMethods();
+ }
+
+ private static Class<?> getAnnotationLiteralSubclass(Class<?> clazz)
+ {
+ Class<?> superclass = clazz.getSuperclass();
+ if (superclass.equals(AnnotationLiteral.class))
+ {
+ return clazz;
+ }
+ else if (superclass.equals(Object.class))
+ {
+ return null;
+ }
+ else
+ {
+ return (getAnnotationLiteralSubclass(superclass));
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ private static <T> Class<T> getTypeParameter(Class<?> annotationLiteralSuperclass)
+ {
+ Type type = annotationLiteralSuperclass.getGenericSuperclass();
+ if (type instanceof ParameterizedType)
+ {
+ ParameterizedType parameterizedType = (ParameterizedType) type;
+ if (parameterizedType.getActualTypeArguments().length == 1)
+ {
+ return (Class<T>) parameterizedType
+ .getActualTypeArguments()[0];
+ }
+ }
+ return null;
+ }
+
+ public Class<? extends Annotation> annotationType()
+ {
+ return annotationType;
+ }
+
+ @Override
+ public String toString()
+ {
+ String string = "@" + annotationType().getName() + "(";
+ for (int i = 0; i < members.length; i++)
+ {
+ string += members[i].getName() + "=";
+ string += invoke(members[i], this);
+ if (i < members.length - 1)
+ {
+ string += ",";
+ }
+ }
+ return string + ")";
+ }
+
+ @Override
+ public boolean equals(Object other)
+ {
+ if (other instanceof Annotation)
+ {
+ Annotation that = (Annotation) other;
+ if (this.annotationType().equals(that.annotationType()))
+ {
+ for (Method member : members)
+ {
+ Object thisValue = invoke(member, this);
+ Object thatValue = invoke(member, that);
+ if (thisValue.getClass().isArray() && thatValue.getClass().isArray())
+ {
+ if (!Arrays.equals(Object[].class.cast(thisValue), Object[].class.cast(thatValue)))
+ {
+ return false;
+ }
+ }
+ else if (!thisValue.equals(thatValue))
+ {
+ return false;
+ }
+ }
+ return true;
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ int hashCode = 0;
+ for (Method member : members)
+ {
+ int memberNameHashCode = 127 * member.getName().hashCode();
+ Object value = invoke(member, this);
+ int memberValueHashCode = value.getClass().isArray() ? Arrays.hashCode(Object[].class.cast(value)) : value.hashCode();
+ hashCode += memberNameHashCode ^ memberValueHashCode;
+ }
+ return hashCode;
+ }
+
+ private static Object invoke(Method method, Object instance)
+ {
+ try
+ {
+ method.setAccessible(true);
+ return method.invoke(instance);
+ }
+ catch (IllegalArgumentException e)
+ {
+ throw new RuntimeException("Error checking value of member method " + method.getName() + " on " + method.getDeclaringClass(), e);
+ }
+ catch (IllegalAccessException e)
+ {
+ throw new RuntimeException("Error checking value of member method " + method.getName() + " on " + method.getDeclaringClass(), e);
+ }
+ catch (InvocationTargetException e)
+ {
+ throw new RuntimeException("Error checking value of member method " + method.getName() + " on " + method.getDeclaringClass(), e);
+ }
+ }
+}
Property changes on: api/trunk/cdi/src/main/java/javax/enterprise/util/AnnotationLiteral.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Copied: api/trunk/cdi/src/main/java/javax/enterprise/util/Nonbinding.java (from rev 4406, api/trunk/cdi/src/main/java/javax/enterprise/inject/Nonbinding.java)
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/util/Nonbinding.java (rev 0)
+++ api/trunk/cdi/src/main/java/javax/enterprise/util/Nonbinding.java 2009-10-29 19:01:24 UTC (rev 4412)
@@ -0,0 +1,53 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package javax.enterprise.util;
+
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+/**
+ * <p>Excludes a member of an annotation type (such as a
+ * {@linkplain javax.inject.Qualifier qualifier type} or
+ * {@linkplain javax.interceptor interceptor binding type})
+ * from consideration when the container compares two
+ * annotation instances.</p>
+ *
+ * <pre>
+ * @Qualifier
+ * @Retention(RUNTIME)
+ * @Target({METHOD, FIELD, PARAMETER, TYPE})
+ * public @interface PayBy {
+ * PaymentMethod value();
+ * @Nonbinding String comment();
+ * }
+ * </pre>
+ *
+ * @author Gavin King
+ *
+ * @see javax.inject.Qualifier @Qualifier
+ * @see javax.interceptor.InterceptorBinding @InterceptorBinding
+ *
+ */
+@Retention(RUNTIME)
+@Target(METHOD)
+public @interface Nonbinding
+{
+}
Property changes on: api/trunk/cdi/src/main/java/javax/enterprise/util/Nonbinding.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
Copied: api/trunk/cdi/src/main/java/javax/enterprise/util/TypeLiteral.java (from rev 4406, api/trunk/cdi/src/main/java/javax/enterprise/inject/TypeLiteral.java)
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/util/TypeLiteral.java (rev 0)
+++ api/trunk/cdi/src/main/java/javax/enterprise/util/TypeLiteral.java 2009-10-29 19:01:24 UTC (rev 4412)
@@ -0,0 +1,129 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2008, Red Hat Middleware LLC, and individual contributors
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+* http://www.apache.org/licenses/LICENSE-2.0
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+package javax.enterprise.util;
+
+import java.lang.reflect.GenericArrayType;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+
+import javax.enterprise.inject.Instance;
+
+/**
+ * <p>Supports inline instantiation of objects that represent parameterized types
+ * with actual type parameters.</p>
+ *
+ * <p>An object that represents any parameterized type may be obtained by
+ * subclassing <tt>TypeLiteral</tt>.</p>
+ *
+ * <pre>
+ * TypeLiteral<List<String>> type = new TypeLiteral<List<String>>() {};
+ * </pre>
+ *
+ * @author Gavin King
+ * @author Pete Muir
+ *
+ * @param <T> the type, including all actual type parameters
+ *
+ * @see javax.enterprise.inject.Instance#select(TypeLiteral, Annotation...)
+ * @see javax.enterprise.event.Event#select(TypeLiteral, Annotation...)
+ *
+ */
+public abstract class TypeLiteral<T>
+{
+
+ private Type actualType;
+
+ protected TypeLiteral()
+ {
+ Class<?> typeLiteralSubclass = getTypeLiteralSubclass(this.getClass());
+ if (typeLiteralSubclass == null)
+ {
+ throw new RuntimeException(getClass() + " is not a subclass of TypeLiteral");
+ }
+ actualType = getTypeParameter(typeLiteralSubclass);
+ if (actualType == null)
+ {
+ throw new RuntimeException(getClass() + " is missing type parameter in TypeLiteral");
+ }
+ }
+
+ /**
+ * @return the actual type represented by type literal
+ */
+ public final Type getType()
+ {
+ return actualType;
+ }
+
+ /**
+ * @return the raw type represented by the type literal
+ */
+ @SuppressWarnings("unchecked")
+ public final Class<T> getRawType() {
+ Type type = getType();
+ if (type instanceof Class)
+ {
+ return (Class<T>) type;
+ }
+ else if (type instanceof ParameterizedType)
+ {
+ return (Class<T>) ((ParameterizedType) type).getRawType();
+ }
+ else if (type instanceof GenericArrayType)
+ {
+ return (Class<T>) Object[].class;
+ }
+ else
+ {
+ throw new RuntimeException("Illegal type");
+ }
+ }
+
+ private static Class<?> getTypeLiteralSubclass(Class<?> clazz)
+ {
+ Class<?> superclass = clazz.getSuperclass();
+ if (superclass.equals(TypeLiteral.class))
+ {
+ return clazz;
+ }
+ else if (superclass.equals(Object.class))
+ {
+ return null;
+ }
+ else
+ {
+ return (getTypeLiteralSubclass(superclass));
+ }
+ }
+
+ private static Type getTypeParameter(Class<?> superclass)
+ {
+ Type type = superclass.getGenericSuperclass();
+ if (type instanceof ParameterizedType)
+ {
+ ParameterizedType parameterizedType = (ParameterizedType) type;
+ if (parameterizedType.getActualTypeArguments().length == 1)
+ {
+ return parameterizedType.getActualTypeArguments()[0];
+ }
+ }
+ return null;
+ }
+
+ // TODO: equals(), hashCode()
+}
Property changes on: api/trunk/cdi/src/main/java/javax/enterprise/util/TypeLiteral.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:eol-style
+ native
14 years, 5 months
- 1
- 0