[jboss-cvs] JBossAS SVN: r105594 - in trunk/server/src: main/java/org/jboss/deployment and 1 other directory.

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

Author: alesj
Date: 2010-06-02 16:11:21 -0400 (Wed, 02 Jun 2010)
New Revision: 105594

Modified:
   trunk/server/src/etc/deployers/scanning-deployers-jboss-beans.xml
   trunk/server/src/main/java/org/jboss/deployment/ResourcesIndexDeployer.java
Log:
Make RID non-optional atm, since web is the only user.


Modified: trunk/server/src/etc/deployers/scanning-deployers-jboss-beans.xml
===================================================================
--- trunk/server/src/etc/deployers/scanning-deployers-jboss-beans.xml	2010-06-02 20:08:53 UTC (rev 105593)
+++ trunk/server/src/etc/deployers/scanning-deployers-jboss-beans.xml	2010-06-02 20:11:21 UTC (rev 105594)
@@ -173,7 +173,9 @@
     <uncallback method="removeFactory" />
   </bean>
 
-   <bean name="ResourcesIndexDeployer" class="org.jboss.deployment.ResourcesIndexDeployer"/>
+   <bean name="ResourcesIndexDeployer" class="org.jboss.deployment.ResourcesIndexDeployer">
+       <property name="disableOptional">true</property>
+   </bean>
 
    <bean name="AnnotationMetaDataDeployer" class="org.jboss.deployment.OptAnnotationMetaDataDeployer">
       <property name="metaDataCompleteIsDefault">false</property>

Modified: trunk/server/src/main/java/org/jboss/deployment/ResourcesIndexDeployer.java
===================================================================
--- trunk/server/src/main/java/org/jboss/deployment/ResourcesIndexDeployer.java	2010-06-02 20:08:53 UTC (rev 105593)
+++ trunk/server/src/main/java/org/jboss/deployment/ResourcesIndexDeployer.java	2010-06-02 20:11:21 UTC (rev 105594)
@@ -47,6 +47,7 @@
       addInput(AnnotationIndex.class);
       addInput(HierarchyIndex.class);
       setOutput(ResourcesIndex.class);
+      addOutput(JBossWebMetaData.class); // pass through
       setStage(DeploymentStages.POST_CLASSLOADER);
    }