[jboss-cvs] JBossAS SVN: r112054 - in trunk/tomcat/src/resources: standalone and 1 other directories.

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

Author: jaikiran
Date: 2011-08-15 11:09:26 -0400 (Mon, 15 Aug 2011)
New Revision: 112054

Modified:
   trunk/tomcat/src/resources/standalone/war-deployers-jboss-beans.xml
   trunk/tomcat/src/resources/standard/war-deployers-jboss-beans.xml
   trunk/tomcat/src/resources/war-deployers-jboss-beans.xml
Log:
JBAS-8318 Switch back to (lenient and sometimes problematic) WarAnnotationMetaDataDeployer to fix regression in testsuite JBCTS-1131

Modified: trunk/tomcat/src/resources/standalone/war-deployers-jboss-beans.xml
===================================================================
--- trunk/tomcat/src/resources/standalone/war-deployers-jboss-beans.xml	2011-08-15 15:04:05 UTC (rev 112053)
+++ trunk/tomcat/src/resources/standalone/war-deployers-jboss-beans.xml	2011-08-15 15:09:26 UTC (rev 112054)
@@ -49,7 +49,7 @@
           class="org.jboss.web.deployers.SharedJBossWebMetaDataDeployer">
       <property name="webXml">${jboss.server.home.url}/deploy/jbossweb.sar/web.xml</property>
    </bean>
-   <bean name="WebAnnotationMetaDataDeployer" class="org.jboss.web.deployers.SpecCompliantWarAnnotationDeployer">
+   <bean name="WebAnnotationMetaDataDeployer" class="org.jboss.web.deployers.WarAnnotationMetaDataDeployer">
       <property name="relativeOrder">2005</property>
       <!-- Order this after AopMetaDataDeployer *if it is present* -->
       <install method="addInput">

Modified: trunk/tomcat/src/resources/standard/war-deployers-jboss-beans.xml
===================================================================
--- trunk/tomcat/src/resources/standard/war-deployers-jboss-beans.xml	2011-08-15 15:04:05 UTC (rev 112053)
+++ trunk/tomcat/src/resources/standard/war-deployers-jboss-beans.xml	2011-08-15 15:09:26 UTC (rev 112054)
@@ -50,7 +50,7 @@
           class="org.jboss.web.deployers.SharedJBossWebMetaDataDeployer">
       <property name="webXml">${jboss.server.home.url}/deploy/jbossweb.sar/web.xml</property>
    </bean>
-   <bean name="WebAnnotationMetaDataDeployer" class="org.jboss.web.deployers.SpecCompliantWarAnnotationDeployer">
+   <bean name="WebAnnotationMetaDataDeployer" class="org.jboss.web.deployers.WarAnnotationMetaDataDeployer">
       <property name="relativeOrder">2005</property>
       <!-- Order this after AopMetaDataDeployer *if it is present* -->
       <install method="addInput">

Modified: trunk/tomcat/src/resources/war-deployers-jboss-beans.xml
===================================================================
--- trunk/tomcat/src/resources/war-deployers-jboss-beans.xml	2011-08-15 15:04:05 UTC (rev 112053)
+++ trunk/tomcat/src/resources/war-deployers-jboss-beans.xml	2011-08-15 15:09:26 UTC (rev 112054)
@@ -50,7 +50,7 @@
           class="org.jboss.web.deployers.SharedJBossWebMetaDataDeployer">
       <property name="webXml">${jboss.server.home.url}/deploy/jbossweb.sar/web.xml</property>
    </bean>
-   <bean name="WebAnnotationMetaDataDeployer" class="org.jboss.web.deployers.SpecCompliantWarAnnotationDeployer">
+   <bean name="WebAnnotationMetaDataDeployer" class="org.jboss.web.deployers.WarAnnotationMetaDataDeployer">
       <property name="relativeOrder">2005</property>
       <!-- Order this after AopMetaDataDeployer *if it is present* -->
       <install method="addInput">