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

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

Author: jfrederic.clere at jboss.com
Date: 2007-11-05 10:19:06 -0500 (Mon, 05 Nov 2007)
New Revision: 66736

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
Log:
Fix for JBCTS-687.


Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java	2007-11-05 15:17:44 UTC (rev 66735)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java	2007-11-05 15:19:06 UTC (rev 66736)
@@ -89,6 +89,16 @@
 
       // Metadata complete
       context.setIgnoreAnnotations(metaData.isMetadataComplete());
+
+      // SetPublicId 
+      if ( metaData.is25())
+          context.setPublicId("/javax/servlet/resources/web-app_2_5.dtd");
+      else if ( metaData.is24())
+          context.setPublicId("/javax/servlet/resources/web-app_2_4.dtd");
+      else if (  metaData.is23())
+          context.setPublicId(org.apache.catalina.startup.Constants.WebDtdPublicId_23);
+      else
+          context.setPublicId(org.apache.catalina.startup.Constants.WebDtdPublicId_22);
     	
     	// Context params
       List<ParamValueMetaData> params = metaData.getContextParams();
@@ -176,7 +186,7 @@
                for(DispatcherType type : dispatchers)
                   filterMap.setDispatcher(type.name());
             }
-       		context.addFilterMap(filterMap);
+       	    context.addFilterMap(filterMap);
        	}
       }