[jboss-cvs] JBossAS SVN: r110974 - in trunk: weld-int/assembly/src/main/assembly/resources/META-INF and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2011-03-18 10:35:58 -0400 (Fri, 18 Mar 2011)
New Revision: 110974

Modified:
   trunk/component-matrix/pom.xml
   trunk/weld-int/assembly/src/main/assembly/resources/META-INF/weld-deployers-jboss-beans.xml
Log:
[JBAS-8937, JBAS-8664, JBAS-8789, JBAS-8913]; remove dead Weld deployers, nested beans replacement, reflect cycle, update MC libs.


Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2011-03-18 14:04:17 UTC (rev 110973)
+++ trunk/component-matrix/pom.xml	2011-03-18 14:35:58 UTC (rev 110974)
@@ -86,7 +86,7 @@
     <version.org.jboss.cluster.cache.spi>3.0.0.Final</version.org.jboss.cluster.cache.spi>
     <version.org.jboss.cluster.cache.ispn>1.0.0.Final</version.org.jboss.cluster.cache.ispn>
     <version.org.jboss.common.core>2.2.17.GA</version.org.jboss.common.core>
-    <version.org.jboss.deployers>2.2.0.GA</version.org.jboss.deployers>
+    <version.org.jboss.deployers>2.2.1.GA</version.org.jboss.deployers>
     <version.org.jboss.ejb3.depchain>1.0.0-alpha-47</version.org.jboss.ejb3.depchain>
     <!-- This to move into the EJB3 BOM -->
     <version.org.jboss.ejb3.embedded>1.0.0-alpha-4</version.org.jboss.ejb3.embedded>
@@ -103,7 +103,7 @@
     <version.org.jboss.jpa.impl>3.0.0-alpha-5</version.org.jboss.jpa.impl>
     <version.org.jboss.jpa.mcint>3.0.0-alpha-5</version.org.jboss.jpa.mcint>
     <version.org.jboss.jpa.spi>3.0.0-alpha-5</version.org.jboss.jpa.spi>
-    <version.org.jboss.kernel>2.2.0.GA</version.org.jboss.kernel>
+    <version.org.jboss.kernel>2.2.0.SP1</version.org.jboss.kernel>
     <version.org.jboss.logging>3.0.0.Beta4</version.org.jboss.logging>
     <version.org.jboss.logging-service-metadata>1.0.0.CR10</version.org.jboss.logging-service-metadata>
     <version.org.jboss.logmanager>1.2.0.CR9</version.org.jboss.logmanager>
@@ -111,7 +111,7 @@
     <version.managed.beans.depchain>1.0.0-alpha-6</version.managed.beans.depchain>
     <version.org.jboss.marshalling>1.3.0.CR3</version.org.jboss.marshalling>
     <version.org.jboss.mc-int>2.2.0.GA</version.org.jboss.mc-int>
-    <version.org.jboss.mdr>2.2.0.GA</version.org.jboss.mdr>
+    <version.org.jboss.mdr>2.2.0.SP1</version.org.jboss.mdr>
     <version.org.jboss.metadata.client>2.0.0.Alpha2</version.org.jboss.metadata.client>
     <version.org.jboss.metadata.common>2.0.0.Alpha24</version.org.jboss.metadata.common>
     <version.org.jboss.metadata.ear>2.0.0.Alpha4</version.org.jboss.metadata.ear>
@@ -122,7 +122,7 @@
     <version.org.jboss.mx>6.0.0.GA</version.org.jboss.mx>
     <version.org.jboss.naming>5.0.5.Final</version.org.jboss.naming>
     <version.org.jboss.profileservice>0.2.2</version.org.jboss.profileservice>
-    <version.org.jboss.reflect>2.2.1.GA</version.org.jboss.reflect>
+    <version.org.jboss.reflect>2.2.1.SP1</version.org.jboss.reflect>
     <version.org.jboss.reloaded.naming>0.3.0</version.org.jboss.reloaded.naming>
     <version.org.jboss.resteasy>2.1.0.GA</version.org.jboss.resteasy>
     <version.org.jboss.remoting>2.5.3</version.org.jboss.remoting>

Modified: trunk/weld-int/assembly/src/main/assembly/resources/META-INF/weld-deployers-jboss-beans.xml
===================================================================
--- trunk/weld-int/assembly/src/main/assembly/resources/META-INF/weld-deployers-jboss-beans.xml	2011-03-18 14:04:17 UTC (rev 110973)
+++ trunk/weld-int/assembly/src/main/assembly/resources/META-INF/weld-deployers-jboss-beans.xml	2011-03-18 14:35:58 UTC (rev 110974)
@@ -114,16 +114,6 @@
      <property name="moduleInformer"><inject bean="NamingJavaEEModuleInformer"/></property>
   </bean>
 
-  <bean name="JavaEEComponentJndiBinderDeployer" class="org.jboss.weld.integration.deployer.jndi.JavaEEComponentJndiBinderDeployer">
-      <constructor><parameter><inject bean="NamingJavaEEComponentInformer"/></parameter></constructor>
-      <depends>NameSpaces</depends>
-  </bean>
-
-  <bean name="WebJndiBinderDeployer" class="org.jboss.weld.integration.deployer.jndi.WebJndiBinderDeployer">
-      <constructor><parameter><inject bean="NamingJavaEEModuleInformer"/></parameter></constructor>
-      <depends>NameSpaces</depends>
-  </bean>
-
   <!--&lt;!&ndash;  UNCOMMENT THIS TO ENABLE WELD/MC INJECTION - This feature is currently very experimental and so not enabled by default  &ndash;&gt;-->
   <!-- Adds plugin to BeanMetaDataDeployer that installs WeldKernelControllerContexts -->
   <!-- bean name="WeldBeanMetaDataDeployerPlugin" class="org.jboss.weld.integration.deployer.mc.WeldBeanMetaDataDeployerPlugin"/ -->