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

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

Author: remy.maucherat at jboss.com
Date: 2010-05-03 16:50:38 -0400 (Mon, 03 May 2010)
New Revision: 104399

Modified:
   trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
   trunk/tomcat/src/resources/catalina.properties
Log:
- Change again the default behavior for tags to be compliant ...
- Use the spec constant for the order.

Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java	2010-05-03 20:05:12 UTC (rev 104398)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java	2010-05-03 20:50:38 UTC (rev 104399)
@@ -200,7 +200,7 @@
             deploymentUnitLocal.get().getAttachment(MergedJBossWebMetaDataDeployer.WEB_ORDER_ATTACHMENT_NAME);
          if (deploymentUnitLocal.get().getAttachment(MergedJBossWebMetaDataDeployer.WEB_NOORDER_ATTACHMENT_NAME) != Boolean.TRUE)
          {
-            context.getServletContext().setAttribute("javax.servlet.context.orderedLibs", order);
+            context.getServletContext().setAttribute(ServletContext.ORDERED_LIBS, order);
          }
       }
       super.lifecycleEvent(event);

Modified: trunk/tomcat/src/resources/catalina.properties
===================================================================
--- trunk/tomcat/src/resources/catalina.properties	2010-05-03 20:05:12 UTC (rev 104398)
+++ trunk/tomcat/src/resources/catalina.properties	2010-05-03 20:50:38 UTC (rev 104399)
@@ -1,8 +1,8 @@
 # JBoss AS configuration
 org.apache.catalina.STRICT_SERVLET_COMPLIANCE=true
 org.apache.jasper.runtime.BodyContentImpl.LIMIT_BUFFER=true
-org.apache.jasper.Constants.INJECT_TAGS=false
-org.apache.jasper.Constants.USE_INSTANCE_MANAGER_FOR_TAGS=false
+org.apache.jasper.Constants.INJECT_TAGS=true
+org.apache.jasper.Constants.USE_INSTANCE_MANAGER_FOR_TAGS=true
 org.apache.catalina.connector.Connector.X_POWERED_BY=true
 org.apache.catalina.connector.Request.SESSION_ID_CHECK=true
 org.apache.catalina.connector.CoyoteAdapter.X_POWERED_BY=Servlet/3.0; JBossAS-6