[jboss-cvs] JBossAS SVN: r58980 - 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-11 16:35:26 -0500 (Mon, 11 Dec 2006)
New Revision: 58980

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/JBossContextConfig.java
Log:
- Forgot taglib field.

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-11 20:35:58 UTC (rev 58979)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/deployers/JBossContextConfig.java	2006-12-11 21:35:26 UTC (rev 58980)
@@ -21,7 +21,6 @@
  */
 package org.jboss.web.tomcat.tc6.deployers;
 
-import java.util.Collection;
 import java.util.Iterator;
 
 import org.apache.catalina.core.StandardContext;
@@ -42,6 +41,7 @@
 import org.jboss.metadata.web.Servlet;
 import org.jboss.metadata.web.ServletMapping;
 import org.jboss.metadata.web.SessionConfig;
+import org.jboss.metadata.web.Taglib;
 
 public class JBossContextConfig extends ContextConfig {
 
@@ -132,7 +132,8 @@
       // JSP mappings
       Iterator<String> iterator10 = metaData.getJspMappings().iterator();
       while (iterator10.hasNext()) {
-         context.addJspMapping(iterator10.next());
+         String value = iterator10.next();
+         context.addJspMapping(value);
       }
     	
     	// Login configuration
@@ -242,7 +243,8 @@
     	// Welcome files
       Iterator<String> iterator13 = metaData.getWelcomeFiles().iterator();
       while (iterator13.hasNext()) {
-         context.addWelcomeFile(iterator13.next());
+         String value = iterator13.next();
+         context.addWelcomeFile(value);
       }
 
       // Session timeout
@@ -254,7 +256,14 @@
             context.setSessionTimeout(i);
          }
       }
-        
+
+      // Taglib
+      Iterator<Taglib> iterator15 = metaData.getTaglibs().iterator();
+      while (iterator15.hasNext()) {
+         Taglib value = iterator15.next();
+         context.addTaglib(value.getUri(), value.getLocation());
+      }
+      
 	}
 
 }