svn commit: r675438 - in /struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng: filter/FilterHostConfig.java servlet/ServletHostConfig.java

[wesw]

Author: wesw
Date: Wed Jul  9 21:37:34 2008
New Revision: 675438

URL: http://svn.apache.org/viewvc?rev=675438&view=rev
Log:
quick fix, broken build, ref WW-2716

Modified:
    
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/FilterHostConfig.java
    
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/servlet/ServletHostConfig.java

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/FilterHostConfig.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/FilterHostConfig.java?rev=675438&r1=675437&r2=675438&view=diff
==============================================================================
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/FilterHostConfig.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/filter/FilterHostConfig.java
 Wed Jul  9 21:37:34 2008
@@ -20,7 +20,7 @@
  */
 package org.apache.struts2.dispatcher.ng.filter;
 
-import com.opensymphony.xwork2.util.EnumerationIterator;
+import org.apache.struts2.util.MakeIterator;
 
 import javax.servlet.FilterConfig;
 import javax.servlet.ServletContext;
@@ -43,7 +43,7 @@
     }
 
     public Iterator<String> getInitParameterNames() {
-        return new EnumerationIterator(config.getInitParameterNames());
+        return MakeIterator.convert(config.getInitParameterNames());
     }
 
     public ServletContext getServletContext() {

Modified: 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/servlet/ServletHostConfig.java
URL: 
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/servlet/ServletHostConfig.java?rev=675438&r1=675437&r2=675438&view=diff
==============================================================================
--- 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/servlet/ServletHostConfig.java
 (original)
+++ 
struts/struts2/trunk/core/src/main/java/org/apache/struts2/dispatcher/ng/servlet/ServletHostConfig.java
 Wed Jul  9 21:37:34 2008
@@ -20,7 +20,7 @@
  */
 package org.apache.struts2.dispatcher.ng.servlet;
 
-import com.opensymphony.xwork2.util.EnumerationIterator;
+import org.apache.struts2.util.MakeIterator;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletContext;
@@ -42,7 +42,7 @@
     }
 
     public Iterator<String> getInitParameterNames() {
-        return new EnumerationIterator(config.getInitParameterNames());
+        return MakeIterator.convert(config.getInitParameterNames());
     }
 
     public ServletContext getServletContext() {