[jboss-cvs] JBossAS SVN: r109477 - in trunk: component-matrix and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Nov 25 12:58:13 EST 2010
Author: jaikiran
Date: 2010-11-25 12:58:12 -0500 (Thu, 25 Nov 2010)
New Revision: 109477
Modified:
trunk/build/build.xml
trunk/component-matrix/pom.xml
trunk/ejb3/src/main/java/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java
trunk/ejb3/src/main/java/org/jboss/ejb3/deployers/JBossASKernel.java
Log:
JBAS-8370 Upgrade to latest EJB3 depchain version (1.0.0-alpha-23)
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2010-11-25 16:42:41 UTC (rev 109476)
+++ trunk/build/build.xml 2010-11-25 17:58:12 UTC (rev 109477)
@@ -2047,6 +2047,7 @@
<fileset refid="org.jboss.ejb3.container:jboss-ejb3-container-spi:jar"/>
<fileset refid="org.jboss.ejb3.context:jboss-ejb3-context-base:jar"/>
<fileset refid="org.jboss.ejb3.context:jboss-ejb3-context-naming:jar"/>
+ <fileset refid="org.jboss.ejb3.context:jboss-ejb3-context-spi:jar"/>
<fileset refid="org.jboss.ejb3.effigy:jboss-ejb3-effigy-api:jar"/>
<fileset refid="org.jboss.ejb3.effigy:jboss-ejb3-effigy-common:jar"/>
<fileset refid="org.jboss.ejb3.effigy:jboss-ejb3-effigy-int2:jar"/>
@@ -2058,6 +2059,7 @@
<fileset refid="org.jboss.ejb3.embedded:jboss-ejb3-embedded-impl-base:jar"/>
<fileset refid="org.jboss.ejb3.embedded:jboss-ejb3-embedded-impl-shrinkwrap:jar"/>
<fileset refid="org.jboss.ejb3.embedded:jboss-ejb3-embedded-spi:jar"/>
+ <fileset refid="org.jboss.ejb3.heks:jboss-ejb3-heks:jar"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-core:jar"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-deployers:jar"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-endpoint:jar"/>
@@ -2417,7 +2419,7 @@
<fileset refid="org.jboss.ejb3:jboss-ejb3-proxy-spi:jar:client"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-proxy-clustered:jar:client"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-security:jar:client"/>
- <fileset refid="org.jboss.ejb3.context:jboss-ejb3-context-base:jar"/>
+ <fileset refid="org.jboss.ejb3.context:jboss-ejb3-context-spi:jar"/>
<fileset refid="org.jboss.ejb3.singleton:jboss-ejb3-singleton-proxy-impl:jar"/>
<fileset refid="org.jboss.ejb3.async:jboss-ejb3-async-spi:jar"/>
<fileset refid="org.jboss.ejb3.async:jboss-ejb3-async-impl:jar"/>
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-11-25 16:42:41 UTC (rev 109476)
+++ trunk/component-matrix/pom.xml 2010-11-25 17:58:12 UTC (rev 109477)
@@ -85,7 +85,7 @@
<version.org.jboss.cluster.cache.ispn>1.0.0.CR8</version.org.jboss.cluster.cache.ispn>
<version.org.jboss.common.core>2.2.17.GA</version.org.jboss.common.core>
<version.org.jboss.deployers>2.2.0.Alpha8</version.org.jboss.deployers>
- <version.org.jboss.ejb3.depchain>1.0.0-alpha-22</version.org.jboss.ejb3.depchain>
+ <version.org.jboss.ejb3.depchain>1.0.0-alpha-23</version.org.jboss.ejb3.depchain>
<!-- This to move into the EJB3 BOM -->
<version.org.jboss.ejb3.embedded>1.0.0-alpha-1</version.org.jboss.ejb3.embedded>
<version.org.jboss.ejb.api>1.0-alpha-1</version.org.jboss.ejb.api>
Modified: trunk/ejb3/src/main/java/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java
===================================================================
--- trunk/ejb3/src/main/java/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java 2010-11-25 16:42:41 UTC (rev 109476)
+++ trunk/ejb3/src/main/java/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java 2010-11-25 17:58:12 UTC (rev 109477)
@@ -272,7 +272,7 @@
// Barrier) gets injected.
String injectorMCBeanName = this.getInjectorMCBeanNamePrefix() + ",bean=" + ejbContainer.getEjbName();
BeanMetaData injectorBMD = this.createInjectorBMD(injectorMCBeanName, lazyEEInjector, switchBoard);
- unit.addAttachment(BeanMetaData.class + ":" + injectorMCBeanName, injectorBMD);
+ this.jbossUnit.addAttachment(BeanMetaData.class + ":" + injectorMCBeanName, injectorBMD);
// Add the Injector dependency on the deployment (so that the DU doesn't
// get started till the Injector is available)
@@ -305,7 +305,7 @@
// Barrier) gets injected.
String interceptorInjectorMCBeanName = this.getInjectorMCBeanNamePrefix() + ",bean=" + ejbContainer.getEjbName() + ",interceptor=" + interceptor.getName();
BeanMetaData injectorBMD = this.createInjectorBMD(interceptorInjectorMCBeanName, lazyEEInjector, switchBoard);
- unit.addAttachment(BeanMetaData.class + ":" + interceptorInjectorMCBeanName, injectorBMD);
+ this.jbossUnit.addAttachment(BeanMetaData.class + ":" + interceptorInjectorMCBeanName, injectorBMD);
// Add the Injector dependency on the deployment (so that the DU doesn't
// get started till the Injector is available)
Modified: trunk/ejb3/src/main/java/org/jboss/ejb3/deployers/JBossASKernel.java
===================================================================
--- trunk/ejb3/src/main/java/org/jboss/ejb3/deployers/JBossASKernel.java 2010-11-25 16:42:41 UTC (rev 109476)
+++ trunk/ejb3/src/main/java/org/jboss/ejb3/deployers/JBossASKernel.java 2010-11-25 17:58:12 UTC (rev 109477)
@@ -21,17 +21,6 @@
*/
package org.jboss.ejb3.deployers;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.management.MBeanInfo;
-import javax.management.MBeanOperationInfo;
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-
import org.jboss.as.ejb3.naming.NamingComponentEjbEncFactory;
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
import org.jboss.beans.metadata.plugins.AbstractConstructorMetaData;
@@ -48,9 +37,13 @@
import org.jboss.ejb3.EJBContainer;
import org.jboss.ejb3.KernelAbstraction;
import org.jboss.ejb3.MCDependencyPolicy;
+import org.jboss.ejb3.heks.businessobject.EJB31StatefulBusinessObjectFactory;
+import org.jboss.ejb3.heks.businessobject.EJB31StatelessBusinessObjectFactory;
import org.jboss.ejb3.instantiator.spi.BeanInstantiatorRegistration;
import org.jboss.ejb3.javaee.JavaEEApplication;
import org.jboss.ejb3.javaee.JavaEEModule;
+import org.jboss.ejb3.stateful.StatefulContainer;
+import org.jboss.ejb3.stateless.StatelessContainer;
import org.jboss.kernel.Kernel;
import org.jboss.kernel.plugins.deployment.AbstractKernelDeployment;
import org.jboss.kernel.spi.deployment.KernelDeployment;
@@ -58,6 +51,16 @@
import org.jboss.logging.Logger;
import org.jboss.reloaded.naming.spi.JavaEEComponent;
+import javax.management.MBeanInfo;
+import javax.management.MBeanOperationInfo;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Set;
+
/**
* The JBossAS implementation of the ejb3 KernelAbstraction integration api
* @author <a href="mailto:bill at jboss.org">Bill Burke</a>
@@ -172,6 +175,13 @@
String beanInstantiatorMcName = BeanInstantiatorRegistration.getInstantiatorRegistrationName(appName, moduleName, container.getEjbName());
builder.addPropertyMetaData("beanInstantiator", new AbstractInjectionValueMetaData(beanInstantiatorMcName));
+ // ahem
+ if(service instanceof StatelessContainer)
+ {
+ ((StatelessContainer) service).setBusinessObjectFactory(new EJB31StatelessBusinessObjectFactory());
+ }
+ if(service instanceof StatefulContainer)
+ ((StatefulContainer) service).setBusinessObjectFactory(new EJB31StatefulBusinessObjectFactory(kernel));
}
if(unit != null)
More information about the jboss-cvs-commits
mailing list