[jboss-cvs] JBossAS SVN: r93094 - in projects/kernel/trunk/webbeans-int: src/main/java/org/jboss/kernel/webbeans/plugins/dependency and 14 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Sep 1 16:53:31 EDT 2009
Author: kabir.khan at jboss.com
Date: 2009-09-01 16:53:30 -0400 (Tue, 01 Sep 2009)
New Revision: 93094
Added:
projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/mctowb/support/mc/ThingFieldProducer.java
projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/mctowb/support/mc/ThingMethodProducer.java
projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/mctowb/support/validateobserver/
projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/mctowb/support/wb/
projects/kernel/trunk/webbeans-int/src/test/resources/org/jboss/test/kernel/webbeans/mctowb/support/validateobserver/
projects/kernel/trunk/webbeans-int/src/test/resources/org/jboss/test/kernel/webbeans/mctowb/support/wb/
Removed:
projects/kernel/trunk/webbeans-int/src/main/java/org/jboss/kernel/webbeans/plugins/webbeans/BeanImpl.java
projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/mctowb/support/artifact1/
projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/mctowb/support/artifact2/
projects/kernel/trunk/webbeans-int/src/test/resources/org/jboss/test/kernel/webbeans/mctowb/support/artifact1/
projects/kernel/trunk/webbeans-int/src/test/resources/org/jboss/test/kernel/webbeans/mctowb/support/artifact2/
Modified:
projects/kernel/trunk/webbeans-int/.classpath
projects/kernel/trunk/webbeans-int/src/main/java/org/jboss/kernel/webbeans/plugins/dependency/WebBeansInjector.java
projects/kernel/trunk/webbeans-int/src/main/java/org/jboss/kernel/webbeans/plugins/metadata/WebBeansDependencyMetaData.java
projects/kernel/trunk/webbeans-int/src/main/java/org/jboss/kernel/webbeans/plugins/webbeans/McAfterBeanDiscoveryObserver.java
projects/kernel/trunk/webbeans-int/src/main/java/org/jboss/kernel/webbeans/plugins/webbeans/WebBeansFromMcRegistry.java
projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/WebBeansMcTestDelegate.java
projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/beanwrapper/support/Thing.java
projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/beanwrapper/support/ThingTarget.java
projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/beanwrapper/test/BeanImplementationTestCase.java
projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/mctowb/support/mc/Thing.java
projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/mctowb/support/validateobserver/TestObserver.java
projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/mctowb/support/wb/TestMcAfterBeanDiscoveryObserver.java
projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/mctowb/support/wb/ThingConstructor.java
projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/mctowb/support/wb/ThingField.java
projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/support/Bean.java
projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/support/FailedBean.java
projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/support/MissingDependenciesConstructorBean.java
projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/support/MissingDependenciesFieldBean.java
projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/test/ExternalBeanConstructor.java
projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/test/ExternalBeanField.java
projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/test/ExternalBeanMixed.java
projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/test/InjectWebBeansInMcBeansTestCase.java
projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/test/McBean.java
projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/test/McBeanInitializerMethod.java
projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/test/McBeanMcConstructor.java
projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/test/McBeanWebBeanSetter.java
projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/test/McBeanWithPostConstructAndPreDestroy.java
projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/test/WebBeanConsumer.java
projects/kernel/trunk/webbeans-int/src/test/resources/org/jboss/test/kernel/webbeans/mctowb/support/validateobserver/javax.enterprise.inject.spi.Extension
projects/kernel/trunk/webbeans-int/src/test/resources/org/jboss/test/kernel/webbeans/mctowb/support/wb/javax.enterprise.inject.spi.Extension
Log:
[JBKERNEL-51] Rework to compile against the latest web beans snapshot implementing the updated spec
Modified: projects/kernel/trunk/webbeans-int/.classpath
===================================================================
--- projects/kernel/trunk/webbeans-int/.classpath 2009-09-01 20:51:47 UTC (rev 93093)
+++ projects/kernel/trunk/webbeans-int/.classpath 2009-09-01 20:53:30 UTC (rev 93094)
@@ -5,18 +5,12 @@
<classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
<classpathentry kind="output" path="target/classes"/>
<classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1.1/activation-1.1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/ejb/ejb-api/3.0/ejb-api-3.0.jar"/>
<classpathentry kind="var" path="M2_REPO/javax/el/el-api/2.1.2-b04/el-api-2.1.2-b04.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar" sourcepath="M2_REPO/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/ws/jaxws-api/2.1/jaxws-api-2.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/inject/inject-api/1.0.0-PRD/inject-api-1.0.0-PRD.jar" sourcepath="M2_REPO/javax/inject/inject-api/1.0.0-PRD/inject-api-1.0.0-PRD-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/javax/faces/jsf-api/1.2_12/jsf-api-1.2_12.jar" sourcepath="M2_REPO/javax/faces/jsf-api/1.2_12/jsf-api-1.2_12-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/jws/jsr181-api/1.0-MR1/jsr181-api-1.0-MR1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar" sourcepath="M2_REPO/javax/annotation/jsr250-api/1.0/jsr250-api-1.0-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.0.1B/jta-1.0.1B.jar"/>
<classpathentry kind="var" path="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0.jar" sourcepath="M2_REPO/javax/persistence/persistence-api/1.0/persistence-api-1.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/soap/saaj-api/1.3/saaj-api-1.3.jar" sourcepath="M2_REPO/javax/xml/soap/saaj-api/1.3/saaj-api-1.3-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar" sourcepath="M2_REPO/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/javax/validation/validation-api/1.0.CR3/validation-api-1.0.CR3.jar" sourcepath="M2_REPO/javax/validation/validation-api/1.0.CR3/validation-api-1.0.CR3-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.0/ant-1.7.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-junit/1.7.0/ant-junit-1.7.0.jar"/>
Modified: projects/kernel/trunk/webbeans-int/src/main/java/org/jboss/kernel/webbeans/plugins/dependency/WebBeansInjector.java
===================================================================
--- projects/kernel/trunk/webbeans-int/src/main/java/org/jboss/kernel/webbeans/plugins/dependency/WebBeansInjector.java 2009-09-01 20:51:47 UTC (rev 93093)
+++ projects/kernel/trunk/webbeans-int/src/main/java/org/jboss/kernel/webbeans/plugins/dependency/WebBeansInjector.java 2009-09-01 20:53:30 UTC (rev 93094)
@@ -27,14 +27,18 @@
import java.lang.reflect.Method;
import java.util.Set;
-import javax.enterprise.context.ScopeType;
+import javax.enterprise.context.NormalScope;
import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.BindingType;
-import javax.enterprise.inject.Policy;
+import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.Annotated;
+import javax.enterprise.inject.spi.AnnotatedField;
+import javax.enterprise.inject.spi.AnnotatedMethod;
import javax.enterprise.inject.spi.AnnotatedType;
import javax.enterprise.inject.spi.InjectionPoint;
import javax.enterprise.inject.spi.InjectionTarget;
import javax.enterprise.inject.stereotype.Stereotype;
+import javax.inject.Qualifier;
+import javax.inject.Scope;
import org.jboss.beans.metadata.spi.BeanMetaData;
import org.jboss.beans.metadata.spi.DependencyMetaData;
@@ -120,17 +124,31 @@
*/
boolean hasWebBeanAnnotations()
{
- Set<Annotation> annotations = type.getAnnotations();
+ if (hasWebBeanAnnotations(type, AnnotationChecker.BINDING))
+ return true;
+
+ for (AnnotatedMethod<?> method : type.getMethods())
+ {
+ if (hasWebBeanAnnotations(method, AnnotationChecker.PRODUCER))
+ return true;
+ }
+
+ for (AnnotatedField<?> method : type.getFields())
+ {
+ if (hasWebBeanAnnotations(method, AnnotationChecker.PRODUCER))
+ return true;
+ }
+
+ return false;
+ }
+
+ boolean hasWebBeanAnnotations(Annotated annotated, AnnotationChecker checker)
+ {
+ Set<Annotation> annotations = annotated.getAnnotations();
for (Annotation annotation : annotations)
{
- for (Annotation meta : annotation.annotationType().getAnnotations())
- {
- Class<? extends Annotation> metaType = meta.annotationType();
- if (metaType == Policy.class || metaType == BindingType.class || metaType == Stereotype.class || metaType == ScopeType.class)
- {
- return true;
- }
- }
+ if (checker.matches(annotation))
+ return true;
}
return false;
}
@@ -329,4 +347,39 @@
}
}
+ private interface AnnotationChecker
+ {
+ boolean matches(Annotation annotation);
+
+ AnnotationChecker BINDING = new BindingAnnotationChecker();
+
+ AnnotationChecker PRODUCER = new ProducerAnnotationChecker();
+ }
+
+ private static class BindingAnnotationChecker implements AnnotationChecker
+ {
+ public boolean matches(Annotation annotation)
+ {
+ for (Annotation meta : annotation.annotationType().getAnnotations())
+ {
+ Class<? extends Annotation> metaType = meta.annotationType();
+ if (/*metaType == Policy.class ||*/ metaType == Qualifier.class || metaType == Stereotype.class || metaType == Scope.class || metaType == NormalScope.class)
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+ }
+
+ private static class ProducerAnnotationChecker implements AnnotationChecker
+ {
+
+ public boolean matches(Annotation annotation)
+ {
+ if (annotation.annotationType() == Produces.class)
+ return true;
+ return false;
+ }
+ }
}
Modified: projects/kernel/trunk/webbeans-int/src/main/java/org/jboss/kernel/webbeans/plugins/metadata/WebBeansDependencyMetaData.java
===================================================================
--- projects/kernel/trunk/webbeans-int/src/main/java/org/jboss/kernel/webbeans/plugins/metadata/WebBeansDependencyMetaData.java 2009-09-01 20:51:47 UTC (rev 93093)
+++ projects/kernel/trunk/webbeans-int/src/main/java/org/jboss/kernel/webbeans/plugins/metadata/WebBeansDependencyMetaData.java 2009-09-01 20:53:30 UTC (rev 93094)
@@ -89,7 +89,7 @@
{
int i = 17;
i = 31 * i + injectionPoint.getMember().hashCode();
- for (Annotation ann : injectionPoint.getBindings())
+ for (Annotation ann : injectionPoint.getQualifiers())
{
i = 31 * i + ann.hashCode();
}
@@ -102,7 +102,7 @@
if (obj instanceof WebBeansDependencyMetaData == false)
return false;
return equals(injectionPoint.getMember(), ((WebBeansDependencyMetaData)obj).injectionPoint.getMember()) &&
- equals(injectionPoint.getBindings(), ((WebBeansDependencyMetaData)obj).injectionPoint.getBindings());
+ equals(injectionPoint.getQualifiers(), ((WebBeansDependencyMetaData)obj).injectionPoint.getQualifiers());
}
/**
Deleted: projects/kernel/trunk/webbeans-int/src/main/java/org/jboss/kernel/webbeans/plugins/webbeans/BeanImpl.java
===================================================================
--- projects/kernel/trunk/webbeans-int/src/main/java/org/jboss/kernel/webbeans/plugins/webbeans/BeanImpl.java 2009-09-01 20:51:47 UTC (rev 93093)
+++ projects/kernel/trunk/webbeans-int/src/main/java/org/jboss/kernel/webbeans/plugins/webbeans/BeanImpl.java 2009-09-01 20:53:30 UTC (rev 93094)
@@ -1,142 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source.
-* Copyright 2006, Red Hat Middleware LLC, and individual contributors
-* as indicated by the @author tags. See the copyright.txt file in the
-* distribution for a full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.kernel.webbeans.plugins.webbeans;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Type;
-import java.util.Set;
-
-import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.InjectionPoint;
-
-import org.jboss.webbeans.beanutils.BeanDescriber;
-
-/**
- * Implementation of the bean interface for MC beans that have an explicit binding
- * annotation sothey can be registered in web beans beanmanager
- *
- * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
- * @version $Revision: 1.1 $
- */
-public class BeanImpl<T> implements Bean<T>
-{
-
- /**
- * The name of the bean in MC
- */
- private final String name;
-
- /**
- * The instance
- */
- private final T instance;
-
- /**
- * Any ScopeType annotation
- */
- Class<? extends Annotation> scopeType;
-
- Bean<T> delegate;
-
- /**
- * @param name the MC name of the MC bean represented by this BeanImpl
- * @param name manager the bean manager
- * @param type the annotated type of the bean
- * @param the bean instance
- */
- public BeanImpl(String name, BeanManager manager, AnnotatedType<T> type, T instance)
- {
- if (name == null)
- throw new IllegalArgumentException("Null name");
- if (manager == null)
- throw new IllegalArgumentException("Null manager");
- if (type == null)
- throw new IllegalArgumentException("Null type");
- if (instance == null)
- throw new IllegalArgumentException("Null instance");
-
- this.name = name;
- this.instance = instance;
-
- delegate = BeanDescriber.describeBean(type, manager);
- }
-
- public Class<?> getBeanClass()
- {
- return delegate.getBeanClass();
- }
-
- public Set<Annotation> getBindings()
- {
- return delegate.getBindings();
- }
-
- public Set<InjectionPoint> getInjectionPoints()
- {
- return delegate.getInjectionPoints();
- }
-
- public String getName()
- {
- return name;
- }
-
- public Class<? extends Annotation> getScopeType()
- {
- return delegate.getScopeType();
- }
-
- public Set<Class<? extends Annotation>> getStereotypes()
- {
- return delegate.getStereotypes();
- }
-
- public Set<Type> getTypes()
- {
- return delegate.getTypes();
- }
-
- public boolean isNullable()
- {
- return false;
- }
-
- public boolean isPolicy()
- {
- return delegate.isPolicy();
- }
-
- public T create(CreationalContext<T> creationalContext)
- {
- creationalContext.push(instance);
- return instance;
- }
-
- public void destroy(T instance, CreationalContext<T> creationalContext)
- {
- creationalContext.release();
- }
-
-}
Modified: projects/kernel/trunk/webbeans-int/src/main/java/org/jboss/kernel/webbeans/plugins/webbeans/McAfterBeanDiscoveryObserver.java
===================================================================
--- projects/kernel/trunk/webbeans-int/src/main/java/org/jboss/kernel/webbeans/plugins/webbeans/McAfterBeanDiscoveryObserver.java 2009-09-01 20:51:47 UTC (rev 93093)
+++ projects/kernel/trunk/webbeans-int/src/main/java/org/jboss/kernel/webbeans/plugins/webbeans/McAfterBeanDiscoveryObserver.java 2009-09-01 20:53:30 UTC (rev 93094)
@@ -26,6 +26,8 @@
import javax.enterprise.inject.spi.Bean;
import javax.enterprise.inject.spi.Extension;
+import org.jboss.webbeans.beanutils.spi.Beans;
+
/**
* Web Beans extension bean to register MC beans that should be accessible from web beans
*
@@ -36,9 +38,10 @@
{
public void observe(@Observes AfterBeanDiscovery afterBeanDiscovery)
{
- for (Bean<?> bean : WebBeansFromMcRegistry.getBeans())
+ for (Beans<?> beans : WebBeansFromMcRegistry.getBeans())
{
- afterBeanDiscovery.addBean(bean);
+ for(Bean<?> bean : beans.getAllBeans())
+ afterBeanDiscovery.addBean(bean);
}
}
}
Modified: projects/kernel/trunk/webbeans-int/src/main/java/org/jboss/kernel/webbeans/plugins/webbeans/WebBeansFromMcRegistry.java
===================================================================
--- projects/kernel/trunk/webbeans-int/src/main/java/org/jboss/kernel/webbeans/plugins/webbeans/WebBeansFromMcRegistry.java 2009-09-01 20:51:47 UTC (rev 93093)
+++ projects/kernel/trunk/webbeans-int/src/main/java/org/jboss/kernel/webbeans/plugins/webbeans/WebBeansFromMcRegistry.java 2009-09-01 20:53:30 UTC (rev 93094)
@@ -27,9 +27,10 @@
import java.util.concurrent.ConcurrentHashMap;
import javax.enterprise.inject.spi.AnnotatedType;
-import javax.enterprise.inject.spi.Bean;
import org.jboss.kernel.webbeans.plugins.dependency.WebBeansKernelControllerContext;
+import org.jboss.webbeans.beanutils.spi.Beans;
+import org.jboss.webbeans.beanutils.spi.ExistingBeanDescriber;
/**
* Registry of MC beans that should be accessible from web beans
@@ -44,7 +45,7 @@
/**
* Map of context name and bean implentation of MC beans that should be accessible from web beans
*/
- private static final Map<Object, Bean<?>> beansByContext = new ConcurrentHashMap<Object, Bean<?>>();
+ private static final Map<Object, Beans<?>> beansByContext = new ConcurrentHashMap<Object, Beans<?>>();
/**
* Check if a context should be accessible from web beans, and if so register it as a web bean.
@@ -56,8 +57,8 @@
AnnotatedType<?> type = context.getAnnotatedType();
if (type != null)
{
- Bean<?> bean = new BeanImpl<Object>((String)context.getName(), context.getManager(), (AnnotatedType<Object>)type, context.getTarget());
- beansByContext.put(context, bean);
+ Beans<Object> beans = ExistingBeanDescriber.describePreinstantiatedBean((AnnotatedType<Object>)type, null, context.getManager(), context.getTarget());
+ beansByContext.put(context, beans);
}
}
@@ -74,9 +75,9 @@
/**
* Get a copy of all the MC beans that should be registered as web beans
*/
- public static Collection<Bean<?>> getBeans()
+ public static Collection<Beans<?>> getBeans()
{
- return new ArrayList<Bean<?>>(beansByContext.values());
+ return new ArrayList(beansByContext.values());
}
}
Modified: projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/WebBeansMcTestDelegate.java
===================================================================
--- projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/WebBeansMcTestDelegate.java 2009-09-01 20:51:47 UTC (rev 93093)
+++ projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/WebBeansMcTestDelegate.java 2009-09-01 20:53:30 UTC (rev 93094)
@@ -120,8 +120,14 @@
@Override
public void tearDown() throws Exception
{
+ if (autoDeployMcBeans == AutoDeployMcBeans.AFTER)
+ undeploy();
+
undeployWebBeans();
+ if (autoDeployMcBeans == AutoDeployMcBeans.BEFORE)
+ undeploy();
+
super.tearDown();
}
@@ -207,6 +213,7 @@
URL url = findExtension(extension);
if (url != null)
{
+ getLog().debug("Deploying extensions " + url);
File metaInfServicesDirectory = findMetaInfServicesDirectory();
extensionFile = new File(metaInfServicesDirectory, EXTENSION_FILE);
if (extensionFile.exists())
Modified: projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/beanwrapper/support/Thing.java
===================================================================
--- projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/beanwrapper/support/Thing.java 2009-09-01 20:51:47 UTC (rev 93093)
+++ projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/beanwrapper/support/Thing.java 2009-09-01 20:53:30 UTC (rev 93094)
@@ -30,7 +30,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
/**
*
@@ -38,7 +38,7 @@
* @version $Revision: 1.1 $
*/
@Retention(RetentionPolicy.RUNTIME)
- at BindingType
+ at Qualifier
@Target({METHOD, FIELD, PARAMETER, TYPE})
public @interface Thing
{
Modified: projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/beanwrapper/support/ThingTarget.java
===================================================================
--- projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/beanwrapper/support/ThingTarget.java 2009-09-01 20:51:47 UTC (rev 93093)
+++ projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/beanwrapper/support/ThingTarget.java 2009-09-01 20:53:30 UTC (rev 93094)
@@ -21,7 +21,7 @@
*/
package org.jboss.test.kernel.webbeans.beanwrapper.support;
-import javax.enterprise.inject.Initializer;
+import javax.inject.Inject;
/**
*
@@ -30,11 +30,11 @@
*/
public class ThingTarget
{
- @Thing ThingBean field;
+ @Inject @Thing ThingBean field;
Thing notInjected;
- @Initializer
+ @Inject
public ThingTarget(@Thing ThingBean bean)
{
Modified: projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/beanwrapper/test/BeanImplementationTestCase.java
===================================================================
--- projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/beanwrapper/test/BeanImplementationTestCase.java 2009-09-01 20:51:47 UTC (rev 93093)
+++ projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/beanwrapper/test/BeanImplementationTestCase.java 2009-09-01 20:53:30 UTC (rev 93094)
@@ -30,7 +30,8 @@
import javax.enterprise.context.Dependent;
import javax.enterprise.inject.Any;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
+import javax.enterprise.inject.New;
import javax.enterprise.inject.spi.AnnotatedConstructor;
import javax.enterprise.inject.spi.AnnotatedField;
import javax.enterprise.inject.spi.AnnotatedMethod;
@@ -42,11 +43,12 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.jboss.kernel.webbeans.plugins.webbeans.BeanImpl;
import org.jboss.test.kernel.webbeans.AbstractWebBeansMcTest;
import org.jboss.test.kernel.webbeans.beanwrapper.support.Thing;
import org.jboss.test.kernel.webbeans.beanwrapper.support.ThingBean;
import org.jboss.test.kernel.webbeans.beanwrapper.support.ThingTarget;
+import org.jboss.webbeans.beanutils.spi.Beans;
+import org.jboss.webbeans.beanutils.spi.ExistingBeanDescriber;
/**
* Tests the Bean
@@ -73,7 +75,7 @@
assertSize(0, thingImpl.getInjectionPoints());
ThingTarget thingTarget = new ThingTarget(thingBean);
- Bean<ThingTarget> targetImpl = assertBeanImpl(thingTarget, "target", false, Dependent.class, false, bindingSet(Current.class, Any.class));
+ Bean<ThingTarget> targetImpl = assertBeanImpl(thingTarget, "target", false, Dependent.class, false, bindingSet(Default.class, Any.class));
assertSize(2, targetImpl.getInjectionPoints());
Set<InjectionPoint> injectionPoints = targetImpl.getInjectionPoints();
for (InjectionPoint point : injectionPoints)
@@ -96,7 +98,7 @@
assertSize(0, thingImpl.getInjectionPoints());
ThingTarget thingTarget = new ThingTarget(thingBean);
- Bean<ThingTarget> targetImpl = assertBeanImpl(thingTarget, "target", false, Dependent.class, true, bindingSet(Current.class, Any.class));
+ Bean<ThingTarget> targetImpl = assertBeanImpl(thingTarget, "target", false, Dependent.class, true, bindingSet(Default.class, Any.class));
assertSize(2, targetImpl.getInjectionPoints());
Set<InjectionPoint> injectionPoints = targetImpl.getInjectionPoints();
for (InjectionPoint point : injectionPoints)
@@ -120,7 +122,7 @@
return set;
}
- private <T> Bean<T> assertBeanImpl(T instance, String name, boolean policy, Class<? extends Annotation> scopeType,
+ private <T> Bean<T> assertBeanImpl(T instance, String name, boolean alternative, Class<? extends Annotation> scopeType,
boolean decorateAnnotatedType, Set<Class<? extends Annotation>> bindings) throws Exception
{
AnnotatedType<T> type = getCurrentManager().createAnnotatedType((Class<T>)instance.getClass());
@@ -130,15 +132,30 @@
type = new MockAnnotatedType<T>(type);
}
- Bean<T> impl = new BeanImpl<T>(name, getCurrentManager(), type, instance);
- assertEquals(name, impl.getName());
- assertEquals(policy, impl.isPolicy());
- assertBindings(impl.getBindings(), bindings);
- assertEquals(scopeType, impl.getScopeType());
+ Beans<T> beans = ExistingBeanDescriber.describePreinstantiatedBean(type, null, getCurrentManager(), instance);
+ assertNotNull(beans);
+
+ assertNotNull(beans.getMainBean());
+ assertNull(beans.getMainBean().getName());
+ assertEquals(alternative, beans.getMainBean().isAlternative());
+ assertBindings(beans.getMainBean().getQualifiers(), bindings);
+ assertEquals(scopeType, beans.getMainBean().getScope());
InjectionTarget<T> target = getCurrentManager().createInjectionTarget(getCurrentManager().createAnnotatedType((Class<T>)instance.getClass()));
- assertEquals(target.getInjectionPoints(), impl.getInjectionPoints());
- return impl;
+ assertEquals(target.getInjectionPoints(), beans.getMainBean().getInjectionPoints());
+
+ assertNotNull(beans.getNewBean());
+ assertNull(beans.getNewBean().getName());
+ assertEquals(alternative, beans.getNewBean().isAlternative());
+ assertBindings(beans.getNewBean().getQualifiers(), bindingSet(New.class));
+ assertEquals(scopeType, beans.getNewBean().getScope());
+ target = getCurrentManager().createInjectionTarget(getCurrentManager().createAnnotatedType((Class<T>)instance.getClass()));
+ assertEquals(target.getInjectionPoints(), beans.getNewBean().getInjectionPoints());
+
+ assertSize(0, beans.getMethodProducerBeans());
+ assertSize(0, beans.getFieldProducerBeans());
+
+ return beans.getMainBean();
}
private void assertBindings(Set<Annotation> actual, Set<Class<? extends Annotation>> expected)
Modified: projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/mctowb/support/mc/Thing.java
===================================================================
--- projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/mctowb/support/mc/Thing.java 2009-09-01 20:51:47 UTC (rev 93093)
+++ projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/mctowb/support/mc/Thing.java 2009-09-01 20:53:30 UTC (rev 93094)
@@ -30,7 +30,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
/**
*
@@ -38,7 +38,7 @@
* @version $Revision: 1.1 $
*/
@Retention(RetentionPolicy.RUNTIME)
- at BindingType
+ at Qualifier
@Target({METHOD, FIELD, PARAMETER, TYPE})
public @interface Thing
{
Added: projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/mctowb/support/mc/ThingFieldProducer.java
===================================================================
--- projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/mctowb/support/mc/ThingFieldProducer.java (rev 0)
+++ projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/mctowb/support/mc/ThingFieldProducer.java 2009-09-01 20:53:30 UTC (rev 93094)
@@ -0,0 +1,40 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.kernel.webbeans.mctowb.support.mc;
+
+import javax.enterprise.inject.Produces;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class ThingFieldProducer
+{
+ @Produces @Thing
+ ThingBean thing = new ThingBean();
+
+ public ThingBean getThing()
+ {
+ return thing;
+ }
+}
Added: projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/mctowb/support/mc/ThingMethodProducer.java
===================================================================
--- projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/mctowb/support/mc/ThingMethodProducer.java (rev 0)
+++ projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/mctowb/support/mc/ThingMethodProducer.java 2009-09-01 20:53:30 UTC (rev 93094)
@@ -0,0 +1,45 @@
+/*
+* JBoss, Home of Professional Open Source.
+* Copyright 2006, Red Hat Middleware LLC, and individual contributors
+* as indicated by the @author tags. See the copyright.txt file in the
+* distribution for a full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.kernel.webbeans.mctowb.support.mc;
+
+import javax.enterprise.inject.Produces;
+
+/**
+ *
+ * @author <a href="kabir.khan at jboss.com">Kabir Khan</a>
+ * @version $Revision: 1.1 $
+ */
+public class ThingMethodProducer
+{
+ ThingBean thing = new ThingBean();
+
+ @Produces @Thing
+ ThingBean createThing()
+ {
+ return thing;
+ }
+
+ public ThingBean getThing()
+ {
+ return thing;
+ }
+}
Copied: projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/mctowb/support/validateobserver (from rev 92878, projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/mctowb/support/artifact1)
Modified: projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/mctowb/support/validateobserver/TestObserver.java
===================================================================
--- projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/mctowb/support/artifact1/TestObserver.java 2009-08-27 16:42:14 UTC (rev 92878)
+++ projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/mctowb/support/validateobserver/TestObserver.java 2009-09-01 20:53:30 UTC (rev 93094)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.kernel.webbeans.mctowb.support.artifact1;
+package org.jboss.test.kernel.webbeans.mctowb.support.validateobserver;
import javax.enterprise.event.Observes;
import javax.enterprise.inject.spi.AfterBeanDiscovery;
Copied: projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/mctowb/support/wb (from rev 92878, projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/mctowb/support/artifact2)
Modified: projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/mctowb/support/wb/TestMcAfterBeanDiscoveryObserver.java
===================================================================
--- projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/mctowb/support/artifact2/TestMcAfterBeanDiscoveryObserver.java 2009-08-27 16:42:14 UTC (rev 92878)
+++ projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/mctowb/support/wb/TestMcAfterBeanDiscoveryObserver.java 2009-09-01 20:53:30 UTC (rev 93094)
@@ -19,7 +19,7 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.kernel.webbeans.mctowb.support.artifact2;
+package org.jboss.test.kernel.webbeans.mctowb.support.wb;
import javax.enterprise.event.Observes;
import javax.enterprise.inject.spi.AfterBeanDiscovery;
Modified: projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/mctowb/support/wb/ThingConstructor.java
===================================================================
--- projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/mctowb/support/artifact2/ThingConstructor.java 2009-08-27 16:42:14 UTC (rev 92878)
+++ projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/mctowb/support/wb/ThingConstructor.java 2009-09-01 20:53:30 UTC (rev 93094)
@@ -19,9 +19,9 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.kernel.webbeans.mctowb.support.artifact2;
+package org.jboss.test.kernel.webbeans.mctowb.support.wb;
-import javax.enterprise.inject.Initializer;
+import javax.inject.Inject;
import org.jboss.test.kernel.webbeans.mctowb.support.mc.Thing;
import org.jboss.test.kernel.webbeans.mctowb.support.mc.ThingBean;
@@ -35,7 +35,7 @@
{
public ThingBean thing;
- @Initializer
+ @Inject
public ThingConstructor(@Thing ThingBean thing)
{
this.thing = thing;
Modified: projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/mctowb/support/wb/ThingField.java
===================================================================
--- projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/mctowb/support/artifact2/ThingField.java 2009-08-27 16:42:14 UTC (rev 92878)
+++ projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/mctowb/support/wb/ThingField.java 2009-09-01 20:53:30 UTC (rev 93094)
@@ -19,8 +19,10 @@
* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.test.kernel.webbeans.mctowb.support.artifact2;
+package org.jboss.test.kernel.webbeans.mctowb.support.wb;
+import javax.inject.Inject;
+
import org.jboss.test.kernel.webbeans.mctowb.support.mc.Thing;
import org.jboss.test.kernel.webbeans.mctowb.support.mc.ThingBean;
@@ -31,6 +33,6 @@
*/
public class ThingField
{
- @Thing
+ @Inject @Thing
public ThingBean thing;
}
Modified: projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/support/Bean.java
===================================================================
--- projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/support/Bean.java 2009-09-01 20:51:47 UTC (rev 93093)
+++ projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/support/Bean.java 2009-09-01 20:53:30 UTC (rev 93094)
@@ -30,7 +30,7 @@
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
-import javax.enterprise.inject.BindingType;
+import javax.inject.Qualifier;
/**
*
@@ -38,7 +38,7 @@
* @version $Revision: 1.1 $
*/
@Retention(RetentionPolicy.RUNTIME)
- at BindingType
+ at Qualifier
@Target({METHOD, FIELD, PARAMETER, TYPE})
public @interface Bean {
Modified: projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/support/FailedBean.java
===================================================================
--- projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/support/FailedBean.java 2009-09-01 20:51:47 UTC (rev 93093)
+++ projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/support/FailedBean.java 2009-09-01 20:53:30 UTC (rev 93094)
@@ -21,7 +21,8 @@
*/
package org.jboss.test.kernel.webbeans.wbtomc.support;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import org.jboss.test.kernel.webbeans.wbtomc.test.WebBean;
@@ -32,7 +33,7 @@
*/
public class FailedBean
{
- @Current @Bean WebBean bean;
+ @Inject @Default @Bean WebBean bean;
public WebBean getBean()
{
Modified: projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/support/MissingDependenciesConstructorBean.java
===================================================================
--- projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/support/MissingDependenciesConstructorBean.java 2009-09-01 20:51:47 UTC (rev 93093)
+++ projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/support/MissingDependenciesConstructorBean.java 2009-09-01 20:53:30 UTC (rev 93094)
@@ -21,8 +21,8 @@
*/
package org.jboss.test.kernel.webbeans.wbtomc.support;
-import javax.enterprise.inject.Current;
-import javax.enterprise.inject.Initializer;
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import org.jboss.test.kernel.webbeans.wbtomc.test.WebBean;
@@ -33,8 +33,8 @@
*/
public class MissingDependenciesConstructorBean
{
- @Initializer
- public MissingDependenciesConstructorBean(@Current @Bean WebBean bean)
+ @Inject
+ public MissingDependenciesConstructorBean(@Default @Bean WebBean bean)
{
}
Modified: projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/support/MissingDependenciesFieldBean.java
===================================================================
--- projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/support/MissingDependenciesFieldBean.java 2009-09-01 20:51:47 UTC (rev 93093)
+++ projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/support/MissingDependenciesFieldBean.java 2009-09-01 20:53:30 UTC (rev 93094)
@@ -21,7 +21,8 @@
*/
package org.jboss.test.kernel.webbeans.wbtomc.support;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
import org.jboss.test.kernel.webbeans.wbtomc.test.WebBean;
@@ -32,5 +33,5 @@
*/
public class MissingDependenciesFieldBean
{
- @Current @Bean WebBean bean;
+ @Inject @Default @Bean WebBean bean;
}
Modified: projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/test/ExternalBeanConstructor.java
===================================================================
--- projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/test/ExternalBeanConstructor.java 2009-09-01 20:51:47 UTC (rev 93093)
+++ projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/test/ExternalBeanConstructor.java 2009-09-01 20:53:30 UTC (rev 93094)
@@ -21,8 +21,8 @@
*/
package org.jboss.test.kernel.webbeans.wbtomc.test;
-import javax.enterprise.inject.Current;
-import javax.enterprise.inject.Initializer;
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
/**
*
@@ -35,8 +35,8 @@
WebBean nonAnnotated;
- @Initializer
- public ExternalBeanConstructor(@Current WebBean bean)
+ @Inject
+ public ExternalBeanConstructor(@Default WebBean bean)
{
this.bean = bean;
}
Modified: projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/test/ExternalBeanField.java
===================================================================
--- projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/test/ExternalBeanField.java 2009-09-01 20:51:47 UTC (rev 93093)
+++ projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/test/ExternalBeanField.java 2009-09-01 20:53:30 UTC (rev 93094)
@@ -21,7 +21,8 @@
*/
package org.jboss.test.kernel.webbeans.wbtomc.test;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
/**
*
@@ -30,7 +31,7 @@
*/
public class ExternalBeanField
{
- @Current WebBean bean;
+ @Inject @Default WebBean bean;
WebBean nonAnnotated;
Modified: projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/test/ExternalBeanMixed.java
===================================================================
--- projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/test/ExternalBeanMixed.java 2009-09-01 20:51:47 UTC (rev 93093)
+++ projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/test/ExternalBeanMixed.java 2009-09-01 20:53:30 UTC (rev 93094)
@@ -21,8 +21,8 @@
*/
package org.jboss.test.kernel.webbeans.wbtomc.test;
-import javax.enterprise.inject.Current;
-import javax.enterprise.inject.Initializer;
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
/**
*
@@ -31,14 +31,14 @@
*/
public class ExternalBeanMixed
{
- @Current WebBean fieldBean;
+ @Inject @Default WebBean fieldBean;
WebBean nonAnnotated;
WebBean constructorBean;
- @Initializer
- public ExternalBeanMixed(@Current WebBean bean)
+ @Inject
+ public ExternalBeanMixed(@Default WebBean bean)
{
this.constructorBean = bean;
}
Modified: projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/test/InjectWebBeansInMcBeansTestCase.java
===================================================================
--- projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/test/InjectWebBeansInMcBeansTestCase.java 2009-09-01 20:51:47 UTC (rev 93093)
+++ projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/test/InjectWebBeansInMcBeansTestCase.java 2009-09-01 20:53:30 UTC (rev 93094)
@@ -22,14 +22,16 @@
package org.jboss.test.kernel.webbeans.wbtomc.test;
import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
import javax.enterprise.context.spi.CreationalContext;
-import javax.enterprise.inject.Current;
-import javax.enterprise.inject.Initializer;
+import javax.enterprise.inject.Default;
import javax.enterprise.inject.UnsatisfiedResolutionException;
import javax.enterprise.inject.spi.AnnotatedType;
import javax.enterprise.inject.spi.BeanManager;
import javax.enterprise.inject.spi.InjectionTarget;
+import javax.inject.Inject;
import junit.framework.Test;
import junit.framework.TestSuite;
@@ -325,16 +327,20 @@
metaData.setAccessMode(BeanAccessMode.ALL);
AbstractConstructorMetaData ctor = new AbstractConstructorMetaData();
- AnnotationMetaData initializer = new AbstractAnnotationMetaData("@" + Initializer.class.getName());
+ AnnotationMetaData initializer = new AbstractAnnotationMetaData("@" + Inject.class.getName());
ctor.setAnnotations(Collections.singleton(initializer));
AbstractParameterMetaData param = new AbstractParameterMetaData(WebBean.class.getName(), (String)null);
- AnnotationMetaData current = new AbstractAnnotationMetaData("@" + Current.class.getName());
+ AnnotationMetaData current = new AbstractAnnotationMetaData("@" + Default.class.getName());
param.setAnnotations(Collections.singleton(current));
ctor.setParameters(Collections.singletonList((ParameterMetaData)param));
metaData.setConstructor(ctor);
AbstractPropertyMetaData property = new AbstractPropertyMetaData("bean", (String)null);
- property.setAnnotations(Collections.singleton(current));
+ Set<AnnotationMetaData> propertyAnns = new HashSet<AnnotationMetaData>();
+ propertyAnns.add(new AbstractAnnotationMetaData("@" + Default.class.getName()));
+ propertyAnns.add(new AbstractAnnotationMetaData("@" + Inject.class.getName()));
+
+ property.setAnnotations(propertyAnns);
metaData.addProperty(property);
WebBeansKernelControllerContext context = deploy(metaData);
Modified: projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/test/McBean.java
===================================================================
--- projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/test/McBean.java 2009-09-01 20:51:47 UTC (rev 93093)
+++ projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/test/McBean.java 2009-09-01 20:53:30 UTC (rev 93094)
@@ -21,8 +21,8 @@
*/
package org.jboss.test.kernel.webbeans.wbtomc.test;
-import javax.enterprise.inject.Current;
-import javax.enterprise.inject.Initializer;
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
/**
*
@@ -33,13 +33,13 @@
{
WebBean beanFromConstructor;
- @Current
+ @Inject @Default
WebBean bean;
WebBean nonInject;
- @Initializer
- public McBean(@Current WebBean beanFromConstructor)
+ @Inject
+ public McBean(@Default WebBean beanFromConstructor)
{
this.beanFromConstructor = beanFromConstructor;
}
Modified: projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/test/McBeanInitializerMethod.java
===================================================================
--- projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/test/McBeanInitializerMethod.java 2009-09-01 20:51:47 UTC (rev 93093)
+++ projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/test/McBeanInitializerMethod.java 2009-09-01 20:53:30 UTC (rev 93094)
@@ -21,8 +21,8 @@
*/
package org.jboss.test.kernel.webbeans.wbtomc.test;
-import javax.enterprise.inject.Current;
-import javax.enterprise.inject.Initializer;
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
/**
*
@@ -35,8 +35,8 @@
WebBean nonInject;
- @Initializer
- public void initializerMethod(@Current WebBean bean)
+ @Inject
+ public void initializerMethod(@Default WebBean bean)
{
this.bean = bean;
}
Modified: projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/test/McBeanMcConstructor.java
===================================================================
--- projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/test/McBeanMcConstructor.java 2009-09-01 20:51:47 UTC (rev 93093)
+++ projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/test/McBeanMcConstructor.java 2009-09-01 20:53:30 UTC (rev 93094)
@@ -21,7 +21,8 @@
*/
package org.jboss.test.kernel.webbeans.wbtomc.test;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
/**
*
@@ -30,7 +31,7 @@
*/
public class McBeanMcConstructor
{
- @Current
+ @Inject @Default
WebBean bean;
Simple simple;
Modified: projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/test/McBeanWebBeanSetter.java
===================================================================
--- projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/test/McBeanWebBeanSetter.java 2009-09-01 20:51:47 UTC (rev 93093)
+++ projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/test/McBeanWebBeanSetter.java 2009-09-01 20:53:30 UTC (rev 93094)
@@ -21,7 +21,8 @@
*/
package org.jboss.test.kernel.webbeans.wbtomc.test;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
/**
*
@@ -39,7 +40,7 @@
return bean;
}
- @Current
+ @Inject @Default
public void setBean(WebBean bean)
{
this.bean = bean;
Modified: projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/test/McBeanWithPostConstructAndPreDestroy.java
===================================================================
--- projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/test/McBeanWithPostConstructAndPreDestroy.java 2009-09-01 20:51:47 UTC (rev 93093)
+++ projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/test/McBeanWithPostConstructAndPreDestroy.java 2009-09-01 20:53:30 UTC (rev 93094)
@@ -23,8 +23,8 @@
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
-import javax.enterprise.inject.Current;
-import javax.enterprise.inject.Initializer;
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
/**
*
@@ -33,14 +33,14 @@
*/
public class McBeanWithPostConstructAndPreDestroy
{
- @Current
+ @Inject @Default
WebBean bean;
boolean postConstructCalled;
boolean preDestroyCalled;
- @Initializer
+ @Inject
public McBeanWithPostConstructAndPreDestroy()
{
}
Modified: projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/test/WebBeanConsumer.java
===================================================================
--- projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/test/WebBeanConsumer.java 2009-09-01 20:51:47 UTC (rev 93093)
+++ projects/kernel/trunk/webbeans-int/src/test/java/org/jboss/test/kernel/webbeans/wbtomc/test/WebBeanConsumer.java 2009-09-01 20:53:30 UTC (rev 93094)
@@ -21,7 +21,8 @@
*/
package org.jboss.test.kernel.webbeans.wbtomc.test;
-import javax.enterprise.inject.Current;
+import javax.enterprise.inject.Default;
+import javax.inject.Inject;
/**
*
@@ -30,7 +31,7 @@
*/
public class WebBeanConsumer
{
- @Current
+ @Inject @Default
WebBean bean;
public WebBean getBean()
Copied: projects/kernel/trunk/webbeans-int/src/test/resources/org/jboss/test/kernel/webbeans/mctowb/support/validateobserver (from rev 92878, projects/kernel/trunk/webbeans-int/src/test/resources/org/jboss/test/kernel/webbeans/mctowb/support/artifact1)
Modified: projects/kernel/trunk/webbeans-int/src/test/resources/org/jboss/test/kernel/webbeans/mctowb/support/validateobserver/javax.enterprise.inject.spi.Extension
===================================================================
--- projects/kernel/trunk/webbeans-int/src/test/resources/org/jboss/test/kernel/webbeans/mctowb/support/artifact1/javax.enterprise.inject.spi.Extension 2009-08-27 16:42:14 UTC (rev 92878)
+++ projects/kernel/trunk/webbeans-int/src/test/resources/org/jboss/test/kernel/webbeans/mctowb/support/validateobserver/javax.enterprise.inject.spi.Extension 2009-09-01 20:53:30 UTC (rev 93094)
@@ -1 +1 @@
-org.jboss.test.kernel.webbeans.mctowb.support.artifact1.TestObserver
\ No newline at end of file
+org.jboss.test.kernel.webbeans.mctowb.support.validateobserver.TestObserver
\ No newline at end of file
Copied: projects/kernel/trunk/webbeans-int/src/test/resources/org/jboss/test/kernel/webbeans/mctowb/support/wb (from rev 92878, projects/kernel/trunk/webbeans-int/src/test/resources/org/jboss/test/kernel/webbeans/mctowb/support/artifact2)
Modified: projects/kernel/trunk/webbeans-int/src/test/resources/org/jboss/test/kernel/webbeans/mctowb/support/wb/javax.enterprise.inject.spi.Extension
===================================================================
--- projects/kernel/trunk/webbeans-int/src/test/resources/org/jboss/test/kernel/webbeans/mctowb/support/artifact2/javax.enterprise.inject.spi.Extension 2009-08-27 16:42:14 UTC (rev 92878)
+++ projects/kernel/trunk/webbeans-int/src/test/resources/org/jboss/test/kernel/webbeans/mctowb/support/wb/javax.enterprise.inject.spi.Extension 2009-09-01 20:53:30 UTC (rev 93094)
@@ -1 +1 @@
-org.jboss.test.kernel.webbeans.mctowb.support.artifact2.TestMcAfterBeanDiscoveryObserver
\ No newline at end of file
+org.jboss.test.kernel.webbeans.mctowb.support.wb.TestMcAfterBeanDiscoveryObserver
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list