[jboss-cvs] JBossAS SVN: r107893 - in trunk: testsuite/src/resources/web/federation/authext and 2 other directories.

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

Author: remy.maucherat at jboss.com
Date: 2010-08-30 15:44:31 -0400 (Mon, 30 Aug 2010)
New Revision: 107893

Modified:
   trunk/testsuite/src/resources/test-configs/tomcat-webctx/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml
   trunk/testsuite/src/resources/web/federation/authext/war-deployers-jboss-beans.xml
   trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
   trunk/tomcat/src/resources/standalone/war-deployers-jboss-beans.xml
Log:
- Fix various test configs.
- Also fix the check to match hosts to a single host.

Modified: trunk/testsuite/src/resources/test-configs/tomcat-webctx/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/test-configs/tomcat-webctx/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml	2010-08-30 17:57:50 UTC (rev 107892)
+++ trunk/testsuite/src/resources/test-configs/tomcat-webctx/deployers/jbossweb.deployer/META-INF/war-deployers-jboss-beans.xml	2010-08-30 19:44:31 UTC (rev 107893)
@@ -92,6 +92,7 @@
     
    <!-- The WebMetaData to service mbean deployer -->
    <bean name="WarDeployer" class="org.jboss.web.tomcat.service.deployers.TomcatDeployer">
+      <constructor><parameter><inject bean="NamingJavaEEComponentInformer"/></parameter></constructor>
       <property name="mainDeployer"><inject bean="MainDeployer" /></property>        
       <property name="relativeOrder">2003</property>
       <!-- You can configure a set of authenticators keyed by http-auth method

Modified: trunk/testsuite/src/resources/web/federation/authext/war-deployers-jboss-beans.xml
===================================================================
--- trunk/testsuite/src/resources/web/federation/authext/war-deployers-jboss-beans.xml	2010-08-30 17:57:50 UTC (rev 107892)
+++ trunk/testsuite/src/resources/web/federation/authext/war-deployers-jboss-beans.xml	2010-08-30 19:44:31 UTC (rev 107893)
@@ -114,6 +114,7 @@
          class="org.jboss.web.tomcat.service.deployers.ClusteringDependencyDeployer"/> 
    
    <bean name="WarDeployer" class="org.jboss.web.tomcat.service.deployers.TomcatDeployer">
+      <constructor><parameter><inject bean="NamingJavaEEComponentInformer"/></parameter></constructor>
       <!-- Inject the MainDeployer for resolving cross deployment refs -->
       <property name="mainDeployer"><inject bean="MainDeployer" /></property>
       <!-- You can configure a set of authenticators keyed by http-auth method

Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java	2010-08-30 17:57:50 UTC (rev 107892)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/TomcatDeployment.java	2010-08-30 19:44:31 UTC (rev 107893)
@@ -597,7 +597,7 @@
                {
                   webappHost = host;
                }
-               else
+               else if (!webappHost.equals(host))
                {
                   throw new IllegalStateException("Cannot add webapp to two different hosts: " 
                         + webappHost + " and " + host);

Modified: trunk/tomcat/src/resources/standalone/war-deployers-jboss-beans.xml
===================================================================
--- trunk/tomcat/src/resources/standalone/war-deployers-jboss-beans.xml	2010-08-30 17:57:50 UTC (rev 107892)
+++ trunk/tomcat/src/resources/standalone/war-deployers-jboss-beans.xml	2010-08-30 19:44:31 UTC (rev 107893)
@@ -71,6 +71,8 @@
 
    <!-- The WebMetaData to service mbean deployer -->
    <bean name="WarDeployer" class="org.jboss.web.tomcat.service.deployers.TomcatDeployer">
+      <constructor><parameter><inject bean="NamingJavaEEComponentInformer"/></parameter></constructor>
+
       <!-- Inject the MainDeployer for resolving cross deployment refs -->
       <property name="mainDeployer"><inject bean="MainDeployer" /></property>