[jboss-cvs] JBossAS SVN: r58928 - 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-12-08 11:04:39 -0500 (Fri, 08 Dec 2006)
New Revision: 58928

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/JBossContextConfig.java
Log:
- Use the new meta data 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-08 16:03:49 UTC (rev 58927)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/JBossContextConfig.java	2006-12-08 16:04:39 UTC (rev 58928)
@@ -21,6 +21,7 @@
  */
 package org.jboss.web.tomcat.tc6.deployers;
 
+import java.util.Collection;
 import java.util.Iterator;
 
 import org.apache.catalina.core.StandardContext;
@@ -34,7 +35,9 @@
 import org.jboss.metadata.web.ErrorPage;
 import org.jboss.metadata.web.Filter;
 import org.jboss.metadata.web.FilterMapping;
+import org.jboss.metadata.web.LocaleEncodingMapping;
 import org.jboss.metadata.web.LoginConfig;
+import org.jboss.metadata.web.MimeMapping;
 import org.jboss.metadata.web.ParamValue;
 import org.jboss.metadata.web.Servlet;
 import org.jboss.metadata.web.ServletMapping;
@@ -125,7 +128,11 @@
     		context.addApplicationListener(value.getListenerClass());
     	}
     	
-    	// FIXME: handling jsp-config for jsp-property-group/url-pattern and listener-class is needed
+      // JSP mappings
+      Iterator<String> iterator10 = metaData.getJspMappings().iterator();
+      while (iterator10.hasNext()) {
+         context.addJspMapping(iterator10.next());
+      }
     	
     	// Login configuration
     	LoginConfig loginConfig = metaData.getLoginConfig();
@@ -141,7 +148,12 @@
     		context.setLoginConfig(loginConfig2);
     	}
     	
-    	// FIXME: mime mappings parsing
+      // MIME mappings
+      Iterator<MimeMapping> iterator11 = metaData.getMimeMappings().iterator();
+      while (iterator11.hasNext()) {
+         MimeMapping value = iterator11.next();
+         context.addMimeMapping(value.getExtension(), value.getMimeType());
+      }
     	
     	// Security constraints
     	Iterator<WebSecurityMetaData> iterator6 = metaData.getSecurityContraints();
@@ -152,7 +164,6 @@
     		constraint.setUserConstraint(value.getTransportGuarantee());
     		constraint.setAuthConstraint(value.getAuthConstraint() != null);
     		if (value.getAuthConstraint() != null) {
-    			// FIXME: there's a duplicate roles field on the WebSecurityMetaData itself
     			Iterator<String> roles = value.getAuthConstraint().getRoleNames().iterator();
     			while (roles.hasNext()) {
     				constraint.addAuthRole(roles.next());
@@ -220,11 +231,23 @@
          }
     	}
     	
-    	// FIXME: locale-encoding-mapping-list
+      // Locale encoding mapping
+      Iterator<LocaleEncodingMapping> iterator12 = metaData.getLocaleEncodingMappings().iterator();
+      while (iterator12.hasNext()) {
+         LocaleEncodingMapping value = iterator12.next();
+         context.addLocaleEncodingMappingParameter(value.getLocale(), value.getEncoding());
+      }
     	
-    	// FIXME: welcome-file-list
+    	// Welcome files
+      Iterator<String> iterator13 = metaData.getWelcomeFiles().iterator();
+      while (iterator13.hasNext()) {
+         context.addWelcomeFile(iterator13.next());
+      }
 
-      // FIXME: session-config
+      // Session timeout
+      if (metaData.getSessionTimeout() > 0) {
+         context.setSessionTimeout(metaData.getSessionTimeout());
+      }
         
 	}