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

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

Author: remy.maucherat at jboss.com
Date: 2010-06-09 12:49:36 -0400 (Wed, 09 Jun 2010)
New Revision: 105876

Modified:
   trunk/tomcat/src/resources/standalone/war-deployers-jboss-beans.xml
   trunk/tomcat/src/resources/war-deployers-jboss-beans.xml
Log:
- Minor cleanup of the config file.

Modified: trunk/tomcat/src/resources/standalone/war-deployers-jboss-beans.xml
===================================================================
--- trunk/tomcat/src/resources/standalone/war-deployers-jboss-beans.xml	2010-06-09 16:45:23 UTC (rev 105875)
+++ trunk/tomcat/src/resources/standalone/war-deployers-jboss-beans.xml	2010-06-09 16:49:36 UTC (rev 105876)
@@ -37,13 +37,14 @@
          </list>         
       </property>
    </bean>
-   <!--<bean name="SharedTldMetaDataDeployer" 
+   <bean name="SharedTldMetaDataDeployer" 
           class="org.jboss.web.deployers.SharedTldMetaDataDeployer">
+      <!-- JARs containing TLDs -->
       <property name="tldJars">
          <list class="java.util.ArrayList" elementClass="java.net.URL">
          </list>
       </property>
-   </bean>-->
+   </bean>
    <bean name="SharedJBossWebMetaDataDeployer" 
           class="org.jboss.web.deployers.SharedJBossWebMetaDataDeployer">
       <property name="webXml">${jboss.server.home.url}/deploy/jbossweb.sar/web.xml</property>

Modified: trunk/tomcat/src/resources/war-deployers-jboss-beans.xml
===================================================================
--- trunk/tomcat/src/resources/war-deployers-jboss-beans.xml	2010-06-09 16:45:23 UTC (rev 105875)
+++ trunk/tomcat/src/resources/war-deployers-jboss-beans.xml	2010-06-09 16:49:36 UTC (rev 105876)
@@ -34,9 +34,6 @@
       <!-- JARs containing SCIs -->
       <property name="sciJars">
          <list class="java.util.ArrayList" elementClass="java.net.URL">
-           <!-- JSF no longer lives in jbossweb.sar.  This will be soon addressed by the JSF deployer
-            <value>${jboss.server.home.url}/deploy/jbossweb.sar/jsf-libs/jsf-impl.jar</value>
-            -->
          </list>         
       </property>
    </bean>