Index: ejb3/.classpath
===================================================================
--- ejb3/.classpath (revision 76999)
+++ ejb3/.classpath (working copy)
@@ -21,5 +21,6 @@
+
Index: ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java
===================================================================
--- ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java (revision 76999)
+++ ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java (working copy)
@@ -27,6 +27,8 @@
import javax.management.MBeanServer;
import org.jboss.beans.metadata.api.annotations.Inject;
+import org.jboss.beans.metadata.api.annotations.Start;
+import org.jboss.beans.metadata.api.annotations.Stop;
import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployers.vfs.spi.deployer.AbstractVFSRealDeployer;
import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
@@ -37,6 +39,9 @@
import org.jboss.ejb3.Ejb3Deployment;
import org.jboss.ejb3.cache.CacheFactoryRegistry;
import org.jboss.ejb3.cache.persistence.PersistenceManagerFactoryRegistry;
+import org.jboss.ejb3.common.registrar.plugin.mc.Ejb3McRegistrar;
+import org.jboss.ejb3.common.registrar.spi.Ejb3Registrar;
+import org.jboss.ejb3.common.registrar.spi.Ejb3RegistrarLocator;
import org.jboss.ejb3.metadata.jpa.spec.PersistenceUnitsMetaData;
import org.jboss.ejb3.pool.PoolFactoryRegistry;
import org.jboss.ejb3.proxy.factory.RemoteProxyFactoryRegistry;
@@ -334,4 +339,52 @@
log.warn("Failed to destroy deployment " + deployment, e);
}
}
+
+ /**
+ * LifeCycle Start
+ *
+ * Responsible for Binding an MC-based EJB3 Registrar Object Store
+ *
+ * @author ALR
+ * @throws Throwable
+ */
+ @Start
+ public void start() throws Throwable
+ {
+ // Bind an EJB3 Registrar Implementation if not already bound
+ if (!Ejb3RegistrarLocator.isRegistrarBound())
+ {
+ // Obtain the Kernel
+ Kernel sanders = this.kernel;
+ assert sanders != null : Kernel.class.getSimpleName() + " must be provided in order to bind "
+ + Ejb3Registrar.class.getSimpleName();
+
+ // Create an EJB3 Registrar
+ Ejb3Registrar registrar = new Ejb3McRegistrar(sanders);
+
+ // Bind Registrar to the Locator
+ Ejb3RegistrarLocator.bindRegistrar(registrar);
+
+ // Log
+ log.debug("Bound " + Ejb3Registrar.class.getSimpleName() + " to static "
+ + Ejb3RegistrarLocator.class.getSimpleName());
+ }
+ }
+
+ /**
+ * LifeCycle Stop
+ *
+ * Responsible for Unbinding the MC-based EJB3 Registrar Object Store
+ *
+ * @throws Throwable
+ */
+ @Stop
+ public void stop() throws Throwable
+ {
+ // If bound
+ if (Ejb3RegistrarLocator.isRegistrarBound())
+ {
+ Ejb3RegistrarLocator.unbindRegistrar();
+ }
+ }
}
Index: ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml
===================================================================
--- ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml (revision 76999)
+++ ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml (working copy)
@@ -293,5 +293,40 @@
+
+
+
+
+
+
+
+ org.jboss.ejb3.proxy.objectfactory.session.stateless.StatelessSessionProxyObjectFactory
+
+
+
+
+
+
+
+
+ org.jboss.ejb3.proxy.objectfactory.session.stateful.StatefulSessionProxyObjectFactory
+
+
+
Index: ejb3/build.xml
===================================================================
--- ejb3/build.xml (revision 76999)
+++ ejb3/build.xml (working copy)
@@ -114,6 +114,7 @@
+
Index: thirdparty/pom.xml
===================================================================
--- thirdparty/pom.xml (revision 76999)
+++ thirdparty/pom.xml (working copy)
@@ -444,6 +444,15 @@
org.jboss.ejb3
+ jboss-ejb3-common
+ client
+
+ jboss.jboss-ejb3-common
+ jboss-ejb3-common-client
+
+
+
+ org.jboss.ejb3
jboss-ejb3-core
jboss.jboss-ejb3-core
@@ -495,6 +504,22 @@
org.jboss.ejb3
+ jboss-ejb3-proxy
+
+ jboss.jboss-ejb3-proxy
+
+
+
+ org.jboss.ejb3
+ jboss-ejb3-proxy
+ client
+
+ jboss.jboss-ejb3-proxy
+ jboss-ejb3-proxy-client
+
+
+
+ org.jboss.ejb3
jboss-ejb3-security
jboss.jboss-ejb3-security
@@ -1288,6 +1313,11 @@
org.jboss.integration
jboss-transaction-spi
+
+ org.jboss.ejb3
+ jboss-ejb3-common
+ client
+
org.jboss.ejb3
jboss-ejb3-core
@@ -1299,6 +1329,11 @@
org.jboss.ejb3
+ jboss-ejb3-proxy
+ client
+
+
+ org.jboss.ejb3
jboss-ejb3-security
client
Index: component-matrix/pom.xml
===================================================================
--- component-matrix/pom.xml (revision 76999)
+++ component-matrix/pom.xml (working copy)
@@ -40,7 +40,10 @@
1.4.1.CR1
2.1.1.CR5
2.0.0.CR15
- 0.1.10
+ 0.1.12-SNAPSHOT
+ 0.1.6-SNAPSHOT
+ 0.1.1-SNAPSHOT
+ 0.13.0
0.1.1
2.0.0.Beta13
2.0.0.Beta16
@@ -473,7 +476,7 @@
org.jboss.aspects
jboss-remoting-aspects
- 1.0.0.Beta1
+ 1.0.1.CR3
org.jboss.aop
@@ -1307,6 +1310,13 @@
jboss-deployers-vfs-spi
${version.org.jboss.deployers}
+
+
+ org.jboss.ejb3
+ jboss-ejb3-common
+ ${version.org.jboss.ejb3.common.client}
+ client
+
org.jboss.ejb3
@@ -1452,11 +1462,18 @@
-
+
org.jboss.ejb3
+ jboss-ejb3-proxy
+ ${version.org.jboss.ejb3.proxy.client}
+ client
+
+
+
+ org.jboss.ejb3
jboss-ejb3-security
- 0.13.0
+ ${version.org.jboss.ejb3.security.client}
client
Index: build/build-distr.xml
===================================================================
--- build/build-distr.xml (revision 76999)
+++ build/build-distr.xml (working copy)
@@ -174,6 +174,8 @@
excludes="*-sources.jar, *-javadoc.jar"/>
+
+