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

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

Author: scott.stark at jboss.org
Date: 2007-01-14 23:01:10 -0500 (Sun, 14 Jan 2007)
New Revision: 59634

Modified:
   trunk/connector/src/resources/deployers/jca-deployers-beans.xml
   trunk/server/src/etc/deployers/ear-deployer-beans.xml
   trunk/server/src/etc/deployers/ejb-deployer-beans.xml
   trunk/server/src/etc/deployers/security-deployer-beans.xml
   trunk/tomcat/src/resources/war-deployers-all-beans.xml
   trunk/tomcat/src/resources/war-deployers-beans.xml
Log:
Set the deployer type for key deployers

Modified: trunk/connector/src/resources/deployers/jca-deployers-beans.xml
===================================================================
--- trunk/connector/src/resources/deployers/jca-deployers-beans.xml	2007-01-15 03:43:00 UTC (rev 59633)
+++ trunk/connector/src/resources/deployers/jca-deployers-beans.xml	2007-01-15 04:01:10 UTC (rev 59634)
@@ -13,6 +13,7 @@
       <uninstall bean="MainDeployer" method="removeDeployer">
          <parameter><this/></parameter>
       </uninstall>
+      <property name="type">rar</property>
    </bean>
    <bean name="RARDeployer" class="org.jboss.resource.deployers.RARDeployer">
       <property name="workManagerName">jboss.jca:service=WorkManager</property>
@@ -23,6 +24,7 @@
       <uninstall bean="MainDeployer" method="removeDeployer">
          <parameter><this/></parameter>
       </uninstall>
+      <property name="type">rar</property>
    </bean>
 
    <!-- ConnectionFactory Deployment -->
@@ -35,6 +37,7 @@
       <uninstall bean="MainDeployer" method="removeDeployer">
          <parameter><this/></parameter>
       </uninstall>
+      <property name="type">jca-ds</property>
    </bean>
 
 </deployment>

Modified: trunk/server/src/etc/deployers/ear-deployer-beans.xml
===================================================================
--- trunk/server/src/etc/deployers/ear-deployer-beans.xml	2007-01-15 03:43:00 UTC (rev 59633)
+++ trunk/server/src/etc/deployers/ear-deployer-beans.xml	2007-01-15 04:01:10 UTC (rev 59634)
@@ -29,6 +29,7 @@
             <this/>
          </parameter>
       </uninstall>
+      <property name="type">ear</property>      
    </bean>
    <bean name="JBossAppParsingDeployer" class="org.jboss.deployment.JBossAppParsingDeployer">
       <install bean="MainDeployer" method="addDeployer">
@@ -41,5 +42,6 @@
             <this/>
          </parameter>
       </uninstall>
+      <property name="type">ear</property>      
    </bean> 
 </deployment>

Modified: trunk/server/src/etc/deployers/ejb-deployer-beans.xml
===================================================================
--- trunk/server/src/etc/deployers/ejb-deployer-beans.xml	2007-01-15 03:43:00 UTC (rev 59633)
+++ trunk/server/src/etc/deployers/ejb-deployer-beans.xml	2007-01-15 04:01:10 UTC (rev 59634)
@@ -12,6 +12,7 @@
       <uninstall bean="MainDeployer" method="removeDeployer">
          <parameter><this/></parameter>
       </uninstall>
+      <property name="type">ejb2x</property>      
       <property name="relativeOrder">3000</property>
    </bean>
    <bean name="JBossEjb2ParsingDeployer" class="org.jboss.deployment.JBossEjbParsingDeployer">
@@ -21,6 +22,7 @@
       <uninstall bean="MainDeployer" method="removeDeployer">
          <parameter><this/></parameter>
       </uninstall>
+      <property name="type">ejb2x</property>      
       <property name="relativeOrder">3001</property>
    </bean>
 

Modified: trunk/server/src/etc/deployers/security-deployer-beans.xml
===================================================================
--- trunk/server/src/etc/deployers/security-deployer-beans.xml	2007-01-15 03:43:00 UTC (rev 59633)
+++ trunk/server/src/etc/deployers/security-deployer-beans.xml	2007-01-15 04:01:10 UTC (rev 59634)
@@ -15,6 +15,7 @@
             <this/>
          </parameter>
       </uninstall>
+      <property name="type">security</property>
       <property name="ignoreSuffixes">
           <set elementClass="java.lang.String">
                <value>xml</value>

Modified: trunk/tomcat/src/resources/war-deployers-all-beans.xml
===================================================================
--- trunk/tomcat/src/resources/war-deployers-all-beans.xml	2007-01-15 03:43:00 UTC (rev 59633)
+++ trunk/tomcat/src/resources/war-deployers-all-beans.xml	2007-01-15 04:01:10 UTC (rev 59634)
@@ -29,6 +29,7 @@
       <uninstall bean="MainDeployer" method="removeDeployer">
          <parameter><this/></parameter>
       </uninstall>
+      <property name="type">war</property>
       <property name="relativeOrder">2000</property>
    </bean>
    <bean name="JBossWebAppParsingDeployer" class="org.jboss.deployment.JBossWebAppParsingDeployer">
@@ -38,6 +39,7 @@
       <uninstall bean="MainDeployer" method="removeDeployer">
          <parameter><this/></parameter>
       </uninstall>
+      <property name="type">war</property>
       <property name="relativeOrder">2001</property>
    </bean>
    
@@ -49,6 +51,7 @@
          <parameter><this/></parameter>
       </uninstall>
 
+      <property name="type">war</property>
       <!-- You can configure a set of authenticators keyed by http-auth method
          used. This will apply the same set of authenticators across all web
          applications. You can override the set of authenticators at the web

Modified: trunk/tomcat/src/resources/war-deployers-beans.xml
===================================================================
--- trunk/tomcat/src/resources/war-deployers-beans.xml	2007-01-15 03:43:00 UTC (rev 59633)
+++ trunk/tomcat/src/resources/war-deployers-beans.xml	2007-01-15 04:01:10 UTC (rev 59634)
@@ -29,6 +29,7 @@
       <uninstall bean="MainDeployer" method="removeDeployer">
          <parameter><this/></parameter>
       </uninstall>
+      <property name="type">war</property>
       <property name="relativeOrder">2000</property>
    </bean>
    <bean name="JBossWebAppParsingDeployer" class="org.jboss.deployment.JBossWebAppParsingDeployer">
@@ -38,6 +39,7 @@
       <uninstall bean="MainDeployer" method="removeDeployer">
          <parameter><this/></parameter>
       </uninstall>
+      <property name="type">war</property>
       <property name="relativeOrder">2001</property>
    </bean>
 
@@ -79,6 +81,7 @@
          <parameter><this/></parameter>
       </uninstall>
 
+      <property name="type">war</property>
       <!-- You can configure a set of authenticators keyed by http-auth method
       used. This will apply the same set of authenticators across all web
       applications. You can override the set of authenticators at the web