October 2009 - weld-commits - Jboss List Archives

Weld SVN: r3929 - api and 1 other directory.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-10-11 13:23:46 -0400 (Sun, 11 Oct 2009) New Revision: 3929 Added: api/ api/branches/ api/tags/ api/trunk/ Log: Add API project

15 years, 2 months

1
0
0 / 0

Weld SVN: r3928 - core/trunk/osgi-bundle.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-10-11 13:01:38 -0400 (Sun, 11 Oct 2009) New Revision: 3928 Modified: core/trunk/osgi-bundle/pom.xml Log: WELD-82, formatting, add Roger Modified: core/trunk/osgi-bundle/pom.xml =================================================================== --- core/trunk/osgi-bundle/pom.xml 2009-10-11 16:37:25 UTC (rev 3927) +++ core/trunk/osgi-bundle/pom.xml 2009-10-11 17:01:38 UTC (rev 3928) @@ -1,23 +1,19 @@ - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + +  +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> <artifactId>weld-parent</artifactId> <groupId>org.jboss.weld</groupId> @@ -28,114 +24,125 @@ <groupId>org.jboss.weld</groupId> <artifactId>weld-osgi-bundle</artifactId> <name>Weld OSGi Bundle</name> - <description>Weld implementation packaged as an OSGi bundle</description> + <description>Weld packaged as an OSGi bundle</description> <developers> - <developer> - - <id>ss141213</id> - <name>Sanjeeb Sahoo</name> - <url>http://weblogs.dev.java.net/ss141213</url> - <organization>Sun Microsystems, Inc.</organization> - <roles> - <role>developer</role> - - </roles> - </developer> + <developer> + <id>ss141213</id> + <name>Sanjeeb Sahoo</name> + <url>http://weblogs.dev.java.net/ss141213</url> + <organization>Sun Microsystems, Inc.</organization> + <roles> + <role>developer</role> + </roles> + </developer> + <developer> + <name>Roger Kitain</name> + <id>rogerk</id> + <organization>Sun Microsystems, Inc.</organization> + </developer> </developers> <properties> - <osgi.version>1.0</osgi.version> + <osgi.version>1.0</osgi.version> </properties> <build> - <plugins> + <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <version>2.0.0</version> - <configuration> - <instructions> - <_include>-osgi.bundle</_include> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <version>2.0.0</version> + <configuration> + <instructions> + <_include>-osgi.bundle</_include> - <Embed-Dependency>*; scope=compile; inline=true</Embed-Dependency> - <_exportcontents>javax.event; javax.context; javax.weld; javax.decorator; javax.inject; javax.enterprise.*; version=${osgi.version}, - org.jboss.weld.context; org.jboss.weld.ejb; org.jboss.weld.bean; org.jboss.weld.bean.proxy; org.jboss.weld.*.api.*; org.jboss.weld.*.spi.*; org.jboss.weld.conversation; org.jboss.weld; org.jboss.weld.bootstrap; org.jboss.weld.introspector; org.jboss.weld.servlet; version=${osgi.version}, - org.jboss.weld.el; version=${osgi.version}, - org.jboss.weld.jsf; include:="WeldPhaseListener"; version=${osgi.version}, - javassist.util.proxy;version="3.8.1.GA" + <Embed-Dependency>*; scope=compile; inline=true</Embed-Dependency> + <_exportcontents>javax.event; javax.context; + javax.weld; javax.decorator; javax.inject; + javax.enterprise.*; version=${osgi.version}, + org.jboss.weld.context; org.jboss.weld.ejb; + org.jboss.weld.bean; org.jboss.weld.bean.proxy; + org.jboss.weld.*.api.*; org.jboss.weld.*.spi.*; + org.jboss.weld.conversation; org.jboss.weld; + org.jboss.weld.bootstrap; + org.jboss.weld.introspector; + org.jboss.weld.servlet; version=${osgi.version}, + org.jboss.weld.el; version=${osgi.version}, + org.jboss.weld.jsf; include:="WeldPhaseListener"; + version=${osgi.version}, + javassist.util.proxy;version="3.8.1.GA" </_exportcontents> - <Import-Package>javax.annotation, javax.interceptor, *;resolution:=optional</Import-Package> - <Private-Package>!javax.annotation.*, !javax.interceptor.*</Private-Package> - </instructions> -  - <unpackBundle>true</unpackBundle> - - </configuration> - <executions> - <execution> - <id>osgi-bundle</id> - <goals> - <goal>bundle</goal> - </goals> - <phase>package</phase> - - </execution> - </executions> - </plugin> - </plugins> + <Import-Package>javax.annotation, javax.interceptor, + *;resolution:=optional</Import-Package> + <Private-Package>!javax.annotation.*, + !javax.interceptor.*</Private-Package> + </instructions> +  + <unpackBundle>true</unpackBundle> + </configuration> + <executions> + <execution> + <id>osgi-bundle</id> + <goals> + <goal>bundle</goal> + </goals> + <phase>package</phase> + </execution> + </executions> + </plugin> + </plugins> </build> <dependencies> - <dependency> - <groupId>javax.enterprise</groupId> + + <dependency> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-api</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-spi</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-logging</artifactId> + </dependency> + + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + </dependency> + + <dependency> + <groupId>com.google.collections</groupId> + <artifactId>google-collections</artifactId> + </dependency> + + <dependency> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + </dependency> - <artifactId>cdi-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-api</artifactId> - <version>${project.version}</version> - - </dependency> - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-spi</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - - <groupId>org.jboss.weld</groupId> - <artifactId>weld-core</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-logging</artifactId> - - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - </dependency> - <dependency> - <groupId>com.google.collections</groupId> - <artifactId>google-collections</artifactId> - </dependency> - <dependency> - <groupId>javax.inject</groupId> - <artifactId>inject-api</artifactId> - <version>1.0.0-PRD</version> - </dependency> - - </dependencies> + </project>

15 years, 2 months

1
0
0 / 0

Weld SVN: r3927 - in core/trunk: impl/src/main/java/org/jboss/weld/bootstrap and 8 other directories.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-10-11 12:37:25 -0400 (Sun, 11 Oct 2009) New Revision: 3927 Added: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AbstractDefinitionContainerEvent.java core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AbstractDeploymentContainerEvent.java core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AbstractProcessClassBean.java core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AbstractProcessProducerBean.java core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessBeanImpl.java core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessProducerFieldImpl.java core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessProducerMethodImpl.java Removed: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AbstractProcessBean.java Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java core/trunk/impl/src/main/java/org/jboss/weld/bean/DisposalMethod.java core/trunk/impl/src/main/java/org/jboss/weld/bean/SessionBean.java core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/AbstractBeanDeployer.java core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployer.java core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AbstractBeanDiscoveryEvent.java core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AbstractContainerEvent.java core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AfterBeanDiscoveryImpl.java core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AfterDeploymentValidationImpl.java core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/BeforeBeanDiscoveryImpl.java core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/BeforeShutdownImpl.java core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessAnnotatedTypeImpl.java core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessInjectionTargetImpl.java core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessManagedBeanImpl.java core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessObserverMethodImpl.java core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessProducerImpl.java core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessSessionBeanImpl.java core/trunk/impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java core/trunk/impl/src/main/java/org/jboss/weld/injection/ConstructorInjectionPoint.java core/trunk/impl/src/main/java/org/jboss/weld/injection/MethodInjectionPoint.java core/trunk/impl/src/main/java/org/jboss/weld/introspector/ForwardingWeldConstructor.java core/trunk/impl/src/main/java/org/jboss/weld/introspector/ForwardingWeldMethod.java core/trunk/impl/src/main/java/org/jboss/weld/introspector/WeldCallable.java core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldConstructorImpl.java core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldMethodImpl.java core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java core/trunk/jboss-as/build.properties core/trunk/tests/src/main/java/org/jboss/weld/mock/MockBeanDeploymentArchive.java Log: implement ProcessBean*, refactor lifecycle events to be cleaner, various other fixes Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java 2009-10-11 16:34:00 UTC (rev 3926) +++ core/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java 2009-10-11 16:37:25 UTC (rev 3927) @@ -52,9 +52,9 @@ * @author Pete Muir * * @param <T> the type of bean - * @param <E> the Class<?> of the bean type + * @param <S> the Class<?> of the bean type */ -public abstract class AbstractBean<T, E> extends RIBean<T> +public abstract class AbstractBean<T, S> extends RIBean<T> { private static final Annotation ANY_LITERAL = new AnyLiteral(); @@ -71,7 +71,7 @@ // The scope type protected Class<? extends Annotation> scopeType; // The merged stereotypes - private MergedStereotypes<T, E> mergedStereotypes; + private MergedStereotypes<T, S> mergedStereotypes; // Is it a policy, either defined by stereotypes or directly? private boolean policy; // The type @@ -134,7 +134,7 @@ protected void initStereotypes() { - mergedStereotypes = new MergedStereotypes<T, E>(getAnnotatedItem().getMetaAnnotations(Stereotype.class), manager); + mergedStereotypes = new MergedStereotypes<T, S>(getAnnotatedItem().getMetaAnnotations(Stereotype.class), manager); } protected void checkDelegateInjectionPoints() @@ -331,7 +331,7 @@ * * @return The annotated item */ - public abstract WeldAnnotated<T, E> getAnnotatedItem(); + public abstract WeldAnnotated<T, S> getAnnotatedItem(); /** * Gets the binding types @@ -366,7 +366,7 @@ * * @return The set of merged stereotypes */ - protected MergedStereotypes<T, E> getMergedStereotypes() + protected MergedStereotypes<T, S> getMergedStereotypes() { return mergedStereotypes; } Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/DisposalMethod.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bean/DisposalMethod.java 2009-10-11 16:34:00 UTC (rev 3926) +++ core/trunk/impl/src/main/java/org/jboss/weld/bean/DisposalMethod.java 2009-10-11 16:37:25 UTC (rev 3927) @@ -34,11 +34,14 @@ import org.jboss.weld.bootstrap.BeanDeployerEnvironment; import org.jboss.weld.injection.MethodInjectionPoint; import org.jboss.weld.introspector.WeldMethod; +import org.jboss.weld.introspector.WeldParameter; public class DisposalMethod<X, T> extends AbstractReceiverBean<X, T, Method> { - protected MethodInjectionPoint<T, ?> disposalMethodInjectionPoint; + protected MethodInjectionPoint<T, X> disposalMethodInjectionPoint; + + private WeldParameter<?, X> disposesParameter; protected DisposalMethod(BeanManagerImpl manager, WeldMethod<T, X> disposalMethod, AbstractClassBean<X> declaringBean) { @@ -51,12 +54,23 @@ initPolicy(); } + private void initDisposesParameter() + { + this.disposesParameter = getAnnotatedItem().getAnnotatedWBParameters(Disposes.class).get(0); + } + + public WeldParameter<?, X> getDisposesParameter() + { + return disposesParameter; + } + @Override public void initialize(BeanDeployerEnvironment environment) { addInjectionPoint(disposalMethodInjectionPoint); super.initialize(environment); checkDisposalMethod(); + initDisposesParameter(); } @SuppressWarnings("unchecked") @@ -66,7 +80,7 @@ } @Override - public WeldMethod<T, ?> getAnnotatedItem() + public WeldMethod<T, X> getAnnotatedItem() { return disposalMethodInjectionPoint; } Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/SessionBean.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bean/SessionBean.java 2009-10-11 16:34:00 UTC (rev 3926) +++ core/trunk/impl/src/main/java/org/jboss/weld/bean/SessionBean.java 2009-10-11 16:37:25 UTC (rev 3927) @@ -143,7 +143,7 @@ public void preDestroy(T instance) { - + defaultPreDestroy(instance); } public void dispose(T instance) Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/AbstractBeanDeployer.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/AbstractBeanDeployer.java 2009-10-11 16:34:00 UTC (rev 3926) +++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/AbstractBeanDeployer.java 2009-10-11 16:37:25 UTC (rev 3927) @@ -17,22 +17,14 @@ package org.jboss.weld.bootstrap; import java.lang.reflect.Member; -import java.lang.reflect.Type; import java.util.Set; import javax.enterprise.event.Observes; import javax.enterprise.inject.Disposes; import javax.enterprise.inject.Produces; -import javax.enterprise.inject.spi.ProcessAnnotatedType; -import javax.enterprise.inject.spi.ProcessInjectionTarget; -import javax.enterprise.inject.spi.ProcessManagedBean; -import javax.enterprise.inject.spi.ProcessObserverMethod; -import javax.enterprise.inject.spi.ProcessProducer; -import javax.enterprise.inject.spi.ProcessSessionBean; import javax.inject.Inject; import org.jboss.weld.BeanManagerImpl; -import org.jboss.weld.DefinitionException; import org.jboss.weld.bean.AbstractClassBean; import org.jboss.weld.bean.AbstractProducerBean; import org.jboss.weld.bean.DecoratorImpl; @@ -48,11 +40,13 @@ import org.jboss.weld.bean.SessionBean; import org.jboss.weld.bean.ee.EEResourceProducerField; import org.jboss.weld.bean.ee.PersistenceContextProducerField; -import org.jboss.weld.bootstrap.events.ProcessAnnotatedTypeImpl; +import org.jboss.weld.bootstrap.events.ProcessBeanImpl; import org.jboss.weld.bootstrap.events.ProcessInjectionTargetImpl; import org.jboss.weld.bootstrap.events.ProcessManagedBeanImpl; import org.jboss.weld.bootstrap.events.ProcessObserverMethodImpl; +import org.jboss.weld.bootstrap.events.ProcessProducerFieldImpl; import org.jboss.weld.bootstrap.events.ProcessProducerImpl; +import org.jboss.weld.bootstrap.events.ProcessProducerMethodImpl; import org.jboss.weld.bootstrap.events.ProcessSessionBeanImpl; import org.jboss.weld.ejb.EJBApiAbstraction; import org.jboss.weld.ejb.InternalEjbDescriptor; @@ -67,7 +61,6 @@ import org.jboss.weld.persistence.PersistenceApiAbstraction; import org.jboss.weld.servlet.ServletApiAbstraction; import org.jboss.weld.util.Reflections; -import org.jboss.weld.util.reflection.ParameterizedTypeImpl; import org.jboss.weld.ws.WSApiAbstraction; public class AbstractBeanDeployer<E extends BeanDeployerEnvironment> @@ -113,20 +106,32 @@ { if (bean instanceof AbstractProducerBean<?, ?, ?>) { - fireProcessProducerEvent((AbstractProducerBean<?, ?, Member>) bean); + ProcessProducerImpl.fire(manager, (AbstractProducerBean<?, ?, Member>) bean); } - if (bean instanceof AbstractClassBean<?>) + else if (bean instanceof AbstractClassBean<?>) { - fireProcessInjectionTargetEvent((AbstractClassBean<?>) bean); + ProcessInjectionTargetImpl.fire(manager, (AbstractClassBean<?>) bean); } if (bean instanceof ManagedBean<?>) { - fireProcessManagedBeanEvent((ManagedBean<?>) bean); + ProcessManagedBeanImpl.fire(manager, (ManagedBean<?>) bean); } - if (bean instanceof SessionBean<?>) + else if (bean instanceof SessionBean<?>) { - fireProcessSessionBeanEvent((SessionBean<Object>) bean); + ProcessSessionBeanImpl.fire(manager, (SessionBean<Object>) bean); } + else if (bean instanceof ProducerField<?, ?>) + { + ProcessProducerFieldImpl.fire(manager, (ProducerField<?, ?>) bean); + } + else if (bean instanceof ProducerMethod<?, ?>) + { + ProcessProducerMethodImpl.fire(manager, (ProducerMethod<?, ?>) bean); + } + else + { + ProcessBeanImpl.fire(getManager(), bean); + } } manager.addBean(bean); log.debug("Bean: " + bean); @@ -135,7 +140,7 @@ { log.debug("Observer : " + observer); observer.initialize(); - fireProcessObserverMethodEvent(observer); + ProcessObserverMethodImpl.fire(manager, observer); manager.addObserver(observer); } @@ -203,63 +208,6 @@ getEnvironment().addBean(bean); } - private <X, T> void fireProcessProducerEvent(AbstractProducerBean<X, T, Member> producer) - { - ProcessProducerImpl<X, T> payload = new ProcessProducerImpl<X, T>(producer.getAnnotatedItem(), producer) {}; - fireEvent(payload, ProcessProducer.class, producer.getAnnotatedItem().getDeclaringType().getBaseType(), producer.getAnnotatedItem().getBaseType()); - if (!payload.getDefinitionErrors().isEmpty()) - { - // FIXME communicate all the captured definition errors in this exception - throw new DefinitionException(payload.getDefinitionErrors().get(0)); - } - } - - private <X> void fireProcessInjectionTargetEvent(AbstractClassBean<X> classBean) - { - ProcessInjectionTargetImpl<X> payload = new ProcessInjectionTargetImpl<X>(classBean.getAnnotatedItem(), classBean) {}; - fireEvent(payload, ProcessInjectionTarget.class, classBean.getAnnotatedItem().getBaseType()); - if (!payload.getDefinitionErrors().isEmpty()) - { - // FIXME communicate all the captured definition errors in this exception - throw new DefinitionException(payload.getDefinitionErrors().get(0)); - } - } - - protected <X> ProcessAnnotatedTypeImpl<X> fireProcessAnnotatedTypeEvent(WeldClass<X> clazz) - { - ProcessAnnotatedTypeImpl<X> payload = new ProcessAnnotatedTypeImpl<X>(clazz) {}; - fireEvent(payload, ProcessAnnotatedType.class, clazz.getBaseType()); - return payload; - } - - private <X> void fireProcessManagedBeanEvent(ManagedBean<X> bean) - { - ProcessManagedBeanImpl<X> payload = new ProcessManagedBeanImpl<X>(bean) {}; - fireEvent(payload, ProcessManagedBean.class, bean.getAnnotatedItem().getBaseType()); - if (!payload.getDefinitionErrors().isEmpty()) - { - // FIXME communicate all the captured definition errors in this exception - throw new DefinitionException(payload.getDefinitionErrors().get(0)); - } - } - - private <X> void fireProcessSessionBeanEvent(SessionBean<Object> bean) - { - ProcessSessionBeanImpl<X> payload = new ProcessSessionBeanImpl<X>(bean) {}; - fireEvent(payload, ProcessSessionBean.class, bean.getAnnotatedItem().getBaseType()); - if (!payload.getDefinitionErrors().isEmpty()) - { - // FIXME communicate all the captured definition errors in this exception - throw new DefinitionException(payload.getDefinitionErrors().get(0)); - } - } - - protected void fireEvent(Object payload, Type rawType, Type... actualTypeArguments) - { - Type eventType = new ParameterizedTypeImpl(rawType, actualTypeArguments, null); - manager.fireEvent(eventType, payload); - } - protected <X> void createProducerFields(AbstractClassBean<X> declaringBean, WeldClass<X> annotatedClass) { for (WeldField<?, X> field : annotatedClass.getDeclaredAnnotatedWeldFields(Produces.class)) @@ -281,18 +229,6 @@ ObserverMethodImpl<X, T> observer = ObserverFactory.create(method, declaringBean, manager); getEnvironment().addObserver(observer); } - - private <X, T> void fireProcessObserverMethodEvent(ObserverMethodImpl<X, T> observer) - { - ProcessObserverMethodImpl<X, T> payload = new ProcessObserverMethodImpl<X, T>(observer.getMethod(), observer) {}; - fireEvent(payload, ProcessObserverMethod.class, observer.getMethod().getDeclaringType().getBaseType(), observer.getObservedType()); - if (!payload.getDefinitionErrors().isEmpty()) - { - // FIXME communicate all the captured definition errors in this exception - throw new DefinitionException(payload.getDefinitionErrors().get(0)); - } - return; - } protected <T> void createSimpleBean(WeldClass<T> annotatedClass) { Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployer.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployer.java 2009-10-11 16:34:00 UTC (rev 3926) +++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployer.java 2009-10-11 16:37:25 UTC (rev 3927) @@ -58,7 +58,7 @@ ClassTransformer classTransformer = Container.instance().deploymentServices().get(ClassTransformer.class); if (!clazz.isAnnotation() && !clazz.isEnum()) { - ProcessAnnotatedTypeImpl<?> event = fireProcessAnnotatedTypeEvent(classTransformer.loadClass(clazz)); + ProcessAnnotatedTypeImpl<?> event = ProcessAnnotatedTypeImpl.fire(deploymentManager, classTransformer.loadClass(clazz)); if (!event.isVeto()) { if (event.getAnnotatedType() instanceof WeldClass<?>) Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java 2009-10-11 16:34:00 UTC (rev 3926) +++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java 2009-10-11 16:37:25 UTC (rev 3927) @@ -22,15 +22,11 @@ import java.util.Set; import java.util.Map.Entry; -import javax.enterprise.inject.spi.BeforeBeanDiscovery; -import javax.enterprise.inject.spi.BeforeShutdown; import javax.enterprise.inject.spi.Extension; import org.jboss.weld.BeanManagerImpl; import org.jboss.weld.Container; import org.jboss.weld.ContextualStore; -import org.jboss.weld.DefinitionException; -import org.jboss.weld.DeploymentException; import org.jboss.weld.Validator; import org.jboss.weld.bean.builtin.ManagerBean; import org.jboss.weld.bootstrap.api.Bootstrap; @@ -157,7 +153,7 @@ private Map<BeanDeploymentArchive, BeanDeployment> beanDeployments; private Environment environment; private Deployment deployment; - private ExtensionBeanDeployerEnvironment extensionBeanDeployerEnvironment; + private ExtensionBeanDeployerEnvironment extensionDeployerEnvironment; public Bootstrap startContainer(Environment environment, Deployment deployment, BeanStore applicationBeanStore) { @@ -216,9 +212,9 @@ // Start the application context Container.instance().deploymentServices().get(ContextLifecycle.class).beginApplication(applicationBeanStore); - this.extensionBeanDeployerEnvironment = new ExtensionBeanDeployerEnvironment(EjbDescriptors.EMPTY, deploymentManager); + this.extensionDeployerEnvironment = new ExtensionBeanDeployerEnvironment(EjbDescriptors.EMPTY, deploymentManager); - DeploymentVisitor deploymentVisitor = new DeploymentVisitor(deploymentManager, environment, deployment, extensionBeanDeployerEnvironment); + DeploymentVisitor deploymentVisitor = new DeploymentVisitor(deploymentManager, environment, deployment, extensionDeployerEnvironment); beanDeployments = deploymentVisitor.visit(); return this; @@ -264,14 +260,14 @@ throw new IllegalStateException("Manager has not been initialized"); } - ExtensionBeanDeployer extensionBeanDeployer = new ExtensionBeanDeployer(deploymentManager, extensionBeanDeployerEnvironment); + ExtensionBeanDeployer extensionBeanDeployer = new ExtensionBeanDeployer(deploymentManager, extensionDeployerEnvironment); extensionBeanDeployer.addExtensions(ServiceLoader.load(Extension.class)); extensionBeanDeployer.createBeans().deploy(); // Add the Deployment BeanManager Bean to the Deployment BeanManager deploymentManager.addBean(new ManagerBean(deploymentManager)); - fireBeforeBeanDiscoveryEvent(); + BeforeBeanDiscoveryImpl.fire(deploymentManager, deployment, beanDeployments, extensionDeployerEnvironment); } return this; } @@ -284,7 +280,7 @@ { entry.getValue().deployBeans(environment); } - fireAfterBeanDiscoveryEvent(); + AfterBeanDiscoveryImpl.fire(deploymentManager, deployment, beanDeployments, extensionDeployerEnvironment); log.debug("Weld initialized. Validating beans."); } return this; @@ -298,7 +294,7 @@ { deployment.getServices().get(Validator.class).validateDeployment(entry.getValue().getBeanManager(), entry.getValue().getBeanDeployer().getEnvironment()); } - fireAfterDeploymentValidationEvent(); + AfterDeploymentValidationImpl.fire(deploymentManager); } return this; } @@ -314,71 +310,6 @@ return this; } - private void fireBeforeBeanDiscoveryEvent() - { - BeforeBeanDiscovery event = new BeforeBeanDiscoveryImpl(deploymentManager, deployment, beanDeployments, extensionBeanDeployerEnvironment); - try - { - deploymentManager.fireEvent(event); - } - catch (Exception e) - { - throw new DefinitionException(e); - } - } - - private void fireBeforeShutdownEvent() - { - BeforeShutdown event = new BeforeShutdownImpl(); - try - { - deploymentManager.fireEvent(event); - } - catch (Exception e) - { - throw new DeploymentException(e); - } - } - - private void fireAfterBeanDiscoveryEvent() - { - AfterBeanDiscoveryImpl event = new AfterBeanDiscoveryImpl(deploymentManager, deployment, beanDeployments, extensionBeanDeployerEnvironment); - try - { - deploymentManager.fireEvent(event); - } - catch (Exception e) - { - event.addDefinitionError(e); - } - - if (event.getDefinitionErrors().size() > 0) - { - // FIXME communicate all the captured definition errors in this exception - throw new DefinitionException(event.getDefinitionErrors().get(0)); - } - } - - private void fireAfterDeploymentValidationEvent() - { - AfterDeploymentValidationImpl event = new AfterDeploymentValidationImpl(); - - try - { - deploymentManager.fireEvent(event); - } - catch (Exception e) - { - event.addDeploymentProblem(e); - } - - if (event.getDeploymentProblems().size() > 0) - { - // FIXME communicate all the captured deployment problems in this exception - throw new DeploymentException(event.getDeploymentProblems().get(0)); - } - } - /** * Gets version information * @@ -417,7 +348,7 @@ { try { - fireBeforeShutdownEvent(); + BeforeShutdownImpl.fire(deploymentManager); } finally { Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AbstractBeanDiscoveryEvent.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AbstractBeanDiscoveryEvent.java 2009-10-11 16:34:00 UTC (rev 3926) +++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AbstractBeanDiscoveryEvent.java 2009-10-11 16:37:25 UTC (rev 3927) @@ -16,6 +16,7 @@ */ package org.jboss.weld.bootstrap.events; +import java.lang.reflect.Type; import java.util.Map; import org.jboss.weld.BeanManagerImpl; @@ -28,18 +29,17 @@ /** * @author pmuir */ -public abstract class AbstractBeanDiscoveryEvent extends AbstractContainerEvent +public abstract class AbstractBeanDiscoveryEvent extends AbstractDefinitionContainerEvent { - + private final Map<BeanDeploymentArchive, BeanDeployment> beanDeployments; - private final BeanManagerImpl deploymentManager; private final Deployment deployment; private final ExtensionBeanDeployerEnvironment extensionBeanDeployerEnvironment; - public AbstractBeanDiscoveryEvent(Map<BeanDeploymentArchive, BeanDeployment> beanDeployments, BeanManagerImpl deploymentManager, Deployment deployment, ExtensionBeanDeployerEnvironment extensionBeanDeployerEnvironment) + public AbstractBeanDiscoveryEvent(BeanManagerImpl deploymentManager, Type rawType, Map<BeanDeploymentArchive, BeanDeployment> beanDeployments, Deployment deployment, ExtensionBeanDeployerEnvironment extensionBeanDeployerEnvironment) { + super(deploymentManager, rawType, EMPTY_TYPE_ARRAY); this.beanDeployments = beanDeployments; - this.deploymentManager = deploymentManager; this.deployment = deployment; this.extensionBeanDeployerEnvironment = extensionBeanDeployerEnvironment; } @@ -60,14 +60,6 @@ return deployment; } - /** - * @return the deploymentManager - */ - protected BeanManagerImpl getDeploymentManager() - { - return deploymentManager; - } - protected TypeStore getTypeStore() { return getDeployment().getServices().get(TypeStore.class); @@ -89,7 +81,7 @@ } else { - BeanDeployment beanDeployment = new BeanDeployment(beanDeploymentArchive, getDeploymentManager(), deployment, extensionBeanDeployerEnvironment, deployment.getServices()); + BeanDeployment beanDeployment = new BeanDeployment(beanDeploymentArchive, getBeanManager(), getDeployment(), extensionBeanDeployerEnvironment, getDeployment().getServices()); getBeanDeployments().put(beanDeploymentArchive, beanDeployment); return beanDeployment; } Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AbstractContainerEvent.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AbstractContainerEvent.java 2009-10-11 16:34:00 UTC (rev 3926) +++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AbstractContainerEvent.java 2009-10-11 16:37:25 UTC (rev 3927) @@ -1,36 +1,29 @@ -/* - * 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 org.jboss.weld.bootstrap.events; +import java.lang.reflect.Type; import java.util.ArrayList; import java.util.List; -/** - * @author pmuir - * - */ -public class AbstractContainerEvent +import org.jboss.weld.BeanManagerImpl; +import org.jboss.weld.DefinitionException; +import org.jboss.weld.util.reflection.ParameterizedTypeImpl; + +public abstract class AbstractContainerEvent { + + protected static final Type[] EMPTY_TYPE_ARRAY = new Type[0]; private final List<Throwable> errors; - - public AbstractContainerEvent() + private final BeanManagerImpl beanManager; + private final Type[] actualTypeArguments; + private final Type rawType; + + protected AbstractContainerEvent(BeanManagerImpl beanManager, Type rawType, Type[] actualTypeArguments) { this.errors = new ArrayList<Throwable>(); + this.beanManager = beanManager; + this.actualTypeArguments = actualTypeArguments; + this.rawType = rawType; } /** @@ -40,5 +33,33 @@ { return errors; } + + protected BeanManagerImpl getBeanManager() + { + return beanManager; + } + + protected void fire() + { + Type eventType = new ParameterizedTypeImpl(getRawType(), getEmptyTypeArray(), null); + try + { + beanManager.fireEvent(eventType, this); + } + catch (Exception e) + { + getErrors().add(new DefinitionException(e)); + } + } -} + protected Type getRawType() + { + return rawType; + } + + protected Type[] getEmptyTypeArray() + { + return actualTypeArguments; + } + +} \ No newline at end of file Copied: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AbstractDefinitionContainerEvent.java (from rev 3909, core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AbstractContainerEvent.java) =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AbstractDefinitionContainerEvent.java (rev 0) +++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AbstractDefinitionContainerEvent.java 2009-10-11 16:37:25 UTC (rev 3927) @@ -0,0 +1,47 @@ +/* + * 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 org.jboss.weld.bootstrap.events; + +import java.lang.reflect.Type; + +import org.jboss.weld.BeanManagerImpl; +import org.jboss.weld.DefinitionException; + +/** + * @author pmuir + * + */ +public abstract class AbstractDefinitionContainerEvent extends AbstractContainerEvent +{ + + protected AbstractDefinitionContainerEvent(BeanManagerImpl beanManager, Type rawType, Type[] actualTypeArguments) + { + super(beanManager, rawType, actualTypeArguments); + } + + @Override + protected void fire() + { + super.fire(); + if (!getErrors().isEmpty()) + { + // FIXME communicate all the captured definition errors in this exception + throw new DefinitionException(getErrors().get(0)); + } + } + +} Property changes on: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AbstractDefinitionContainerEvent.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AbstractDeploymentContainerEvent.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AbstractDeploymentContainerEvent.java (rev 0) +++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AbstractDeploymentContainerEvent.java 2009-10-11 16:37:25 UTC (rev 3927) @@ -0,0 +1,47 @@ +/* + * 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 org.jboss.weld.bootstrap.events; + +import java.lang.reflect.Type; + +import org.jboss.weld.BeanManagerImpl; +import org.jboss.weld.DeploymentException; + +/** + * @author pmuir + * + */ +public abstract class AbstractDeploymentContainerEvent extends AbstractContainerEvent +{ + + protected AbstractDeploymentContainerEvent(BeanManagerImpl beanManager, Type rawType, Type[] actualTypeArguments) + { + super(beanManager, rawType, actualTypeArguments); + } + + @Override + protected void fire() + { + super.fire(); + if (!getErrors().isEmpty()) + { + // FIXME communicate all the captured deployment errors in this exception + throw new DeploymentException(getErrors().get(0)); + } + } + +} Property changes on: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AbstractDeploymentContainerEvent.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Deleted: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AbstractProcessBean.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AbstractProcessBean.java 2009-10-11 16:34:00 UTC (rev 3926) +++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AbstractProcessBean.java 2009-10-11 16:37:25 UTC (rev 3927) @@ -1,40 +0,0 @@ -package org.jboss.weld.bootstrap.events; - -import java.util.List; - -import javax.enterprise.inject.spi.Annotated; -import javax.enterprise.inject.spi.ProcessBean; - -import org.jboss.weld.bean.AbstractBean; - -public abstract class AbstractProcessBean<X, B extends AbstractBean<X, ?>> extends AbstractContainerEvent implements ProcessBean<X> -{ - - private final B bean; - - public AbstractProcessBean(B bean) - { - this.bean = bean; - } - - public void addDefinitionError(Throwable t) - { - getErrors().add(t); - } - - public List<Throwable> getDefinitionErrors() - { - return super.getErrors(); - } - - public Annotated getAnnotated() - { - return bean.getAnnotatedItem(); - } - - public B getBean() - { - return bean; - } - -} Copied: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AbstractProcessClassBean.java (from rev 3909, core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AbstractProcessBean.java) =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AbstractProcessClassBean.java (rev 0) +++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AbstractProcessClassBean.java 2009-10-11 16:37:25 UTC (rev 3927) @@ -0,0 +1,37 @@ +package org.jboss.weld.bootstrap.events; + +import java.lang.reflect.Type; + +import javax.enterprise.inject.spi.Annotated; +import javax.enterprise.inject.spi.ProcessBean; + +import org.jboss.weld.BeanManagerImpl; +import org.jboss.weld.bean.AbstractClassBean; + +public abstract class AbstractProcessClassBean<X, B extends AbstractClassBean<X>> extends AbstractDefinitionContainerEvent implements ProcessBean<X> +{ + + private final B bean; + + public AbstractProcessClassBean(BeanManagerImpl beanManager, Type rawType, Type[] actualTypeArguments, B bean) + { + super(beanManager, rawType, actualTypeArguments); + this.bean = bean; + } + + public void addDefinitionError(Throwable t) + { + getErrors().add(t); + } + + public Annotated getAnnotated() + { + return bean.getAnnotatedItem(); + } + + public B getBean() + { + return bean; + } + +} Property changes on: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AbstractProcessClassBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AbstractProcessProducerBean.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AbstractProcessProducerBean.java (rev 0) +++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AbstractProcessProducerBean.java 2009-10-11 16:37:25 UTC (rev 3927) @@ -0,0 +1,37 @@ +package org.jboss.weld.bootstrap.events; + +import java.lang.reflect.Type; + +import javax.enterprise.inject.spi.Annotated; +import javax.enterprise.inject.spi.ProcessBean; + +import org.jboss.weld.BeanManagerImpl; +import org.jboss.weld.bean.AbstractProducerBean; + +public abstract class AbstractProcessProducerBean<X, T, B extends AbstractProducerBean<X, T, ? >> extends AbstractDefinitionContainerEvent implements ProcessBean<T> +{ + + private final B bean; + + public AbstractProcessProducerBean(BeanManagerImpl beanManager, Type rawType, Type[] actualTypeArguments, B bean) + { + super(beanManager, rawType, actualTypeArguments); + this.bean = bean; + } + + public void addDefinitionError(Throwable t) + { + getErrors().add(t); + } + + public Annotated getAnnotated() + { + return bean.getAnnotatedItem(); + } + + public B getBean() + { + return bean; + } + +} Property changes on: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AbstractProcessProducerBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AfterBeanDiscoveryImpl.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AfterBeanDiscoveryImpl.java 2009-10-11 16:34:00 UTC (rev 3926) +++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AfterBeanDiscoveryImpl.java 2009-10-11 16:37:25 UTC (rev 3927) @@ -33,11 +33,16 @@ public class AfterBeanDiscoveryImpl extends AbstractBeanDiscoveryEvent implements AfterBeanDiscovery { - - public AfterBeanDiscoveryImpl(BeanManagerImpl deploymentManager, Deployment deployment, Map<BeanDeploymentArchive, BeanDeployment> beanDeployments, ExtensionBeanDeployerEnvironment extensionDeployerEnvironment) + + public static void fire(BeanManagerImpl deploymentManager, Deployment deployment, Map<BeanDeploymentArchive, BeanDeployment> beanDeployments, ExtensionBeanDeployerEnvironment extensionDeployerEnvironment) { - super(beanDeployments, deploymentManager, deployment, extensionDeployerEnvironment); + new AfterBeanDiscoveryImpl(deploymentManager, deployment, beanDeployments, extensionDeployerEnvironment).fire(); } + + protected AfterBeanDiscoveryImpl(BeanManagerImpl deploymentManager, Deployment deployment, Map<BeanDeploymentArchive, BeanDeployment> beanDeployments, ExtensionBeanDeployerEnvironment extensionDeployerEnvironment) + { + super(deploymentManager, AfterBeanDiscovery.class, beanDeployments, deployment, extensionDeployerEnvironment); + } public void addDefinitionError(Throwable t) { @@ -51,12 +56,14 @@ public void addBean(Bean<?> bean) { - getOrCreateBeanDeployment(bean.getBeanClass()).getBeanManager().addBean(bean); + BeanManagerImpl beanManager = getOrCreateBeanDeployment(bean.getBeanClass()).getBeanManager(); + beanManager.addBean(bean); + ProcessBeanImpl.fire(beanManager, bean); } public void addContext(Context context) { - getDeploymentManager().addContext(context); + getBeanManager().addContext(context); } public void addObserverMethod(ObserverMethod<?, ?> observerMethod) Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AfterDeploymentValidationImpl.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AfterDeploymentValidationImpl.java 2009-10-11 16:34:00 UTC (rev 3926) +++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AfterDeploymentValidationImpl.java 2009-10-11 16:37:25 UTC (rev 3927) @@ -16,22 +16,27 @@ */ package org.jboss.weld.bootstrap.events; -import java.util.Collections; -import java.util.List; - import javax.enterprise.inject.spi.AfterDeploymentValidation; +import org.jboss.weld.BeanManagerImpl; -public class AfterDeploymentValidationImpl extends AbstractContainerEvent implements AfterDeploymentValidation + +public class AfterDeploymentValidationImpl extends AbstractDeploymentContainerEvent implements AfterDeploymentValidation { + public static void fire(BeanManagerImpl deploymentManager) + { + new AfterDeploymentValidationImpl(deploymentManager).fire(); + } + + protected AfterDeploymentValidationImpl(BeanManagerImpl beanManager) + { + super(beanManager, AfterDeploymentValidation.class, EMPTY_TYPE_ARRAY); + } + public void addDeploymentProblem(Throwable t) { getErrors().add(t); } - - public List<Throwable> getDeploymentProblems() - { - return Collections.unmodifiableList(getErrors()); - } + } Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/BeforeBeanDiscoveryImpl.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/BeforeBeanDiscoveryImpl.java 2009-10-11 16:34:00 UTC (rev 3926) +++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/BeforeBeanDiscoveryImpl.java 2009-10-11 16:37:25 UTC (rev 3927) @@ -34,12 +34,17 @@ public class BeforeBeanDiscoveryImpl extends AbstractBeanDiscoveryEvent implements BeforeBeanDiscovery { - - public BeforeBeanDiscoveryImpl(BeanManagerImpl deploymentManager, Deployment deployment, Map<BeanDeploymentArchive, BeanDeployment> beanDeployments, ExtensionBeanDeployerEnvironment extensionBeanDeployerEnvironment) + + public static void fire(BeanManagerImpl deploymentManager, Deployment deployment, Map<BeanDeploymentArchive, BeanDeployment> beanDeployments, ExtensionBeanDeployerEnvironment extensionDeployerEnvironment) { - super(beanDeployments, deploymentManager, deployment, extensionBeanDeployerEnvironment); + new BeforeBeanDiscoveryImpl(deploymentManager, deployment, beanDeployments, extensionDeployerEnvironment).fire(); } + protected BeforeBeanDiscoveryImpl(BeanManagerImpl deploymentManager, Deployment deployment, Map<BeanDeploymentArchive, BeanDeployment> beanDeployments, ExtensionBeanDeployerEnvironment extensionBeanDeployerEnvironment) + { + super(deploymentManager, BeforeBeanDiscovery.class, beanDeployments, deployment, extensionBeanDeployerEnvironment); + } + public void addQualifier(Class<? extends Annotation> bindingType) { getTypeStore().add(bindingType, new BindingTypeLiteral()); @@ -50,8 +55,7 @@ getTypeStore().add(bindingType, new InterceptorBindingTypeLiteral()); } - public void addScope(Class<? extends Annotation> scopeType, - boolean normal, boolean passivating) + public void addScope(Class<? extends Annotation> scopeType, boolean normal, boolean passivating) { if (normal) { @@ -63,17 +67,14 @@ } } - public void addStereotype(Class<? extends Annotation> stereotype, - Annotation... stereotypeDef) + public void addStereotype(Class<? extends Annotation> stereotype, Annotation... stereotypeDef) { throw new UnsupportedOperationException(); } - + public void addAnnotatedType(AnnotatedType<?> type) { getOrCreateBeanDeployment(type.getJavaClass()).getBeanDeployer().addClass(type); } - - } Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/BeforeShutdownImpl.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/BeforeShutdownImpl.java 2009-10-11 16:34:00 UTC (rev 3926) +++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/BeforeShutdownImpl.java 2009-10-11 16:37:25 UTC (rev 3927) @@ -18,11 +18,23 @@ import javax.enterprise.inject.spi.BeforeShutdown; +import org.jboss.weld.BeanManagerImpl; + /** * @author pmuir * */ -public class BeforeShutdownImpl implements BeforeShutdown +public class BeforeShutdownImpl extends AbstractContainerEvent implements BeforeShutdown { + + public static void fire(BeanManagerImpl beanManager) + { + new BeforeShutdownImpl(beanManager).fire(); + } + + public BeforeShutdownImpl(BeanManagerImpl beanManager) + { + super(beanManager, BeforeShutdown.class, EMPTY_TYPE_ARRAY); + } } Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessAnnotatedTypeImpl.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessAnnotatedTypeImpl.java 2009-10-11 16:34:00 UTC (rev 3926) +++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessAnnotatedTypeImpl.java 2009-10-11 16:37:25 UTC (rev 3927) @@ -16,9 +16,14 @@ */ package org.jboss.weld.bootstrap.events; +import java.lang.reflect.Type; + import javax.enterprise.inject.spi.AnnotatedType; import javax.enterprise.inject.spi.ProcessAnnotatedType; +import org.jboss.weld.BeanManagerImpl; +import org.jboss.weld.introspector.WeldClass; + /** * Container lifecycle event for each Java class or interface discovered by * the container. @@ -27,14 +32,22 @@ * @author David Allen * */ -public class ProcessAnnotatedTypeImpl<X> implements ProcessAnnotatedType<X> +public class ProcessAnnotatedTypeImpl<X> extends AbstractDefinitionContainerEvent implements ProcessAnnotatedType<X> { + public static <X> ProcessAnnotatedTypeImpl<X> fire(BeanManagerImpl beanManager, WeldClass<X> clazz) + { + ProcessAnnotatedTypeImpl<X> payload = new ProcessAnnotatedTypeImpl<X>(beanManager, clazz) {}; + payload.fire(); + return payload; + } + private AnnotatedType<X> annotatedType; private boolean veto; - public ProcessAnnotatedTypeImpl(AnnotatedType<X> annotatedType) + public ProcessAnnotatedTypeImpl(BeanManagerImpl beanManager, AnnotatedType<X> annotatedType) { + super(beanManager, ProcessAnnotatedType.class, new Type[] { annotatedType.getBaseType() }); this.annotatedType = annotatedType; } Added: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessBeanImpl.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessBeanImpl.java (rev 0) +++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessBeanImpl.java 2009-10-11 16:37:25 UTC (rev 3927) @@ -0,0 +1,46 @@ +package org.jboss.weld.bootstrap.events; + +import java.lang.reflect.Type; + +import javax.enterprise.inject.spi.Annotated; +import javax.enterprise.inject.spi.Bean; +import javax.enterprise.inject.spi.ProcessBean; + +import org.jboss.weld.BeanManagerImpl; +import org.jboss.weld.introspector.WeldAnnotated; +import org.jboss.weld.resources.ClassTransformer; + +public abstract class ProcessBeanImpl<X> extends AbstractDefinitionContainerEvent implements ProcessBean<X> +{ + + public static <X> void fire(BeanManagerImpl beanManager, Bean<X> bean) + { + new ProcessBeanImpl<X>(beanManager, bean) {}.fire(); + } + + private final Bean<X> bean; + private final WeldAnnotated<?, ?> annotated; + + public ProcessBeanImpl(BeanManagerImpl beanManager, Bean<X> bean) + { + super(beanManager, ProcessBean.class, new Type[] {bean.getBeanClass()}); + this.bean = bean; + this.annotated = beanManager.getServices().get(ClassTransformer.class).loadClass(bean.getBeanClass()); + } + + public void addDefinitionError(Throwable t) + { + getErrors().add(t); + } + + public Annotated getAnnotated() + { + return annotated; + } + + public Bean<X> getBean() + { + return bean; + } + +} Property changes on: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessBeanImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessInjectionTargetImpl.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessInjectionTargetImpl.java 2009-10-11 16:34:00 UTC (rev 3926) +++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessInjectionTargetImpl.java 2009-10-11 16:37:25 UTC (rev 3927) @@ -1,23 +1,31 @@ package org.jboss.weld.bootstrap.events; +import java.lang.reflect.Type; import java.util.List; import javax.enterprise.inject.spi.AnnotatedType; import javax.enterprise.inject.spi.InjectionTarget; import javax.enterprise.inject.spi.ProcessInjectionTarget; +import org.jboss.weld.BeanManagerImpl; import org.jboss.weld.bean.AbstractClassBean; -public class ProcessInjectionTargetImpl<T> extends AbstractContainerEvent implements ProcessInjectionTarget<T> +public class ProcessInjectionTargetImpl<T> extends AbstractDefinitionContainerEvent implements ProcessInjectionTarget<T> { + public static <X> void fire(BeanManagerImpl beanManager, AbstractClassBean<X> bean) + { + new ProcessInjectionTargetImpl<X>(beanManager, bean.getAnnotatedItem(), bean) {}.fire(); + } + private final AnnotatedType<T> annotatedType; private AbstractClassBean<T> classBean; - public ProcessInjectionTargetImpl(AnnotatedType<T> annotatedType, AbstractClassBean<T> classBean) + public ProcessInjectionTargetImpl(BeanManagerImpl beanManager, AnnotatedType<T> annotatedType, AbstractClassBean<T> bean) { - this.classBean = classBean; + super(beanManager, ProcessInjectionTarget.class, new Type[] { bean.getAnnotatedItem().getBaseType() }); + this.classBean = bean; this.annotatedType = annotatedType; } Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessManagedBeanImpl.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessManagedBeanImpl.java 2009-10-11 16:34:00 UTC (rev 3926) +++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessManagedBeanImpl.java 2009-10-11 16:37:25 UTC (rev 3927) @@ -1,17 +1,25 @@ package org.jboss.weld.bootstrap.events; +import java.lang.reflect.Type; + import javax.enterprise.inject.spi.AnnotatedType; import javax.enterprise.inject.spi.ProcessManagedBean; +import org.jboss.weld.BeanManagerImpl; import org.jboss.weld.bean.ManagedBean; -public class ProcessManagedBeanImpl<X> extends AbstractProcessBean<X, ManagedBean<X>> implements ProcessManagedBean<X> +public class ProcessManagedBeanImpl<X> extends AbstractProcessClassBean<X, ManagedBean<X>> implements ProcessManagedBean<X> { - public ProcessManagedBeanImpl(ManagedBean<X> bean) + public static <X> void fire(BeanManagerImpl beanManager, ManagedBean<X> bean) { - super(bean); + new ProcessManagedBeanImpl<X>(beanManager, bean) {}.fire(); } + + public ProcessManagedBeanImpl(BeanManagerImpl beanManager, ManagedBean<X> bean) + { + super(beanManager, ProcessManagedBean.class, new Type[] { bean.getAnnotatedItem().getBaseType() }, bean); + } public AnnotatedType<X> getAnnotatedBeanClass() { Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessObserverMethodImpl.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessObserverMethodImpl.java 2009-10-11 16:34:00 UTC (rev 3926) +++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessObserverMethodImpl.java 2009-10-11 16:37:25 UTC (rev 3927) @@ -17,6 +17,7 @@ package org.jboss.weld.bootstrap.events; +import java.lang.reflect.Type; import java.util.Collections; import java.util.List; @@ -24,6 +25,9 @@ import javax.enterprise.inject.spi.ObserverMethod; import javax.enterprise.inject.spi.ProcessObserverMethod; +import org.jboss.weld.BeanManagerImpl; +import org.jboss.weld.event.ObserverMethodImpl; + /** * Implementation of the event used to notify observers for each observer * method that is added. @@ -31,13 +35,20 @@ * @author David Allen * */ -public class ProcessObserverMethodImpl<X, T> extends AbstractContainerEvent implements ProcessObserverMethod<X, T> +public class ProcessObserverMethodImpl<X, T> extends AbstractDefinitionContainerEvent implements ProcessObserverMethod<X, T> { + + public static <X, T> void fire(BeanManagerImpl beanManager, ObserverMethodImpl<X, T> observer) + { + new ProcessObserverMethodImpl<X, T>(beanManager, observer.getMethod(), observer) {}.fire(); + } + private final AnnotatedMethod<X> beanMethod; private final ObserverMethod<X, T> observerMethod; - public ProcessObserverMethodImpl(AnnotatedMethod<X> beanMethod, ObserverMethod<X, T> observerMethod) + public ProcessObserverMethodImpl(BeanManagerImpl beanManager, AnnotatedMethod<X> beanMethod, ObserverMethodImpl<X, T> observerMethod) { + super(beanManager, ProcessObserverMethod.class, new Type[] { observerMethod.getMethod().getDeclaringType().getBaseType(), observerMethod.getObservedType() }); this.beanMethod = beanMethod; this.observerMethod = observerMethod; } Added: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessProducerFieldImpl.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessProducerFieldImpl.java (rev 0) +++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessProducerFieldImpl.java 2009-10-11 16:37:25 UTC (rev 3927) @@ -0,0 +1,30 @@ +package org.jboss.weld.bootstrap.events; + +import java.lang.reflect.Type; + +import javax.enterprise.inject.spi.AnnotatedField; +import javax.enterprise.inject.spi.ProcessProducerField; + +import org.jboss.weld.BeanManagerImpl; +import org.jboss.weld.bean.ProducerField; + +public class ProcessProducerFieldImpl<X, T> extends AbstractProcessProducerBean<X, T, ProducerField<X, T>> implements ProcessProducerField<X, T> +{ + + + public static <X, T> void fire(BeanManagerImpl beanManager, ProducerField<X, T> bean) + { + new ProcessProducerFieldImpl<X, T>(beanManager, bean) {}.fire(); + } + + public ProcessProducerFieldImpl(BeanManagerImpl beanManager, ProducerField<X, T> bean) + { + super(beanManager, ProcessProducerField.class, new Type[] { bean.getAnnotatedItem().getDeclaringType().getBaseType(), bean.getAnnotatedItem().getBaseType() }, bean); + } + + public AnnotatedField<X> getAnnotatedProducerField() + { + return getBean().getAnnotatedItem(); + } + +} Property changes on: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessProducerFieldImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessProducerImpl.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessProducerImpl.java 2009-10-11 16:34:00 UTC (rev 3926) +++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessProducerImpl.java 2009-10-11 16:37:25 UTC (rev 3927) @@ -1,22 +1,30 @@ package org.jboss.weld.bootstrap.events; -import java.util.List; +import java.lang.reflect.Member; +import java.lang.reflect.Type; import javax.enterprise.inject.spi.AnnotatedMember; import javax.enterprise.inject.spi.ProcessProducer; import javax.enterprise.inject.spi.Producer; +import org.jboss.weld.BeanManagerImpl; import org.jboss.weld.bean.AbstractProducerBean; -public class ProcessProducerImpl<X, T> extends AbstractContainerEvent implements ProcessProducer<X, T> +public class ProcessProducerImpl<X, T> extends AbstractDefinitionContainerEvent implements ProcessProducer<X, T> { + public static <X, T> void fire(BeanManagerImpl beanManager, AbstractProducerBean<X, T, Member> producer) + { + new ProcessProducerImpl<X, T>(beanManager, producer.getAnnotatedItem(), producer) {}.fire(); + } + private final AnnotatedMember<X> annotatedMember; private AbstractProducerBean<X, T, ?> bean; - public ProcessProducerImpl(AnnotatedMember<X> annotatedMember, AbstractProducerBean<X, T, ?> bean) + public ProcessProducerImpl(BeanManagerImpl beanManager, AnnotatedMember<X> annotatedMember, AbstractProducerBean<X, T, ?> bean) { + super(beanManager, ProcessProducer.class, new Type[] { bean.getAnnotatedItem().getDeclaringType().getBaseType(), bean.getAnnotatedItem().getBaseType() }); this.bean = bean; this.annotatedMember = annotatedMember; } @@ -25,11 +33,6 @@ { getErrors().add(t); } - - public List<Throwable> getDefinitionErrors() - { - return super.getErrors(); - } public AnnotatedMember<X> getAnnotatedMember() { Added: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessProducerMethodImpl.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessProducerMethodImpl.java (rev 0) +++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessProducerMethodImpl.java 2009-10-11 16:37:25 UTC (rev 3927) @@ -0,0 +1,38 @@ +package org.jboss.weld.bootstrap.events; + +import java.lang.reflect.Type; + +import javax.enterprise.inject.spi.AnnotatedMethod; +import javax.enterprise.inject.spi.AnnotatedParameter; +import javax.enterprise.inject.spi.ProcessProducerMethod; + +import org.jboss.weld.BeanManagerImpl; +import org.jboss.weld.bean.ProducerMethod; + +public class ProcessProducerMethodImpl<X, T> extends AbstractProcessProducerBean<X, T, ProducerMethod<X, T>> implements ProcessProducerMethod<X, T> +{ + + + public static <X, T> void fire(BeanManagerImpl beanManager, ProducerMethod<X, T> bean) + { + new ProcessProducerMethodImpl<X, T>(beanManager, bean) {}.fire(); + } + + public ProcessProducerMethodImpl(BeanManagerImpl beanManager, ProducerMethod<X, T> bean) + { + super(beanManager, ProcessProducerMethod.class, new Type[] { bean.getAnnotatedItem().getDeclaringType().getBaseType(), bean.getAnnotatedItem().getBaseType() }, bean); + } + + public AnnotatedParameter<X> getAnnotatedDisposedParameter() + { + return getBean().getDisposalMethod().getDisposesParameter(); + } + + public AnnotatedMethod<X> getAnnotatedProducerMethod() + { + return getBean().getAnnotatedItem(); + } + + + +} Property changes on: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessProducerMethodImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessSessionBeanImpl.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessSessionBeanImpl.java 2009-10-11 16:34:00 UTC (rev 3926) +++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessSessionBeanImpl.java 2009-10-11 16:37:25 UTC (rev 3927) @@ -1,17 +1,25 @@ package org.jboss.weld.bootstrap.events; +import java.lang.reflect.Type; + import javax.enterprise.inject.spi.AnnotatedType; import javax.enterprise.inject.spi.ProcessSessionBean; import javax.enterprise.inject.spi.SessionBeanType; +import org.jboss.weld.BeanManagerImpl; import org.jboss.weld.bean.SessionBean; -public class ProcessSessionBeanImpl<X> extends AbstractProcessBean<Object, SessionBean<Object>> implements ProcessSessionBean<X> +public class ProcessSessionBeanImpl<X> extends AbstractProcessClassBean<Object, SessionBean<Object>> implements ProcessSessionBean<X> { + + public static <X> void fire(BeanManagerImpl beanManager, SessionBean<Object> bean) + { + new ProcessSessionBeanImpl<X>(beanManager, bean) {}.fire(); + } - public ProcessSessionBeanImpl(SessionBean<Object> bean) + public ProcessSessionBeanImpl(BeanManagerImpl beanManager, SessionBean<Object> bean) { - super(bean); + super(beanManager, ProcessSessionBean.class, new Type[] { bean.getAnnotatedItem().getBaseType() }, bean); } public AnnotatedType<X> getAnnotatedSessionBeanClass() Modified: core/trunk/impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java 2009-10-11 16:34:00 UTC (rev 3926) +++ core/trunk/impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java 2009-10-11 16:37:25 UTC (rev 3927) @@ -95,7 +95,7 @@ private void checkObserverMethod() { // Make sure exactly one and only one parameter is annotated with Observes - List<WeldParameter<?, ?>> eventObjects = this.observerMethod.getAnnotatedParameters(Observes.class); + List<WeldParameter<?, X>> eventObjects = this.observerMethod.getAnnotatedParameters(Observes.class); if (this.notifyType.equals(Notify.IF_EXISTS) && declaringBean.getScope().equals(Dependent.class)) { throw new DefinitionException(this + " is invalid because it is a conditional observer method, and is declared by a @Dependent scoped bean"); @@ -125,7 +125,7 @@ } } // Check for parameters annotated with @Disposes - List<WeldParameter<?, ?>> disposeParams = this.observerMethod.getAnnotatedParameters(Disposes.class); + List<WeldParameter<?, X>> disposeParams = this.observerMethod.getAnnotatedParameters(Disposes.class); if (disposeParams.size() > 0) { throw new DefinitionException(this + " cannot have any parameters annotated with @Disposes"); Modified: core/trunk/impl/src/main/java/org/jboss/weld/injection/ConstructorInjectionPoint.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/injection/ConstructorInjectionPoint.java 2009-10-11 16:34:00 UTC (rev 3926) +++ core/trunk/impl/src/main/java/org/jboss/weld/injection/ConstructorInjectionPoint.java 2009-10-11 16:37:25 UTC (rev 3927) @@ -42,17 +42,17 @@ public class ConstructorInjectionPoint<T> extends ForwardingWeldConstructor<T> implements WeldInjectionPoint<T, Constructor<T>> { - private abstract class ForwardingParameterInjectionPointList extends AbstractList<ParameterInjectionPoint<?, ?>> + private static abstract class ForwardingParameterInjectionPointList<T, X> extends AbstractList<ParameterInjectionPoint<T, X>> { - protected abstract List<? extends WeldParameter<?, ?>> delegate(); + protected abstract List<? extends WeldParameter<T, X>> delegate(); - protected abstract Bean<?> declaringBean();; + protected abstract Bean<X> declaringBean();; @Override - public ParameterInjectionPoint<?, ?> get(int index) + public ParameterInjectionPoint<T, X> get(int index) { - return ParameterInjectionPoint.of(declaringBean, delegate().get(index)); + return ParameterInjectionPoint.of(declaringBean(), delegate().get(index)); } @Override @@ -65,16 +65,16 @@ private static final Annotation[] EMPTY_ANNOTATION_ARRAY = new Annotation[0]; - private final Bean<?> declaringBean; + private final Bean<T> declaringBean; private final WeldConstructor<T> constructor; private final boolean delegate; - public static <T> ConstructorInjectionPoint<T> of(Bean<?> declaringBean, WeldConstructor<T> constructor) + public static <T> ConstructorInjectionPoint<T> of(Bean<T> declaringBean, WeldConstructor<T> constructor) { return new ConstructorInjectionPoint<T>(declaringBean, constructor); } - protected ConstructorInjectionPoint(Bean<?> declaringBean, WeldConstructor<T> constructor) + protected ConstructorInjectionPoint(Bean<T> declaringBean, WeldConstructor<T> constructor) { this.declaringBean = declaringBean; this.constructor = constructor; @@ -92,6 +92,7 @@ return declaringBean; } + @Override public Set<Annotation> getQualifiers() { return delegate().getQualifiers(); @@ -123,20 +124,20 @@ } @Override - public List<ParameterInjectionPoint<?, ?>> getWBParameters() + public List<ParameterInjectionPoint<?, T>> getWBParameters() { - final List<? extends WeldParameter<?, ?>> delegate = super.getWBParameters(); + final List<? extends WeldParameter<?, T>> delegate = super.getWBParameters(); return new ForwardingParameterInjectionPointList() { @Override - protected Bean<?> declaringBean() + protected Bean<T> declaringBean() { return declaringBean; } @Override - protected List<? extends WeldParameter<?, ?>> delegate() + protected List<? extends WeldParameter<?, T>> delegate() { return delegate; } @@ -157,12 +158,12 @@ * @param manager The Bean manager * @return The object array of looked up values */ - protected Object[] getParameterValues(List<ParameterInjectionPoint<?, ?>> parameters, + protected Object[] getParameterValues(List<ParameterInjectionPoint<?, T>> parameters, Object specialVal, Class<? extends Annotation> specialParam, BeanManagerImpl manager, CreationalContext<?> creationalContext) { Object[] parameterValues = new Object[parameters.size()]; - Iterator<ParameterInjectionPoint<?, ?>> iterator = parameters.iterator(); + Iterator<ParameterInjectionPoint<?, T>> iterator = parameters.iterator(); for (int i = 0; i < parameterValues.length; i++) { ParameterInjectionPoint<?, ?> param = iterator.next(); Modified: core/trunk/impl/src/main/java/org/jboss/weld/injection/MethodInjectionPoint.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/injection/MethodInjectionPoint.java 2009-10-11 16:34:00 UTC (rev 3926) +++ core/trunk/impl/src/main/java/org/jboss/weld/injection/MethodInjectionPoint.java 2009-10-11 16:37:25 UTC (rev 3927) @@ -42,17 +42,17 @@ public class MethodInjectionPoint<T, X> extends ForwardingWeldMethod<T, X> implements WeldInjectionPoint<T, Method> { - private abstract class ForwardingParameterInjectionPointList extends AbstractList<ParameterInjectionPoint<?, ?>> + private static abstract class ForwardingParameterInjectionPointList<T, X> extends AbstractList<ParameterInjectionPoint<T, X>> { - protected abstract List<? extends WeldParameter<?, ?>> delegate(); + protected abstract List<? extends WeldParameter<T, X>> delegate(); - protected abstract Bean<?> declaringBean();; + protected abstract Bean<X> declaringBean(); @Override - public ParameterInjectionPoint<?, ?> get(int index) + public ParameterInjectionPoint<T, X> get(int index) { - return ParameterInjectionPoint.of(declaringBean, delegate().get(index)); + return ParameterInjectionPoint.of(declaringBean(), delegate().get(index)); } @Override @@ -92,6 +92,7 @@ return declaringBean; } + @Override public Set<Annotation> getQualifiers() { return delegate().getQualifiers(); @@ -200,9 +201,9 @@ } @Override - public List<ParameterInjectionPoint<?, ?>> getWBParameters() + public List<ParameterInjectionPoint<?, X>> getWBParameters() { - final List<? extends WeldParameter<?, ?>> delegate = super.getWBParameters(); + final List<? extends WeldParameter<?, X>> delegate = super.getWBParameters(); return new ForwardingParameterInjectionPointList() { @@ -213,7 +214,7 @@ } @Override - protected List<? extends WeldParameter<?, ?>> delegate() + protected List<? extends WeldParameter<?, X>> delegate() { return delegate; } @@ -249,12 +250,12 @@ * @param manager The Bean manager * @return The object array of looked up values */ - protected Object[] getParameterValues(List<ParameterInjectionPoint<?, ?>> parameters, + protected Object[] getParameterValues(List<ParameterInjectionPoint<?, X>> parameters, Class<? extends Annotation> specialParam, Object specialVal, BeanManagerImpl manager, CreationalContext<?> creationalContext) { Object[] parameterValues = new Object[parameters.size()]; - Iterator<ParameterInjectionPoint<?, ?>> iterator = parameters.iterator(); + Iterator<ParameterInjectionPoint<?, X>> iterator = parameters.iterator(); for (int i = 0; i < parameterValues.length; i++) { ParameterInjectionPoint<?, ?> param = iterator.next(); Modified: core/trunk/impl/src/main/java/org/jboss/weld/introspector/ForwardingWeldConstructor.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/introspector/ForwardingWeldConstructor.java 2009-10-11 16:34:00 UTC (rev 3926) +++ core/trunk/impl/src/main/java/org/jboss/weld/introspector/ForwardingWeldConstructor.java 2009-10-11 16:37:25 UTC (rev 3927) @@ -29,17 +29,18 @@ @Override protected abstract WeldConstructor<T> delegate(); - public List<WeldParameter<?, ?>> getAnnotatedWBParameters(Class<? extends Annotation> annotationType) + public List<WeldParameter<?, T>> getAnnotatedWBParameters(Class<? extends Annotation> annotationType) { return delegate().getAnnotatedWBParameters(annotationType); } + @Override public WeldClass<T> getDeclaringType() { return delegate().getDeclaringType(); } - public List<? extends WeldParameter<?, ?>> getWBParameters() + public List<? extends WeldParameter<?, T>> getWBParameters() { return delegate().getWBParameters(); } Modified: core/trunk/impl/src/main/java/org/jboss/weld/introspector/ForwardingWeldMethod.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/introspector/ForwardingWeldMethod.java 2009-10-11 16:34:00 UTC (rev 3926) +++ core/trunk/impl/src/main/java/org/jboss/weld/introspector/ForwardingWeldMethod.java 2009-10-11 16:37:25 UTC (rev 3927) @@ -34,7 +34,7 @@ return delegate().getAnnotatedMethod(); } - public List<WeldParameter<?, ?>> getAnnotatedParameters(Class<? extends Annotation> metaAnnotationType) + public List<WeldParameter<?, X>> getAnnotatedParameters(Class<? extends Annotation> metaAnnotationType) { return delegate().getAnnotatedWBParameters(metaAnnotationType); } @@ -44,7 +44,7 @@ return delegate().getParameterTypesAsArray(); } - public List<? extends WeldParameter<?, ?>> getWBParameters() + public List<? extends WeldParameter<?, X>> getWBParameters() { return delegate().getWBParameters(); } @@ -74,7 +74,7 @@ return delegate().getSignature(); } - public List<WeldParameter<?, ?>> getAnnotatedWBParameters(Class<? extends Annotation> metaAnnotationType) + public List<WeldParameter<?, X>> getAnnotatedWBParameters(Class<? extends Annotation> metaAnnotationType) { return delegate().getAnnotatedWBParameters(metaAnnotationType); } Modified: core/trunk/impl/src/main/java/org/jboss/weld/introspector/WeldCallable.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/introspector/WeldCallable.java 2009-10-11 16:34:00 UTC (rev 3926) +++ core/trunk/impl/src/main/java/org/jboss/weld/introspector/WeldCallable.java 2009-10-11 16:37:25 UTC (rev 3927) @@ -35,7 +35,7 @@ * @return A list of parameters. Returns an empty list if no parameters are * present. */ - public List<? extends WeldParameter<?, ?>> getWBParameters(); + public List<? extends WeldParameter<?, X>> getWBParameters(); /** * Gets the list of annotated parameters for a given annotation @@ -44,6 +44,6 @@ * @return A set of matching parameter abstractions. Returns an empty list if * there are no matches. */ - public List<WeldParameter<?, ?>> getAnnotatedWBParameters(Class<? extends Annotation> metaAnnotationType); + public List<WeldParameter<?, X>> getAnnotatedWBParameters(Class<? extends Annotation> metaAnnotationType); } Modified: core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldConstructorImpl.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldConstructorImpl.java 2009-10-11 16:34:00 UTC (rev 3926) +++ core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldConstructorImpl.java 2009-10-11 16:37:25 UTC (rev 3927) @@ -60,9 +60,9 @@ private final Constructor<T> constructor; // The list of parameter abstractions - private final List<WeldParameter<?, ?>> parameters; + private final List<WeldParameter<?, T>> parameters; // The mapping of annotation -> parameter abstraction - private final ListMultimap<Class<? extends Annotation>, WeldParameter<?, ?>> annotatedParameters; + private final ListMultimap<Class<? extends Annotation>, WeldParameter<?, T>> annotatedParameters; private final ConstructorSignature signature; @@ -95,13 +95,13 @@ this.toString = new StringBuilder().append("constructor ").append(constructor.toString()).toString(); this.constructor = constructor; - this.parameters = new ArrayList<WeldParameter<?, ?>>(); - annotatedParameters = Multimaps.newListMultimap(new HashMap<Class<? extends Annotation>, Collection<WeldParameter<?, ?>>>(), new Supplier< List<WeldParameter<?, ?>>>() + this.parameters = new ArrayList<WeldParameter<?, T>>(); + annotatedParameters = Multimaps.newListMultimap(new HashMap<Class<? extends Annotation>, Collection<WeldParameter<?, T>>>(), new Supplier< List<WeldParameter<?, T>>>() { - public List<WeldParameter<?, ?>> get() + public List<WeldParameter<?, T>> get() { - return new ArrayList<WeldParameter<?, ?>>(); + return new ArrayList<WeldParameter<?, T>>(); } }); @@ -122,7 +122,7 @@ { Class<?> clazz = constructor.getParameterTypes()[i]; Type type = constructor.getGenericParameterTypes()[i]; - WeldParameter<?, ?> parameter = null; + WeldParameter<?, T> parameter = null; if (annotatedTypeParameters.containsKey(i)) { AnnotatedParameter<?> annotatedParameter = annotatedTypeParameters.get(i); @@ -152,7 +152,7 @@ { type = clazz; } - WeldParameter<?, ?> parameter = WeldParameterImpl.of(new Annotation[0], clazz, type, this, i, classTransformer); + WeldParameter<?, T> parameter = WeldParameterImpl.of(new Annotation[0], clazz, type, this, i, classTransformer); parameters.add(parameter); for (Annotation annotation : parameter.getAnnotations()) @@ -194,7 +194,7 @@ * * @see org.jboss.weld.introspector.WeldConstructor#getWBParameters() */ - public List<WeldParameter<?, ?>> getWBParameters() + public List<WeldParameter<?, T>> getWBParameters() { return Collections.unmodifiableList(parameters); } @@ -210,7 +210,7 @@ * * @see org.jboss.weld.introspector.WeldConstructor#getAnnotatedWBParameters(Class) */ - public List<WeldParameter<?, ?>> getAnnotatedWBParameters(Class<? extends Annotation> annotationType) + public List<WeldParameter<?, T>> getAnnotatedWBParameters(Class<? extends Annotation> annotationType) { return Collections.unmodifiableList(annotatedParameters.get(annotationType)); } Modified: core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldMethodImpl.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldMethodImpl.java 2009-10-11 16:34:00 UTC (rev 3926) +++ core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldMethodImpl.java 2009-10-11 16:37:25 UTC (rev 3927) @@ -61,10 +61,10 @@ private final Method method; // The abstracted parameters - private final List<WeldParameter<?, ?>> parameters; + private final List<WeldParameter<?, X>> parameters; // A mapping from annotation type to parameter abstraction with that // annotation present - private final ListMultimap<Class<? extends Annotation>, WeldParameter<?, ?>> annotatedParameters; + private final ListMultimap<Class<? extends Annotation>, WeldParameter<?, X>> annotatedParameters; // The property name private final String propertyName; @@ -101,13 +101,13 @@ super(annotationStore, method, (Class<T>) method.getReturnType(), method.getGenericReturnType(), declaringClass); this.method = method; this.toString = new StringBuilder().append("method ").append(method.toString()).toString(); - this.parameters = new ArrayList<WeldParameter<?, ?>>(); - this.annotatedParameters = Multimaps.newListMultimap(new HashMap<Class<? extends Annotation>, Collection<WeldParameter<?, ?>>>(), new Supplier< List<WeldParameter<?, ?>>>() + this.parameters = new ArrayList<WeldParameter<?, X>>(); + this.annotatedParameters = Multimaps.newListMultimap(new HashMap<Class<? extends Annotation>, Collection<WeldParameter<?, X>>>(), new Supplier<List<WeldParameter<?, X>>>() { - public List<WeldParameter<?, ?>> get() + public List<WeldParameter<?, X>> get() { - return new ArrayList<WeldParameter<?, ?>>(); + return new ArrayList<WeldParameter<?, X>>(); } }); @@ -128,7 +128,7 @@ { Class<? extends Object> clazz = method.getParameterTypes()[i]; Type type = method.getGenericParameterTypes()[i]; - WeldParameter<?, ?> parameter = null; + WeldParameter<?, X> parameter = null; if (annotatedTypeParameters.containsKey(i)) { AnnotatedParameter<?> annotatedParameter = annotatedTypeParameters.get(i); @@ -151,7 +151,7 @@ { Class<? extends Object> clazz = method.getParameterTypes()[i]; Type type = method.getGenericParameterTypes()[i]; - WeldParameter<?, ?> parameter = WeldParameterImpl.of(new Annotation[0], (Class<Object>) clazz, type, this, i, classTransformer); + WeldParameter<?, X> parameter = WeldParameterImpl.of(new Annotation[0], (Class<Object>) clazz, type, this, i, classTransformer); this.parameters.add(parameter); } } @@ -180,7 +180,7 @@ return method; } - public List<WeldParameter<?, ?>> getWBParameters() + public List<WeldParameter<?, X>> getWBParameters() { return Collections.unmodifiableList(parameters); } @@ -190,7 +190,7 @@ return method.getParameterTypes(); } - public List<WeldParameter<?, ?>> getAnnotatedWBParameters(Class<? extends Annotation> annotationType) + public List<WeldParameter<?, X>> getAnnotatedWBParameters(Class<? extends Annotation> annotationType) { return Collections.unmodifiableList(annotatedParameters.get(annotationType)); } Modified: core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java 2009-10-11 16:34:00 UTC (rev 3926) +++ core/trunk/impl/src/main/java/org/jboss/weld/util/Beans.java 2009-10-11 16:37:25 UTC (rev 3927) @@ -17,9 +17,8 @@ package org.jboss.weld.util; import java.lang.annotation.Annotation; +import java.lang.reflect.Modifier; import java.lang.reflect.Type; -import java.lang.reflect.Member; -import java.lang.reflect.Modifier; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -40,11 +39,10 @@ import javax.enterprise.inject.Disposes; import javax.enterprise.inject.Produces; import javax.enterprise.inject.spi.Bean; -import javax.enterprise.inject.spi.Interceptor; -import javax.enterprise.inject.spi.AnnotatedMethod; import javax.inject.Inject; -import javax.interceptor.AroundInvoke; +import org.jboss.interceptor.model.InterceptionType; +import org.jboss.interceptor.model.InterceptionTypeRegistry; import org.jboss.weld.BeanManagerImpl; import org.jboss.weld.DefinitionException; import org.jboss.weld.bean.AbstractProducerBean; @@ -59,15 +57,19 @@ import org.jboss.weld.injection.spi.EjbInjectionServices; import org.jboss.weld.injection.spi.JpaInjectionServices; import org.jboss.weld.injection.spi.ResourceInjectionServices; -import org.jboss.weld.introspector.*; +import org.jboss.weld.introspector.MethodSignature; +import org.jboss.weld.introspector.WeldClass; +import org.jboss.weld.introspector.WeldConstructor; +import org.jboss.weld.introspector.WeldField; +import org.jboss.weld.introspector.WeldMember; +import org.jboss.weld.introspector.WeldMethod; +import org.jboss.weld.introspector.WeldParameter; import org.jboss.weld.log.Log; import org.jboss.weld.log.Logging; import org.jboss.weld.metadata.cache.BindingTypeModel; import org.jboss.weld.metadata.cache.InterceptorBindingModel; import org.jboss.weld.metadata.cache.MetaAnnotationStore; import org.jboss.weld.persistence.PersistenceApiAbstraction; -import org.jboss.interceptor.model.InterceptionType; -import org.jboss.interceptor.model.InterceptionTypeRegistry; import com.google.common.base.Supplier; import com.google.common.collect.Multimap; @@ -576,7 +578,7 @@ return false; } - public static <T> ConstructorInjectionPoint<T> getBeanConstructor(Bean<?> declaringBean, WeldClass<T> type) + public static <T> ConstructorInjectionPoint<T> getBeanConstructor(Bean<T> declaringBean, WeldClass<T> type) { ConstructorInjectionPoint<T> constructor = null; Set<WeldConstructor<T>> initializerAnnotatedConstructors = type.getAnnotatedWeldConstructors(Inject.class); Modified: core/trunk/jboss-as/build.properties =================================================================== --- core/trunk/jboss-as/build.properties 2009-10-11 16:34:00 UTC (rev 3926) +++ core/trunk/jboss-as/build.properties 2009-10-11 16:37:25 UTC (rev 3927) @@ -1,6 +1,6 @@ # Container a number of properties associated with installing Weld into JBoss AS and running the TCK in JBoss AS jboss.home=/Applications/jboss-5.2.0.Beta -org.jboss.testharness.container.javaOpts=-Xms128m -Xmx384m -XX:MaxPermSize=128m -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 +org.jboss.testharness.container.javaOpts=-Xms128m -Xmx384m -XX:MaxPermSize=192m -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 # time to allow before attempting to restart JBoss AS # org.jboss.testharness.container.shutdownDelay=15000 Modified: core/trunk/tests/src/main/java/org/jboss/weld/mock/MockBeanDeploymentArchive.java =================================================================== --- core/trunk/tests/src/main/java/org/jboss/weld/mock/MockBeanDeploymentArchive.java 2009-10-11 16:34:00 UTC (rev 3926) +++ core/trunk/tests/src/main/java/org/jboss/weld/mock/MockBeanDeploymentArchive.java 2009-10-11 16:37:25 UTC (rev 3927) @@ -24,6 +24,7 @@ import java.util.List; import java.util.Set; +import javax.ejb.EnterpriseBean; import javax.ejb.MessageDriven; import javax.ejb.Singleton; import javax.ejb.Stateful; @@ -94,7 +95,7 @@ Set<Class<?>> ejbs = new HashSet<Class<?>>(); for (Class<?> clazz : webBeanClasses) { - if (clazz.isAnnotationPresent(Stateless.class) || clazz.isAnnotationPresent(Stateful.class) || clazz.isAnnotationPresent(MessageDriven.class) || clazz.isAnnotationPresent(Singleton.class)) + if (clazz.isAnnotationPresent(Stateless.class) || clazz.isAnnotationPresent(Stateful.class) || clazz.isAnnotationPresent(MessageDriven.class) || clazz.isAnnotationPresent(Singleton.class) || EnterpriseBean.class.isAssignableFrom(clazz)) { ejbs.add(clazz); }

15 years, 2 months

1
0
0 / 0

Weld SVN: r3926 - in cdi-tck/trunk: impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb and 9 other directories.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-10-11 12:34:00 -0400 (Sun, 11 Oct 2009) New Revision: 3926 Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/afterBeanDiscovery/ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/afterBeanDiscovery/AfterBeanDiscoveryObserver.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/afterBeanDiscovery/AfterBeanDiscoveryTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/afterBeanDiscovery/Cockatoo.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/Cat.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/Chicken.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ChickenHutch.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/Cow.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/Cowshed.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/Elephant.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ElephantLocal.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessBeanObserver.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessBeanTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessSessionBeanTest.java cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/extensions/afterBeanDiscovery/ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/extensions/afterBeanDiscovery/javax.enterprise.inject.spi.Extension cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/extensions/processBean/ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/extensions/processBean/javax.enterprise.inject.spi.Extension Removed: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockEnterpriseBeanLocal.java Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/DependentContextEjbTest.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Farm.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/House.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/simple/definition/MockEnterpriseBean.java cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml cdi-tck/trunk/pom.xml Log: add some process bean tests, improve others Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/DependentContextEjbTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/DependentContextEjbTest.java 2009-10-11 13:47:46 UTC (rev 3925) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/DependentContextEjbTest.java 2009-10-11 16:34:00 UTC (rev 3926) @@ -44,10 +44,12 @@ Bean<HouseLocal> bean = getBeans(HouseLocal.class).iterator().next(); CreationalContext<HouseLocal> creationalContext = getCurrentManager().createCreationalContext(bean); HouseLocal instance = bean.create(creationalContext); - instance.open(); + instance.open().getTable().lay(); Room.destroyed = false; Table.destroyed = false; + House.destroyed = false; bean.destroy(instance, creationalContext); + assert House.destroyed; assert Room.destroyed; assert Table.destroyed; } @@ -62,7 +64,9 @@ FarmLocal farm = farmBean.create(creationalContext); Horse.destroyed = false; Stable.destroyed = false; + Farm.destroyed = false; farmBean.destroy(farm, creationalContext); + assert Farm.destroyed; assert Horse.destroyed; assert Stable.destroyed; } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Farm.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Farm.java 2009-10-11 13:47:46 UTC (rev 3925) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/Farm.java 2009-10-11 16:34:00 UTC (rev 3926) @@ -1,5 +1,6 @@ package org.jboss.jsr299.tck.tests.context.dependent.ejb; +import javax.annotation.PreDestroy; import javax.ejb.Stateful; import javax.enterprise.context.RequestScoped; import javax.inject.Inject; @@ -9,8 +10,17 @@ public class Farm implements FarmLocal { + public static boolean destroyed; + @Inject Stable stable; - public void open() {}; + public void open() {} + + @PreDestroy + public void preDestroy() + { + Farm.destroyed = true; + } + } Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/House.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/House.java 2009-10-11 13:47:46 UTC (rev 3925) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/context/dependent/ejb/House.java 2009-10-11 16:34:00 UTC (rev 3926) @@ -1,5 +1,6 @@ package org.jboss.jsr299.tck.tests.context.dependent.ejb; +import javax.annotation.PreDestroy; import javax.ejb.Stateful; import javax.enterprise.context.RequestScoped; import javax.inject.Inject; @@ -8,11 +9,19 @@ public class House implements HouseLocal { + public static boolean destroyed; + @Inject RoomLocal room; public RoomLocal open() { return room; - }; + } + @PreDestroy + public void preDestroy() + { + House.destroyed = true; + } + } Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/afterBeanDiscovery/AfterBeanDiscoveryObserver.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/afterBeanDiscovery/AfterBeanDiscoveryObserver.java (rev 0) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/afterBeanDiscovery/AfterBeanDiscoveryObserver.java 2009-10-11 16:34:00 UTC (rev 3926) @@ -0,0 +1,102 @@ +package org.jboss.jsr299.tck.tests.extensions.afterBeanDiscovery; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; + +import javax.enterprise.context.Dependent; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.event.Observes; +import javax.enterprise.inject.spi.AfterBeanDiscovery; +import javax.enterprise.inject.spi.Bean; +import javax.enterprise.inject.spi.Extension; +import javax.enterprise.inject.spi.InjectionPoint; +import javax.enterprise.inject.spi.ProcessBean; + +import org.jboss.jsr299.tck.literals.DefaultLiteral; + +public class AfterBeanDiscoveryObserver implements Extension +{ + + private static boolean processBeanFiredForCockatooBean; + + public static boolean isProcessBeanFiredForCockatooBean() + { + return processBeanFiredForCockatooBean; + } + + public void observeProcessBean(@Observes ProcessBean<Cockatoo> event) + { + AfterBeanDiscoveryObserver.processBeanFiredForCockatooBean = true; + assert event.getBean().getName().equals("cockatoo"); + } + + public void addABean(@Observes AfterBeanDiscovery afterBeanDiscovery) + { + afterBeanDiscovery.addBean(new Bean<Cockatoo>() + { + + private final Set<Annotation> qualifiers = new HashSet<Annotation>(Arrays.asList(new DefaultLiteral())); + private final Set<Type> types = new HashSet<Type>(Arrays.<Type>asList(Cockatoo.class)); + + public Class<?> getBeanClass() + { + return Cockatoo.class; + } + + public Set<InjectionPoint> getInjectionPoints() + { + return Collections.emptySet(); + } + + public String getName() + { + return "cockatoo"; + } + + public Set<Annotation> getQualifiers() + { + return qualifiers; + } + + public Class<? extends Annotation> getScope() + { + return Dependent.class; + } + + public Set<Class<? extends Annotation>> getStereotypes() + { + return Collections.emptySet(); + } + + public Set<Type> getTypes() + { + return types; + } + + public boolean isAlternative() + { + return false; + } + + public boolean isNullable() + { + return true; + } + + public Cockatoo create(CreationalContext<Cockatoo> creationalContext) + { + return new Cockatoo("Billy"); + } + + public void destroy(Cockatoo instance, CreationalContext<Cockatoo> creationalContext) + { + // No-op + } + }); + } + +} Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/afterBeanDiscovery/AfterBeanDiscoveryObserver.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/afterBeanDiscovery/AfterBeanDiscoveryTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/afterBeanDiscovery/AfterBeanDiscoveryTest.java (rev 0) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/afterBeanDiscovery/AfterBeanDiscoveryTest.java 2009-10-11 16:34:00 UTC (rev 3926) @@ -0,0 +1,38 @@ +package org.jboss.jsr299.tck.tests.extensions.afterBeanDiscovery; + +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.IntegrationTest; +import org.jboss.testharness.impl.packaging.jsr299.Extension; +import org.testng.annotations.Test; + +@Artifact +@IntegrationTest +@Extension("javax.enterprise.inject.spi.Extension") +@SpecVersion(spec="cdi", version="PFD2") +public class AfterBeanDiscoveryTest extends AbstractJSR299Test +{ + + @Test + @SpecAssertions({ + @SpecAssertion(section = "11.5.2", id="db") + }) + public void testBeanIsAdded() + { + assert getBeans(Cockatoo.class).size() == 1; + assert getInstanceByType(Cockatoo.class).getName().equals("Billy"); + } + + @Test + @SpecAssertions({ + @SpecAssertion(section = "11.5.2", id="da") + }) + public void testProcessBeanIsFired() + { + assert AfterBeanDiscoveryObserver.isProcessBeanFiredForCockatooBean(); + } + +} Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/afterBeanDiscovery/AfterBeanDiscoveryTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/afterBeanDiscovery/Cockatoo.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/afterBeanDiscovery/Cockatoo.java (rev 0) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/afterBeanDiscovery/Cockatoo.java 2009-10-11 16:34:00 UTC (rev 3926) @@ -0,0 +1,18 @@ +package org.jboss.jsr299.tck.tests.extensions.afterBeanDiscovery; + +public class Cockatoo +{ + + private final String name; + + public Cockatoo(String name) + { + this.name = name; + } + + public String getName() + { + return name; + } + +} Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/afterBeanDiscovery/Cockatoo.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/Cat.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/Cat.java (rev 0) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/Cat.java 2009-10-11 16:34:00 UTC (rev 3926) @@ -0,0 +1,8 @@ +package org.jboss.jsr299.tck.tests.extensions.processBean; + + +class Cat +{ + + +} Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/Cat.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/Chicken.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/Chicken.java (rev 0) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/Chicken.java 2009-10-11 16:34:00 UTC (rev 3926) @@ -0,0 +1,10 @@ +package org.jboss.jsr299.tck.tests.extensions.processBean; + +public class Chicken +{ + + public Chicken(String name) + { + } + +} Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/Chicken.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ChickenHutch.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ChickenHutch.java (rev 0) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ChickenHutch.java 2009-10-11 16:34:00 UTC (rev 3926) @@ -0,0 +1,10 @@ +package org.jboss.jsr299.tck.tests.extensions.processBean; + +import javax.enterprise.inject.Produces; + +public class ChickenHutch +{ + @Produces + private Chicken chicken; + +} Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ChickenHutch.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/Cow.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/Cow.java (rev 0) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/Cow.java 2009-10-11 16:34:00 UTC (rev 3926) @@ -0,0 +1,10 @@ +package org.jboss.jsr299.tck.tests.extensions.processBean; + +public class Cow +{ + + public Cow(String name) + { + } + +} Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/Cow.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/Cowshed.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/Cowshed.java (rev 0) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/Cowshed.java 2009-10-11 16:34:00 UTC (rev 3926) @@ -0,0 +1,19 @@ +package org.jboss.jsr299.tck.tests.extensions.processBean; + +import javax.enterprise.inject.Disposes; +import javax.enterprise.inject.Produces; + +public class Cowshed +{ + @Produces + public Cow getDaisy() + { + return new Cow("Daisy"); + } + + public void disposeOfDaisy(@Disposes Cow daisy) + { + + } + +} Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/Cowshed.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/Elephant.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/Elephant.java (rev 0) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/Elephant.java 2009-10-11 16:34:00 UTC (rev 3926) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.extensions.processBean; + +import javax.ejb.Stateless; + +@Stateless(name="Rosie") +public class Elephant implements ElephantLocal +{ + +} Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/Elephant.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ElephantLocal.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ElephantLocal.java (rev 0) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ElephantLocal.java 2009-10-11 16:34:00 UTC (rev 3926) @@ -0,0 +1,9 @@ +package org.jboss.jsr299.tck.tests.extensions.processBean; + +import javax.ejb.Local; + +@Local +public interface ElephantLocal +{ + +} Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ElephantLocal.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessBeanObserver.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessBeanObserver.java (rev 0) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessBeanObserver.java 2009-10-11 16:34:00 UTC (rev 3926) @@ -0,0 +1,106 @@ +package org.jboss.jsr299.tck.tests.extensions.processBean; + +import javax.enterprise.event.Observes; +import javax.enterprise.inject.spi.Extension; +import javax.enterprise.inject.spi.ProcessBean; +import javax.enterprise.inject.spi.ProcessManagedBean; +import javax.enterprise.inject.spi.ProcessProducerField; +import javax.enterprise.inject.spi.ProcessProducerMethod; +import javax.enterprise.inject.spi.ProcessSessionBean; + +public class ProcessBeanObserver implements Extension +{ + private static ProcessManagedBean<Cat> catProcessManagedBean; + private static int catProcessBeanCount; + + private static ProcessProducerMethod<Cowshed, Cow> cowProcessProducerMethod; + private static int cowShedProcessBeanCount; + + private static ProcessSessionBean<Elephant> elephantProcessSessionBean; + private static int elephantProcessBeanCount; + private static ProcessProducerField<ChickenHutch, Chicken> chickenProcessProducerField; + private static int chickenHutchProcessBeanCount; + + public void observeCatManagedBean(@Observes ProcessManagedBean<Cat> event) + { + ProcessBeanObserver.catProcessManagedBean = event; + ProcessBeanObserver.catProcessBeanCount++; + } + + public void observeCatBean(@Observes ProcessBean<Cat> event) + { + ProcessBeanObserver.catProcessBeanCount++; + } + + public void observeElephantSessionBean(@Observes ProcessSessionBean<Elephant> event) + { + ProcessBeanObserver.elephantProcessSessionBean = event; + ProcessBeanObserver.elephantProcessBeanCount++; + } + + public void observeElephantBean(@Observes ProcessBean<Elephant> event) + { + ProcessBeanObserver.elephantProcessBeanCount++; + } + + public void observeCowProcessProducerMethod(@Observes ProcessProducerMethod<Cowshed, Cow> event) + { + ProcessBeanObserver.cowProcessProducerMethod = event; + } + + public void observeCowProccesBean(@Observes ProcessBean<Cowshed> event) + { + ProcessBeanObserver.cowShedProcessBeanCount++; + } + + public void observeChickenProcessProducerField(@Observes ProcessProducerField<ChickenHutch, Chicken> event) + { + ProcessBeanObserver.chickenProcessProducerField = event; + } + + public void observeChickenProccesBean(@Observes ProcessBean<ChickenHutch> event) + { + ProcessBeanObserver.chickenHutchProcessBeanCount++; + } + + public static ProcessManagedBean<Cat> getCatProcessManagedBean() + { + return catProcessManagedBean; + } + + public static ProcessProducerMethod<Cowshed, Cow> getCowProcessProducerMethod() + { + return cowProcessProducerMethod; + } + + public static ProcessSessionBean<Elephant> getElephantProcessSessionBean() + { + return elephantProcessSessionBean; + } + + public static int getCatProcessBeanCount() + { + return catProcessBeanCount; + } + + public static int getCowShedProcessBeanCount() + { + return cowShedProcessBeanCount; + } + + public static int getElephantProcessBeanCount() + { + return elephantProcessBeanCount; + } + + public static int getChickenHutchProcessBeanCount() + { + return chickenHutchProcessBeanCount; + } + + public static ProcessProducerField<ChickenHutch, Chicken> getChickenProcessProducerField() + { + return chickenProcessProducerField; + } + +} Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessBeanObserver.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessBeanTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessBeanTest.java (rev 0) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessBeanTest.java 2009-10-11 16:34:00 UTC (rev 3926) @@ -0,0 +1,89 @@ +package org.jboss.jsr299.tck.tests.extensions.processBean; + +import javax.enterprise.inject.spi.AnnotatedField; +import javax.enterprise.inject.spi.AnnotatedMethod; +import javax.enterprise.inject.spi.AnnotatedType; + +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.IntegrationTest; +import org.jboss.testharness.impl.packaging.jsr299.Extension; +import org.testng.annotations.Test; + +/** + * Producer extension tests. + * + * @author David Allen + * + */ +@Artifact +@Extension("javax.enterprise.inject.spi.Extension") +// Must be an integration test as it needs a resource copied to a folder +@IntegrationTest +@SpecVersion(spec="cdi", version="PFD2") +public class ProcessBeanTest extends AbstractJSR299Test +{ + + @Test + @SpecAssertions({ + @SpecAssertion(section = "11.5.8", id = "ba"), + @SpecAssertion(section = "11.5.8", id = "eda"), + @SpecAssertion(section = "11.5.8", id = "efa"), + @SpecAssertion(section = "11.5.8", id = "fa"), + @SpecAssertion(section = "11.5.8", id = "l") + }) + public void testProcessBeanEvent() + { + assert ProcessBeanObserver.getCatProcessManagedBean().getBean().getBeanClass().equals(Cat.class); + assert ProcessBeanObserver.getCatProcessBeanCount() == 2; + assert ProcessBeanObserver.getCatProcessManagedBean().getAnnotated() instanceof AnnotatedType<?>; + assert ProcessBeanObserver.getCatProcessManagedBean().getAnnotatedBeanClass().getBaseType().equals(Cat.class); + } + + @SpecAssertions({ + @SpecAssertion(section = "11.5.8", id = "eaa"), + @SpecAssertion(section = "11.5.8", id = "edc"), + @SpecAssertion(section = "11.5.8", id = "efc"), + @SpecAssertion(section = "11.5.8", id = "fc"), + @SpecAssertion(section = "11.5.8", id = "i"), + @SpecAssertion(section = "11.5.8", id = "j") + }) + @Test + public void testProcessProducerMethodEvent() + { + assert ProcessBeanObserver.getCowProcessProducerMethod().getBean().getTypes().contains(Cow.class); + assert ProcessBeanObserver.getCowProcessProducerMethod().getBean().getBeanClass().equals(Cowshed.class); + assert ProcessBeanObserver.getCowProcessProducerMethod().getAnnotatedProducerMethod().getBaseType().equals(Cow.class); + assert ProcessBeanObserver.getCowProcessProducerMethod().getAnnotatedProducerMethod().getDeclaringType().getBaseType().equals(Cowshed.class); + assert ProcessBeanObserver.getCowShedProcessBeanCount() == 2; + assert ProcessBeanObserver.getCowProcessProducerMethod().getAnnotated() instanceof AnnotatedMethod<?>; + assert ProcessBeanObserver.getCowProcessProducerMethod().getAnnotatedProducerMethod().getJavaMember().getName().equals("getDaisy"); + assert ProcessBeanObserver.getCowProcessProducerMethod().getAnnotatedProducerMethod().getJavaMember().getDeclaringClass().equals(Cowshed.class); + assert ProcessBeanObserver.getCowProcessProducerMethod().getAnnotatedDisposedParameter().getDeclaringCallable().getJavaMember().getName().equals("disposeOfDaisy"); + assert ProcessBeanObserver.getCowProcessProducerMethod().getAnnotatedDisposedParameter().getDeclaringCallable().getJavaMember().getDeclaringClass().equals(Cowshed.class); + } + + @SpecAssertions({ + @SpecAssertion(section = "11.5.8", id = "eb"), + @SpecAssertion(section = "11.5.8", id = "edd"), + @SpecAssertion(section = "11.5.8", id = "efd"), + @SpecAssertion(section = "11.5.8", id = "fd"), + @SpecAssertion(section = "11.5.8", id = "n") + }) + @Test + public void testProcessProducerFieldEvent() + { + assert ProcessBeanObserver.getChickenProcessProducerField().getBean().getTypes().contains(Chicken.class); + assert ProcessBeanObserver.getChickenProcessProducerField().getBean().getBeanClass().equals(ChickenHutch.class); + assert ProcessBeanObserver.getChickenProcessProducerField().getAnnotatedProducerField().getBaseType().equals(Chicken.class); + assert ProcessBeanObserver.getChickenProcessProducerField().getAnnotatedProducerField().getDeclaringType().getBaseType().equals(ChickenHutch.class); + assert ProcessBeanObserver.getChickenHutchProcessBeanCount() == 2; + assert ProcessBeanObserver.getChickenProcessProducerField().getAnnotated() instanceof AnnotatedField<?>; + assert ProcessBeanObserver.getChickenProcessProducerField().getAnnotatedProducerField().getJavaMember().getName().equals("chicken"); + assert ProcessBeanObserver.getChickenProcessProducerField().getAnnotatedProducerField().getJavaMember().getDeclaringClass().equals(ChickenHutch.class); + } + +} Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessBeanTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Added: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessSessionBeanTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessSessionBeanTest.java (rev 0) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessSessionBeanTest.java 2009-10-11 16:34:00 UTC (rev 3926) @@ -0,0 +1,54 @@ +package org.jboss.jsr299.tck.tests.extensions.processBean; + +import javax.enterprise.inject.spi.AnnotatedType; +import javax.enterprise.inject.spi.SessionBeanType; + +import org.jboss.jsr299.tck.AbstractJSR299Test; +import org.jboss.test.audit.annotations.SpecAssertion; +import org.jboss.test.audit.annotations.SpecAssertions; +import org.jboss.test.audit.annotations.SpecVersion; +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.IntegrationTest; +import org.jboss.testharness.impl.packaging.Packaging; +import org.jboss.testharness.impl.packaging.PackagingType; +import org.jboss.testharness.impl.packaging.jsr299.Extension; +import org.testng.annotations.Test; + +/** + * Producer extension tests. + * + * @author David Allen + * + */ +@Artifact +@Extension("javax.enterprise.inject.spi.Extension") +// Must be an integration test as it needs a resource copied to a folder +@IntegrationTest +(a)Packaging(PackagingType.EAR) +@SpecVersion(spec="cdi", version="PFD2") +public class ProcessSessionBeanTest extends AbstractJSR299Test +{ + + @Test + @SpecAssertions({ + @SpecAssertion(section = "11.5.8", id = "c"), + @SpecAssertion(section = "11.5.8", id = "edb"), + @SpecAssertion(section = "11.5.8", id = "efb"), + @SpecAssertion(section = "11.5.8", id = "fb"), + @SpecAssertion(section = "11.5.8", id = "hb"), + @SpecAssertion(section = "11.5.8", id = "hc"), + @SpecAssertion(section = "11.5.8", id = "m"), + @SpecAssertion(section = "11.5.8", id = "k") + }) + public void testProcessSessionBeanEvent() + { + assert ProcessBeanObserver.getElephantProcessSessionBean().getBean().getBeanClass().equals(Elephant.class); + assert ProcessBeanObserver.getElephantProcessBeanCount() == 2; + assert ProcessBeanObserver.getElephantProcessSessionBean().getEjbName().equals("Rosie"); + assert ProcessBeanObserver.getElephantProcessSessionBean().getSessionBeanType().equals(SessionBeanType.STATELESS); + assert ProcessBeanObserver.getElephantProcessSessionBean().getAnnotated() instanceof AnnotatedType<?>; + assert ProcessBeanObserver.getElephantProcessSessionBean().getAnnotatedSessionBeanClass().getBaseType().equals(Elephant.class); + assert ProcessBeanObserver.getElephantProcessSessionBean().getAnnotatedBeanClass().getBaseType().equals(Elephant.class); + } + +} Property changes on: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/processBean/ProcessSessionBeanTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native 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-11 13:47:46 UTC (rev 3925) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/extensions/producer/ProducerTest.java 2009-10-11 16:34:00 UTC (rev 3926) @@ -187,8 +187,8 @@ @Test @SpecAssertions({ @SpecAssertion(section = "11.2", id = "i"), - @SpecAssertion(section = "11.5.6", id = "ba"), - @SpecAssertion(section = "12.3", id = "ba") + @SpecAssertion(section = "12.3", id = "ba"), + @SpecAssertion(section = "11.5.6", id = "aaa") }) public void testInjectionTargetInject() { Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockEnterpriseBean.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockEnterpriseBean.java 2009-10-11 13:47:46 UTC (rev 3925) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockEnterpriseBean.java 2009-10-11 16:34:00 UTC (rev 3926) @@ -1,9 +1,8 @@ package org.jboss.jsr299.tck.tests.implementation.simple.definition; -import javax.ejb.Stateless; +import javax.ejb.EnterpriseBean; -@Stateless -class MockEnterpriseBean implements MockEnterpriseBeanLocal +class MockEnterpriseBean implements EnterpriseBean { /** Deleted: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockEnterpriseBeanLocal.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockEnterpriseBeanLocal.java 2009-10-11 13:47:46 UTC (rev 3925) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/MockEnterpriseBeanLocal.java 2009-10-11 16:34:00 UTC (rev 3926) @@ -1,9 +0,0 @@ -package org.jboss.jsr299.tck.tests.implementation.simple.definition; - -import javax.ejb.Local; - -@Local -interface MockEnterpriseBeanLocal -{ - -} Modified: cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java =================================================================== --- cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java 2009-10-11 13:47:46 UTC (rev 3925) +++ cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/definition/SimpleBeanDefinitionTest.java 2009-10-11 16:34:00 UTC (rev 3926) @@ -7,10 +7,13 @@ import org.jboss.test.audit.annotations.SpecAssertions; import org.jboss.test.audit.annotations.SpecVersion; import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.testharness.impl.packaging.Packaging; +import org.jboss.testharness.impl.packaging.PackagingType; import org.testng.annotations.Test; @Artifact @SpecVersion(spec="cdi", version="PFD2") +(a)Packaging(PackagingType.EAR) public class SimpleBeanDefinitionTest extends AbstractJSR299Test { @@ -46,7 +49,8 @@ assert getBeans(Car.class).size() == 0; } - @Test + @Test(groups = "broken") + // TODO The bean will be discovered, just not as a managed bean. This test is doesn't check that *at all* @SpecAssertion(section="3.1.1", id="f") public void testClassesImplementingEnterpriseBeanInterfaceNotDiscoveredAsSimpleBean() { Added: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/extensions/afterBeanDiscovery/javax.enterprise.inject.spi.Extension =================================================================== --- cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/extensions/afterBeanDiscovery/javax.enterprise.inject.spi.Extension (rev 0) +++ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/extensions/afterBeanDiscovery/javax.enterprise.inject.spi.Extension 2009-10-11 16:34:00 UTC (rev 3926) @@ -0,0 +1 @@ +org.jboss.jsr299.tck.tests.extensions.afterBeanDiscovery.AfterBeanDiscoveryObserver \ No newline at end of file Added: cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/extensions/processBean/javax.enterprise.inject.spi.Extension =================================================================== --- cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/extensions/processBean/javax.enterprise.inject.spi.Extension (rev 0) +++ cdi-tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/extensions/processBean/javax.enterprise.inject.spi.Extension 2009-10-11 16:34:00 UTC (rev 3926) @@ -0,0 +1 @@ +org.jboss.jsr299.tck.tests.extensions.processBean.ProcessBeanObserver Modified: cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml =================================================================== --- cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml 2009-10-11 13:47:46 UTC (rev 3925) +++ cdi-tck/trunk/impl/src/main/resources/tck-audit-cdi.xml 2009-10-11 16:34:00 UTC (rev 3926) @@ -2700,15 +2700,16 @@ </assertion> <assertion id="d"> - <text>When a context is destroyed, all mapped instances belonging to that context are destroyed by passing them to the |Contextual.destroy()| method.</text> + <text>When a context is destroyed, all mapped instances belonging to that context are destroyed by passing them to the |Contextual.destroy()| method.</text> </assertion> <assertion id="e"> <text>Contexts with normal scopes must obey the following rule: Suppose beans A, B and Z all have normal scopes. Suppose A has an injection point x, and B has an injection point y. Suppose further that both x and y resolve to bean Z according to the typesafe resolution algorithm. If a is the current instance of A, and b is the current instance of B, then both a.x and b.y refer to the same instance of Z. This instance is the current instance of Z.</text> </assertion> - <assertion id="ea"> + <assertion id="ea" testable="false"> <text>All normal scopes must be explicitly declared |@NormalScope|, to indicate to the container that a client proxy is required.</text> + <note>A statement of intent</note> </assertion> <assertion id="fa" testable="false"> @@ -5616,8 +5617,9 @@ </section> <section id="11.5.8" title="ProcessBean event"> - <assertion id="aa"> - <text>The container must fire an event for each bean it discovers, before registering the |Bean| object. The event object in the package |javax.enterprise.inject.spi| depends upon what kind of bean was discovered.</text> + <assertion id="aa" testable="false"> + <text>The container must fire an event for each bean it discovers, before registering the |Bean| object. The event object in the package |javax.enterprise.inject.spi| depends upon what kind of bean was discovered.</text> + <note>Tested below</note> </assertion> <assertion id="ba"> @@ -5640,23 +5642,54 @@ <text>Resources are considered to be producer fields.</text> </assertion> - <assertion id="ed"> + <group> <text>The interface |javax.enterprise.inject.spi.ProcessBean| is a supertype of all these event types.</text> - </assertion> + <assertion id="eda"> + <text>Test |ProcessManagedBean|</text> + </assertion> + <assertion id="edb"> + <text>Test |ProcessSessionBean|</text> + </assertion> + <assertion id="edc"> + <text>Test |ProcessProducerMethod|</text> + </assertion> + <assertion id="edd"> + <text>Test |ProcessProducerField|</text> + </assertion> + </group> <group> <text>|getAnnotated()| returns the |AnnotatedType| representing the bean class, the |AnnotatedMethod| representing the producer method, or the |AnnotatedField| representing the producer field.</text> <assertion id="efa"> - <text>Test producer method</text> + <text>Test |ProcessManagedBean|</text> </assertion> <assertion id="efb"> - <text>Test producer field</text> + <text>Test |ProcessSessionBean|</text> </assertion> - </group> + <assertion id="efc"> + <text>Test |ProcessProducerMethod|</text> + </assertion> + <assertion id="efd"> + <text>Test |ProcessProducerField|</text> + </assertion> + </group> - <assertion id="fa"> + <group> <text>|getBean()| returns the |Bean| object that is about to be registered. The |Bean| may implement |Interceptor| or |Decorator|.</text> - </assertion> + <assertion id="fa"> + <text>Test |ProcessManagedBean|</text> + </assertion> + <assertion id="fb"> + <text>Test |ProcessSessionBean|</text> + </assertion> + <assertion id="fc"> + <text>Test |ProcessProducerMethod|</text> + </assertion> + <assertion id="fd"> + <text>Test |ProcessProducerField|</text> + </assertion> + </group> + <assertion id="h"> <text>|addDefinitionError()| registers a definition error with the container, causing the container to abort deployment after bean discovery is complete.</text> @@ -5673,6 +5706,33 @@ <assertion id="hd"> <text>If any observer method of a |ProcessBean| event throws an exception, the exception is treated as a definition error by the container.</text> </assertion> + + <assertion id="i" implied="true"> + <text>Check the |getAnnotatedProducerMethod()|</text> + </assertion> + + <assertion id="j" implied="true"> + <text>Check the |getAnnotatedDisposesParameter()|</text> + </assertion> + + <assertion id="k" implied="true"> + <text>Check the |getAnnotatedSessionBeanClass()|</text> + </assertion> + + <group> + <text>Check the |getAnnotatedBeanClass()|</text> + <assertion id="l" implied="true"> + <text>Check for managed bean</text> + </assertion> + <assertion id="m" implied="true"> + <text>Check for session bean</text> + </assertion> + </group> + + <assertion id="n" implied="true"> + <text>Check the |getAnnotatedProducerField()|</text> + </assertion> + </section> <section id="11.5.9" title="ProcessObserverMethod event"> Modified: cdi-tck/trunk/pom.xml =================================================================== --- cdi-tck/trunk/pom.xml 2009-10-11 13:47:46 UTC (rev 3925) +++ cdi-tck/trunk/pom.xml 2009-10-11 16:34:00 UTC (rev 3926) @@ -365,11 +365,21 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <version>2.0-beta-9</version> - </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <version>2.0-beta-9</version> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-eclipse-plugin</artifactId> + <configuration> + <classpathContainers> + <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer> + </classpathContainers> + </configuration> + </plugin> + </plugins> </pluginManagement> </build>

15 years, 2 months

1
0
0 / 0

Weld SVN: r3925 - core/trunk/inject-tck-runner.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-10-11 09:47:46 -0400 (Sun, 11 Oct 2009) New Revision: 3925 Modified: core/trunk/inject-tck-runner/pom.xml Log: Use Junit, not TestNG to run tests Modified: core/trunk/inject-tck-runner/pom.xml =================================================================== --- core/trunk/inject-tck-runner/pom.xml 2009-10-10 16:18:17 UTC (rev 3924) +++ core/trunk/inject-tck-runner/pom.xml 2009-10-11 13:47:46 UTC (rev 3925) @@ -20,7 +20,13 @@ <dependency> <groupId>org.jboss.weld</groupId> - <artifactId>weld-porting-package</artifactId> + <artifactId>weld-core-test</artifactId> + <exclusions> + <exclusion> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -31,7 +37,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - </dependency> + </dependency> </dependencies> @@ -41,9 +47,9 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <suiteXmlFiles> - <suiteXmlFile>tests.xml</suiteXmlFile> - </suiteXmlFiles> + <includes> + <include>**/AtInjectTCK.java</include> + </includes> </configuration> </plugin> </plugins>

15 years, 2 months

1
0
0 / 0

Weld SVN: r3924 - cdi-tck/trunk/impl and 5 other directories.

by weld-commits＠lists.jboss.org

Author: marius.bogoevici Date: 2009-10-10 12:18:17 -0400 (Sat, 10 Oct 2009) New Revision: 3924 Removed: core/trunk/cdi-api/src/main/java/javax/interceptor/ Modified: cdi-tck/trunk/impl/pom.xml cdi-tck/trunk/pom.xml core/trunk/impl/pom.xml core/trunk/spi/pom.xml core/trunk/tests/pom.xml core/trunk/version-matrix/pom.xml Log: Use org.jboss.interceptors:jboss-interceptor-api.jar and the newly renamed org.jboss.interceptors:jboss-interceptor.jar Modified: cdi-tck/trunk/impl/pom.xml =================================================================== --- cdi-tck/trunk/impl/pom.xml 2009-10-10 16:13:02 UTC (rev 3923) +++ cdi-tck/trunk/impl/pom.xml 2009-10-10 16:18:17 UTC (rev 3924) @@ -78,6 +78,11 @@ </dependency> <dependency> + <groupId>org.jboss.interceptor</groupId> + <artifactId>jboss-interceptor-api</artifactId> + </dependency> + + <dependency> <groupId>javax.annotation</groupId> <artifactId>jsr250-api</artifactId> </dependency> Modified: cdi-tck/trunk/pom.xml =================================================================== --- cdi-tck/trunk/pom.xml 2009-10-10 16:13:02 UTC (rev 3923) +++ cdi-tck/trunk/pom.xml 2009-10-10 16:18:17 UTC (rev 3924) @@ -169,6 +169,11 @@ </exclusions> </dependency> <dependency> + <groupId>org.jboss.interceptor</groupId> + <artifactId>jboss-interceptor-api</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + <dependency> <groupId>javax.jws</groupId> <artifactId>jsr181-api</artifactId> <version>1.0-MR1</version> Modified: core/trunk/impl/pom.xml =================================================================== --- core/trunk/impl/pom.xml 2009-10-10 16:13:02 UTC (rev 3923) +++ core/trunk/impl/pom.xml 2009-10-10 16:18:17 UTC (rev 3924) @@ -115,12 +115,19 @@ <optional>true</optional> </dependency> - <dependency> - <groupId>org.jboss.interceptors</groupId> - <artifactId>interceptors</artifactId> - <optional>true</optional> - </dependency> + <dependency> + <groupId>org.jboss.interceptor</groupId> + <artifactId>jboss-interceptor-api</artifactId> + <optional>true</optional> + </dependency> + + <dependency> + <groupId>org.jboss.interceptor</groupId> + <artifactId>jboss-interceptor</artifactId> + <optional>true</optional> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> Modified: core/trunk/spi/pom.xml =================================================================== --- core/trunk/spi/pom.xml 2009-10-10 16:13:02 UTC (rev 3923) +++ core/trunk/spi/pom.xml 2009-10-10 16:18:17 UTC (rev 3924) @@ -71,6 +71,12 @@ <optional>true</optional> </dependency> + <dependency> + <groupId>org.jboss.interceptor</groupId> + <artifactId>jboss-interceptor-api</artifactId> + <optional>true</optional> + </dependency> + </dependencies> <build> Modified: core/trunk/tests/pom.xml =================================================================== --- core/trunk/tests/pom.xml 2009-10-10 16:13:02 UTC (rev 3923) +++ core/trunk/tests/pom.xml 2009-10-10 16:18:17 UTC (rev 3924) @@ -58,10 +58,15 @@ <groupId>org.jboss.weld</groupId> <artifactId>weld-spi</artifactId> </dependency> - + + <dependency> + <groupId>org.jboss.interceptor</groupId> + <artifactId>jboss-interceptor-api</artifactId> + </dependency> + <dependency> - <groupId>org.jboss.interceptors</groupId> - <artifactId>interceptors</artifactId> + <groupId>org.jboss.interceptor</groupId> + <artifactId>jboss-interceptor</artifactId> </dependency> <dependency> Modified: core/trunk/version-matrix/pom.xml =================================================================== --- core/trunk/version-matrix/pom.xml 2009-10-10 16:13:02 UTC (rev 3923) +++ core/trunk/version-matrix/pom.xml 2009-10-10 16:18:17 UTC (rev 3924) @@ -282,13 +282,19 @@ <version>3.1.0-Alpha1</version> </dependency> - <dependency> - <groupId>org.jboss.interceptors</groupId> - <artifactId>interceptors</artifactId> - <version>1.0.0-SNAPSHOT</version> - </dependency> - - <dependency> + <dependency> + <groupId>org.jboss.interceptor</groupId> + <artifactId>jboss-interceptor-api</artifactId> + <version>3.1.0-SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.jboss.interceptor</groupId> + <artifactId>jboss-interceptor</artifactId> + <version>1.0.0-SNAPSHOT</version> + </dependency> + + <dependency> <groupId>com.sun.facelets</groupId> <artifactId>jsf-facelets</artifactId> <version>1.1.15.B1</version>

15 years, 2 months

1
0
0 / 0

Weld SVN: r3923 - core/trunk/spi/src/main/java/org/jboss/weld/ejb/spi.

by weld-commits＠lists.jboss.org

Author: marius.bogoevici Date: 2009-10-10 12:13:02 -0400 (Sat, 10 Oct 2009) New Revision: 3923 Modified: core/trunk/spi/src/main/java/org/jboss/weld/ejb/spi/InterceptorBindings.java Log: minor javadoc Modified: core/trunk/spi/src/main/java/org/jboss/weld/ejb/spi/InterceptorBindings.java =================================================================== --- core/trunk/spi/src/main/java/org/jboss/weld/ejb/spi/InterceptorBindings.java 2009-10-10 04:23:56 UTC (rev 3922) +++ core/trunk/spi/src/main/java/org/jboss/weld/ejb/spi/InterceptorBindings.java 2009-10-10 16:13:02 UTC (rev 3923) @@ -49,6 +49,7 @@ /** * Returns the interceptors that are applicable to a given {@link InterceptionType} * and method (bound by {@link InterceptorBinding}). + * * This includes class and method-bound interceptors, but no interceptors * bound by EJB-specific mechanisms. *

15 years, 2 months

1
0
0 / 0

Weld SVN: r3922 - in examples/trunk: jsf/login and 20 other directories.

by weld-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2009-10-10 00:23:56 -0400 (Sat, 10 Oct 2009) New Revision: 3922 Removed: examples/trunk/jsf/translator/ejb/src/main/java/org/jboss/webbeans/ Modified: examples/trunk/jsf/login/build.xml examples/trunk/jsf/numberguess/build.xml examples/trunk/jsf/numberguess/readme.txt examples/trunk/jsf/numberguess/src/jetty/resources/log4j.properties examples/trunk/jsf/numberguess/src/main/webapp-gae/WEB-INF/appengine-web.xml examples/trunk/jsf/numberguess/src/main/webapp-gae/WEB-INF/web.xml examples/trunk/jsf/numberguess/src/main/webapp-jetty/WEB-INF/jetty-env.xml examples/trunk/jsf/numberguess/src/main/webapp-jetty/WEB-INF/web.xml examples/trunk/jsf/numberguess/src/main/webapp-tomcat/META-INF/context.xml examples/trunk/jsf/numberguess/src/main/webapp-tomcat/WEB-INF/web.xml examples/trunk/jsf/translator/build.xml examples/trunk/jsf/translator/ear/pom.xml examples/trunk/jsf/translator/ejb/pom.xml examples/trunk/jsf/translator/war/pom.xml examples/trunk/readme.txt examples/trunk/se/hello-world/src/main/java/org/jboss/weld/environment/se/example/simple/CommandLineArgsValidator.java examples/trunk/se/hello-world/src/main/java/org/jboss/weld/environment/se/example/simple/HelloWorld.java examples/trunk/se/numberguess/readme.txt examples/trunk/se/numberguess/src/main/java/org/jboss/weld/environment/se/example/numberguess/NumberGuessFrame.java examples/trunk/wicket/gae/readme.txt examples/trunk/wicket/gae/war/WEB-INF/appengine-web.xml examples/trunk/wicket/gae/war/WEB-INF/web.xml examples/trunk/wicket/numberguess/build.xml examples/trunk/wicket/numberguess/pom.xml examples/trunk/wicket/numberguess/readme.txt examples/trunk/wicket/numberguess/src/main/java/org/jboss/weld/examples/wicket/HomePage.html examples/trunk/wicket/numberguess/src/main/java/org/jboss/weld/examples/wicket/SampleApplication.java examples/trunk/wicket/numberguess/src/main/resources/log4j.properties examples/trunk/wicket/numberguess/src/main/webapp/WEB-INF/jetty-additions-to-web.xml examples/trunk/wicket/numberguess/src/main/webapp/WEB-INF/web.xml Log: rename all instance of webbeans to weld Modified: examples/trunk/jsf/login/build.xml =================================================================== --- examples/trunk/jsf/login/build.xml 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/jsf/login/build.xml 2009-10-10 04:23:56 UTC (rev 3922) @@ -1,6 +1,6 @@ <project basedir="." name="Login Example Build" default="restart"> - <property name="example.name" value="webbeans-login" /> + <property name="example.name" value="weld-login" /> <import file="../../build.xml" /> Modified: examples/trunk/jsf/numberguess/build.xml =================================================================== --- examples/trunk/jsf/numberguess/build.xml 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/jsf/numberguess/build.xml 2009-10-10 04:23:56 UTC (rev 3922) @@ -1,6 +1,6 @@ <project basedir="." name="Numberguess Example Build" default="restart"> - <property name="example.name" value="webbeans-numberguess" /> + <property name="example.name" value="weld-numberguess" /> <import file="../../build.xml" /> Modified: examples/trunk/jsf/numberguess/readme.txt =================================================================== --- examples/trunk/jsf/numberguess/readme.txt 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/jsf/numberguess/readme.txt 2009-10-10 04:23:56 UTC (rev 3922) @@ -1,9 +1,9 @@ -Web Beans Numberguess Example -============================== +Weld Numberguess Example +======================== -This example demonstrates the use of Web Beans in a Servlet container +This example demonstrates the use of Weld in a Servlet container (Tomcat 6 / Jetty 6) and in as a non-EJB application JBoss AS. No alterations -are expeccted to be made to the container. All services are +are expected to be made to the container. All services are self-contained within the deployment. This example uses a Maven 2 build, and an ant script to deploy to JBoss AS. @@ -20,7 +20,7 @@ jboss.home as the key. Now, type ant restart to deploy the application to JBoss AS. You can access it -at http://localhost:8080/webbeans-numberguess +at http://localhost:8080/weld-numberguess == Deploying with an embedded servlet container @@ -78,7 +78,7 @@ mvn war:exploded tomcat:redeploy -Ptomcat mvn compile war:exploded tomcat:redeploy -Ptomcat -The application is available at http://localhost:8080/webbeans-numberguess +The application is available at http://localhost:8080/weld-numberguess == Launching Jetty embedded from Eclipse @@ -107,4 +107,4 @@ mvn war:inplace -Dgae -Now, in Eclipse, you can either run the app locally, or deploy it to Google App Engine \ No newline at end of file +Now, in Eclipse, you can either run the app locally, or deploy it to Google App Engine Modified: examples/trunk/jsf/numberguess/src/jetty/resources/log4j.properties =================================================================== --- examples/trunk/jsf/numberguess/src/jetty/resources/log4j.properties 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/jsf/numberguess/src/jetty/resources/log4j.properties 2009-10-10 04:23:56 UTC (rev 3922) @@ -5,6 +5,6 @@ log4j.rootLogger=INFO,Stdout -log4j.logger.org.jboss.webbeans=DEBUG +log4j.logger.org.jboss.weld=DEBUG Modified: examples/trunk/jsf/numberguess/src/main/webapp-gae/WEB-INF/appengine-web.xml =================================================================== --- examples/trunk/jsf/numberguess/src/main/webapp-gae/WEB-INF/appengine-web.xml 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/jsf/numberguess/src/main/webapp-gae/WEB-INF/appengine-web.xml 2009-10-10 04:23:56 UTC (rev 3922) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <appengine-web-app xmlns="http://appengine.google.com/ns/1.0"> - <application>webbeans-numberguess</application> + <application>weld-numberguess</application> <version>2</version>  @@ -10,4 +10,4 @@ <sessions-enabled>true</sessions-enabled> -</appengine-web-app> \ No newline at end of file +</appengine-web-app> Modified: examples/trunk/jsf/numberguess/src/main/webapp-gae/WEB-INF/web.xml =================================================================== --- examples/trunk/jsf/numberguess/src/main/webapp-gae/WEB-INF/web.xml 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/jsf/numberguess/src/main/webapp-gae/WEB-INF/web.xml 2009-10-10 04:23:56 UTC (rev 3922) @@ -4,7 +4,7 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5"> - <display-name>Web Beans Numberguess example</display-name> + <display-name>Weld Numberguess example</display-name> <context-param> <param-name>javax.faces.DEFAULT_SUFFIX</param-name> @@ -24,7 +24,7 @@ </context-param> <listener> - <listener-class>org.jboss.webbeans.environment.servlet.Listener</listener-class> + <listener-class>org.jboss.weld.environment.servlet.Listener</listener-class> </listener> <servlet> Modified: examples/trunk/jsf/numberguess/src/main/webapp-jetty/WEB-INF/jetty-env.xml =================================================================== --- examples/trunk/jsf/numberguess/src/main/webapp-jetty/WEB-INF/jetty-env.xml 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/jsf/numberguess/src/main/webapp-jetty/WEB-INF/jetty-env.xml 2009-10-10 04:23:56 UTC (rev 3922) @@ -8,7 +8,7 @@ <Arg> <New class="javax.naming.Reference"> <Arg>javax.enterprise.inject.spi.BeanManager</Arg> - <Arg>org.jboss.webbeans.resources.ManagerObjectFactory</Arg> + <Arg>org.jboss.weld.resources.ManagerObjectFactory</Arg> <Arg/> </New> </Arg> Modified: examples/trunk/jsf/numberguess/src/main/webapp-jetty/WEB-INF/web.xml =================================================================== --- examples/trunk/jsf/numberguess/src/main/webapp-jetty/WEB-INF/web.xml 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/jsf/numberguess/src/main/webapp-jetty/WEB-INF/web.xml 2009-10-10 04:23:56 UTC (rev 3922) @@ -4,7 +4,7 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5"> - <display-name>Web Beans Numberguess example</display-name> + <display-name>Weld Numberguess example</display-name> <context-param> <param-name>javax.faces.DEFAULT_SUFFIX</param-name> @@ -12,7 +12,7 @@ </context-param> <listener> - <listener-class>org.jboss.webbeans.environment.servlet.Listener</listener-class> + <listener-class>org.jboss.weld.environment.servlet.Listener</listener-class> </listener> <servlet> Modified: examples/trunk/jsf/numberguess/src/main/webapp-tomcat/META-INF/context.xml =================================================================== --- examples/trunk/jsf/numberguess/src/main/webapp-tomcat/META-INF/context.xml 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/jsf/numberguess/src/main/webapp-tomcat/META-INF/context.xml 2009-10-10 04:23:56 UTC (rev 3922) @@ -4,7 +4,7 @@ <Resource name="BeanManager" auth="Container" type="javax.enterprise.inject.spi.BeanManager" - factory="org.jboss.webbeans.resources.ManagerObjectFactory"/> + factory="org.jboss.weld.resources.ManagerObjectFactory"/>  -  +  </Context> Modified: examples/trunk/jsf/numberguess/src/main/webapp-tomcat/WEB-INF/web.xml =================================================================== --- examples/trunk/jsf/numberguess/src/main/webapp-tomcat/WEB-INF/web.xml 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/jsf/numberguess/src/main/webapp-tomcat/WEB-INF/web.xml 2009-10-10 04:23:56 UTC (rev 3922) @@ -4,7 +4,7 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" version="2.5"> - <display-name>Web Beans Numberguess example</display-name> + <display-name>Weld Numberguess example</display-name> <context-param> <param-name>javax.faces.DEFAULT_SUFFIX</param-name> @@ -12,7 +12,7 @@ </context-param> <listener> - <listener-class>org.jboss.webbeans.environment.servlet.Listener</listener-class> + <listener-class>org.jboss.weld.environment.servlet.Listener</listener-class> </listener> <servlet> Modified: examples/trunk/jsf/translator/build.xml =================================================================== --- examples/trunk/jsf/translator/build.xml 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/jsf/translator/build.xml 2009-10-10 04:23:56 UTC (rev 3922) @@ -1,6 +1,6 @@ <project basedir="." name="Translator Example Build" default="restart"> - <property name="example.name" value="webbeans-translator" /> + <property name="example.name" value="weld-translator" /> <property name="type" value="ear" /> <import file="../../build.xml" /> Modified: examples/trunk/jsf/translator/ear/pom.xml =================================================================== --- examples/trunk/jsf/translator/ear/pom.xml 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/jsf/translator/ear/pom.xml 2009-10-10 04:23:56 UTC (rev 3922) @@ -3,15 +3,15 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.webbeans.examples.jsf.translator</groupId> - <artifactId>webbeans-jsf-translator-parent</artifactId> + <groupId>org.jboss.weld.examples.jsf.translator</groupId> + <artifactId>weld-jsf-translator-parent</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> - <groupId>org.jboss.webbeans.examples.jsf.translator</groupId> - <artifactId>webbeans-jsf-translator-ear</artifactId> + <groupId>org.jboss.weld.examples.jsf.translator</groupId> + <artifactId>weld-jsf-translator-ear</artifactId> <packaging>ear</packaging> - <name>Web Beans Examples: Translator (ear)</name> + <name>Weld Examples: Translator (ear)</name> <pluginRepositories> <pluginRepository> @@ -26,14 +26,14 @@ <dependencies> <dependency> - <groupId>org.jboss.webbeans.examples.jsf.translator</groupId> - <artifactId>webbeans-jsf-translator-ejb</artifactId> + <groupId>org.jboss.weld.examples.jsf.translator</groupId> + <artifactId>weld-jsf-translator-ejb</artifactId> <type>ejb</type> </dependency> <dependency> - <groupId>org.jboss.webbeans.examples.jsf.translator</groupId> - <artifactId>webbeans-jsf-translator-war</artifactId> + <groupId>org.jboss.weld.examples.jsf.translator</groupId> + <artifactId>weld-jsf-translator-war</artifactId> <type>war</type> </dependency> @@ -58,7 +58,7 @@ </dependencies> <build> - <finalName>webbeans-translator</finalName> + <finalName>weld-translator</finalName> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -66,9 +66,9 @@ <configuration> <modules> <webModule> - <groupId>org.jboss.webbeans.examples.jsf.translator</groupId> - <artifactId>webbeans-jsf-translator-war</artifactId> - <contextRoot>/webbeans-translator</contextRoot> + <groupId>org.jboss.weld.examples.jsf.translator</groupId> + <artifactId>weld-jsf-translator-war</artifactId> + <contextRoot>/weld-translator</contextRoot> </webModule> </modules> </configuration> Modified: examples/trunk/jsf/translator/ejb/pom.xml =================================================================== --- examples/trunk/jsf/translator/ejb/pom.xml 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/jsf/translator/ejb/pom.xml 2009-10-10 04:23:56 UTC (rev 3922) @@ -3,15 +3,15 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.webbeans.examples.jsf.translator</groupId> - <artifactId>webbeans-jsf-translator-parent</artifactId> + <groupId>org.jboss.weld.examples.jsf.translator</groupId> + <artifactId>weld-jsf-translator-parent</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> - <groupId>org.jboss.webbeans.examples.jsf.translator</groupId> - <artifactId>webbeans-jsf-translator-ejb</artifactId> + <groupId>org.jboss.weld.examples.jsf.translator</groupId> + <artifactId>weld-jsf-translator-ejb</artifactId> <packaging>ejb</packaging> - <name>Web Beans Examples: Translator (ejb)</name> + <name>Weld Examples: Translator (ejb)</name> <pluginRepositories> <pluginRepository> @@ -32,8 +32,8 @@ </dependency> <dependency> - <groupId>org.jboss.webbeans</groupId> - <artifactId>jsr299-api</artifactId> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> <scope>provided</scope> </dependency> @@ -46,7 +46,7 @@ </dependencies> <build> - <finalName>webbeans-translator</finalName> + <finalName>weld-translator</finalName> </build> </project> Modified: examples/trunk/jsf/translator/war/pom.xml =================================================================== --- examples/trunk/jsf/translator/war/pom.xml 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/jsf/translator/war/pom.xml 2009-10-10 04:23:56 UTC (rev 3922) @@ -3,15 +3,15 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.webbeans.examples.jsf.translator</groupId> - <artifactId>webbeans-jsf-translator-parent</artifactId> + <groupId>org.jboss.weld.examples.jsf.translator</groupId> + <artifactId>weld-jsf-translator-parent</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> - <groupId>org.jboss.webbeans.examples.jsf.translator</groupId> - <artifactId>webbeans-jsf-translator-war</artifactId> + <groupId>org.jboss.weld.examples.jsf.translator</groupId> + <artifactId>weld-jsf-translator-war</artifactId> <packaging>war</packaging> - <name>Web Beans Examples: Translator (war)</name> + <name>Weld Examples: Translator (war)</name> <pluginRepositories> <pluginRepository> @@ -51,7 +51,7 @@ </dependencies> <build> - <finalName>webbeans-translator</finalName> + <finalName>weld-translator</finalName> </build> </project> Modified: examples/trunk/readme.txt =================================================================== --- examples/trunk/readme.txt 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/readme.txt 2009-10-10 04:23:56 UTC (rev 3922) @@ -1,4 +1,4 @@ -Web Beans currently comes with a number of examples: +Weld currently comes with a number of examples: * numberguess (a war example for JSF) * translator (an EJB example for JSF). @@ -9,7 +9,7 @@ * servlet-numberguess (the numberguess example for using on Tomcat or Jetty) Before running the examples, you'll need to ensure your -server supports Web Beans. +server supports Weld. The examples and RI are explained in detail in the reference guide, including -how to add Web Beans support to JBoss 5, and how to deploy the examples to Tomcat +how to add Weld support to JBoss 5, and how to deploy the examples to Tomcat Modified: examples/trunk/se/hello-world/src/main/java/org/jboss/weld/environment/se/example/simple/CommandLineArgsValidator.java =================================================================== --- examples/trunk/se/hello-world/src/main/java/org/jboss/weld/environment/se/example/simple/CommandLineArgsValidator.java 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/se/hello-world/src/main/java/org/jboss/weld/environment/se/example/simple/CommandLineArgsValidator.java 2009-10-10 04:23:56 UTC (rev 3922) @@ -22,7 +22,7 @@ import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; -import org.jboss.webbeans.environment.se.bindings.Parameters; +import org.jboss.weld.environment.se.bindings.Parameters; /** * Validates command line arguments, producing errors where applicable. Modified: examples/trunk/se/hello-world/src/main/java/org/jboss/weld/environment/se/example/simple/HelloWorld.java =================================================================== --- examples/trunk/se/hello-world/src/main/java/org/jboss/weld/environment/se/example/simple/HelloWorld.java 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/se/hello-world/src/main/java/org/jboss/weld/environment/se/example/simple/HelloWorld.java 2009-10-10 04:23:56 UTC (rev 3922) @@ -19,7 +19,7 @@ import javax.enterprise.context.ApplicationScoped; import javax.enterprise.event.Observes; import javax.inject.Inject; -import org.jboss.webbeans.environment.se.events.ContainerInitialized; +import org.jboss.weld.environment.se.events.ContainerInitialized; import javax.inject.Inject; /** Modified: examples/trunk/se/numberguess/readme.txt =================================================================== --- examples/trunk/se/numberguess/readme.txt 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/se/numberguess/readme.txt 2009-10-10 04:23:56 UTC (rev 3922) @@ -96,7 +96,7 @@ ------------------- As with all Web Beans SE applications, this example is executed -by starting Java with org.jboss.webbeans.environment.se.StartMain +by starting Java with org.jboss.weld.environment.se.StartMain as the main class. Of course you will need all of the relevant jar dependencies on your classpath, which is most easily done by loading the project into your favourite Maven-capable IDE and running it from there.. Modified: examples/trunk/se/numberguess/src/main/java/org/jboss/weld/environment/se/example/numberguess/NumberGuessFrame.java =================================================================== --- examples/trunk/se/numberguess/src/main/java/org/jboss/weld/environment/se/example/numberguess/NumberGuessFrame.java 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/se/numberguess/src/main/java/org/jboss/weld/environment/se/example/numberguess/NumberGuessFrame.java 2009-10-10 04:23:56 UTC (rev 3922) @@ -20,7 +20,7 @@ import javax.enterprise.event.Observes; import javax.inject.Inject; -import org.jboss.webbeans.environment.se.events.ContainerInitialized; +import org.jboss.weld.environment.se.events.ContainerInitialized; /** * Swing-based number guess example, main application frame. Modified: examples/trunk/wicket/gae/readme.txt =================================================================== --- examples/trunk/wicket/gae/readme.txt 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/wicket/gae/readme.txt 2009-10-10 04:23:56 UTC (rev 3922) @@ -1,5 +1,5 @@ This example is similar to its sibling "numberguess" example, but implemented -with wicket and the wicket-webbeans integration. It can be deployed to google +with wicket and the wicket-weld integration. It can be deployed to google app engine using the eclipse plugin Modified: examples/trunk/wicket/gae/war/WEB-INF/appengine-web.xml =================================================================== --- examples/trunk/wicket/gae/war/WEB-INF/appengine-web.xml 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/wicket/gae/war/WEB-INF/appengine-web.xml 2009-10-10 04:23:56 UTC (rev 3922) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <appengine-web-app xmlns="http://appengine.google.com/ns/1.0"> - <application>webbeans-wicket-numberguess</application> + <application>weld-wicket-numberguess</application> <version>1</version>  @@ -10,4 +10,4 @@ <sessions-enabled>true</sessions-enabled> -</appengine-web-app> \ No newline at end of file +</appengine-web-app> Modified: examples/trunk/wicket/gae/war/WEB-INF/web.xml =================================================================== --- examples/trunk/wicket/gae/war/WEB-INF/web.xml 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/wicket/gae/war/WEB-INF/web.xml 2009-10-10 04:23:56 UTC (rev 3922) @@ -4,14 +4,14 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4"> - <display-name>webbeans-numberguess-wicket</display-name> + <display-name>weld-numberguess-wicket</display-name> <filter> <filter-name>wicket.numberguess-example</filter-name> <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class> <init-param> <param-name>applicationClassName</param-name> - <param-value>org.jboss.webbeans.examples.wicket.SampleApplication</param-value> + <param-value>org.jboss.weld.examples.wicket.SampleApplication</param-value> </init-param> </filter> @@ -21,7 +21,7 @@ </filter-mapping> <listener> - <listener-class>org.jboss.webbeans.environment.servlet.Listener</listener-class> + <listener-class>org.jboss.weld.environment.servlet.Listener</listener-class> </listener> Modified: examples/trunk/wicket/numberguess/build.xml =================================================================== --- examples/trunk/wicket/numberguess/build.xml 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/wicket/numberguess/build.xml 2009-10-10 04:23:56 UTC (rev 3922) @@ -1,6 +1,6 @@ <project basedir="." name="Wicket Numberguess Example Build" default="restart"> - <property name="example.name" value="webbeans-numberguess-wicket" /> + <property name="example.name" value="weld-numberguess-wicket" /> <import file="../../build.xml" /> Modified: examples/trunk/wicket/numberguess/pom.xml =================================================================== --- examples/trunk/wicket/numberguess/pom.xml 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/wicket/numberguess/pom.xml 2009-10-10 04:23:56 UTC (rev 3922) @@ -3,22 +3,22 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.jboss.webbeans.examples</groupId> - <artifactId>webbeans-examples-parent</artifactId> + <groupId>org.jboss.weld.examples</groupId> + <artifactId>weld-examples-parent</artifactId> <version>1.0.0-SNAPSHOT</version> <relativePath>../../pom.xml</relativePath> </parent> - <groupId>org.jboss.webbeans.examples</groupId> - <artifactId>webbeans-wicket-numberguess</artifactId> + <groupId>org.jboss.weld.examples</groupId> + <artifactId>weld-wicket-numberguess</artifactId> <packaging>war</packaging> - <name>Web Beans Examples: Numberguess with wicket</name> + <name>Weld Examples: Numberguess with wicket</name> <dependencies> <dependency> - <groupId>org.jboss.webbeans</groupId> - <artifactId>jsr299-api</artifactId> + <groupId>javax.enterprise</groupId> + <artifactId>cdi-api</artifactId> <scope>provided</scope> </dependency> @@ -28,8 +28,8 @@ </dependency> <dependency> - <groupId>org.jboss.webbeans</groupId> - <artifactId>webbeans-wicket</artifactId> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-wicket</artifactId> </dependency> <dependency> @@ -42,8 +42,8 @@ <artifactId>jsr250-api</artifactId> </dependency> <dependency> - <groupId>org.jboss.webbeans.servlet</groupId> - <artifactId>webbeans-servlet</artifactId> + <groupId>org.jboss.weld.servlet</groupId> + <artifactId>weld-servlet</artifactId> <scope>runtime</scope> </dependency> @@ -71,7 +71,7 @@ </dependencies> <build> - <finalName>webbeans-numberguess-wicket</finalName> + <finalName>weld-numberguess-wicket</finalName>  <resources> @@ -132,8 +132,8 @@ <id>jetty</id> <dependencies> <dependency> - <groupId>org.jboss.webbeans.servlet</groupId> - <artifactId>webbeans-servlet</artifactId> + <groupId>org.jboss.weld.servlet</groupId> + <artifactId>weld-servlet</artifactId> <scope>runtime</scope> </dependency> </dependencies> Modified: examples/trunk/wicket/numberguess/readme.txt =================================================================== --- examples/trunk/wicket/numberguess/readme.txt 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/wicket/numberguess/readme.txt 2009-10-10 04:23:56 UTC (rev 3922) @@ -1,5 +1,5 @@ This example is similar to its sibling "numberguess" example, but implemented -with wicket and the wicket-webbeans integration. It also follows the wicket +with wicket and the wicket-weld integration. It also follows the wicket standard usage of running from within eclipse with jetty. So, for example, to run the app, right-click on Start.java in the project and choose "Run as Java Application," which will launch jetty with the example. Then hit Modified: examples/trunk/wicket/numberguess/src/main/java/org/jboss/weld/examples/wicket/HomePage.html =================================================================== --- examples/trunk/wicket/numberguess/src/main/java/org/jboss/weld/examples/wicket/HomePage.html 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/wicket/numberguess/src/main/java/org/jboss/weld/examples/wicket/HomePage.html 2009-10-10 04:23:56 UTC (rev 3922) @@ -1,6 +1,6 @@ <html> <head> - <title>Wicket WebBeans example</title> + <title>Wicket Weld example</title> </head> <body> <h1>Guess a number...</h1> Modified: examples/trunk/wicket/numberguess/src/main/java/org/jboss/weld/examples/wicket/SampleApplication.java =================================================================== --- examples/trunk/wicket/numberguess/src/main/java/org/jboss/weld/examples/wicket/SampleApplication.java 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/wicket/numberguess/src/main/java/org/jboss/weld/examples/wicket/SampleApplication.java 2009-10-10 04:23:56 UTC (rev 3922) @@ -1,8 +1,8 @@ package org.jboss.weld.examples.wicket; -import org.jboss.webbeans.wicket.WebBeansApplication; +import org.jboss.weld.wicket.WeldApplication; -public class SampleApplication extends WebBeansApplication +public class SampleApplication extends WeldApplication { @Override Modified: examples/trunk/wicket/numberguess/src/main/resources/log4j.properties =================================================================== --- examples/trunk/wicket/numberguess/src/main/resources/log4j.properties 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/wicket/numberguess/src/main/resources/log4j.properties 2009-10-10 04:23:56 UTC (rev 3922) @@ -5,6 +5,6 @@ log4j.rootLogger=INFO,Stdout -log4j.logger.org.jboss.webbeans=DEBUG +log4j.logger.org.jboss.weld=DEBUG Modified: examples/trunk/wicket/numberguess/src/main/webapp/WEB-INF/jetty-additions-to-web.xml =================================================================== --- examples/trunk/wicket/numberguess/src/main/webapp/WEB-INF/jetty-additions-to-web.xml 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/wicket/numberguess/src/main/webapp/WEB-INF/jetty-additions-to-web.xml 2009-10-10 04:23:56 UTC (rev 3922) @@ -4,9 +4,9 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4"> - + <listener> - <listener-class>org.jboss.webbeans.environment.servlet.Listener</listener-class> + <listener-class>org.jboss.weld.environment.servlet.Listener</listener-class> </listener> </web-app> Modified: examples/trunk/wicket/numberguess/src/main/webapp/WEB-INF/web.xml =================================================================== --- examples/trunk/wicket/numberguess/src/main/webapp/WEB-INF/web.xml 2009-10-10 04:09:03 UTC (rev 3921) +++ examples/trunk/wicket/numberguess/src/main/webapp/WEB-INF/web.xml 2009-10-10 04:23:56 UTC (rev 3922) @@ -4,14 +4,14 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" version="2.4"> - <display-name>webbeans-numberguess-wicket</display-name> + <display-name>weld-numberguess-wicket</display-name> <filter> <filter-name>wicket.numberguess-example</filter-name> <filter-class>org.apache.wicket.protocol.http.WicketFilter</filter-class> <init-param> <param-name>applicationClassName</param-name> - <param-value>org.jboss.webbeans.examples.wicket.SampleApplication</param-value> + <param-value>org.jboss.weld.examples.wicket.SampleApplication</param-value> </init-param> </filter>

15 years, 2 months

1
0
0 / 0

Weld SVN: r3921 - in examples/trunk/jsf/numberguess/src/main/java/org/jboss: weld and 2 other directories.

by weld-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2009-10-10 00:09:03 -0400 (Sat, 10 Oct 2009) New Revision: 3921 Added: examples/trunk/jsf/numberguess/src/main/java/org/jboss/weld/ examples/trunk/jsf/numberguess/src/main/java/org/jboss/weld/examples/ examples/trunk/jsf/numberguess/src/main/java/org/jboss/weld/examples/numberguess/ Removed: examples/trunk/jsf/numberguess/src/main/java/org/jboss/webbeans/ Modified: examples/trunk/jsf/numberguess/src/main/java/org/jboss/weld/examples/numberguess/Game.java examples/trunk/jsf/numberguess/src/main/java/org/jboss/weld/examples/numberguess/Generator.java examples/trunk/jsf/numberguess/src/main/java/org/jboss/weld/examples/numberguess/MaxNumber.java examples/trunk/jsf/numberguess/src/main/java/org/jboss/weld/examples/numberguess/Random.java Log: rename package Copied: examples/trunk/jsf/numberguess/src/main/java/org/jboss/weld/examples/numberguess (from rev 3916, examples/trunk/jsf/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess) Modified: examples/trunk/jsf/numberguess/src/main/java/org/jboss/weld/examples/numberguess/Game.java =================================================================== --- examples/trunk/jsf/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Game.java 2009-10-09 23:30:54 UTC (rev 3916) +++ examples/trunk/jsf/numberguess/src/main/java/org/jboss/weld/examples/numberguess/Game.java 2009-10-10 04:09:03 UTC (rev 3921) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.examples.numberguess; +package org.jboss.weld.examples.numberguess; import java.io.Serializable; Modified: examples/trunk/jsf/numberguess/src/main/java/org/jboss/weld/examples/numberguess/Generator.java =================================================================== --- examples/trunk/jsf/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Generator.java 2009-10-09 23:30:54 UTC (rev 3916) +++ examples/trunk/jsf/numberguess/src/main/java/org/jboss/weld/examples/numberguess/Generator.java 2009-10-10 04:09:03 UTC (rev 3921) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.examples.numberguess; +package org.jboss.weld.examples.numberguess; import java.io.Serializable; Modified: examples/trunk/jsf/numberguess/src/main/java/org/jboss/weld/examples/numberguess/MaxNumber.java =================================================================== --- examples/trunk/jsf/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/MaxNumber.java 2009-10-09 23:30:54 UTC (rev 3916) +++ examples/trunk/jsf/numberguess/src/main/java/org/jboss/weld/examples/numberguess/MaxNumber.java 2009-10-10 04:09:03 UTC (rev 3921) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.examples.numberguess; +package org.jboss.weld.examples.numberguess; import static java.lang.annotation.ElementType.FIELD; Modified: examples/trunk/jsf/numberguess/src/main/java/org/jboss/weld/examples/numberguess/Random.java =================================================================== --- examples/trunk/jsf/numberguess/src/main/java/org/jboss/webbeans/examples/numberguess/Random.java 2009-10-09 23:30:54 UTC (rev 3916) +++ examples/trunk/jsf/numberguess/src/main/java/org/jboss/weld/examples/numberguess/Random.java 2009-10-10 04:09:03 UTC (rev 3921) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.examples.numberguess; +package org.jboss.weld.examples.numberguess; import static java.lang.annotation.ElementType.FIELD;

15 years, 2 months

1
0
0 / 0

Weld SVN: r3920 - in examples/trunk/jsf/translator/ejb/src/main/java/org/jboss: webbeans/examples and 3 other directories.

by weld-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2009-10-09 23:51:06 -0400 (Fri, 09 Oct 2009) New Revision: 3920 Added: examples/trunk/jsf/translator/ejb/src/main/java/org/jboss/weld/ examples/trunk/jsf/translator/ejb/src/main/java/org/jboss/weld/examples/ examples/trunk/jsf/translator/ejb/src/main/java/org/jboss/weld/examples/translator/ Removed: examples/trunk/jsf/translator/ejb/src/main/java/org/jboss/webbeans/examples/translator/ Modified: examples/trunk/jsf/translator/ejb/src/main/java/org/jboss/weld/examples/translator/SentenceParser.java examples/trunk/jsf/translator/ejb/src/main/java/org/jboss/weld/examples/translator/SentenceTranslator.java examples/trunk/jsf/translator/ejb/src/main/java/org/jboss/weld/examples/translator/TextTranslator.java examples/trunk/jsf/translator/ejb/src/main/java/org/jboss/weld/examples/translator/Translator.java examples/trunk/jsf/translator/ejb/src/main/java/org/jboss/weld/examples/translator/TranslatorController.java examples/trunk/jsf/translator/ejb/src/main/java/org/jboss/weld/examples/translator/TranslatorControllerBean.java Log: rename package Copied: examples/trunk/jsf/translator/ejb/src/main/java/org/jboss/weld/examples/translator (from rev 3916, examples/trunk/jsf/translator/ejb/src/main/java/org/jboss/webbeans/examples/translator) Modified: examples/trunk/jsf/translator/ejb/src/main/java/org/jboss/weld/examples/translator/SentenceParser.java =================================================================== --- examples/trunk/jsf/translator/ejb/src/main/java/org/jboss/webbeans/examples/translator/SentenceParser.java 2009-10-09 23:30:54 UTC (rev 3916) +++ examples/trunk/jsf/translator/ejb/src/main/java/org/jboss/weld/examples/translator/SentenceParser.java 2009-10-10 03:51:06 UTC (rev 3920) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.examples.translator; +package org.jboss.weld.examples.translator; import java.util.Arrays; import java.util.List; Modified: examples/trunk/jsf/translator/ejb/src/main/java/org/jboss/weld/examples/translator/SentenceTranslator.java =================================================================== --- examples/trunk/jsf/translator/ejb/src/main/java/org/jboss/webbeans/examples/translator/SentenceTranslator.java 2009-10-09 23:30:54 UTC (rev 3916) +++ examples/trunk/jsf/translator/ejb/src/main/java/org/jboss/weld/examples/translator/SentenceTranslator.java 2009-10-10 03:51:06 UTC (rev 3920) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.examples.translator; +package org.jboss.weld.examples.translator; import javax.ejb.Stateless; Modified: examples/trunk/jsf/translator/ejb/src/main/java/org/jboss/weld/examples/translator/TextTranslator.java =================================================================== --- examples/trunk/jsf/translator/ejb/src/main/java/org/jboss/webbeans/examples/translator/TextTranslator.java 2009-10-09 23:30:54 UTC (rev 3916) +++ examples/trunk/jsf/translator/ejb/src/main/java/org/jboss/weld/examples/translator/TextTranslator.java 2009-10-10 03:51:06 UTC (rev 3920) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.examples.translator; +package org.jboss.weld.examples.translator; import java.io.Serializable; Modified: examples/trunk/jsf/translator/ejb/src/main/java/org/jboss/weld/examples/translator/Translator.java =================================================================== --- examples/trunk/jsf/translator/ejb/src/main/java/org/jboss/webbeans/examples/translator/Translator.java 2009-10-09 23:30:54 UTC (rev 3916) +++ examples/trunk/jsf/translator/ejb/src/main/java/org/jboss/weld/examples/translator/Translator.java 2009-10-10 03:51:06 UTC (rev 3920) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.examples.translator; +package org.jboss.weld.examples.translator; import javax.ejb.Local; Modified: examples/trunk/jsf/translator/ejb/src/main/java/org/jboss/weld/examples/translator/TranslatorController.java =================================================================== --- examples/trunk/jsf/translator/ejb/src/main/java/org/jboss/webbeans/examples/translator/TranslatorController.java 2009-10-09 23:30:54 UTC (rev 3916) +++ examples/trunk/jsf/translator/ejb/src/main/java/org/jboss/weld/examples/translator/TranslatorController.java 2009-10-10 03:51:06 UTC (rev 3920) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.examples.translator; +package org.jboss.weld.examples.translator; public interface TranslatorController { Modified: examples/trunk/jsf/translator/ejb/src/main/java/org/jboss/weld/examples/translator/TranslatorControllerBean.java =================================================================== --- examples/trunk/jsf/translator/ejb/src/main/java/org/jboss/webbeans/examples/translator/TranslatorControllerBean.java 2009-10-09 23:30:54 UTC (rev 3916) +++ examples/trunk/jsf/translator/ejb/src/main/java/org/jboss/weld/examples/translator/TranslatorControllerBean.java 2009-10-10 03:51:06 UTC (rev 3920) @@ -1,4 +1,4 @@ -package org.jboss.webbeans.examples.translator; +package org.jboss.weld.examples.translator; import javax.ejb.Remove; import javax.ejb.Stateful;

15 years, 2 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

weld-commits October 2009