[jboss-cvs] JBossAS SVN: r107991 - in projects/ejb3/trunk/core: src/main/java/org/jboss/ejb3 and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Sep 6 01:10:46 EDT 2010
Author: jaikiran
Date: 2010-09-06 01:10:45 -0400 (Mon, 06 Sep 2010)
New Revision: 107991
Modified:
projects/ejb3/trunk/core/pom.xml
projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/Ejb3Deployment.java
projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/mdb/MessagingContainer.java
projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateless/StatelessContainer.java
projects/ejb3/trunk/core/src/main/resources/META-INF/ejb3-deployers-jboss-beans.xml
projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/common/AbstractEJB3TestCase.java
Log:
EJBTHREE-2143 Integrate core with the newly released jboss-ejb3-ejbref-resolver
Modified: projects/ejb3/trunk/core/pom.xml
===================================================================
--- projects/ejb3/trunk/core/pom.xml 2010-09-05 07:56:26 UTC (rev 107990)
+++ projects/ejb3/trunk/core/pom.xml 2010-09-06 05:10:45 UTC (rev 107991)
@@ -49,6 +49,7 @@
<version.sun-jaxws>2.1.1</version.sun-jaxws>
<version.org.jboss.ejb3.async>1.0.0-alpha-5</version.org.jboss.ejb3.async>
<version.org.jboss.ejb3.instantiator>1.0.0-alpha-2</version.org.jboss.ejb3.instantiator>
+ <version.org.jboss.ejb3.ejbref.resolver>1.0.0-alpha-1</version.org.jboss.ejb3.ejbref.resolver>
</properties>
<!-- Build Information -->
@@ -493,6 +494,20 @@
<version>${version.org.jboss.ejb3.context}</version>
<scope>runtime</scope>
</dependency>
+
+ <!-- ejbref-resolver -->
+ <dependency>
+ <groupId>org.jboss.ejb3.ejbref.resolver</groupId>
+ <artifactId>ejbref-resolver-spi</artifactId>
+ <version>${version.org.jboss.ejb3.ejbref.resolver}</version>
+ </dependency>
+ <!-- For test support -->
+ <dependency>
+ <groupId>org.jboss.ejb3.ejbref.resolver</groupId>
+ <artifactId>ejbref-resolver-ejb30-impl</artifactId>
+ <version>${version.org.jboss.ejb3.ejbref.resolver}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.jboss.ejb3.timeout</groupId>
Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/Ejb3Deployment.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/Ejb3Deployment.java 2010-09-05 07:56:26 UTC (rev 107990)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/Ejb3Deployment.java 2010-09-06 05:10:45 UTC (rev 107991)
@@ -49,8 +49,8 @@
import org.jboss.ejb3.cache.CacheFactoryRegistry;
import org.jboss.ejb3.cache.persistence.PersistenceManagerFactoryRegistry;
import org.jboss.ejb3.common.lang.ClassHelper;
-import org.jboss.ejb3.common.resolvers.spi.EjbReference;
-import org.jboss.ejb3.common.resolvers.spi.EjbReferenceResolver;
+import org.jboss.ejb3.ejbref.resolver.spi.EjbReference;
+import org.jboss.ejb3.ejbref.resolver.spi.EjbReferenceResolver;
import org.jboss.ejb3.instantiator.spi.AttachmentNames;
import org.jboss.ejb3.instantiator.spi.BeanInstantiator;
import org.jboss.ejb3.javaee.JavaEEApplication;
@@ -134,6 +134,11 @@
private org.jboss.deployers.structure.spi.DeploymentUnit deploymentUnit;
+ // DEPRECATED!!! Use org.jboss.ejb3.ejbref.resolver.spi.EjbReferenceResolver instead
+ @Deprecated
+ private org.jboss.ejb3.common.resolvers.spi.EjbReferenceResolver deprecatedEjbRefResolver;
+
+ /** Resolver used for resolving jndi name from {@link EjbReference} */
private EjbReferenceResolver ejbReferenceResolver;
private PersistenceUnitDependencyResolver persistenceUnitDependencyResolver;
@@ -196,7 +201,7 @@
@Deprecated
public boolean canResolveEJB()
{
- return ejbReferenceResolver != null;
+ return this.ejbReferenceResolver != null;
}
public JavaEEApplication getApplication()
@@ -248,11 +253,29 @@
return persistenceManagerFactoryRegistry;
}
+ /**
+ *
+ * @param resolver
+ * @deprecated Use {@link #setEJBReferenceResolver(EjbReferenceResolver)} instead
+ */
+ public void setEJBReferenceResolver(org.jboss.ejb3.common.resolvers.spi.EjbReferenceResolver resolver)
+ {
+ log.debug("setEJBReferenceResolver(" + org.jboss.ejb3.common.resolvers.spi.EjbReferenceResolver.class + ") is deprecated");
+ this.deprecatedEjbRefResolver = resolver;
+ }
+
+ /**
+ * Sets the {@link EjbReferenceResolver} to be used for resolving jndi names
+ * from an {@link EjbReference}
+ *
+ * @param resolver
+ */
@Inject
public void setEJBReferenceResolver(EjbReferenceResolver resolver)
{
this.ejbReferenceResolver = resolver;
}
+
public ExecutorService getAsynchronousProcessor()
{
@@ -803,7 +826,7 @@
public String resolveEJB(String link, Class<?> beanInterface, String mappedName)
{
EjbReference reference = new EjbReference(link, beanInterface.getName(), mappedName);
- return ejbReferenceResolver.resolveEjb(deploymentUnit, reference);
+ return this.ejbReferenceResolver.resolveEjb(deploymentUnit, reference);
}
public String resolveMessageDestination(String link)
Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/mdb/MessagingContainer.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/mdb/MessagingContainer.java 2010-09-05 07:56:26 UTC (rev 107990)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/mdb/MessagingContainer.java 2010-09-06 05:10:45 UTC (rev 107991)
@@ -21,7 +21,6 @@
*/
package org.jboss.ejb3.mdb;
-import java.io.Serializable;
import java.lang.reflect.Method;
import java.util.Hashtable;
import java.util.Map;
@@ -291,7 +290,13 @@
public void callTimeout(Timer timer) throws Exception
{
// the method annotated with @Timeout or it's xml equivalent
- if (timeout == null) throw new EJBException("No method has been annotated with @Timeout");
+ if (this.timeout == null)
+ {
+ throw new EJBException(
+ "No timeout method has been specified (either through @Timeout or deployment descriptor) for bean named: "
+ + this.ejbName);
+ }
+
// call the timeout method
this.callTimeout(timer, this.timeout);
}
Modified: projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateless/StatelessContainer.java
===================================================================
--- projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateless/StatelessContainer.java 2010-09-05 07:56:26 UTC (rev 107990)
+++ projects/ejb3/trunk/core/src/main/java/org/jboss/ejb3/stateless/StatelessContainer.java 2010-09-06 05:10:45 UTC (rev 107991)
@@ -195,7 +195,12 @@
public void callTimeout(Timer timer) throws Exception
{
// the method annotated with @Timeout or it's xml equivalent
- if (timeout == null) throw new EJBException("No method has been annotated with @Timeout");
+ if (this.timeout == null)
+ {
+ throw new EJBException(
+ "No timeout method has been specified (either through @Timeout or deployment descriptor) for bean named: "
+ + this.ejbName);
+ }
// call the timeout method
this.callTimeout(timer, timeout);
Modified: projects/ejb3/trunk/core/src/main/resources/META-INF/ejb3-deployers-jboss-beans.xml
===================================================================
--- projects/ejb3/trunk/core/src/main/resources/META-INF/ejb3-deployers-jboss-beans.xml 2010-09-05 07:56:26 UTC (rev 107990)
+++ projects/ejb3/trunk/core/src/main/resources/META-INF/ejb3-deployers-jboss-beans.xml 2010-09-06 05:10:45 UTC (rev 107991)
@@ -77,11 +77,6 @@
</constructor>
</bean>
-
-
- <!-- EJB Reference Resolver -->
- <bean name="org.jboss.ejb3.EjbReferenceResolver" class="org.jboss.ejb3.core.resolvers.ScopedEJBReferenceResolver"/>
-
<!-- Add Annotation Plugins upon installation -->
<bean name="org.jboss.ejb3.AddAnnotationPluginOnBeanAnnotationAdaptorCallbackService"
class="org.jboss.ejb3.mcint.annotationadaptor.AddAnnotationPluginOnBeanAnnotationAdaptorCallbackService">
@@ -89,7 +84,8 @@
<parameter><inject bean="jboss.kernel:service=Kernel"/></parameter>
</constructor>
</bean>
-
+
+ <!-- TODO: Move this out of core -->
<!-- EJB Reference Annotation Plugin -->
<bean name="org.jboss.ejb3.EjbReferenceAnnotationPlugin"
class="org.jboss.ejb3.mcint.metadata.plugins.EjbReferenceAnnotationPlugin">
Modified: projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/common/AbstractEJB3TestCase.java
===================================================================
--- projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/common/AbstractEJB3TestCase.java 2010-09-05 07:56:26 UTC (rev 107990)
+++ projects/ejb3/trunk/core/src/test/java/org/jboss/ejb3/core/test/common/AbstractEJB3TestCase.java 2010-09-06 05:10:45 UTC (rev 107991)
@@ -59,7 +59,7 @@
import org.jboss.ejb3.common.registrar.plugin.mc.Ejb3McRegistrar;
import org.jboss.ejb3.common.registrar.spi.Ejb3RegistrarLocator;
import org.jboss.ejb3.common.registrar.spi.NotBoundException;
-import org.jboss.ejb3.core.resolvers.ScopedEJBReferenceResolver;
+import org.jboss.ejb3.ejbref.resolver.ejb30.impl.ScopedEJBReferenceResolver;
import org.jboss.ejb3.service.ServiceContainer;
import org.jboss.ejb3.session.SessionContainer;
import org.jboss.ejb3.stateful.StatefulContainer;
More information about the jboss-cvs-commits
mailing list