[jboss-cvs] JBossAS SVN: r76907 - in trunk: component-matrix and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Aug 11 00:15:10 EDT 2008
Author: ALRubinger
Date: 2008-08-11 00:15:09 -0400 (Mon, 11 Aug 2008)
New Revision: 76907
Modified:
trunk/build/build-distr.xml
trunk/component-matrix/pom.xml
trunk/ejb3/.classpath
trunk/ejb3/build.xml
trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java
trunk/ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml
trunk/main/src/bin/run.conf
trunk/thirdparty/pom.xml
Log:
[EJBTHREE-1385] Upgrade AS to EJB3 Core 0.1.11, integration of EJB3 Proxy included
Modified: trunk/build/build-distr.xml
===================================================================
--- trunk/build/build-distr.xml 2008-08-11 04:04:20 UTC (rev 76906)
+++ trunk/build/build-distr.xml 2008-08-11 04:15:09 UTC (rev 76907)
@@ -174,6 +174,8 @@
excludes="*-sources.jar, *-javadoc.jar"/>
<fileset dir="${jboss.jboss.ejb3.metadata.lib}" includes="*.jar"
excludes="*-sources.jar, *-javadoc.jar"/>
+ <fileset dir="${jboss.jboss.ejb3.proxy.lib}" includes="*.jar"
+ excludes="*-sources.jar, *-javadoc.jar, *-client.jar, *-tests.jar"/>
<fileset dir="${jboss.jboss.ejb3.security.lib}" includes="*.jar"
excludes="*-sources.jar, *-javadoc.jar, *-client.jar, *-tests.jar"/>
<fileset dir="${jboss.jboss.ejb3.transactions.lib}" includes="*.jar"
@@ -207,6 +209,7 @@
<fileset dir="${jboss.jboss.ejb3.ext.api.impl.lib}" includes="*.jar" excludes="*sources.jar"/>
<fileset dir="${jboss.jboss.ejb3.common.lib}" includes="*-client.jar" excludes="*sources.jar"/>
<fileset dir="${jboss.jboss.ejb3.core.lib}" includes="*-client.jar" excludes="*sources.jar"/>
+ <fileset dir="${jboss.jboss.ejb3.proxy.lib}" includes="*-client.jar" excludes="*sources.jar"/>
<fileset dir="${jboss.jboss.ejb3.security.lib}" includes="*-client.jar" excludes="*sources.jar"/>
</copy>
</target>
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2008-08-11 04:04:20 UTC (rev 76906)
+++ trunk/component-matrix/pom.xml 2008-08-11 04:15:09 UTC (rev 76907)
@@ -40,7 +40,10 @@
<version.jboss.messaging>1.4.1.CR1</version.jboss.messaging>
<version.jboss.web>2.1.1.CR5</version.jboss.web>
<version.org.jboss.aop>2.0.0.CR13</version.org.jboss.aop>
- <version.org.jboss.ejb3>0.1.10</version.org.jboss.ejb3>
+ <version.org.jboss.ejb3>0.1.11</version.org.jboss.ejb3>
+ <version.org.jboss.ejb3.common.client>0.1.5</version.org.jboss.ejb3.common.client>
+ <version.org.jboss.ejb3.proxy.client>0.1.0</version.org.jboss.ejb3.proxy.client>
+ <version.org.jboss.ejb3.security.client>0.13.0</version.org.jboss.ejb3.security.client>
<version.org.jboss.jpa>0.1.1</version.org.jboss.jpa>
<version.org.jboss.mdr>2.0.0.Beta15</version.org.jboss.mdr>
<version.org.jboss.vfs>2.0.0.Beta20</version.org.jboss.vfs>
@@ -471,7 +474,7 @@
<dependency>
<groupId>org.jboss.aspects</groupId>
<artifactId>jboss-remoting-aspects</artifactId>
- <version>1.0.0.Beta1</version>
+ <version>1.0.1-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>org.jboss.aop</groupId>
@@ -1305,6 +1308,13 @@
<artifactId>jboss-deployers-vfs-spi</artifactId>
<version>${version.org.jboss.deployers}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-common</artifactId>
+ <version>${version.org.jboss.ejb3.common.client}</version>
+ <classifier>client</classifier>
+ </dependency>
<dependency>
<groupId>org.jboss.ejb3</groupId>
@@ -1450,11 +1460,18 @@
</exclusion>
</exclusions>
</dependency>
-
+
<dependency>
<groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-proxy</artifactId>
+ <version>${version.org.jboss.ejb3.proxy.client}</version>
+ <classifier>client</classifier>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-security</artifactId>
- <version>0.13.0</version>
+ <version>${version.org.jboss.ejb3.security.client}</version>
<classifier>client</classifier>
<exclusions>
<exclusion>
Modified: trunk/ejb3/.classpath
===================================================================
--- trunk/ejb3/.classpath 2008-08-11 04:04:20 UTC (rev 76906)
+++ trunk/ejb3/.classpath 2008-08-11 04:15:09 UTC (rev 76907)
@@ -21,5 +21,6 @@
<classpathentry kind="lib" path="/thirdparty/org/jboss/ws/lib/jbossws-spi.jar" sourcepath="/thirdparty/org/jboss/ws/lib/jbossws-spi-sources.jar"/>
<classpathentry kind="lib" path="/thirdparty/hibernate/lib/hibernate-core.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jboss-jpa-deployers/lib/jboss-jpa-deployers.jar" sourcepath="/thirdparty/jboss/jboss-jpa-deployers/lib/jboss-jpa-deployers-sources.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/jboss-ejb3-common/lib/jboss-ejb3-common.jar"/>
<classpathentry kind="output" path="output/eclipse-classes"/>
</classpath>
Modified: trunk/ejb3/build.xml
===================================================================
--- trunk/ejb3/build.xml 2008-08-11 04:04:20 UTC (rev 76906)
+++ trunk/ejb3/build.xml 2008-08-11 04:15:09 UTC (rev 76907)
@@ -114,6 +114,7 @@
<path refid="dom4j.dom4j.classpath"/>
<path refid="jboss.integration.classpath"/>
<path refid="jboss.jboss.ejb3.cache.classpath"/>
+ <path refid="jboss.jboss.ejb3.common.classpath"/>
<path refid="jboss.jboss.ejb3.core.classpath"/>
<path refid="jboss.jboss.ejb3.ext.api.classpath" />
<path refid="jboss.jboss.ejb3.ext.api.impl.classpath" />
Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java 2008-08-11 04:04:20 UTC (rev 76906)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java 2008-08-11 04:15:09 UTC (rev 76907)
@@ -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();
+ }
+ }
}
Modified: trunk/ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml
===================================================================
--- trunk/ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml 2008-08-11 04:04:20 UTC (rev 76906)
+++ trunk/ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml 2008-08-11 04:15:09 UTC (rev 76907)
@@ -294,5 +294,40 @@
</parameter>
</uninstall>
</bean>
+
+ <!--
+
+ JNDI Registrars
+
+
+ The JNDI Registrar is responsible for all JNDI Bindings for
+ an EJB. Its constructor takes the following arguments, in order:
+
+ javax.naming.Context (JNDI Context into which to bind objects)
+ org.jboss.ejb3.proxy.spi.registry.ProxyFactoryRegistry (Implementation of ProxyFactoryRegistry)
+ String statelessSessionProxyObjectFactoryType The JNDI ObjectFactory implementation to use for SLSB
+ ...more later when SFSB, @Service, MDB Implemented
+
+ -->
+
+ <!-- SLSB JNDI Registrar -->
+ <bean name="org.jboss.ejb3.JndiRegistrar.Session.SLSBJndiRegistrar"
+ class="org.jboss.ejb3.proxy.jndiregistrar.JndiStatelessSessionRegistrar">
+ <constructor>
+ <parameter>
+ org.jboss.ejb3.proxy.objectfactory.session.stateless.StatelessSessionProxyObjectFactory
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- SFSB JNDI Registrar -->
+ <bean name="org.jboss.ejb3.JndiRegistrar.Session.SFSBJndiRegistrar"
+ class="org.jboss.ejb3.proxy.jndiregistrar.JndiStatefulSessionRegistrar">
+ <constructor>
+ <parameter>
+ org.jboss.ejb3.proxy.objectfactory.session.stateful.StatefulSessionProxyObjectFactory
+ </parameter>
+ </constructor>
+ </bean>
</deployment>
Modified: trunk/main/src/bin/run.conf
===================================================================
--- trunk/main/src/bin/run.conf 2008-08-11 04:04:20 UTC (rev 76906)
+++ trunk/main/src/bin/run.conf 2008-08-11 04:15:09 UTC (rev 76907)
@@ -44,7 +44,7 @@
fi
# Sample JPDA settings for remote socket debuging
-#JAVA_OPTS="$JAVA_OPTS -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n"
+JAVA_OPTS="$JAVA_OPTS -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=n"
# Sample JPDA settings for shared memory debugging
#JAVA_OPTS="$JAVA_OPTS -Xrunjdwp:transport=dt_shmem,server=y,suspend=n,address=jboss"
Modified: trunk/thirdparty/pom.xml
===================================================================
--- trunk/thirdparty/pom.xml 2008-08-11 04:04:20 UTC (rev 76906)
+++ trunk/thirdparty/pom.xml 2008-08-11 04:15:09 UTC (rev 76907)
@@ -444,6 +444,15 @@
</dependency>
<dependency>
<groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-common</artifactId>
+ <classifier>client</classifier>
+ <mapping>
+ <componentId>jboss.jboss-ejb3-common</componentId>
+ <artifactId>jboss-ejb3-common-client</artifactId>
+ </mapping>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-core</artifactId>
<mapping>
<componentId>jboss.jboss-ejb3-core</componentId>
@@ -495,6 +504,22 @@
</dependency>
<dependency>
<groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-proxy</artifactId>
+ <mapping>
+ <componentId>jboss.jboss-ejb3-proxy</componentId>
+ </mapping>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-proxy</artifactId>
+ <classifier>client</classifier>
+ <mapping>
+ <componentId>jboss.jboss-ejb3-proxy</componentId>
+ <artifactId>jboss-ejb3-proxy-client</artifactId>
+ </mapping>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-security</artifactId>
<mapping>
<componentId>jboss.jboss-ejb3-security</componentId>
@@ -1288,6 +1313,11 @@
<groupId>org.jboss.integration</groupId>
<artifactId>jboss-transaction-spi</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-common</artifactId>
+ <classifier>client</classifier>
+ </dependency>
<dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-core</artifactId>
@@ -1299,6 +1329,11 @@
</dependency>
<dependency>
<groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-proxy</artifactId>
+ <classifier>client</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-security</artifactId>
<classifier>client</classifier>
</dependency>
More information about the jboss-cvs-commits
mailing list