[jboss-cvs] JBossAS SVN: r105303 - in trunk: component-matrix and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu May 27 10:30:05 EDT 2010
Author: johnbailey
Date: 2010-05-27 10:30:03 -0400 (Thu, 27 May 2010)
New Revision: 105303
Added:
trunk/server/src/etc/deployers/naming-switchboard-deployer-jboss-beans.xml
Modified:
trunk/build/build.xml
trunk/component-matrix/pom.xml
trunk/server/pom.xml
Log:
[JBAS-8048] - Initial integration of naming switchboard operator into AS
Modified: trunk/build/build.xml
===================================================================
--- trunk/build/build.xml 2010-05-27 13:59:27 UTC (rev 105302)
+++ trunk/build/build.xml 2010-05-27 14:30:03 UTC (rev 105303)
@@ -2069,6 +2069,13 @@
<fileset refid="org.hibernate.javax.persistence:hibernate-jpa-2.0-api:jar"/>
<fileset refid="org.hibernate:hibernate-validator:jar"/>
<fileset refid="org.hibernate:hibernate-validator-legacy:jar"/>
+
+ <fileset refid="org.jboss.injection:jboss-injection:jar"/>
+ <fileset refid="org.jboss.injection:jboss-resolver-spi:jar"/>
+ <fileset refid="org.jboss.injection:jboss-resolver-impl:jar"/>
+ <fileset refid="org.jboss.injection:jboss-switchboard-metadata:jar"/>
+ <fileset refid="org.jboss.injection:jboss-injection-switchboard-deployer:jar"/>
+
<fileset refid="org.jboss.jpa:jboss-jpa-deployers:jar"/>
<fileset refid="org.jboss.jpa:jboss-jpa-vfs3:jar"/>
<fileset refid="org.jboss.jpa:jboss-jpa-impl:jar"/>
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-05-27 13:59:27 UTC (rev 105302)
+++ trunk/component-matrix/pom.xml 2010-05-27 14:30:03 UTC (rev 105303)
@@ -102,6 +102,7 @@
<version.org.jboss.ejb3.bom>0.1.2</version.org.jboss.ejb3.bom>
<version.org.jboss.ejb.api>1.0-alpha-1</version.org.jboss.ejb.api>
<version.org.jboss.embedded>1.0.0-alpha-3</version.org.jboss.embedded>
+ <version.org.jboss.injection>0.1.0-alpha-2</version.org.jboss.injection>
<version.org.jboss.integration>6.0.0.CR1</version.org.jboss.integration>
<version.org.jboss.jbossxb>2.0.2.Beta7</version.org.jboss.jbossxb>
<version.org.jboss.jopr>1.4.0.Beta3</version.org.jboss.jopr>
@@ -1818,6 +1819,62 @@
</dependency>
<dependency>
+ <groupId>org.jboss.injection</groupId>
+ <artifactId>jboss-injection</artifactId>
+ <version>${version.org.jboss.injection}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.injection</groupId>
+ <artifactId>jboss-resolver-spi</artifactId>
+ <version>${version.org.jboss.injection}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.injection</groupId>
+ <artifactId>jboss-resolver-impl</artifactId>
+ <version>${version.org.jboss.injection}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.injection</groupId>
+ <artifactId>jboss-injection-switchboard-deployer</artifactId>
+ <version>${version.org.jboss.injection}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.injection</groupId>
+ <artifactId>jboss-switchboard-metadata</artifactId>
+ <version>${version.org.jboss.injection}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-mdr</artifactId>
<version>${version.org.jboss.mdr}</version>
Modified: trunk/server/pom.xml
===================================================================
--- trunk/server/pom.xml 2010-05-27 13:59:27 UTC (rev 105302)
+++ trunk/server/pom.xml 2010-05-27 14:30:03 UTC (rev 105303)
@@ -297,6 +297,27 @@
<groupId>org.jboss.reloaded</groupId>
<artifactId>jboss-reloaded-naming-deployers</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.jboss.injection</groupId>
+ <artifactId>jboss-injection</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.injection</groupId>
+ <artifactId>jboss-resolver-spi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.injection</groupId>
+ <artifactId>jboss-resolver-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.injection</groupId>
+ <artifactId>jboss-injection-switchboard-deployer</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.injection</groupId>
+ <artifactId>jboss-switchboard-metadata</artifactId>
+ </dependency>
<dependency>
<groupId>org.jboss.security</groupId>
Added: trunk/server/src/etc/deployers/naming-switchboard-deployer-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/deployers/naming-switchboard-deployer-jboss-beans.xml (rev 0)
+++ trunk/server/src/etc/deployers/naming-switchboard-deployer-jboss-beans.xml 2010-05-27 14:30:03 UTC (rev 105303)
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!--
+ Switchboard Operator Deployers
+ -->
+ <bean name="SwitchBoardOperatorDeployer" class="org.jboss.injection.naming.deployer.SwitchBoardOperatorDeployer"/>
+
+ <bean name="SwitchBoardParsingDeployer" class="org.jboss.injection.naming.deployer.SwitchBoardParsingDeployer"/>
+
+ <bean name="EnvironmentProcessor" class="org.jboss.injection.resolve.naming.EnvironmentProcessor">
+ <incallback method="addResolver"/>
+ <incallback method="addMetaDataVisitor"/>
+ </bean>
+
+</deployment>
More information about the jboss-cvs-commits
mailing list