[jboss-cvs] JBossAS SVN: r58693 - 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-27 16:09:15 -0500 (Mon, 27 Nov 2006)
New Revision: 58693

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/JBossContextConfig.java
Log:
- All WebMetaData fields except WebSecurityMetaData.

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-27 20:26:41 UTC (rev 58692)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/JBossContextConfig.java	2006-11-27 21:09:15 UTC (rev 58693)
@@ -29,6 +29,7 @@
 import org.apache.catalina.startup.ContextConfig;
 import org.jboss.metadata.Listener;
 import org.jboss.metadata.NameValuePair;
+import org.jboss.metadata.SecurityRoleRefMetaData;
 import org.jboss.metadata.WebMetaData;
 import org.jboss.metadata.WebSecurityMetaData;
 import org.jboss.metadata.web.ErrorPage;
@@ -37,6 +38,7 @@
 import org.jboss.metadata.web.LoginConfig;
 import org.jboss.metadata.web.ParamValue;
 import org.jboss.metadata.web.Servlet;
+import org.jboss.metadata.web.ServletMapping;
 
 public class JBossContextConfig extends ContextConfig {
 
@@ -134,16 +136,49 @@
     	// Security constraints
     	Iterator<WebSecurityMetaData> iterator6 = metaData.getSecurityContraints();
     	// FIXME: compatibility with everything should be checked
+    	while (iterator6.hasNext()) {
+    		WebSecurityMetaData value = iterator6.next();
+    		
+    	}
     	
+    	// Security roles
+    	Iterator iterator9 = metaData.getSecurityRoleNames().iterator();
+    	while (iterator9.hasNext()) {
+    		context.addSecurityRole((String) iterator9.next());
+    	}
+    	
     	// Servlet
     	Iterator<Servlet> iterator7 = metaData.getServlets().iterator();
     	while (iterator7.hasNext()) {
     		Servlet value = iterator7.next();
     		org.apache.catalina.Wrapper wrapper = context.createWrapper();
-    		
+    		wrapper.setName(value.getName());
+    		wrapper.setServletClass(value.getServletClass());
+    		wrapper.setJspFile(value.getJspFile());
+    		wrapper.setLoadOnStartup(value.getLoadOnStartup());
+    		if (value.getRunAs() != null) {
+    			wrapper.setRunAs(value.getRunAs().getRoleName());
+    		}
+    		Iterator nvps = value.getInitParams().iterator();
+    		while (nvps.hasNext()) {
+    			NameValuePair nvp = (NameValuePair) nvps.next();
+    			wrapper.addInitParameter(nvp.getName(), nvp.getValue());
+    		}
+    		Iterator securityRoleRefs = value.getSecurityRoleRefs().iterator();
+    		while (securityRoleRefs.hasNext()) {
+    			SecurityRoleRefMetaData securityRoleRef = (SecurityRoleRefMetaData) securityRoleRefs.next();
+    			wrapper.addSecurityReference(securityRoleRef.getLink(), securityRoleRef.getName());
+    		}
+    		context.addChild(wrapper);
     	}
     	
     	// 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.getName(), value.getUrlPattern());
+    	}
     	
     	// FIXME: locale encoding mapping