[jboss-cvs] JBossAS SVN: r83991 - in projects/ejb3/trunk/profile3_1: src/main/resources/conf/deployers and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Feb 9 03:40:56 EST 2009
Author: jaikiran
Date: 2009-02-09 03:40:55 -0500 (Mon, 09 Feb 2009)
New Revision: 83991
Modified:
projects/ejb3/trunk/profile3_1/pom.xml
projects/ejb3/trunk/profile3_1/src/main/resources/conf/deployers/ejb3-deployers-jboss-beans.xml
Log:
EJBTHREE-1712 Removed references to some of the embedded deployers
Modified: projects/ejb3/trunk/profile3_1/pom.xml
===================================================================
--- projects/ejb3/trunk/profile3_1/pom.xml 2009-02-09 08:19:32 UTC (rev 83990)
+++ projects/ejb3/trunk/profile3_1/pom.xml 2009-02-09 08:40:55 UTC (rev 83991)
@@ -25,10 +25,12 @@
<version.org.jboss_jboss-vfs>2.0.1.GA</version.org.jboss_jboss-vfs>
<version.org.jboss.bootstrap_jboss-bootstrap>0.1.0-SNAPSHOT</version.org.jboss.bootstrap_jboss-bootstrap>
<version.org.jboss.jpa_jboss-jpa-deployers>1.0.0-Beta6</version.org.jboss.jpa_jboss-jpa-deployers>
+ <version.org.jboss.ejb3_jboss-ejb3-deployers>1.0.1-SNAPSHOT</version.org.jboss.ejb3_jboss-ejb3-deployers>
+
</properties>
-
+
<build>
- <plugins>
+ <plugins>
<!-- Let's build the test deployables through Ant -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -49,16 +51,16 @@
</execution>
</executions>
</plugin>
-
+
<!-- Surefire plugin for integration tests -->
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <!-- Disable unit tests -->
+ <!-- Disable unit tests -->
<skip>true</skip>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<printSummary>true</printSummary>
-
+
</configuration>
<executions>
<execution>
@@ -70,8 +72,8 @@
<configuration>
<skip>false</skip>
<additionalClasspathElements>
- <!-- The target/test-lib which we create contains the jars (deployables)
- which will be used by the tests -->
+ <!-- The target/test-lib which we create contains the jars (deployables)
+ which will be used by the tests -->
<additionalClasspathElement>
${basedir}/target/test-lib
</additionalClasspathElement>
@@ -80,108 +82,108 @@
</execution>
</executions>
</plugin>
- </plugins>
-
+ </plugins>
+
</build>
-
-
- <dependencies>
- <!-- EJB3 Embedded dependency. Needs to be removed once the
- deployers in Embedded are moved to ejb3-deployers. EJBTHREE-1712 -->
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-embedded</artifactId>
- <version>${version.org.jboss.ejb3.jboss-ejb3-embedded}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-core-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-structure-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-bootstrap</artifactId>
- </exclusion>
-
- </exclusions>
- </dependency>
-
+
+
+ <dependencies>
+ <!-- EJB3 Embedded dependency. Needs to be removed once the
+ deployers in Embedded are moved to ejb3-deployers. EJBTHREE-1712 -->
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-embedded</artifactId>
+ <version>${version.org.jboss.ejb3.jboss-ejb3-embedded}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-core-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-structure-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-bootstrap</artifactId>
+ </exclusion>
+
+ </exclusions>
+ </dependency>
+
<!-- Bootstrap -->
- <dependency>
- <groupId>org.jboss.bootstrap</groupId>
- <artifactId>jboss-bootstrap</artifactId>
- <version>${version.org.jboss.bootstrap_jboss-bootstrap}</version>
- <scope>test</scope>
- </dependency>
-
- <!-- JBoss deployers -->
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs</artifactId>
- <version>${version.org.jboss.deployers}</version>
- <scope>test</scope>
- </dependency>
-
- <!-- EJB3 deployers -->
- <dependency>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-deployers</artifactId>
- <version>0.1.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-ejb3</artifactId>
- <version>5.0.0.GA</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- <version>${version.org.jboss_jboss-vfs}</version>
- </dependency>
-
-
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-impl</artifactId>
- <version>${version.org.jboss.deployers}</version>
-
- </dependency>
-
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-structure-spi</artifactId>
- <version>${version.org.jboss.deployers}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-core-spi</artifactId>
- <version>${version.org.jboss.deployers}</version>
- </dependency>
-
- <!-- JPA deployers -->
- <dependency>
- <groupId>org.jboss.jpa</groupId>
- <artifactId>jboss-jpa-deployers</artifactId>
- <version>${version.org.jboss.jpa_jboss-jpa-deployers}</version>
- <scope>runtime</scope>
- </dependency>
- </dependencies>
+ <dependency>
+ <groupId>org.jboss.bootstrap</groupId>
+ <artifactId>jboss-bootstrap</artifactId>
+ <version>${version.org.jboss.bootstrap_jboss-bootstrap}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- JBoss deployers -->
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs</artifactId>
+ <version>${version.org.jboss.deployers}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- EJB3 deployers -->
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-deployers</artifactId>
+ <version>${version.org.jboss.ejb3_jboss-ejb3-deployers}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-ejb3</artifactId>
+ <version>5.0.0.GA</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ <version>${version.org.jboss_jboss-vfs}</version>
+ </dependency>
+
+
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-impl</artifactId>
+ <version>${version.org.jboss.deployers}</version>
+
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-structure-spi</artifactId>
+ <version>${version.org.jboss.deployers}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-core-spi</artifactId>
+ <version>${version.org.jboss.deployers}</version>
+ </dependency>
+
+ <!-- JPA deployers -->
+ <dependency>
+ <groupId>org.jboss.jpa</groupId>
+ <artifactId>jboss-jpa-deployers</artifactId>
+ <version>${version.org.jboss.jpa_jboss-jpa-deployers}</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
</project>
Modified: projects/ejb3/trunk/profile3_1/src/main/resources/conf/deployers/ejb3-deployers-jboss-beans.xml
===================================================================
--- projects/ejb3/trunk/profile3_1/src/main/resources/conf/deployers/ejb3-deployers-jboss-beans.xml 2009-02-09 08:19:32 UTC (rev 83990)
+++ projects/ejb3/trunk/profile3_1/src/main/resources/conf/deployers/ejb3-deployers-jboss-beans.xml 2009-02-09 08:40:55 UTC (rev 83991)
@@ -24,29 +24,43 @@
</map>
</property>
</bean>
-
- <bean name="EjbParsingDeployer" class="org.jboss.ejb3.embedded.deployers.EjbParsingDeployer">
+
+ <!-- Deployer which parses the ejb-jar.xml -->
+ <bean name="EjbParsingDeployer" class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer">
+
+ <constructor>
+ <parameter class="java.lang.Class">org.jboss.metadata.ejb.spec.EjbJarMetaData</parameter>
+ </constructor>
+ <property name="name">ejb-jar.xml</property>
<!-- We need to be fast, so no schema validation -->
<property name="useSchemaValidation">false</property>
</bean>
- <bean name="JBossEjbParsingDeployer" class="org.jboss.ejb3.embedded.deployers.JBossEjbParsingDeployer">
+
+ <!-- Deployer which parses jboss.xml -->
+ <bean name="JBossEjbParsingDeployer" class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer">
+
+ <constructor>
+ <parameter class="java.lang.Class">org.jboss.metadata.ejb.jboss.JBossMetaData</parameter>
+ </constructor>
+ <property name="name">jboss.xml</property>
<!-- We need to be fast, so no schema validation -->
<property name="useSchemaValidation">false</property>
</bean>
- <bean name="EjbAnnotationMetaDataDeployer" class="org.jboss.ejb3.embedded.deployers.EjbAnnotationMetaDataDeployer"/>
-
- <bean name="MergedJBossMetaDataDeployer" class="org.jboss.ejb3.embedded.deployers.MergedJBossMetaDataDeployer"/>
-
- <bean name="EjbMetadataJndiPolicyDecoratorDeployer" class="org.jboss.ejb3.embedded.deployers.EjbMetadataJndiPolicyDecoratorDeployer"/>
-
+
+ <bean name="EjbAnnotationMetaDataDeployer" class="org.jboss.ejb3.deployers.EjbAnnotationMetaDataDeployer"/>
+
+ <bean name="MergedJBossMetaDataDeployer" class="org.jboss.ejb3.deployers.MergedJBossMetaDataDeployer"/>
+
+ <bean name="EjbMetadataJndiPolicyDecoratorDeployer" class="org.jboss.ejb3.deployers.EjbMetadataJndiPolicyDecoratorDeployer"/>
+
<!-- EJB3 ProcessorChain Deployer -->
<bean name="Ejb3MetadataProcessingDeployer" class="org.jboss.ejb3.deployers.Ejb3MetadataProcessingDeployer" />
-
- <bean name="EjbModuleDeployer" class="org.jboss.ejb3.embedded.deployers.EjbModuleDeployer"/>
+
+ <bean name="EjbModuleDeployer" class="org.jboss.ejb3.embedded.deployers.EjbModuleDeployer"/>
<bean name="EjbComponentDeployer" class="org.jboss.ejb3.embedded.deployers.EjbComponentDeployer"/>
<bean name="MessageDestinationReferenceResolver" class="org.jboss.ejb3.embedded.resolvers.EmbeddedMessageDestinationReferenceResolver"/>
-
+
<!-- EJB3 Cache Factory Registry -->
<bean name="EJB3CacheFactoryRegistry" class="org.jboss.ejb3.cache.CacheFactoryRegistry">
<property name="factories">
@@ -71,7 +85,7 @@
</map>
</property>
</bean>
-
+
<!-- EJB3 Persistence Manager Factory Registry -->
<bean name="EJB3PersistenceManagerFactoryRegistry" class="org.jboss.ejb3.cache.persistence.PersistenceManagerFactoryRegistry">
<property name="factories">
@@ -86,7 +100,7 @@
</map>
</property>
</bean>
-
+
<!-- EJB3 Pool Factory Registry -->
<bean name="EJB3PoolFactoryRegistry" class="org.jboss.ejb3.pool.PoolFactoryRegistry">
<property name="factories">
@@ -106,7 +120,7 @@
</map>
</property>
</bean>
-
+
<!-- SFSB JNDI Registrar -->
<bean name="org.jboss.ejb3.JndiRegistrar.Session.SFSBJndiRegistrar"
class="org.jboss.ejb3.proxy.jndiregistrar.JndiStatefulSessionRegistrar">
@@ -126,6 +140,6 @@
</parameter>
</constructor>
</bean>
-
-
+
+
</deployment>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list