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

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

Author: scott.stark at jboss.org
Date: 2007-11-07 01:49:34 -0500 (Wed, 07 Nov 2007)
New Revision: 66810

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
Log:
Update for web metadata changes to jsp-config/login-config

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-07 06:44:20 UTC (rev 66809)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java	2007-11-07 06:49:34 UTC (rev 66810)
@@ -201,21 +201,18 @@
       }
     	
     	// Login configuration
-      List<LoginConfigMetaData> loginConfigs = metaData.getLoginConfig();
-      if(loginConfigs != null)
+      LoginConfigMetaData loginConfig = metaData.getLoginConfig();
+      if(loginConfig != null)
       {
-       	for (LoginConfigMetaData loginConfig : loginConfigs)
-         {
-       		org.apache.catalina.deploy.LoginConfig loginConfig2 =
-       			new org.apache.catalina.deploy.LoginConfig();
-       		loginConfig2.setAuthMethod(loginConfig.getAuthMethod());
-       		loginConfig2.setRealmName(loginConfig.getRealmName());
-       		if (loginConfig.getFormLoginConfig() != null) {
-       			loginConfig2.setLoginPage(loginConfig.getFormLoginConfig().getLoginPage());
-       			loginConfig2.setErrorPage(loginConfig.getFormLoginConfig().getErrorPage());
-       		}
-       		context.setLoginConfig(loginConfig2);
-       	}
+    		org.apache.catalina.deploy.LoginConfig loginConfig2 =
+    			new org.apache.catalina.deploy.LoginConfig();
+    		loginConfig2.setAuthMethod(loginConfig.getAuthMethod());
+    		loginConfig2.setRealmName(loginConfig.getRealmName());
+    		if (loginConfig.getFormLoginConfig() != null) {
+    			loginConfig2.setLoginPage(loginConfig.getFormLoginConfig().getLoginPage());
+    			loginConfig2.setErrorPage(loginConfig.getFormLoginConfig().getErrorPage());
+    		}
+    		context.setLoginConfig(loginConfig2);
       }
     	
       // MIME mappings
@@ -341,30 +338,27 @@
       }
     	
       // JSP mappings
-      List<JspConfigMetaData> jsps = metaData.getJspConfig();
-      if(jsps != null)
+      JspConfigMetaData config = metaData.getJspConfig();
+      if(config != null)
       {
-         for (JspConfigMetaData config : jsps)
+         List<JspPropertyGroup> groups = config.getPropertyGroups();
+         if(groups != null)
          {
-            List<JspPropertyGroup> groups = config.getPropertyGroups();
-            if(groups != null)
+            for (JspPropertyGroup group : groups)
             {
-               for (JspPropertyGroup group : groups)
+               for(String pattern : group.getUrlPatterns())
                {
-                  for(String pattern : group.getUrlPatterns())
-                  {
-                     context.addJspMapping(pattern);
-                  }
+                  context.addJspMapping(pattern);
                }
             }
-            // Taglib
-            List<TaglibMetaData> taglibs = config.getTaglibs();
-            if(taglibs != null)
+         }
+         // Taglib
+         List<TaglibMetaData> taglibs = config.getTaglibs();
+         if(taglibs != null)
+         {
+            for(TaglibMetaData taglib : taglibs)
             {
-               for(TaglibMetaData taglib : taglibs)
-               {
-                  context.addTaglib(taglib.getTaglibUri(), taglib.getTaglibLocation());
-               }
+               context.addTaglib(taglib.getTaglibUri(), taglib.getTaglibLocation());
             }
          }
       }