[jboss-cvs] JBossAS SVN: r102561 - in trunk: component-matrix and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Mar 18 08:05:15 EDT 2010
Author: wolfc
Date: 2010-03-18 08:05:14 -0400 (Thu, 18 Mar 2010)
New Revision: 102561
Modified:
trunk/build/build.xml
trunk/build/pom.xml
trunk/component-matrix/pom.xml
trunk/ejb3/src/resources/META-INF/ejb3-as-deployers-jboss-beans.xml
Log:
JBAS-7823: added EJBContextBinder
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2010-03-18 11:52:26 UTC (rev 102560)
+++ trunk/build/build.xml 2010-03-18 12:05:14 UTC (rev 102561)
@@ -934,7 +934,7 @@
</fileset>
</copy>
- <!--
+ <!--
Remove me
<copy todir="${install.all.deploy}" filtering="no">
<fileset dir="${connector.module.output}">
@@ -1776,7 +1776,7 @@
<!-- The hornetq-int module output -->
<copy file="${hornetq.module.output}/jboss-as-hornetq-int.jar"
todir="${install.common.lib}/" filtering="no" />
-
+
<copy todir="${install.common.deploy}/admin-console.war/plugins" filtering="no">
<fileset dir="${hornetq.module.output}">
<include name="jboss-as-hornetq-plugin.jar"/>
@@ -1797,8 +1797,8 @@
<include name="**/*"/>
</fileset>
</copy>
-
-
+
+
</target>
<!-- ================= -->
@@ -1898,6 +1898,8 @@
<fileset refid="jboss:jboss-serialization:jar"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-cache:jar"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-common: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:jboss-ejb3-core:jar"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-deployers:jar"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-endpoint:jar"/>
Modified: trunk/build/pom.xml
===================================================================
--- trunk/build/pom.xml 2010-03-18 11:52:26 UTC (rev 102560)
+++ trunk/build/pom.xml 2010-03-18 12:05:14 UTC (rev 102561)
@@ -491,7 +491,7 @@
<artifactId>jboss-transaction-api</artifactId>
</exclusion>
</exclusions>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.jboss.spec.javax.ejb</groupId>
<artifactId>jboss-ejb-api_3.1_spec</artifactId>
@@ -518,6 +518,16 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.jboss.ejb3.context</groupId>
+ <artifactId>jboss-ejb3-context-base</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ejb3.context</groupId>
+ <artifactId>jboss-ejb3-context-naming</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3-endpoint-deployer</artifactId>
<optional>true</optional>
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-03-18 11:52:26 UTC (rev 102560)
+++ trunk/component-matrix/pom.xml 2010-03-18 12:05:14 UTC (rev 102561)
@@ -76,6 +76,7 @@
<version.org.jboss.deployers>2.2.0.Alpha4</version.org.jboss.deployers>
<version.org.jboss.ejb3>1.0.5</version.org.jboss.ejb3>
<version.org.jboss.ejb3.common.client>1.0.2</version.org.jboss.ejb3.common.client>
+ <version.org.jboss.ejb3.context>0.1.1</version.org.jboss.ejb3.context>
<version.org.jboss.ejb3.core.client>1.2.3</version.org.jboss.ejb3.core.client>
<version.org.jboss.ejb3.endpoint.deployer>0.1.4</version.org.jboss.ejb3.endpoint.deployer>
<version.org.jboss.ejb3.ext.api>1.1.1</version.org.jboss.ejb3.ext.api>
@@ -504,57 +505,57 @@
<dependency>
<groupId>org.hornetq</groupId>
<artifactId>hornetq-resources</artifactId>
- <version>${version.hornetq}</version>
+ <version>${version.hornetq}</version>
</dependency>
<dependency>
<groupId>org.hornetq</groupId>
<artifactId>hornetq-bootstrap</artifactId>
- <version>${version.hornetq}</version>
+ <version>${version.hornetq}</version>
</dependency>
<dependency>
<groupId>org.hornetq</groupId>
<artifactId>hornetq-core-client</artifactId>
- <version>${version.hornetq}</version>
+ <version>${version.hornetq}</version>
</dependency>
<dependency>
<groupId>org.hornetq</groupId>
<artifactId>hornetq-core</artifactId>
- <version>${version.hornetq}</version>
+ <version>${version.hornetq}</version>
</dependency>
<dependency>
<groupId>org.hornetq</groupId>
<artifactId>hornetq-jboss-as-integration</artifactId>
- <version>${version.hornetq}</version>
+ <version>${version.hornetq}</version>
</dependency>
<dependency>
<groupId>org.hornetq</groupId>
<artifactId>hornetq-jms-client</artifactId>
- <version>${version.hornetq}</version>
+ <version>${version.hornetq}</version>
</dependency>
<dependency>
<groupId>org.hornetq</groupId>
<artifactId>hornetq-jms</artifactId>
- <version>${version.hornetq}</version>
+ <version>${version.hornetq}</version>
</dependency>
<dependency>
<groupId>org.hornetq</groupId>
<artifactId>hornetq-logging</artifactId>
- <version>${version.hornetq}</version>
+ <version>${version.hornetq}</version>
</dependency>
<dependency>
<groupId>org.hornetq</groupId>
<artifactId>hornetq-ra</artifactId>
- <version>${version.hornetq}</version>
+ <version>${version.hornetq}</version>
</dependency>
<dependency>
<groupId>org.hornetq</groupId>
<artifactId>hornetq-resources</artifactId>
- <version>${version.hornetq}</version>
+ <version>${version.hornetq}</version>
</dependency>
<dependency>
<groupId>org.hornetq</groupId>
<artifactId>hornetq-transports</artifactId>
- <version>${version.hornetq}</version>
+ <version>${version.hornetq}</version>
</dependency>
<dependency>
<groupId>org.jboss.aspects</groupId>
@@ -1098,7 +1099,7 @@
</dependency>
<!-- JBoss EE API Dependencies -->
-
+
<dependency>
<groupId>org.jboss.spec.javax.annotation</groupId>
<artifactId>jboss-annotations-api_1.1_spec</artifactId>
@@ -1110,13 +1111,13 @@
<artifactId>jboss-ejb-api_3.1_spec</artifactId>
<version>${version.org.jboss.spec.javaee}</version>
</dependency>
-
+
<dependency>
<groupId>org.jboss.spec.javax.el</groupId>
<artifactId>jboss-el-api_2.2_spec</artifactId>
<version>${version.org.jboss.spec.javaee}</version>
</dependency>
-
+
<dependency>
<groupId>org.jboss.spec.javax.enterprise.deploy</groupId>
<artifactId>jboss-jad-api_1.2_spec</artifactId>
@@ -1158,31 +1159,31 @@
<artifactId>jboss-jsp-api_2.2_spec</artifactId>
<version>${version.org.jboss.spec.javaee}</version>
</dependency>
-
+
<dependency>
<groupId>org.jboss.spec.javax.servlet</groupId>
<artifactId>jboss-servlet-api_3.0_spec</artifactId>
<version>1.0.0.Beta2</version>
</dependency>
-
+
<dependency>
<groupId>org.jboss.spec.javax.transaction</groupId>
<artifactId>jboss-transaction-api_1.1_spec</artifactId>
<version>${version.org.jboss.spec.javaee}</version>
</dependency>
-
+
<dependency>
<groupId>org.jboss.spec.javax.xml.registry</groupId>
<artifactId>jboss-jaxr-api_1.0_spec</artifactId>
<version>${version.org.jboss.spec.javaee}</version>
</dependency>
-
+
<dependency>
<groupId>javax.activation</groupId>
<artifactId>activation</artifactId>
<version>1.1</version>
</dependency>
-
+
<dependency>
<groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId>
@@ -1206,7 +1207,7 @@
<artifactId>jsf-api</artifactId>
<version>${version.javax.faces}</version>
</dependency>
-
+
<dependency>
<groupId>javax.jws</groupId>
<artifactId>jsr181-api</artifactId>
@@ -1230,7 +1231,7 @@
<artifactId>jstl</artifactId>
<version>1.2</version>
</dependency>
-
+
<dependency>
<groupId>sun-jaxb</groupId>
<artifactId>jaxb-api</artifactId>
@@ -1242,13 +1243,13 @@
<artifactId>stax-api</artifactId>
<version>1.0</version>
</dependency>
-
+
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>${version.javax.validation}</version>
</dependency>
-
+
<dependency>
<groupId>javax.xml</groupId>
<artifactId>jaxrpc-api</artifactId>
@@ -2048,6 +2049,18 @@
</dependency>
<dependency>
+ <groupId>org.jboss.ejb3.context</groupId>
+ <artifactId>jboss-ejb3-context-base</artifactId>
+ <version>${version.org.jboss.ejb3.context}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.ejb3.context</groupId>
+ <artifactId>jboss-ejb3-context-naming</artifactId>
+ <version>${version.org.jboss.ejb3.context}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.ejb3</groupId>
<artifactId>jboss-ejb3_1</artifactId>
<version>${version.org.jboss.ejb3}</version>
Modified: trunk/ejb3/src/resources/META-INF/ejb3-as-deployers-jboss-beans.xml
===================================================================
--- trunk/ejb3/src/resources/META-INF/ejb3-as-deployers-jboss-beans.xml 2010-03-18 11:52:26 UTC (rev 102560)
+++ trunk/ejb3/src/resources/META-INF/ejb3-as-deployers-jboss-beans.xml 2010-03-18 12:05:14 UTC (rev 102561)
@@ -5,6 +5,9 @@
-->
<deployment xmlns="urn:jboss:bean-deployer:2.0">
+ <bean name="EJBContextBinder" class="org.jboss.ejb3.context.naming.EJBContextBinder">
+ <depends>NameSpaces</depends>
+ </bean>
<bean name="Ejb3DependenciesDeployer" class="org.jboss.ejb3.deployers.Ejb3DependenciesDeployer">
<!-- TODO: allow for configuration
More information about the jboss-cvs-commits
mailing list