[jboss-cvs] JBossAS SVN: r64022 - trunk/testsuite/src/resources/test-configs/jaspi/deployers/jbossweb.deployer/META-INF.

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

Author: scott.stark at jboss.org
Date: 2007-07-12 21:41:07 -0400 (Thu, 12 Jul 2007)
New Revision: 64022

Modified:
   trunk/testsuite/src/resources/test-configs/jaspi/deployers/jbossweb.deployer/META-INF/war-deployers-beans.xml
Log:
Fix the war deployers

Modified: trunk/testsuite/src/resources/test-configs/jaspi/deployers/jbossweb.deployer/META-INF/war-deployers-beans.xml
===================================================================
--- trunk/testsuite/src/resources/test-configs/jaspi/deployers/jbossweb.deployer/META-INF/war-deployers-beans.xml	2007-07-13 01:36:57 UTC (rev 64021)
+++ trunk/testsuite/src/resources/test-configs/jaspi/deployers/jbossweb.deployer/META-INF/war-deployers-beans.xml	2007-07-13 01:41:07 UTC (rev 64022)
@@ -23,22 +23,10 @@
    
    <!-- web.xml parsing deployer -->
    <bean name="WebAppParsingDeployer" class="org.jboss.deployment.WebAppParsingDeployer">
-      <install bean="MainDeployer" method="addDeployer">
-         <parameter><this/></parameter>
-      </install>
-      <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">
-      <install bean="MainDeployer" method="addDeployer">
-         <parameter><this/></parameter>
-      </install>
-      <uninstall bean="MainDeployer" method="removeDeployer">
-         <parameter><this/></parameter>
-      </uninstall>
       <property name="type">war</property>
       <property name="relativeOrder">2001</property>
    </bean>
@@ -74,13 +62,7 @@
    
    <!-- The WebMetaData to service mbean deployer -->
    <bean name="WarDeployer" class="org.jboss.web.tomcat.service.deployers.TomcatDeployer">
-      <install bean="MainDeployer" method="addDeployer">
-         <parameter><this/></parameter>
-      </install>
-      <uninstall bean="MainDeployer" method="removeDeployer">
-         <parameter><this/></parameter>
-      </uninstall>
-      
+      <property name="mainDeployer"><inject bean="MainDeployer" /></property>        
       <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