[jboss-cvs] JBossAS SVN: r79218 - in trunk: server/src/etc/deployers and 1 other directories.

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

Author: alesj
Date: 2008-10-07 08:45:01 -0400 (Tue, 07 Oct 2008)
New Revision: 79218

Modified:
   trunk/component-matrix/pom.xml
   trunk/server/src/etc/deployers/metadata-deployer-jboss-beans.xml
   trunk/varia/src/resources/seam/seam-deployers-jboss-beans.xml
Log:
Update to latest MC releases (group them in pom.xml).
Remove overhead xml in some deployers.

Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml	2008-10-07 12:26:26 UTC (rev 79217)
+++ trunk/component-matrix/pom.xml	2008-10-07 12:45:01 UTC (rev 79218)
@@ -54,19 +54,19 @@
     <version.org.jboss.ejb3.security.client>1.0.0-Beta1</version.org.jboss.ejb3.security.client>
     <version.org.jboss.jpa>0.1.2</version.org.jboss.jpa>
     <version.org.jboss.reflect>2.0.0.CR1</version.org.jboss.reflect>
-    <version.org.jboss.mdr>2.0.0.CR1</version.org.jboss.mdr>
     <version.org.jboss.vfs>2.0.0.CR1</version.org.jboss.vfs>
-    <version.org.jboss.cl>2.0.0.CR2</version.org.jboss.cl>
+    <version.org.jboss.mdr>2.0.0.CR3</version.org.jboss.mdr>
+    <version.org.jboss.man>2.0.0.CR1</version.org.jboss.man>
+    <version.org.jboss.microcontainer>2.0.0.CR2</version.org.jboss.microcontainer>
+    <version.org.jboss.cl>2.0.0.CR3</version.org.jboss.cl>
+    <version.org.jboss.deployers>2.0.0.CR2</version.org.jboss.deployers>
     <version.org.jboss.cache.core>2.2.0.GA</version.org.jboss.cache.core>
     <version.org.jboss.cache.pojo>2.2.0.CR5</version.org.jboss.cache.pojo>
     <version.org.jboss.cluster>1.1.0.GA</version.org.jboss.cluster>
     <version.org.jboss.cluster.cache>1.0.0.GA</version.org.jboss.cluster.cache>
-    <version.org.jboss.deployers>2.0.0.CR1</version.org.jboss.deployers>
     <version.org.jboss.integration>5.0.0.CR2</version.org.jboss.integration>
     <version.org.jboss.jbossxb>2.0.0.CR15</version.org.jboss.jbossxb>
-    <version.org.jboss.man>2.0.0.CR1</version.org.jboss.man>
     <version.org.jboss.metadata>1.0.0.CR1</version.org.jboss.metadata>
-    <version.org.jboss.microcontainer>2.0.0.CR1</version.org.jboss.microcontainer>
     <version.org.jboss.naming>5.0.0.CR2</version.org.jboss.naming>
     <version.org.jboss.remoting>2.5.0.GA</version.org.jboss.remoting>
     <version.org.jboss.security>2.0.2.CR6</version.org.jboss.security>
@@ -76,7 +76,7 @@
     <version.sun-jaxws>2.1.1</version.sun-jaxws>
     <version.sun.jaxb>2.1.4</version.sun.jaxb>
     <version.xdoclet>1.2.3</version.xdoclet>
-    <version.seam.integration>5.0.0.CR2</version.seam.integration>
+    <version.seam.integration>5.0.0.CR3</version.seam.integration>
   </properties>
 
   <!-- Build Configuration -->

Modified: trunk/server/src/etc/deployers/metadata-deployer-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/deployers/metadata-deployer-jboss-beans.xml	2008-10-07 12:26:26 UTC (rev 79217)
+++ trunk/server/src/etc/deployers/metadata-deployer-jboss-beans.xml	2008-10-07 12:45:01 UTC (rev 79218)
@@ -15,13 +15,7 @@
   
    <bean name="EarLibExcludeDeployer" class="org.jboss.deployment.EarLibExcludeDeployer"/>
 
-   <bean name="GenScanDeployer" class="org.jboss.deployers.vfs.plugins.annotations.FilteredAnnotationEnvironmentDeployer">
-     <property name="inputs">
-       <set elementClass="java.lang.String">
-         <value>org.jboss.classloading.spi.visitor.ResourceFilter.recurse</value>
-       </set>
-     </property>
-   </bean>
+   <bean name="GenScanDeployer" class="org.jboss.deployers.vfs.plugins.annotations.FilteredAnnotationEnvironmentDeployer"/>
 
    <bean name="AnnotationMetaDataDeployer" class="org.jboss.deployment.OptAnnotationMetaDataDeployer">
       <property name="metaDataCompleteIsDefault">false</property>

Modified: trunk/varia/src/resources/seam/seam-deployers-jboss-beans.xml
===================================================================
--- trunk/varia/src/resources/seam/seam-deployers-jboss-beans.xml	2008-10-07 12:26:26 UTC (rev 79217)
+++ trunk/varia/src/resources/seam/seam-deployers-jboss-beans.xml	2008-10-07 12:45:01 UTC (rev 79218)
@@ -6,8 +6,6 @@
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
   <!-- Seam deployer -->
-  <bean name="SeamDeployer" class="org.jboss.seam.integration.microcontainer.deployers.SeamWebUrlIntegrationDeployer">
-    <property name="integrationURL">${jboss.server.home.url}/lib-opt/jboss-seam-int-jbossas.jar</property>
-  </bean>
+  <bean name="SeamDeployer" class="org.jboss.seam.integration.microcontainer.deployers.SeamWebUrlIntegrationDeployer"/>
 
 </deployment>