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

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

Author: remy.maucherat at jboss.com
Date: 2006-11-30 11:46:07 -0500 (Thu, 30 Nov 2006)
New Revision: 58776

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/JBossContextConfig.java
Log:
- Fix usage of jsp file.
- Update fixmes.

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	2006-11-30 16:36:45 UTC (rev 58775)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/JBossContextConfig.java	2006-11-30 16:46:07 UTC (rev 58776)
@@ -48,7 +48,11 @@
     @Override
 	protected void applicationWebConfig() {
     	
-    	WebMetaData metaData = metaDataLocal.get();
+      if (context instanceof StandardContext) {
+         ((StandardContext) context).setReplaceWelcomeFiles(true);
+      }
+
+      WebMetaData metaData = metaDataLocal.get();
     	
     	// FIXME: metadata-complete attribute
     	
@@ -89,7 +93,6 @@
     		filterDef.setFilterName(value.getName());
     		filterDef.setFilterClass(value.getFilterClass());
     		Iterator params = value.getInitParams().iterator();
-            // FIXME: init-params list is always empty
     		while (params.hasNext()) {
     			NameValuePair nvp = (NameValuePair) params.next();
     			filterDef.addInitParameter(nvp.getName(), nvp.getValue());
@@ -182,7 +185,9 @@
     		org.apache.catalina.Wrapper wrapper = context.createWrapper();
     		wrapper.setName(value.getName());
     		wrapper.setServletClass(value.getServletClass());
-    		wrapper.setJspFile(value.getJspFile());
+    		if (value.getJspFile() != null) {
+    		   wrapper.setJspFile(value.getJspFile());
+    		}
     		wrapper.setLoadOnStartup(value.getLoadOnStartup());
     		if (value.getRunAs() != null) {
     			wrapper.setRunAs(value.getRunAs().getRoleName());
@@ -208,8 +213,12 @@
     		context.addServletMapping(value.getUrlPattern(), value.getName());
     	}
     	
-    	// FIXME: locale encoding mapping
+    	// FIXME: locale-encoding-mapping-list
     	
+    	// FIXME: welcome-file-list
+
+      // FIXME: session-config
+        
 	}
 
 }