[jboss-cvs] JBossAS SVN: r93156 - in branches/Branch_5_x: ejb3/src/resources/META-INF and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Sep 3 07:02:49 EDT 2009
Author: dimitris at jboss.org
Date: 2009-09-03 07:02:49 -0400 (Thu, 03 Sep 2009)
New Revision: 93156
Modified:
branches/Branch_5_x/component-matrix/pom.xml
branches/Branch_5_x/ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml
branches/Branch_5_x/thirdparty/pom.xml
Log:
JBAS-6364, Doh, commons-beanutils is only a test dependency used by a jsf/myfaces test, so mark it as such.
Modified: branches/Branch_5_x/component-matrix/pom.xml
===================================================================
--- branches/Branch_5_x/component-matrix/pom.xml 2009-09-03 10:41:26 UTC (rev 93155)
+++ branches/Branch_5_x/component-matrix/pom.xml 2009-09-03 11:02:49 UTC (rev 93156)
@@ -322,6 +322,7 @@
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>${version.commons.beanutils}</version>
+ <scope>test</scope>
</dependency>
<dependency>
@@ -1047,11 +1048,6 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${version.junit}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${version.junit}</version>
<scope>test</scope>
</dependency>
Modified: branches/Branch_5_x/ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml
===================================================================
--- branches/Branch_5_x/ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml 2009-09-03 10:41:26 UTC (rev 93155)
+++ branches/Branch_5_x/ejb3/src/resources/META-INF/ejb3-deployers-jboss-beans.xml 2009-09-03 11:02:49 UTC (rev 93156)
@@ -4,19 +4,19 @@
EJB3 Deployers
-->
<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <bean name="MessageDestinationReferenceResolver" class="org.jboss.ejb3.resolvers.DefaultMessageDestinationReferenceResolver"/>
+
+ <bean name="MessageDestinationReferenceResolver" class="org.jboss.ejb3.resolvers.DefaultMessageDestinationReferenceResolver"/>
- <bean name="Ejb3DependenciesDeployer" class="org.jboss.ejb3.deployers.Ejb3DependenciesDeployer">
- <!-- TODO: allow for configuration
- <property name="dependencies">
- <dependency xmlns="urn:jboss:dependency:1.0">
- <item>javax.transaction.TransactionManager</item>
- </dependency>
- </property>
- -->
- </bean>
-
+ <bean name="Ejb3DependenciesDeployer" class="org.jboss.ejb3.deployers.Ejb3DependenciesDeployer">
+ <!-- TODO: allow for configuration
+ <property name="dependencies">
+ <dependency xmlns="urn:jboss:dependency:1.0">
+ <item>javax.transaction.TransactionManager</item>
+ </dependency>
+ </property>
+ -->
+ </bean>
+
<bean name="Ejb3Deployer" class="org.jboss.ejb3.deployers.Ejb3Deployer">
<install bean="ManagedDeploymentCreator" method="addVersionedAttachmentType">
<parameter>
@@ -121,7 +121,6 @@
<value>jstl.jar</value>
<value>commons-digester-1.6.jar</value>
<value>myfaces-impl.jar</value>
- <value>commons-beanutils.jar</value>
<value>myfaces-jsf-api.jar</value>
<value>commons-codec-1.2.jar</value>
<value>catalina-optional.jar</value>
@@ -256,77 +255,77 @@
</parameter>
</uninstall>
</bean>
-
- <!--
-
- JNDI Registrars
-
-
- The JNDI Registrar is responsible for all JNDI Bindings for
- an EJB.
-
- -->
-
- <!-- SLSB JNDI Registrar -->
- <bean name="org.jboss.ejb3.JndiRegistrar.Session.SLSBJndiRegistrar"
- class="org.jboss.ejb3.proxy.impl.jndiregistrar.JndiStatelessSessionRegistrar">
- <constructor>
- <parameter>
- org.jboss.ejb3.proxy.impl.objectfactory.session.stateless.StatelessSessionProxyObjectFactory
- </parameter>
- </constructor>
- </bean>
-
- <!-- SFSB JNDI Registrar -->
- <bean name="org.jboss.ejb3.JndiRegistrar.Session.SFSBJndiRegistrar"
- class="org.jboss.ejb3.proxy.impl.jndiregistrar.JndiStatefulSessionRegistrar">
- <constructor>
- <parameter>
- org.jboss.ejb3.proxy.impl.objectfactory.session.stateful.StatefulSessionProxyObjectFactory
- </parameter>
- </constructor>
- </bean>
-
- <!-- @Service JNDI Registrar -->
- <bean name="org.jboss.ejb3.JndiRegistrar.Session.ServiceJndiRegistrar"
- class="org.jboss.ejb3.proxy.impl.jndiregistrar.JndiServiceRegistrar">
- <constructor>
- <parameter>
- org.jboss.ejb3.proxy.impl.objectfactory.session.service.ServiceProxyObjectFactory
- </parameter>
- </constructor>
- </bean>
+
+ <!--
+
+ JNDI Registrars
+
+
+ The JNDI Registrar is responsible for all JNDI Bindings for
+ an EJB.
+
+ -->
+
+ <!-- SLSB JNDI Registrar -->
+ <bean name="org.jboss.ejb3.JndiRegistrar.Session.SLSBJndiRegistrar"
+ class="org.jboss.ejb3.proxy.impl.jndiregistrar.JndiStatelessSessionRegistrar">
+ <constructor>
+ <parameter>
+ org.jboss.ejb3.proxy.impl.objectfactory.session.stateless.StatelessSessionProxyObjectFactory
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- SFSB JNDI Registrar -->
+ <bean name="org.jboss.ejb3.JndiRegistrar.Session.SFSBJndiRegistrar"
+ class="org.jboss.ejb3.proxy.impl.jndiregistrar.JndiStatefulSessionRegistrar">
+ <constructor>
+ <parameter>
+ org.jboss.ejb3.proxy.impl.objectfactory.session.stateful.StatefulSessionProxyObjectFactory
+ </parameter>
+ </constructor>
+ </bean>
+
+ <!-- @Service JNDI Registrar -->
+ <bean name="org.jboss.ejb3.JndiRegistrar.Session.ServiceJndiRegistrar"
+ class="org.jboss.ejb3.proxy.impl.jndiregistrar.JndiServiceRegistrar">
+ <constructor>
+ <parameter>
+ org.jboss.ejb3.proxy.impl.objectfactory.session.service.ServiceProxyObjectFactory
+ </parameter>
+ </constructor>
+ </bean>
- <bean name="org.jboss.ejb3.ProxyClusteringRegistry"
- class="org.jboss.ejb3.proxy.clustered.registry.ProxyClusteringRegistry"/>
-
- <!-- Clustered SLSB JNDI Registrar -->
- <bean name="org.jboss.ejb3.JndiRegistrar.Session.ClusteredSLSBJndiRegistrar"
- class="org.jboss.ejb3.proxy.clustered.jndiregistrar.JndiClusteredStatelessSessionRegistrar">
- <constructor>
- <parameter>
- org.jboss.ejb3.proxy.clustered.objectfactory.session.stateless.StatelessSessionClusteredProxyObjectFactory
- </parameter>
- <parameter><inject bean="org.jboss.ejb3.ProxyClusteringRegistry"/></parameter>
- </constructor>
- </bean>
-
- <!-- Clustered SFSB JNDI Registrar -->
- <bean name="org.jboss.ejb3.JndiRegistrar.Session.ClusteredSFSBJndiRegistrar"
- class="org.jboss.ejb3.proxy.clustered.jndiregistrar.JndiClusteredStatefulSessionRegistrar">
- <constructor>
- <parameter>
- org.jboss.ejb3.proxy.clustered.objectfactory.session.stateful.StatefulSessionClusteredProxyObjectFactory
- </parameter>
- <parameter><inject bean="org.jboss.ejb3.ProxyClusteringRegistry"/></parameter>
- </constructor>
- </bean>
-
- <!-- EJB3 ProcessorChain Deployer -->
- <bean name="Ejb3MetadataProcessingDeployer"
- class="org.jboss.ejb3.deployers.Ejb3MetadataProcessingDeployer" />
- <!-- EJB3 JNDI Policy Decorator Deployer -->
- <bean name="EjbMetadataJndiPolicyDecoratorDeployer"
+ <bean name="org.jboss.ejb3.ProxyClusteringRegistry"
+ class="org.jboss.ejb3.proxy.clustered.registry.ProxyClusteringRegistry"/>
+
+ <!-- Clustered SLSB JNDI Registrar -->
+ <bean name="org.jboss.ejb3.JndiRegistrar.Session.ClusteredSLSBJndiRegistrar"
+ class="org.jboss.ejb3.proxy.clustered.jndiregistrar.JndiClusteredStatelessSessionRegistrar">
+ <constructor>
+ <parameter>
+ org.jboss.ejb3.proxy.clustered.objectfactory.session.stateless.StatelessSessionClusteredProxyObjectFactory
+ </parameter>
+ <parameter><inject bean="org.jboss.ejb3.ProxyClusteringRegistry"/></parameter>
+ </constructor>
+ </bean>
+
+ <!-- Clustered SFSB JNDI Registrar -->
+ <bean name="org.jboss.ejb3.JndiRegistrar.Session.ClusteredSFSBJndiRegistrar"
+ class="org.jboss.ejb3.proxy.clustered.jndiregistrar.JndiClusteredStatefulSessionRegistrar">
+ <constructor>
+ <parameter>
+ org.jboss.ejb3.proxy.clustered.objectfactory.session.stateful.StatefulSessionClusteredProxyObjectFactory
+ </parameter>
+ <parameter><inject bean="org.jboss.ejb3.ProxyClusteringRegistry"/></parameter>
+ </constructor>
+ </bean>
+
+ <!-- EJB3 ProcessorChain Deployer -->
+ <bean name="Ejb3MetadataProcessingDeployer"
+ class="org.jboss.ejb3.deployers.Ejb3MetadataProcessingDeployer" />
+ <!-- EJB3 JNDI Policy Decorator Deployer -->
+ <bean name="EjbMetadataJndiPolicyDecoratorDeployer"
class="org.jboss.ejb3.deployers.EjbMetadataJndiPolicyDecoratorDeployer" />
<!-- EJB Reference Resolver -->
@@ -351,6 +350,6 @@
<constructor>
<parameter><inject bean="org.jboss.ejb3.EjbReferenceResolver" /></parameter>
</constructor>
- </bean>
-
+ </bean>
+
</deployment>
Modified: branches/Branch_5_x/thirdparty/pom.xml
===================================================================
--- branches/Branch_5_x/thirdparty/pom.xml 2009-09-03 10:41:26 UTC (rev 93155)
+++ branches/Branch_5_x/thirdparty/pom.xml 2009-09-03 11:02:49 UTC (rev 93156)
@@ -1050,6 +1050,7 @@
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>apache-bsf</groupId>
More information about the jboss-cvs-commits
mailing list