[jboss-cvs] JBossAS SVN: r58791 - 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 19:42:58 -0500 (Thu, 30 Nov 2006)
New Revision: 58791

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/JBossContextConfig.java
   trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/TomcatDeployment2.java
Log:
- Add support for some missing fields.

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-12-01 00:42:19 UTC (rev 58790)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/JBossContextConfig.java	2006-12-01 00:42:58 UTC (rev 58791)
@@ -22,9 +22,7 @@
 package org.jboss.web.tomcat.tc6.deployers;
 
 import java.util.Iterator;
-import java.util.List;
 
-import org.apache.catalina.Wrapper;
 import org.apache.catalina.core.StandardContext;
 import org.apache.catalina.startup.ContextConfig;
 import org.jboss.metadata.Listener;
@@ -54,7 +52,8 @@
 
       WebMetaData metaData = metaDataLocal.get();
     	
-    	// FIXME: metadata-complete attribute
+    	// Metadata complete
+      context.setIgnoreAnnotations(metaData.isMetadataComplete());
     	
     	// Context params
     	Iterator<ParamValue> iterator = metaData.getContextParams().iterator();
@@ -70,16 +69,13 @@
     	context.setDistributable(metaData.getDistributable());
     	
     	// Error pages
-    	// FIXME: Exception type ?
     	Iterator iterator2 = metaData.getErrorPages().iterator();
     	while (iterator2.hasNext()) {
     		ErrorPage value = (ErrorPage) iterator2.next();
     		org.apache.catalina.deploy.ErrorPage errorPage =
     			new org.apache.catalina.deploy.ErrorPage();
     		errorPage.setErrorCode(value.getErrorCode());
-    		if (errorPage.getErrorCode() == 0) {
-    			errorPage.setExceptionType(value.getErrorCode());
-    		}
+         errorPage.setExceptionType(value.getExceptionType());
     		errorPage.setLocation(value.getLocation());
     		context.addErrorPage(errorPage);
     	}
@@ -101,15 +97,24 @@
     	}
     	
     	// Filter mappings
-    	// FIXME: No dispatcher mapping
     	Iterator<FilterMapping> iterator4 = metaData.getFilterMappings().iterator();
     	while (iterator4.hasNext()) {
     		FilterMapping value = iterator4.next();
     		org.apache.catalina.deploy.FilterMap filterMap =
     			new org.apache.catalina.deploy.FilterMap();
     		filterMap.setFilterName(value.getFilterName());
-    		filterMap.addServletName(value.getServletName());
-    		filterMap.addURLPattern(value.getUrlPattern());
+         Iterator<String> servletNames = value.getServletNames().iterator();
+         while (servletNames.hasNext()) {
+            filterMap.addServletName(servletNames.next());
+         }
+         Iterator<String> urlPatterns = value.getUrlPatterns().iterator();
+         while (urlPatterns.hasNext()) {
+            filterMap.addURLPattern(urlPatterns.next());
+         }
+         Iterator<String> dispatchers = value.getDispatchers().iterator();
+         while (dispatchers.hasNext()) {
+            filterMap.setDispatcher(dispatchers.next());
+         }
     		context.addFilterMap(filterMap);
     	}
     	
@@ -206,11 +211,13 @@
     	}
     	
     	// Servlet mapping
-    	// FIXME: Most likely it does not handle multiple mappings from Servlet 2.5
     	Iterator iterator8 = metaData.getServletMappings().iterator();
     	while (iterator8.hasNext()) {
     		ServletMapping value = (ServletMapping) iterator8.next();
-    		context.addServletMapping(value.getUrlPattern(), value.getName());
+         Iterator<String> urlPatterns = value.getUrlPatterns().iterator();
+         while (urlPatterns.hasNext()) {
+            context.addServletMapping(urlPatterns.next(), value.getName());
+         }
     	}
     	
     	// FIXME: locale-encoding-mapping-list

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/TomcatDeployment2.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/TomcatDeployment2.java	2006-12-01 00:42:19 UTC (rev 58790)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/TomcatDeployment2.java	2006-12-01 00:42:58 UTC (rev 58791)
@@ -285,7 +285,7 @@
       context.addValve(jaccValve);
 
       // Set listener
-      //context.setConfigClass("org.jboss.web.tomcat.tc6.deployers.JBossContextConfig");
+      context.setConfigClass("org.jboss.web.tomcat.tc6.deployers.JBossContextConfig");
       
       // Pass the metadata to the RunAsListener via a thread local
       RunAsListener.metaDataLocal.set(metaData);