[jboss-cvs] JBossAS SVN: r60458 - trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers.

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

Author: remy.maucherat at jboss.com
Date: 2007-02-09 07:19:03 -0500 (Fri, 09 Feb 2007)
New Revision: 60458

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/JBossContextConfig.java
Log:
- Fix order (JSP mappings must be set after servlet mappings).

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/JBossContextConfig.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/JBossContextConfig.java	2007-02-09 09:19:46 UTC (rev 60457)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/JBossContextConfig.java	2007-02-09 12:19:03 UTC (rev 60458)
@@ -140,13 +140,6 @@
     		context.addApplicationListener(value.getListenerClass());
     	}
     	
-      // JSP mappings
-      Iterator<String> iterator10 = metaData.getJspMappings().iterator();
-      while (iterator10.hasNext()) {
-         String value = iterator10.next();
-         context.addJspMapping(value);
-      }
-    	
     	// Login configuration
     	LoginConfig loginConfig = metaData.getLoginConfig();
     	if (loginConfig != null) {
@@ -244,6 +237,13 @@
          }
     	}
     	
+      // JSP mappings
+      Iterator<String> iterator10 = metaData.getJspMappings().iterator();
+      while (iterator10.hasNext()) {
+         String value = iterator10.next();
+         context.addJspMapping(value);
+      }
+      
       // Locale encoding mapping
       Iterator<LocaleEncodingMapping> iterator12 = metaData.getLocaleEncodingMappings().iterator();
       while (iterator12.hasNext()) {