March 2009 - weld-commits - Jboss List Archives

[webbeans-commits] Webbeans SVN: r1997 - ri/trunk/impl/src/main/java/org/jboss/webbeans/xsd.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-03-14 17:54:58 -0400 (Sat, 14 Mar 2009) New Revision: 1997 Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xsd/sample-schema.xsd Log: sample schema Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/xsd/sample-schema.xsd =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/xsd/sample-schema.xsd 2009-03-14 17:21:07 UTC (rev 1996) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/xsd/sample-schema.xsd 2009-03-14 21:54:58 UTC (rev 1997) @@ -1,96 +1,28 @@ <?xml version="1.0" encoding="UTF-8"?> <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" - targetNamespace="http://jboss.com/products/webbeans/tck/audit" - xmlns:audit="http://jboss.com/products/webbeans/tck/audit" + targetNamespace="urn:java:com.acme.foo" + xmlns:foo="urn:java:com.acme.foo" + xmlns:ee="urn:java:ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.w3.org/2001/XMLSchema http://www.w3.org/2001/XMLSchema.xsd" > - - <xs:element name="specification"> - <xs:annotation> - <xs:documentation> The specification tag is the root element for tck-audit.xml. </xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:sequence maxOccurs="unbounded"> - <xs:element ref="audit:section"/> - </xs:sequence> - <xs:attribute name="name" type="xs:string"/> - <xs:attribute name="version" type="xs:string"/> - </xs:complexType> - </xs:element> - - <xs:element name="section"> - <xs:annotation> - <xs:documentation>Each section of the specification should be identified and entered</xs:documentation> - </xs:annotation> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="audit:assertion"/> - </xs:sequence> - <xs:attributeGroup ref="audit:attlist.section"/> - </xs:complexType> - </xs:element> - <xs:attributeGroup name="attlist.section"> - <xs:attribute name="id" type="xs:string"> - <xs:annotation> - <xs:documentation>The section number</xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="title" type="xs:string"> - <xs:annotation> - <xs:documentation>The section title</xs:documentation> - </xs:annotation> - </xs:attribute> - </xs:attributeGroup> - - <xs:element name="assertion"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="1" maxOccurs="1" ref="audit:text"> - <xs:annotation> - <xs:documentation>The specification text that this assertion represents. You can include highlighting such as _highlight_ or ~score out~.</xs:documentation> - </xs:annotation> - </xs:element> - <xs:element minOccurs="0" maxOccurs="1" ref="audit:note"> - <xs:annotation> - <xs:documentation>A note on the assertion, for example a justifaction for marking this assertion untestable</xs:documentation> - </xs:annotation> - </xs:element> - </xs:sequence> - <xs:attributeGroup ref="audit:attlist.assertion"/> - </xs:complexType> + <xs:element name="Foo"> + <xs:complexType> + <xs:choice> +  + <xs:element ref="ee:BindingType"/> + <xs:element ref="ee:StereotypType"/> +  + <xs:any />  + </xs:choice> + </xs:complexType> </xs:element> - <xs:attributeGroup name="attlist.assertion"> - <xs:attribute name="id" type="xs:string"/> - <xs:attribute name="testable" type="xs:boolean" default="true"> - <xs:annotation> - <xs:documentation>By default true, set to false if this test is untestable. The coverage report will then not count it as untested.</xs:documentation> - </xs:annotation> - </xs:attribute> - <xs:attribute name="implied" type="xs:boolean" default="true"> - <xs:annotation> - <xs:documentation>Some assertions are often implied by the specification (for example inversions of statments), mark an assertion as implied using this attribute.</xs:documentation> - </xs:annotation> - </xs:attribute> - </xs:attributeGroup> + <xs:element name="Bar"> - <xs:element name="text"> - <xs:complexType> - <xs:simpleContent> - <xs:extension base="xs:string"/> - </xs:simpleContent> - </xs:complexType> </xs:element> - <xs:element name="note"> - <xs:complexType> - <xs:simpleContent> - <xs:extension base="xs:string"/> - </xs:simpleContent> - </xs:complexType> - </xs:element> </xs:schema> \ No newline at end of file

15 years, 3 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1996 - ri/trunk/impl/src/main/java/org/jboss/webbeans/bean.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-03-14 13:21:07 -0400 (Sat, 14 Mar 2009) New Revision: 1996 Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java Log: WBRI-181 Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java 2009-03-14 17:10:09 UTC (rev 1995) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java 2009-03-14 17:21:07 UTC (rev 1996) @@ -295,16 +295,23 @@ // This is a bit dangerous, as it means that producer methods can end of // executing on partially constructed instances. Also, it's not required // by the spec... - if (creationalContext instanceof CreationalContextImpl) + if (getAnnotatedItem().isStatic()) { - CreationalContextImpl<?> creationalContextImpl = (CreationalContextImpl<?>) creationalContext; - if (creationalContextImpl.containsIncompleteInstance(getDeclaringBean())) + return null; + } + else + { + if (creationalContext instanceof CreationalContextImpl) { - log.warn("Executing producer field or method " + getAnnotatedItem() + " on incomplete declaring bean " + getDeclaringBean() + " due to circular injection"); - return creationalContextImpl.getIncompleteInstance(getDeclaringBean()); + CreationalContextImpl<?> creationalContextImpl = (CreationalContextImpl<?>) creationalContext; + if (creationalContextImpl.containsIncompleteInstance(getDeclaringBean())) + { + log.warn("Executing producer field or method " + getAnnotatedItem() + " on incomplete declaring bean " + getDeclaringBean() + " due to circular injection"); + return creationalContextImpl.getIncompleteInstance(getDeclaringBean()); + } } + return manager.getInstance(getDeclaringBean()); } - return getAnnotatedItem().isStatic() ? null : manager.getInstance(getDeclaringBean()); } /**

15 years, 4 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1995 - in ri/trunk/impl/src: test/java/org/jboss/webbeans/test/unit/implementation and 1 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-03-14 13:10:09 -0400 (Sat, 14 Mar 2009) New Revision: 1995 Added: ri/trunk/impl/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/ ri/trunk/impl/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/IntInjection.java ri/trunk/impl/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/ManagerProducer.java ri/trunk/impl/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/ManagerProducerTest.java Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/ManagerImpl.java Log: WBRI-183, thanks to Takeshi Kondo Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/ManagerImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/ManagerImpl.java 2009-03-14 16:46:33 UTC (rev 1994) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/ManagerImpl.java 2009-03-14 17:10:09 UTC (rev 1995) @@ -31,6 +31,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.Stack; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.ExecutorService; @@ -112,7 +113,7 @@ private transient final ExecutorService taskExecutor = Executors.newSingleThreadExecutor(); // An injection point metadata beans factory - private transient final ThreadLocal<InjectionPoint> currentInjectionPoint; + private transient final ThreadLocal<Stack<InjectionPoint>> currentInjectionPoint; // The bean resolver private transient final Resolver resolver; @@ -167,7 +168,14 @@ this.contextMap = new ContextMap(); this.eventManager = new EventManager(); this.ejbDescriptorCache = new EjbDescriptorCache(); - this.currentInjectionPoint = new ThreadLocal<InjectionPoint>(); + this.currentInjectionPoint = new ThreadLocal<Stack<InjectionPoint>>() + { + @Override + protected Stack<InjectionPoint> initialValue() + { + return new Stack<InjectionPoint>(); + } + }; this.specializedBeans = new HashMap<Bean<?>, Bean<?>>(); this.servletInjector = new ServletInjector(this); List<Class<? extends Annotation>> defaultEnabledDeploymentTypes = new ArrayList<Class<? extends Annotation>>(); @@ -635,7 +643,7 @@ { if (registerInjectionPoint) { - currentInjectionPoint.set(injectionPoint); + currentInjectionPoint.get().push(injectionPoint); } AnnotatedItem<T, ?> element = ResolvableAnnotatedClass.of((Class<T>) injectionPoint.getType(), injectionPoint.getBindings().toArray(new Annotation[0])); Bean<T> bean = getBeanByType(element, element.getBindingsAsArray()); @@ -660,7 +668,7 @@ { if (registerInjectionPoint) { - currentInjectionPoint.remove(); + currentInjectionPoint.get().pop(); } } } @@ -917,7 +925,14 @@ */ public InjectionPoint getInjectionPoint() { - return currentInjectionPoint.get(); + if (!currentInjectionPoint.get().empty()) + { + return currentInjectionPoint.get().peek(); + } + else + { + return null; + } } /** Added: ri/trunk/impl/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/IntInjection.java =================================================================== --- ri/trunk/impl/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/IntInjection.java (rev 0) +++ ri/trunk/impl/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/IntInjection.java 2009-03-14 17:10:09 UTC (rev 1995) @@ -0,0 +1,15 @@ +package org.jboss.webbeans.test.unit.implementation.producer; + +import javax.inject.Initializer; + +public class IntInjection +{ + + int value; + + @Initializer public IntInjection(Integer integer) + { + this.value = integer; + } + +} Property changes on: ri/trunk/impl/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/IntInjection.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/impl/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/ManagerProducer.java =================================================================== --- ri/trunk/impl/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/ManagerProducer.java (rev 0) +++ ri/trunk/impl/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/ManagerProducer.java 2009-03-14 17:10:09 UTC (rev 1995) @@ -0,0 +1,32 @@ +package org.jboss.webbeans.test.unit.implementation.producer; + +import javax.inject.Current; +import javax.inject.Produces; +import javax.inject.manager.InjectionPoint; +import javax.inject.manager.Manager; + +class ManagerProducer +{ + + @Current Manager manager; + + private static boolean injectionPointInjected; + + public static boolean isInjectionPointInjected() + { + return injectionPointInjected; + } + + public static void setInjectionPointInjected(boolean injectionPointInjected) + { + ManagerProducer.injectionPointInjected = injectionPointInjected; + } + + @Produces + Integer create(InjectionPoint point) + { + injectionPointInjected = point != null; + return 10; + } + +} Property changes on: ri/trunk/impl/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/ManagerProducer.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/impl/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/ManagerProducerTest.java =================================================================== --- ri/trunk/impl/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/ManagerProducerTest.java (rev 0) +++ ri/trunk/impl/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/ManagerProducerTest.java 2009-03-14 17:10:09 UTC (rev 1995) @@ -0,0 +1,18 @@ +package org.jboss.webbeans.test.unit.implementation.producer; + +import org.jboss.testharness.impl.packaging.Artifact; +import org.jboss.webbeans.test.unit.AbstractWebBeansTest; +import org.testng.annotations.Test; + +@Artifact +public class ManagerProducerTest extends AbstractWebBeansTest +{ + @Test(description="WBRI-183") + public void testInjectManagerProducer() + { + ManagerProducer.setInjectionPointInjected(false); + manager.getInstanceByType(IntInjection.class); + assert ManagerProducer.isInjectionPointInjected(); + } + +} Property changes on: ri/trunk/impl/src/test/java/org/jboss/webbeans/test/unit/implementation/producer/ManagerProducerTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain

15 years, 4 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1994 - ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/api.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-03-14 12:46:33 -0400 (Sat, 14 Mar 2009) New Revision: 1994 Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/api/EjbReference.java Log: minor Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/api/EjbReference.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/api/EjbReference.java 2009-03-14 16:45:47 UTC (rev 1993) +++ ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/api/EjbReference.java 2009-03-14 16:46:33 UTC (rev 1994) @@ -55,8 +55,6 @@ * Request that the SFSB backing this reference is instantiated, and any * @PostConstruct lifecycle callbacks are executed * - * @throws UnsupportedOperationException - * if the reference is backed by an SLSB */ public void create();

15 years, 4 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1993 - ri/trunk/jboss-as.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-03-14 12:45:47 -0400 (Sat, 14 Mar 2009) New Revision: 1993 Modified: ri/trunk/jboss-as/build.properties Log: update webbeans version Modified: ri/trunk/jboss-as/build.properties =================================================================== --- ri/trunk/jboss-as/build.properties 2009-03-14 16:45:32 UTC (rev 1992) +++ ri/trunk/jboss-as/build.properties 2009-03-14 16:45:47 UTC (rev 1993) @@ -10,6 +10,6 @@ # maximum number of TCK tests to deploy before restarting JBoss AS # jboss.deployments.restart = 25 webbeans-ri-int.version=5.2.0-SNAPSHOT -webbeans.version=1.0.0.BETA1 +webbeans.version=1.0.0-SNAPSHOT jboss-ejb3.version=1.0.0

15 years, 4 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1992 - ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/api.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-03-14 12:45:32 -0400 (Sat, 14 Mar 2009) New Revision: 1992 Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/api/EjbReference.java Log: javadoc Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/api/EjbReference.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/api/EjbReference.java 2009-03-14 16:43:22 UTC (rev 1991) +++ ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/api/EjbReference.java 2009-03-14 16:45:32 UTC (rev 1992) @@ -19,7 +19,8 @@ import java.io.Serializable; /** - * A serializable reference to an EJB + * A serializable reference to an EJB. For an SFSB the same state must be + * returned for each call to {@link #get(Class)} * * @author Pete Muir * @param <T> @@ -52,7 +53,6 @@ /** * Request that the SFSB backing this reference is instantiated, and any - * * @PostConstruct lifecycle callbacks are executed * * @throws UnsupportedOperationException

15 years, 4 months

1
0
0 / 0

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

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-03-14 12:43:22 -0400 (Sat, 14 Mar 2009) New Revision: 1991 Added: ri/trunk/impl/src/main/java/org/jboss/webbeans/mock/MockEjBServices.java ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/api/ ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/api/EjbReference.java ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/EjbServices.java ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwardingEjbServices.java Removed: ri/trunk/impl/src/main/java/org/jboss/webbeans/mock/MockEjBResolver.java ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/EjbResolver.java ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwardingEjbResolver.java Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/ManagerImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/EnterpriseBeanProxyMethodHandler.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java ri/trunk/impl/src/main/java/org/jboss/webbeans/ejb/InternalEjbDescriptor.java ri/trunk/impl/src/main/java/org/jboss/webbeans/ejb/SessionBeanInterceptor.java ri/trunk/impl/src/main/java/org/jboss/webbeans/mock/MockLifecycle.java ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/Bootstrap.java ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/AbstractBootstrap.java ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/ForwardingBootstrap.java Log: WBRI-159, WBRI-165, Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/ManagerImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/ManagerImpl.java 2009-03-14 16:41:23 UTC (rev 1990) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/ManagerImpl.java 2009-03-14 16:43:22 UTC (rev 1991) @@ -65,7 +65,7 @@ import org.jboss.webbeans.context.ContextMap; import org.jboss.webbeans.context.CreationalContextImpl; import org.jboss.webbeans.ejb.EjbDescriptorCache; -import org.jboss.webbeans.ejb.spi.EjbResolver; +import org.jboss.webbeans.ejb.spi.EjbServices; import org.jboss.webbeans.event.EventManager; import org.jboss.webbeans.event.ObserverImpl; import org.jboss.webbeans.injection.ResolvableAnnotatedClass; @@ -125,14 +125,13 @@ private transient List<Bean<?>> beans; // The registered beans, mapped by implementation class private transient final Map<Class<?>, EnterpriseBean<?>> newEnterpriseBeanMap; - private transient final Map<Class<?>, EnterpriseBean<?>> enterpriseBeanMap; // The registered decorators private transient final Set<Decorator> decorators; // The registered interceptors private transient final Set<Interceptor> interceptors; // The EJB resolver provided by the container - private transient final EjbResolver ejbResolver; + private transient final EjbServices ejbServices; private transient final EjbDescriptorCache ejbDescriptorCache; @@ -151,17 +150,16 @@ /** * Create a new manager * - * @param ejbResolver the ejbResolver to use + * @param ejbServices the ejbResolver to use */ - public ManagerImpl(NamingContext namingContext, EjbResolver ejbResolver, ResourceLoader resourceLoader, TransactionServices transactionServices) + public ManagerImpl(NamingContext namingContext, EjbServices ejbServices, ResourceLoader resourceLoader, TransactionServices transactionServices) { - this.ejbResolver = ejbResolver; + this.ejbServices = ejbServices; this.namingContext = namingContext; this.resourceLoader = resourceLoader; this.transactionServices = transactionServices; this.beans = new CopyOnWriteArrayList<Bean<?>>(); this.newEnterpriseBeanMap = new ConcurrentHashMap<Class<?>, EnterpriseBean<?>>(); - this.enterpriseBeanMap = new ConcurrentHashMap<Class<?>, EnterpriseBean<?>>(); this.resolver = new Resolver(this); this.clientProxyProvider = new ClientProxyProvider(); this.decorators = new HashSet<Decorator>(); @@ -381,10 +379,6 @@ { newEnterpriseBeanMap.put(bean.getType(), (EnterpriseBean<?>) bean); } - else if (bean instanceof EnterpriseBean) - { - enterpriseBeanMap.put(bean.getType(), (EnterpriseBean<?>) bean); - } } resolver.clear(); } @@ -399,11 +393,6 @@ { return newEnterpriseBeanMap; } - - public Map<Class<?>, EnterpriseBean<?>> getEnterpriseBeanMap() - { - return enterpriseBeanMap; - } /** * The beans registered with the Web Bean manager. For internal use @@ -899,9 +888,9 @@ return namingContext; } - public final EjbResolver getEjbResolver() + public final EjbServices getEjbServices() { - return ejbResolver; + return ejbServices; } public final ResourceLoader getResourceLoader() Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-03-14 16:41:23 UTC (rev 1990) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-03-14 16:43:22 UTC (rev 1991) @@ -35,12 +35,14 @@ import javax.inject.DefinitionException; import javax.interceptor.Interceptor; +import org.jboss.webbeans.CurrentManager; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.bean.proxy.EnterpriseBeanInstance; import org.jboss.webbeans.bean.proxy.EnterpriseBeanProxyMethodHandler; import org.jboss.webbeans.context.DependentContext; import org.jboss.webbeans.context.DependentStorageRequest; import org.jboss.webbeans.ejb.InternalEjbDescriptor; +import org.jboss.webbeans.ejb.api.EjbReference; import org.jboss.webbeans.ejb.spi.BusinessInterfaceDescriptor; import org.jboss.webbeans.introspector.AnnotatedClass; import org.jboss.webbeans.introspector.AnnotatedMethod; @@ -209,7 +211,7 @@ DependentContext.INSTANCE.setActive(true); T instance = proxyClass.newInstance(); creationalContext.push(instance); - ((ProxyObject) instance).setHandler(new EnterpriseBeanProxyMethodHandler(this, ejbDescriptor.getRemoveMethods())); + ((ProxyObject) instance).setHandler(new EnterpriseBeanProxyMethodHandler(this)); if (log.isTraceEnabled()) log.trace("Enterprise bean instance created for bean " + this); return instance; @@ -375,5 +377,11 @@ } return false; } + + public EjbReference<T> createReference() + { + return getManager().getEjbServices().resolveEJB(getEjbDescriptor(), CurrentManager.rootManager().getNaming()); + } + } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2009-03-14 16:41:23 UTC (rev 1990) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2009-03-14 16:43:22 UTC (rev 1991) @@ -219,12 +219,12 @@ protected void initEjbInjectionPoints() { this.ejbInjectionPoints = new HashSet<AnnotatedInjectionPoint<?, ?>>(); - for (AnnotatedField<?> field : annotatedItem.getAnnotatedFields(manager.getEjbResolver().getEJBAnnotation())) + for (AnnotatedField<?> field : annotatedItem.getAnnotatedFields(manager.getEjbServices().getEJBAnnotation())) { this.ejbInjectionPoints.add(FieldInjectionPoint.of(this, field)); } - for (AnnotatedMethod<?> method : annotatedItem.getAnnotatedMethods(manager.getEjbResolver().getEJBAnnotation())) + for (AnnotatedMethod<?> method : annotatedItem.getAnnotatedMethods(manager.getEjbServices().getEJBAnnotation())) { this.ejbInjectionPoints.add(MethodInjectionPoint.of(this, method)); } @@ -233,7 +233,7 @@ protected void initPersistenceUnitInjectionPoints() { this.persistenceUnitInjectionPoints = new HashSet<AnnotatedInjectionPoint<?, ?>>(); - for (AnnotatedField<?> field : annotatedItem.getAnnotatedFields(manager.getEjbResolver().getPersistenceContextAnnotation())) + for (AnnotatedField<?> field : annotatedItem.getAnnotatedFields(manager.getEjbServices().getPersistenceContextAnnotation())) { if (field.getAnnotation(PersistenceContext.class).type().equals(PersistenceContextType.EXTENDED)) { @@ -242,7 +242,7 @@ this.persistenceUnitInjectionPoints.add(FieldInjectionPoint.of(this, field)); } - for (AnnotatedMethod<?> method : annotatedItem.getAnnotatedMethods(manager.getEjbResolver().getPersistenceContextAnnotation())) + for (AnnotatedMethod<?> method : annotatedItem.getAnnotatedMethods(manager.getEjbServices().getPersistenceContextAnnotation())) { if (method.getAnnotation(PersistenceContext.class).type().equals(PersistenceContextType.EXTENDED)) { @@ -255,7 +255,7 @@ protected void initResourceInjectionPoints() { this.resourceInjectionPoints = new HashSet<AnnotatedInjectionPoint<?, ?>>(); - for (AnnotatedField<?> field : annotatedItem.getAnnotatedFields(manager.getEjbResolver().getResourceAnnotation())) + for (AnnotatedField<?> field : annotatedItem.getAnnotatedFields(manager.getEjbServices().getResourceAnnotation())) { this.resourceInjectionPoints.add(FieldInjectionPoint.of(this, field)); } @@ -269,19 +269,19 @@ for (AnnotatedInjectionPoint<?, ?> injectionPoint : ejbInjectionPoints) { - Object ejbInstance = manager.getEjbResolver().resolveEjb(injectionPoint, manager.getNaming()); + Object ejbInstance = manager.getEjbServices().resolveEjb(injectionPoint, manager.getNaming()); injectionPoint.inject(beanInstance, ejbInstance); } for (AnnotatedInjectionPoint<?, ?> injectionPoint : persistenceUnitInjectionPoints) { - Object puInstance = manager.getEjbResolver().resolvePersistenceContext(injectionPoint, manager.getNaming()); + Object puInstance = manager.getEjbServices().resolvePersistenceContext(injectionPoint, manager.getNaming()); injectionPoint.inject(beanInstance, puInstance); } for (AnnotatedInjectionPoint<?, ?> injectionPoint : resourceInjectionPoints) { - Object resourceInstance = manager.getEjbResolver().resolveResource(injectionPoint, manager.getNaming()); + Object resourceInstance = manager.getEjbServices().resolveResource(injectionPoint, manager.getNaming()); injectionPoint.inject(beanInstance, resourceInstance); } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/EnterpriseBeanProxyMethodHandler.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/EnterpriseBeanProxyMethodHandler.java 2009-03-14 16:41:23 UTC (rev 1990) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/EnterpriseBeanProxyMethodHandler.java 2009-03-14 16:43:22 UTC (rev 1991) @@ -18,16 +18,11 @@ package org.jboss.webbeans.bean.proxy; import java.lang.reflect.Method; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; import javassist.util.proxy.MethodHandler; -import org.jboss.webbeans.CurrentManager; import org.jboss.webbeans.bean.EnterpriseBean; +import org.jboss.webbeans.ejb.api.EjbReference; import org.jboss.webbeans.log.LogProvider; import org.jboss.webbeans.log.Logging; import org.jboss.webbeans.util.Reflections; @@ -44,48 +39,27 @@ // The log provider private static final transient LogProvider log = Logging.getLogProvider(EnterpriseBeanProxyMethodHandler.class); - private static final ThreadLocal<Set<Class<?>>> contextualInstance; + private static final ThreadLocal<EnterpriseBean<?>> enterpriseBean; static { - contextualInstance = new ThreadLocal<Set<Class<?>>>() - { - - @Override - protected Set<Class<?>> initialValue() - { - return new HashSet<Class<?>>(); - } - - }; + enterpriseBean = new ThreadLocal<EnterpriseBean<?>>(); } - // TODO Surely we can do this better! - public static boolean isContextualInstance(Class<?> beanClass) + public static EnterpriseBean<?> getEnterpriseBean() { - return contextualInstance.get().contains(beanClass); + return enterpriseBean.get(); } - private static void setContextualInstance(Class<?> beanClass, boolean accessing) + private static void setEnterpriseBean(EnterpriseBean<?> bean) { - if (accessing) - { - contextualInstance.get().add(beanClass); - } - else - { - contextualInstance.get().remove(beanClass); - } + enterpriseBean.set(bean); } - // The container provided proxy that implements all interfaces - private final Map<Class<?>, Object> proxiedInstances; - private final Map<Class<?>, String> jndiNames; + private final EjbReference<?> reference; + private final Class<?> objectInterface; private boolean destroyed; - private boolean canCallRemoveMethods; - private final List<Method> removeMethods; - private final Class<?> beanClass; /** * Constructor @@ -94,14 +68,20 @@ * * @param proxy The generic proxy */ - public EnterpriseBeanProxyMethodHandler(EnterpriseBean<?> bean, Iterable<Method> removeMethods) + public EnterpriseBeanProxyMethodHandler(EnterpriseBean<?> bean) { - this.proxiedInstances = new HashMap<Class<?>, Object>(); - this.jndiNames = bean.getEjbDescriptor().getLocalBusinessInterfacesJndiNames(); - this.canCallRemoveMethods = bean.canCallRemoveMethods(); - this.removeMethods = bean.getEjbDescriptor().getRemoveMethods(); + this.reference = bean.createReference(); this.destroyed = false; - this.beanClass = bean.getType(); + this.objectInterface = bean.getEjbDescriptor().getObjectInterface(); + try + { + setEnterpriseBean(bean); + reference.create(); + } + finally + { + setEnterpriseBean(null); + } log.trace("Created enterprise bean proxy method handler for " + bean); } @@ -124,6 +104,7 @@ */ public Object invoke(Object self, Method method, Method proceed, Object[] args) throws Throwable { + // EnterpriseBeanInstance methods if ("isDestroyed".equals(method.getName())) { return destroyed; @@ -147,38 +128,18 @@ } Class<?> businessInterface = method.getDeclaringClass(); - Object proxiedInstance = proxiedInstances.get(businessInterface); - if (proxiedInstance == null) + if (businessInterface.equals(Object.class)) { - String jndiName = jndiNames.get(businessInterface); - if (jndiName == null) - { - throw new IllegalStateException("Unable to establish jndi name to use to lookup EJB"); - } - try - { - setContextualInstance(beanClass, true); - proxiedInstance = CurrentManager.rootManager().getNaming().lookup(jndiName, businessInterface); - } - finally - { - setContextualInstance(beanClass, false); - } - proxiedInstances.put(businessInterface, proxiedInstance); + businessInterface = objectInterface; } + Object proxiedInstance = reference.get(businessInterface); Method proxiedMethod = Reflections.lookupMethod(method, proxiedInstance); - try - { - setContextualInstance(beanClass, true); - Object returnValue = Reflections.invokeAndWrap(proxiedMethod, proxiedInstance, args); - log.trace("Executed " + method + " on " + proxiedInstance + " with parameters " + args + " and got return value " + returnValue); - return returnValue; - } - finally - { - setContextualInstance(beanClass, false); - } + Object returnValue = Reflections.invokeAndWrap(proxiedMethod, proxiedInstance, args); + log.trace("Executed " + method + " on " + proxiedInstance + " with parameters " + args + " and got return value " + returnValue); + return returnValue; } + + } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java 2009-03-14 16:41:23 UTC (rev 1990) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java 2009-03-14 16:43:22 UTC (rev 1991) @@ -204,6 +204,7 @@ private void createEnterpriseBean(AnnotatedClass<?> annotatedClass) { + // TODO Don't create enterprise bean if it has no local interfaces! EnterpriseBean<?> bean = EnterpriseBean.of(annotatedClass, manager); createBean(bean, annotatedClass); beans.add(NewEnterpriseBean.of(annotatedClass, manager)); Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-03-14 16:41:23 UTC (rev 1990) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-03-14 16:43:22 UTC (rev 1991) @@ -77,15 +77,15 @@ { throw new IllegalStateException("NamingContext is not set"); } - if (getEjbResolver() == null) + if (getEjbServices() == null) { - throw new IllegalStateException("EjbResolver is not set"); + throw new IllegalStateException("EjbServices is not set"); } if (getTransactionServices() == null) { log.info("Transactional services not available. Transactional observers will be invoked synchronously."); } - this.manager = new ManagerImpl(getNamingContext(), getEjbResolver(), getResourceLoader(), getTransactionServices()); + this.manager = new ManagerImpl(getNamingContext(), getEjbServices(), getResourceLoader(), getTransactionServices()); getManager().getNaming().bind(ManagerImpl.JNDI_KEY, getManager()); CurrentManager.setRootManager(manager); initializeContexts(); Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/ejb/InternalEjbDescriptor.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/ejb/InternalEjbDescriptor.java 2009-03-14 16:41:23 UTC (rev 1990) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/ejb/InternalEjbDescriptor.java 2009-03-14 16:43:22 UTC (rev 1991) @@ -17,13 +17,7 @@ package org.jboss.webbeans.ejb; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; import java.util.Iterator; -import java.util.List; -import java.util.Map; import org.jboss.webbeans.ejb.spi.BusinessInterfaceDescriptor; import org.jboss.webbeans.ejb.spi.EjbDescriptor; @@ -34,52 +28,45 @@ * constructor * * @author Pete Muir - * + * */ public class InternalEjbDescriptor<T> extends ForwardingEjbDescriptor<T> implements EjbDescriptor<T> { - - private final Map<Class<?>, String> localBusinessInterfacesJndiNames; + + private final Class<?> objectInterface; + private final boolean local; private final EjbDescriptor<T> delegate; - public List<Method> removeMethods; - + public InternalEjbDescriptor(EjbDescriptor<T> ejbDescriptor) { this.delegate = ejbDescriptor; - this.localBusinessInterfacesJndiNames = new HashMap<Class<?>, String>(); - for (BusinessInterfaceDescriptor<?> businessInterfaceDescriptor : ejbDescriptor.getLocalBusinessInterfaces()) - { - localBusinessInterfacesJndiNames.put(businessInterfaceDescriptor.getInterface(), businessInterfaceDescriptor.getJndiName()); - } - // Internally, Object.class is added to the type hierachy of an - // EnterpriseBean, so we need to represent that here. We can just use any - // of the local business interfaces Iterator<BusinessInterfaceDescriptor<?>> it = ejbDescriptor.getLocalBusinessInterfaces().iterator(); if (it.hasNext()) { - localBusinessInterfacesJndiNames.put(Object.class, it.next().getJndiName()); + this.objectInterface = it.next().getInterface(); + this.local = true; } - removeMethods = new ArrayList<Method>(); - for (Method removeMethod : ejbDescriptor.getRemoveMethods()) + else { - removeMethods.add(removeMethod); + this.objectInterface = null; + this.local = false; } } - - public Map<Class<?>, String> getLocalBusinessInterfacesJndiNames() + + @Override + protected EjbDescriptor<T> delegate() { - return Collections.unmodifiableMap(localBusinessInterfacesJndiNames); + return delegate; } - - public List<Method> getRemoveMethods() + + public boolean isLocal() { - return Collections.unmodifiableList(removeMethods); + return local; } - - @Override - protected EjbDescriptor<T> delegate() + + public Class<?> getObjectInterface() { - return delegate; + return objectInterface; } - + } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/ejb/SessionBeanInterceptor.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/ejb/SessionBeanInterceptor.java 2009-03-14 16:41:23 UTC (rev 1990) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/ejb/SessionBeanInterceptor.java 2009-03-14 16:43:22 UTC (rev 1991) @@ -25,6 +25,8 @@ import org.jboss.webbeans.bean.EnterpriseBean; import org.jboss.webbeans.bean.proxy.EnterpriseBeanInstance; import org.jboss.webbeans.bean.proxy.EnterpriseBeanProxyMethodHandler; +import org.jboss.webbeans.log.Log; +import org.jboss.webbeans.log.Logging; /** * Interceptor for handling EJB post-construct tasks @@ -33,6 +35,13 @@ */ public class SessionBeanInterceptor { + + private transient Log log = Logging.getLog(SessionBeanInterceptor.class); + + // TODO make Bean serializable + private transient EnterpriseBean<Object> bean; + private boolean contextual; + /** * Gets the underlying target and calls the post-construct method * @@ -43,11 +52,8 @@ public void postConstruct(InvocationContext invocationContext) throws Exception { Object target = invocationContext.getTarget(); - EnterpriseBean<Object> enterpriseBean = getBean(target.getClass()); - if (enterpriseBean != null) - { - enterpriseBean.postConstruct(target); - } + initBean(target.getClass()); + bean.postConstruct(target); invocationContext.proceed(); } @@ -61,12 +67,15 @@ public void preDestroy(InvocationContext invocationContext) throws Exception { Object target = invocationContext.getTarget(); - EnterpriseBean<Object> enterpriseBean = getBean(target.getClass()); - if (enterpriseBean != null) + if (bean == null) { - enterpriseBean.preDestroy(target); + log.warn("Support for destroying passivated EJBs not yet implemented"); } - getEnterpriseBeanInstance(enterpriseBean).setDestroyed(true); + bean.preDestroy(target); + if (contextual) + { + getEnterpriseBeanInstance(bean).setDestroyed(true); + } invocationContext.proceed(); } @@ -76,18 +85,18 @@ * @param invocationContext The invocation context * @return The found bean or null if the bean was not an enterprise bean */ - private static <T> EnterpriseBean<T> getBean(Class<? extends T> beanClass) + private void initBean(Class<? extends Object> beanClass) { - if (EnterpriseBeanProxyMethodHandler.isContextualInstance(beanClass)) + EnterpriseBean<Object> bean = (EnterpriseBean<Object>) EnterpriseBeanProxyMethodHandler.getEnterpriseBean(); + if (bean != null && bean.getType().equals(beanClass)) { - // Access all non-new enterprise beans. - // TODO Deal with XML defined enterprise beans! - return (EnterpriseBean<T>) CurrentManager.rootManager().getEnterpriseBeanMap().get(beanClass); + this.bean = bean; + this.contextual = true; } else { - // Access all @New enterprise beans - return (EnterpriseBean<T>) CurrentManager.rootManager().getNewEnterpriseBeanMap().get(beanClass); + this.bean = (EnterpriseBean<Object>) CurrentManager.rootManager().getNewEnterpriseBeanMap().get(beanClass); + this.contextual = false; } } @@ -105,3 +114,5 @@ } } + + \ No newline at end of file Deleted: ri/trunk/impl/src/main/java/org/jboss/webbeans/mock/MockEjBResolver.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/mock/MockEjBResolver.java 2009-03-14 16:41:23 UTC (rev 1990) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/mock/MockEjBResolver.java 2009-03-14 16:43:22 UTC (rev 1991) @@ -1,53 +0,0 @@ -/** - * - */ -package org.jboss.webbeans.mock; - -import java.lang.annotation.Annotation; -import java.util.Collection; - -import javax.annotation.Resource; -import javax.ejb.EJB; -import javax.inject.manager.InjectionPoint; -import javax.persistence.PersistenceContext; - -import org.jboss.webbeans.ejb.spi.EjbResolver; -import org.jboss.webbeans.resources.spi.NamingContext; - -final class MockEjBResolver implements EjbResolver -{ - public Class<? extends Annotation> getEJBAnnotation() - { - return EJB.class; - } - - public Class<? extends Annotation> getPersistenceContextAnnotation() - { - return PersistenceContext.class; - } - - public Object resolveEjb(InjectionPoint injectionPoint, NamingContext namingContext) - { - return null; - } - - public Object resolvePersistenceContext(InjectionPoint injectionPoint, NamingContext namingContext) - { - return null; - } - - public Class<? extends Annotation> getResourceAnnotation() - { - return Resource.class; - } - - public Object resolveResource(InjectionPoint injectionPoint, NamingContext namingContext) - { - return null; - } - - public void removeEjb(Collection<Object> instance) - { - // No-op - } -} \ No newline at end of file Copied: ri/trunk/impl/src/main/java/org/jboss/webbeans/mock/MockEjBServices.java (from rev 1971, ri/trunk/impl/src/main/java/org/jboss/webbeans/mock/MockEjBResolver.java) =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/mock/MockEjBServices.java (rev 0) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/mock/MockEjBServices.java 2009-03-14 16:43:22 UTC (rev 1991) @@ -0,0 +1,78 @@ +/** + * + */ +package org.jboss.webbeans.mock; + +import java.lang.annotation.Annotation; +import java.util.Collection; + +import javax.annotation.Resource; +import javax.ejb.EJB; +import javax.inject.manager.InjectionPoint; +import javax.persistence.PersistenceContext; + +import org.jboss.webbeans.ejb.api.EjbReference; +import org.jboss.webbeans.ejb.spi.EjbDescriptor; +import org.jboss.webbeans.ejb.spi.EjbServices; +import org.jboss.webbeans.resources.spi.NamingContext; + +final class MockEjBServices implements EjbServices +{ + public Class<? extends Annotation> getEJBAnnotation() + { + return EJB.class; + } + + public Class<? extends Annotation> getPersistenceContextAnnotation() + { + return PersistenceContext.class; + } + + public Object resolveEjb(InjectionPoint injectionPoint, NamingContext namingContext) + { + return null; + } + + public Object resolvePersistenceContext(InjectionPoint injectionPoint, NamingContext namingContext) + { + return null; + } + + public Class<? extends Annotation> getResourceAnnotation() + { + return Resource.class; + } + + public Object resolveResource(InjectionPoint injectionPoint, NamingContext namingContext) + { + return null; + } + + public void removeEjb(Collection<Object> instance) + { + // No-op + } + + public <T> EjbReference<T> resolveEJB(EjbDescriptor<T> ejbDescriptor, NamingContext naming) + { + return new EjbReference<T>() + { + + public <S> S get(Class<S> businessInterfaceType) + { + return null; + } + + public void remove() + { + // No-op + } + + public void create() + { + // No-op + } + + }; + } +} \ No newline at end of file Property changes on: ri/trunk/impl/src/main/java/org/jboss/webbeans/mock/MockEjBServices.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/mock/MockLifecycle.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/mock/MockLifecycle.java 2009-03-14 16:41:23 UTC (rev 1990) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/mock/MockLifecycle.java 2009-03-14 16:43:22 UTC (rev 1991) @@ -21,7 +21,7 @@ import org.jboss.webbeans.bootstrap.WebBeansBootstrap; import org.jboss.webbeans.context.api.BeanStore; import org.jboss.webbeans.context.api.helpers.ConcurrentHashMapBeanStore; -import org.jboss.webbeans.ejb.spi.EjbResolver; +import org.jboss.webbeans.ejb.spi.EjbServices; import org.jboss.webbeans.resources.spi.ResourceLoader; import org.jboss.webbeans.servlet.AbstractLifecycle; import org.jboss.webbeans.transaction.spi.TransactionServices; @@ -29,7 +29,7 @@ public class MockLifecycle extends AbstractLifecycle { - private static final EjbResolver MOCK_EJB_RESOLVER = new MockEjBResolver(); + private static final EjbServices MOCK_EJB_RESOLVER = new MockEjBServices(); private static final ResourceLoader MOCK_RESOURCE_LOADER = new MockResourceLoader(); private static final TransactionServices MOCK_TRANSACTION_SERVICES = new MockTransactionServices(); @@ -53,7 +53,7 @@ } bootstrap = new WebBeansBootstrap(); bootstrap.setNamingContext(new MockNamingContext(null)); - bootstrap.setEjbResolver(MOCK_EJB_RESOLVER); + bootstrap.setEjbServices(MOCK_EJB_RESOLVER); bootstrap.setResourceLoader(MOCK_RESOURCE_LOADER); bootstrap.setWebBeanDiscovery(webBeanDiscovery); bootstrap.setApplicationContext(applicationBeanStore); Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/Bootstrap.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/Bootstrap.java 2009-03-14 16:41:23 UTC (rev 1990) +++ ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/Bootstrap.java 2009-03-14 16:43:22 UTC (rev 1991) @@ -3,7 +3,7 @@ import org.jboss.webbeans.bootstrap.spi.EjbDiscovery; import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery; import org.jboss.webbeans.context.api.BeanStore; -import org.jboss.webbeans.ejb.spi.EjbResolver; +import org.jboss.webbeans.ejb.spi.EjbServices; import org.jboss.webbeans.manager.api.WebBeansManager; import org.jboss.webbeans.resources.spi.NamingContext; import org.jboss.webbeans.resources.spi.ResourceLoader; @@ -33,11 +33,11 @@ public void setEjbDiscovery(EjbDiscovery ejbDiscovery); /** - * Set the EjbResolver to use + * Set the EjbServices to use * - * @param ejbResolver + * @param ejbServices */ - public void setEjbResolver(EjbResolver ejbResolver); + public void setEjbServices(EjbServices ejbServices); /** * Set the NamingContext to use. Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/AbstractBootstrap.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/AbstractBootstrap.java 2009-03-14 16:41:23 UTC (rev 1990) +++ ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/AbstractBootstrap.java 2009-03-14 16:43:22 UTC (rev 1991) @@ -4,7 +4,7 @@ import org.jboss.webbeans.bootstrap.spi.EjbDiscovery; import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery; import org.jboss.webbeans.context.api.BeanStore; -import org.jboss.webbeans.ejb.spi.EjbResolver; +import org.jboss.webbeans.ejb.spi.EjbServices; import org.jboss.webbeans.resources.spi.NamingContext; import org.jboss.webbeans.resources.spi.ResourceLoader; import org.jboss.webbeans.transaction.spi.TransactionServices; @@ -15,7 +15,7 @@ private WebBeanDiscovery webBeanDiscovery; private ResourceLoader resourceLoader; private NamingContext namingContext; - private EjbResolver ejbResolver; + private EjbServices ejbServices; private EjbDiscovery ejbDiscovery; private BeanStore applicationContext; private TransactionServices transactionServices; @@ -25,9 +25,9 @@ this.ejbDiscovery = ejbDiscovery; } - public void setEjbResolver(EjbResolver ejbResolver) + public void setEjbServices(EjbServices ejbServices) { - this.ejbResolver = ejbResolver; + this.ejbServices = ejbServices; } public void setNamingContext(NamingContext namingContext) @@ -65,9 +65,9 @@ return namingContext; } - public EjbResolver getEjbResolver() + public EjbServices getEjbServices() { - return ejbResolver; + return ejbServices; } public EjbDiscovery getEjbDiscovery() Modified: ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/ForwardingBootstrap.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/ForwardingBootstrap.java 2009-03-14 16:41:23 UTC (rev 1990) +++ ri/trunk/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/ForwardingBootstrap.java 2009-03-14 16:43:22 UTC (rev 1991) @@ -4,7 +4,7 @@ import org.jboss.webbeans.bootstrap.spi.EjbDiscovery; import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery; import org.jboss.webbeans.context.api.BeanStore; -import org.jboss.webbeans.ejb.spi.EjbResolver; +import org.jboss.webbeans.ejb.spi.EjbServices; import org.jboss.webbeans.manager.api.WebBeansManager; import org.jboss.webbeans.resources.spi.NamingContext; import org.jboss.webbeans.resources.spi.ResourceLoader; @@ -39,9 +39,9 @@ delegate().setEjbDiscovery(ejbDiscovery); } - public void setEjbResolver(EjbResolver ejbResolver) + public void setEjbServices(EjbServices ejbServices) { - delegate().setEjbResolver(ejbResolver); + delegate().setEjbServices(ejbServices); } public void setNamingContext(NamingContext namingContext) Added: ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/api/EjbReference.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/api/EjbReference.java (rev 0) +++ ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/api/EjbReference.java 2009-03-14 16:43:22 UTC (rev 1991) @@ -0,0 +1,63 @@ +/* + * 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.webbeans.ejb.api; + +import java.io.Serializable; + +/** + * A serializable reference to an EJB + * + * @author Pete Muir + * @param <T> + * The EJB bean class + */ +public interface EjbReference<T> extends Serializable +{ + + /** + * Get the reference to the EJB for the given business interfaces + * + * The reference may be lazily instantiated; if Web Beans wishes to eagerly + * instantiated the bean it will call {@link #create()}. + * + * @param <S> + * the type of the business interface + * @param businessInterfaceType + * the type of the business interface + * @return a reference + */ + public <S> S get(Class<S> businessInterfaceType); + + /** + * Request the SFSB backing this reference is removed + * + * @throws UnsupportedOperationException + * if the reference is backed by an SLSB + */ + public void remove(); + + /** + * Request that the SFSB backing this reference is instantiated, and any + * + * @PostConstruct lifecycle callbacks are executed + * + * @throws UnsupportedOperationException + * if the reference is backed by an SLSB + */ + public void create(); + +} Property changes on: ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/api/EjbReference.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/EjbResolver.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/EjbResolver.java 2009-03-14 16:41:23 UTC (rev 1990) +++ ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/EjbResolver.java 2009-03-14 16:43:22 UTC (rev 1991) @@ -1,100 +0,0 @@ -package org.jboss.webbeans.ejb.spi; - -import java.lang.annotation.Annotation; - -import javax.inject.manager.InjectionPoint; - -import org.jboss.webbeans.resources.spi.NamingContext; - -/** - * A container should implement this interface to allow the Web Beans RI to - * resolve EJBs, Resources and JPA persistence units - * - * TODO This probably needs renaming to EjbLifecycle - * - * @author Pete Muir - * - */ -public interface EjbResolver -{ - - public static final String PROPERTY_NAME = EjbResolver.class.getName(); - - /** - * Resolve the value for the given @EJB injection point - * - * @param injectionPoint - * the injection point metadata - * @return an instance of the EJB - * @throws IllegalArgumentException - * if the injection point is not annotated with @EJB, or, if the - * injection point is a method that doesn't follow JavaBean - * conventions - * @throws IllegalStateException - * if no EJBs can be resolved for injection - */ - public Object resolveEjb(InjectionPoint injectionPoint, NamingContext namingContext); - -// /** -// * Request the EJB container remove an EJB -// * -// * @param instances all objects retrieved from the container for this EJB -// */ -// public void removeEjb(Collection<Object> instances); - - /** - * Resolve the value for the given @PersistenceContext injection point - * - * @param injectionPoint - * the injection point metadata - * @param namingContext - * the pluggable Web Beans JNDI lookup facility - * @return an instance of the persistence unit - * @throws IllegalArgumentException - * if the injection point is not annotated with - * @PersistenceContext, or, if the injection point is a method that doesn't - * follow JavaBean conventions - * @throws IllegalStateException - * if no suitable persistence units can be resolved for injection - */ - public Object resolvePersistenceContext(InjectionPoint injectionPoint, NamingContext namingContext); - - /** - * Resolve the value for the given @Resource injection point - * - * @param injectionPoint - * the injection point metadata - * @param namingContext - * the pluggable Web Beans JNDI lookup facility - * @return an instance of the resource - * @throws IllegalArgumentException - * if the injection point is not annotated with @Resource, or, if - * the injection point is a method that doesn't follow JavaBean - * conventions - * @throws IllegalStateException - * if no resource can be resolved for injection - */ - public Object resolveResource(InjectionPoint injectionPoint, NamingContext namingContext); - - /** - * Get the annotation which defines an @EJB injection point - * - * @return the annotation which defines an @EJB injection point - */ - public Class<? extends Annotation> getEJBAnnotation(); - - /** - * Get the annotation which defines a @PersistenceContext injection point - * - * @return the annotation which defines a @PersistenceContext injection point - */ - public Class<? extends Annotation> getPersistenceContextAnnotation(); - - /** - * Get the annotation which defines a @Resource injection point - * - * @return the annotation which defines a @Resource injection point - */ - public Class<? extends Annotation> getResourceAnnotation(); - -} Copied: ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/EjbServices.java (from rev 1966, ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/EjbResolver.java) =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/EjbServices.java (rev 0) +++ ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/EjbServices.java 2009-03-14 16:43:22 UTC (rev 1991) @@ -0,0 +1,119 @@ +/* + * 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.webbeans.ejb.spi; + +import java.lang.annotation.Annotation; + +import javax.inject.manager.InjectionPoint; + +import org.jboss.webbeans.ejb.api.EjbReference; +import org.jboss.webbeans.resources.spi.NamingContext; + +/** + * A container should implement this interface to allow the Web Beans RI to + * resolve EJBs, Resources and JPA persistence units + * + * @author Pete Muir + * + */ +public interface EjbServices +{ + + public static final String PROPERTY_NAME = EjbServices.class.getName(); + + /** + * Resolve the value for the given @EJB injection point + * + * @param injectionPoint + * the injection point metadata + * @return an instance of the EJB + * @throws IllegalArgumentException + * if the injection point is not annotated with @EJB, or, if the + * injection point is a method that doesn't follow JavaBean + * conventions + * @throws IllegalStateException + * if no EJBs can be resolved for injection + */ + public Object resolveEjb(InjectionPoint injectionPoint, NamingContext namingContext); + + /** + * Resolve the value for the given @PersistenceContext injection point + * + * @param injectionPoint + * the injection point metadata + * @param namingContext + * the pluggable Web Beans JNDI lookup facility + * @return an instance of the persistence unit + * @throws IllegalArgumentException + * if the injection point is not annotated with + * @PersistenceContext, or, if the injection point is a method that doesn't + * follow JavaBean conventions + * @throws IllegalStateException + * if no suitable persistence units can be resolved for injection + */ + public Object resolvePersistenceContext(InjectionPoint injectionPoint, NamingContext namingContext); + + /** + * Resolve the value for the given @Resource injection point + * + * @param injectionPoint + * the injection point metadata + * @param namingContext + * the pluggable Web Beans JNDI lookup facility + * @return an instance of the resource + * @throws IllegalArgumentException + * if the injection point is not annotated with @Resource, or, if + * the injection point is a method that doesn't follow JavaBean + * conventions + * @throws IllegalStateException + * if no resource can be resolved for injection + */ + public Object resolveResource(InjectionPoint injectionPoint, NamingContext namingContext); + + /** + * Request an EJB instance from the container + * + * @param <T> the type of the bean class + * @param ejbDescriptor the ejb to resolve + * @param namingContext the pluggable Web Beans JNDI lookup facility + * @return a reference to the EJB + */ + public <T> EjbReference<T> resolveEJB(EjbDescriptor<T> ejbDescriptor, NamingContext namingContext); + + /** + * Get the annotation which defines an @EJB injection point + * + * @return the annotation which defines an @EJB injection point + */ + public Class<? extends Annotation> getEJBAnnotation(); + + /** + * Get the annotation which defines a @PersistenceContext injection point + * + * @return the annotation which defines a @PersistenceContext injection point + */ + public Class<? extends Annotation> getPersistenceContextAnnotation(); + + /** + * Get the annotation which defines a @Resource injection point + * + * @return the annotation which defines a @Resource injection point + */ + public Class<? extends Annotation> getResourceAnnotation(); + +} Property changes on: ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/EjbServices.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwardingEjbResolver.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwardingEjbResolver.java 2009-03-14 16:41:23 UTC (rev 1990) +++ ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwardingEjbResolver.java 2009-03-14 16:43:22 UTC (rev 1991) @@ -1,78 +0,0 @@ -package org.jboss.webbeans.ejb.spi.helpers; - -import java.lang.annotation.Annotation; - -import javax.inject.manager.InjectionPoint; - -import org.jboss.webbeans.ejb.spi.EjbResolver; -import org.jboss.webbeans.resources.spi.NamingContext; - -/** - * An implementation of {@link EjbResolver} which forwards all its method calls - * to another {@link EjbResolver}}. Subclasses should override one or more - * methods to modify the behavior of the backing {@link EjbResolver} as desired - * per the <a - * href="http://en.wikipedia.org/wiki/Decorator_pattern">decorator pattern</a>. - * - * @author Pete Muir - * - */ -public abstract class ForwardingEjbResolver implements EjbResolver -{ - - public abstract EjbResolver delegate(); - - public Class<? extends Annotation> getEJBAnnotation() - { - return delegate().getEJBAnnotation(); - } - - public Class<? extends Annotation> getPersistenceContextAnnotation() - { - return delegate().getPersistenceContextAnnotation(); - } - - public Class<? extends Annotation> getResourceAnnotation() - { - return delegate().getResourceAnnotation(); - } - - public Object resolveEjb(InjectionPoint injectionPoint, NamingContext namingContext) - { - return delegate().resolveEjb(injectionPoint, namingContext); - } - - public Object resolvePersistenceContext(InjectionPoint injectionPoint, NamingContext namingContext) - { - return delegate().resolvePersistenceContext(injectionPoint, namingContext); - } - - public Object resolveResource(InjectionPoint injectionPoint, NamingContext namingContext) - { - return delegate().resolveResource(injectionPoint, namingContext); - } -// -// public void removeEjb(Collection<Object> instance) -// { -// delegate().removeEjb(instance); -// } - - @Override - public boolean equals(Object obj) - { - return delegate().equals(obj); - } - - @Override - public String toString() - { - return delegate().toString(); - } - - @Override - public int hashCode() - { - return delegate().hashCode(); - } - -} Copied: ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwardingEjbServices.java (from rev 1966, ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwardingEjbResolver.java) =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwardingEjbServices.java (rev 0) +++ ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwardingEjbServices.java 2009-03-14 16:43:22 UTC (rev 1991) @@ -0,0 +1,85 @@ +package org.jboss.webbeans.ejb.spi.helpers; + +import java.lang.annotation.Annotation; + +import javax.inject.manager.InjectionPoint; + +import org.jboss.webbeans.ejb.api.EjbReference; +import org.jboss.webbeans.ejb.spi.EjbDescriptor; +import org.jboss.webbeans.ejb.spi.EjbServices; +import org.jboss.webbeans.resources.spi.NamingContext; + +/** + * An implementation of {@link EjbServices} which forwards all its method calls + * to another {@link EjbServices}}. Subclasses should override one or more + * methods to modify the behavior of the backing {@link EjbServices} as desired + * per the <a + * href="http://en.wikipedia.org/wiki/Decorator_pattern">decorator pattern</a>. + * + * @author Pete Muir + * + */ +public abstract class ForwardingEjbServices implements EjbServices +{ + + public abstract EjbServices delegate(); + + public Class<? extends Annotation> getEJBAnnotation() + { + return delegate().getEJBAnnotation(); + } + + public Class<? extends Annotation> getPersistenceContextAnnotation() + { + return delegate().getPersistenceContextAnnotation(); + } + + public Class<? extends Annotation> getResourceAnnotation() + { + return delegate().getResourceAnnotation(); + } + + public Object resolveEjb(InjectionPoint injectionPoint, NamingContext namingContext) + { + return delegate().resolveEjb(injectionPoint, namingContext); + } + + public <T> EjbReference<T> resolveEJB(EjbDescriptor<T> ejbDescriptor, NamingContext namingContext) + { + return delegate().resolveEJB(ejbDescriptor, namingContext); + } + + public Object resolvePersistenceContext(InjectionPoint injectionPoint, NamingContext namingContext) + { + return delegate().resolvePersistenceContext(injectionPoint, namingContext); + } + + public Object resolveResource(InjectionPoint injectionPoint, NamingContext namingContext) + { + return delegate().resolveResource(injectionPoint, namingContext); + } +// +// public void removeEjb(Collection<Object> instance) +// { +// delegate().removeEjb(instance); +// } + + @Override + public boolean equals(Object obj) + { + return delegate().equals(obj); + } + + @Override + public String toString() + { + return delegate().toString(); + } + + @Override + public int hashCode() + { + return delegate().hashCode(); + } + +} Property changes on: ri/trunk/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwardingEjbServices.java ___________________________________________________________________ Name: svn:mime-type + text/plain

15 years, 4 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1990 - ri/trunk/impl/src/main/java/org/jboss/webbeans/event.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-03-14 12:41:23 -0400 (Sat, 14 Mar 2009) New Revision: 1990 Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventImpl.java Log: implement serializable Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventImpl.java 2009-03-14 13:01:37 UTC (rev 1989) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventImpl.java 2009-03-14 16:41:23 UTC (rev 1990) @@ -17,6 +17,7 @@ package org.jboss.webbeans.event; +import java.io.Serializable; import java.lang.annotation.Annotation; import java.util.Arrays; import java.util.HashSet; @@ -38,8 +39,11 @@ * @param <T> The type of event being wrapped * @see javax.event.Event */ -public class EventImpl<T> extends FacadeImpl<T> implements Event<T> +public class EventImpl<T> extends FacadeImpl<T> implements Event<T>, Serializable { + + private static final long serialVersionUID = 8130060821283091287L; + @SuppressWarnings("unchecked") private static final Set<Class<? extends Annotation>> FILTERED_ANNOTATIONS = new HashSet<Class<? extends Annotation>>(Arrays.asList(Fires.class));

15 years, 4 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1989 - in ri/trunk/impl/src/main/java/org/jboss/webbeans: bean/proxy and 1 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-03-14 09:01:37 -0400 (Sat, 14 Mar 2009) New Revision: 1989 Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/EnterpriseBeanInstance.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/EnterpriseBeanProxyMethodHandler.java ri/trunk/impl/src/main/java/org/jboss/webbeans/ejb/SessionBeanInterceptor.java Log: use predestroy callback to note bean instance was removed Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-03-14 00:07:04 UTC (rev 1988) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-03-14 13:01:37 UTC (rev 1989) @@ -238,6 +238,10 @@ { throw new IllegalArgumentException("instance to destroy cannot be null"); } + if (!(instance instanceof EnterpriseBeanInstance)) + { + throw new IllegalArgumentException("Cannot destroy session bean instance not created by the container"); + } EnterpriseBeanInstance enterpiseBeanInstance = (EnterpriseBeanInstance) instance; if (enterpiseBeanInstance.isDestroyed()) { Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/EnterpriseBeanInstance.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/EnterpriseBeanInstance.java 2009-03-14 00:07:04 UTC (rev 1988) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/EnterpriseBeanInstance.java 2009-03-14 13:01:37 UTC (rev 1989) @@ -16,11 +16,9 @@ */ package org.jboss.webbeans.bean.proxy; -import java.util.Collection; /** - * Interface implemented by all enterprise bean proxies to determine if - * the enterprise bean has already had a remove method called by the application + * Interface implemented by all enterprise bean proxies to query/control the proxy * * @author Pete Muir * @@ -35,10 +33,6 @@ */ public boolean isDestroyed(); - /** - * The unproxied version of this object - * @return - */ - public Collection<Object> getUnproxiedInstances(); + public void setDestroyed(boolean destroyed); } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/EnterpriseBeanProxyMethodHandler.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/EnterpriseBeanProxyMethodHandler.java 2009-03-14 00:07:04 UTC (rev 1988) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/proxy/EnterpriseBeanProxyMethodHandler.java 2009-03-14 13:01:37 UTC (rev 1989) @@ -61,6 +61,7 @@ } + // TODO Surely we can do this better! public static boolean isContextualInstance(Class<?> beanClass) { return contextualInstance.get().contains(beanClass); @@ -127,6 +128,24 @@ { return destroyed; } + else if ("setDestroyed".equals(method.getName())) + { + if (args.length != 1) + { + throw new IllegalArgumentException("enterpriseBeanInstance.setDestroyed() called with >1 argument"); + } + if (!args[0].getClass().equals(boolean.class)) + { + throw new IllegalArgumentException("enterpriseBeanInstance.setDestroyed() called with non-boolean argument"); + } + destroyed = ((Boolean) args[0]).booleanValue(); + } + + if (destroyed) + { + return null; + } + Class<?> businessInterface = method.getDeclaringClass(); Object proxiedInstance = proxiedInstances.get(businessInterface); if (proxiedInstance == null) @@ -148,17 +167,6 @@ proxiedInstances.put(businessInterface, proxiedInstance); } Method proxiedMethod = Reflections.lookupMethod(method, proxiedInstance); - if (removeMethods.contains(proxiedMethod)) - { - if (canCallRemoveMethods) - { - destroyed = true; - } - else - { - throw new UnsupportedOperationException("Remove method can't be called directly on non-dependent scoped Enterprise Beans"); - } - } try { setContextualInstance(beanClass, true); @@ -172,4 +180,5 @@ } } + } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/ejb/SessionBeanInterceptor.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/ejb/SessionBeanInterceptor.java 2009-03-14 00:07:04 UTC (rev 1988) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/ejb/SessionBeanInterceptor.java 2009-03-14 13:01:37 UTC (rev 1989) @@ -23,6 +23,7 @@ import org.jboss.webbeans.CurrentManager; import org.jboss.webbeans.bean.EnterpriseBean; +import org.jboss.webbeans.bean.proxy.EnterpriseBeanInstance; import org.jboss.webbeans.bean.proxy.EnterpriseBeanProxyMethodHandler; /** @@ -65,6 +66,7 @@ { enterpriseBean.preDestroy(target); } + getEnterpriseBeanInstance(enterpriseBean).setDestroyed(true); invocationContext.proceed(); } @@ -78,12 +80,28 @@ { if (EnterpriseBeanProxyMethodHandler.isContextualInstance(beanClass)) { + // Access all non-new enterprise beans. + // TODO Deal with XML defined enterprise beans! return (EnterpriseBean<T>) CurrentManager.rootManager().getEnterpriseBeanMap().get(beanClass); } else { + // Access all @New enterprise beans return (EnterpriseBean<T>) CurrentManager.rootManager().getNewEnterpriseBeanMap().get(beanClass); } } + + private static <T> EnterpriseBeanInstance getEnterpriseBeanInstance(EnterpriseBean<T> bean) + { + T instance = CurrentManager.rootManager().getContext(bean.getScopeType()).get(bean); + if (instance instanceof EnterpriseBeanInstance) + { + return (EnterpriseBeanInstance) instance; + } + else + { + throw new IllegalStateException("Contextual instance not an session bean created by the container"); + } + } }

15 years, 4 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r1988 - in ri/trunk/impl/src/test/java/org/jboss/webbeans/test/unit: implementation and 3 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-03-13 20:07:04 -0400 (Fri, 13 Mar 2009) New Revision: 1988 Added: ri/trunk/impl/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/ ri/trunk/impl/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/EnterpriseBeanTest.java ri/trunk/impl/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/Hat.java ri/trunk/impl/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/HatRemote.java Modified: ri/trunk/impl/src/test/java/org/jboss/webbeans/test/unit/context/ContextTest.java ri/trunk/impl/src/test/java/org/jboss/webbeans/test/unit/implementation/proxy/enterprise/EnterpriseBeanProxyTest.java ri/trunk/impl/src/test/java/org/jboss/webbeans/test/unit/xml/BeansXmlParserTest.java Log: label tests Modified: ri/trunk/impl/src/test/java/org/jboss/webbeans/test/unit/context/ContextTest.java =================================================================== --- ri/trunk/impl/src/test/java/org/jboss/webbeans/test/unit/context/ContextTest.java 2009-03-13 23:26:57 UTC (rev 1987) +++ ri/trunk/impl/src/test/java/org/jboss/webbeans/test/unit/context/ContextTest.java 2009-03-14 00:07:04 UTC (rev 1988) @@ -10,11 +10,11 @@ public class ContextTest extends AbstractWebBeansTest { // WBRI-155 - @Test(groups="stub") + @Test(description="WBRI155", groups="stub") public void testSessionContextActiveForMultipleSimultaneousThreads() { + // TODO impl assert false; - // TODO Implement this test } } Added: ri/trunk/impl/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/EnterpriseBeanTest.java =================================================================== --- ri/trunk/impl/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/EnterpriseBeanTest.java (rev 0) +++ ri/trunk/impl/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/EnterpriseBeanTest.java 2009-03-14 00:07:04 UTC (rev 1988) @@ -0,0 +1,22 @@ +package org.jboss.webbeans.test.unit.implementation.enterprise; + +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.webbeans.test.unit.AbstractWebBeansTest; +import org.testng.annotations.Test; + +@Artifact +@IntegrationTest +(a)Packaging(PackagingType.EAR) +public class EnterpriseBeanTest extends AbstractWebBeansTest +{ + + @Test(description="WBRI-179") + public void testSFSBWithOnlyRemoteInterfacesDeploys() + { + + } + +} Property changes on: ri/trunk/impl/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/EnterpriseBeanTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/impl/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/Hat.java =================================================================== --- ri/trunk/impl/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/Hat.java (rev 0) +++ ri/trunk/impl/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/Hat.java 2009-03-14 00:07:04 UTC (rev 1988) @@ -0,0 +1,9 @@ +package org.jboss.webbeans.test.unit.implementation.enterprise; + +import javax.ejb.Stateful; + +@Stateful +public class Hat implements HatRemote +{ + +} Property changes on: ri/trunk/impl/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/Hat.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/impl/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/HatRemote.java =================================================================== --- ri/trunk/impl/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/HatRemote.java (rev 0) +++ ri/trunk/impl/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/HatRemote.java 2009-03-14 00:07:04 UTC (rev 1988) @@ -0,0 +1,9 @@ +package org.jboss.webbeans.test.unit.implementation.enterprise; + +import javax.ejb.Remote; + +@Remote +public interface HatRemote +{ + +} Property changes on: ri/trunk/impl/src/test/java/org/jboss/webbeans/test/unit/implementation/enterprise/HatRemote.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/impl/src/test/java/org/jboss/webbeans/test/unit/implementation/proxy/enterprise/EnterpriseBeanProxyTest.java =================================================================== --- ri/trunk/impl/src/test/java/org/jboss/webbeans/test/unit/implementation/proxy/enterprise/EnterpriseBeanProxyTest.java 2009-03-13 23:26:57 UTC (rev 1987) +++ ri/trunk/impl/src/test/java/org/jboss/webbeans/test/unit/implementation/proxy/enterprise/EnterpriseBeanProxyTest.java 2009-03-14 00:07:04 UTC (rev 1988) @@ -16,7 +16,7 @@ /** * <a href="https://jira.jboss.org/jira/browse/WBRI-109">WBRI-109</a> */ - @Test + @Test(description="WBRI-109") public void testNoInterfaceView() throws Exception { new RunInDependentContext() Modified: ri/trunk/impl/src/test/java/org/jboss/webbeans/test/unit/xml/BeansXmlParserTest.java =================================================================== --- ri/trunk/impl/src/test/java/org/jboss/webbeans/test/unit/xml/BeansXmlParserTest.java 2009-03-13 23:26:57 UTC (rev 1987) +++ ri/trunk/impl/src/test/java/org/jboss/webbeans/test/unit/xml/BeansXmlParserTest.java 2009-03-14 00:07:04 UTC (rev 1988) @@ -62,7 +62,7 @@ /** * Test case for WBRI-21. */ - @Test(expectedExceptions=DeploymentException.class) + @Test(expectedExceptions=DeploymentException.class, description="WBRI-21") public void testDuplicateDeployElement() { Iterable<URL> urls = getResources("duplicate-deployments-beans.xml");

15 years, 4 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

weld-commits March 2009