Modified: tomcat/trunk/java/org/apache/catalina/core/DummyResponse.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/DummyResponse.java?rev=767956&r1=767955&r2=767956&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/core/DummyResponse.java (original) +++ tomcat/trunk/java/org/apache/catalina/core/DummyResponse.java Thu Apr 23 16:14:59 2009 @@ -100,10 +100,8 @@ public void setLocale(Locale locale) {} public Cookie[] getCookies() { return null; } - public String getHeader(@SuppressWarnings("unused") String name) { - return null; - } - public String[] getHeaderNames() { return null; } + public String getHeader(String name) { return null; } + public Iterable<String> getHeaderNames() { return null; } public String[] getHeaderValues(@SuppressWarnings("unused") String name) { return null; } @@ -132,6 +130,5 @@ public void setStatus(int status) {} /** @deprecated */ public void setStatus(int status, String message) {} - - + public Iterable<String> getHeaders(String name) { return null; } }
Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=767956&r1=767955&r2=767956&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties (original) +++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Thu Apr 23 16:14:59 2009 @@ -13,15 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -applicationContext.addFilter.iae=The filter name {0} already exists in context {1} applicationContext.addFilter.ise=Filters can not be added to context {0} as the context has been initialised -applicationContext.addFilterMapping.iae.servlet=The list of servletNames provided was null or empty -applicationContext.addFilterMapping.iae.url=The list of urlPatterns provided was null or empty -applicationContext.addFilterMapping.ise=Filter mappings can not be added to context {0} as the context has been initialised -applicationContext.addServlet.iae=The servlet name {0} already exists in context {1} applicationContext.addServlet.ise=Servlets can not be added to context {0} as the context has been initialised -applicationContext.addServletMapping.iae=The list of urlPatterns provided was null or empty -applicationContext.addServletMapping.ise=Servlet mappings can not be added to context {0} as the context has been initialised applicationContext.attributeEvent=Exception thrown by attributes event listener applicationContext.mapping.error=Error during mapping applicationContext.requestDispatcher.iae=Path {0} does not start with a "/" character Modified: tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java?rev=767956&r1=767955&r2=767956&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java Thu Apr 23 16:14:59 2009 @@ -28,6 +28,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; +import java.util.Iterator; import java.util.List; import java.util.TimeZone; @@ -1284,16 +1285,15 @@ public void addElement(StringBuffer buf, Date date, Request request, Response response, long time) { if (null != response) { - String[] values = response.getHeaderValues(header); - if(values.length > 0) { - for (int i = 0; i < values.length; i++) { - String string = values[i]; - buf.append(string) ; - if(i+1<values.length) - buf.append(","); + Iterator<String> iter = response.getHeaders(header).iterator(); + boolean first = true; + while (iter.hasNext()) { + if (!first) { + buf.append(","); } - return ; + buf.append(iter.next()); } + return ; } buf.append("-"); } Modified: tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java?rev=767956&r1=767955&r2=767956&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/ExtendedAccessLogValve.java Thu Apr 23 16:14:59 2009 @@ -26,6 +26,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; +import java.util.Iterator; import java.util.List; import java.util.TimeZone; @@ -346,19 +347,20 @@ public void addElement(StringBuffer buf, Date date, Request request, Response response, long time) { - if (null != response) { - String[] values = response.getHeaderValues(header); - if(values.length > 0) { + if (null != response) { + Iterator<String> iter = response.getHeaders(header).iterator(); + if (iter.hasNext()) { StringBuffer buffer = new StringBuffer(); - for (int i = 0; i < values.length; i++) { - String string = values[i]; - buffer.append(string) ; - if(i+1<values.length) + boolean first = true; + while (iter.hasNext()) { + if (!first) { buffer.append(","); + } + buffer.append(iter.next()); } buf.append(wrap(buffer.toString())); - return ; } + return ; } buf.append("-"); } Modified: tomcat/trunk/java/org/apache/catalina/valves/RequestDumperValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/RequestDumperValve.java?rev=767956&r1=767955&r2=767956&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/RequestDumperValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/RequestDumperValve.java Thu Apr 23 16:14:59 2009 @@ -161,11 +161,11 @@ rcookies[i].getValue() + "; domain=" + rcookies[i].getDomain() + "; path=" + rcookies[i].getPath()); } - String rhnames[] = response.getHeaderNames(); - for (int i = 0; i < rhnames.length; i++) { - String rhvalues[] = response.getHeaderValues(rhnames[i]); - for (int j = 0; j < rhvalues.length; j++) - log.info(" header=" + rhnames[i] + "=" + rhvalues[j]); + Iterable<String> rhnames = response.getHeaderNames(); + for (String rhname : rhnames) { + Iterable<String> rhvalues = response.getHeaders(rhname); + for (String rhvalue : rhvalues) + log.info(" header=" + rhname + "=" + rhvalue); } log.info(" message=" + response.getMessage()); log.info(" remoteUser=" + request.getRemoteUser()); Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java?rev=767956&r1=767955&r2=767956&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java (original) +++ tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java Thu Apr 23 16:14:59 2009 @@ -27,18 +27,19 @@ import java.util.Enumeration; import java.util.HashSet; import java.util.Hashtable; -import java.util.Map; import java.util.Set; import java.util.Vector; -import javax.servlet.AsyncDispatcher; -import javax.servlet.DispatcherType; +import javax.servlet.Filter; +import javax.servlet.FilterRegistration; import javax.servlet.RequestDispatcher; import javax.servlet.Servlet; import javax.servlet.ServletContext; import javax.servlet.ServletException; +import javax.servlet.ServletRegistration; import javax.servlet.SessionCookieConfig; import javax.servlet.SessionTrackingMode; +import javax.servlet.FilterRegistration.Dynamic; /** @@ -443,68 +444,86 @@ } - public void addFilter(String filterName, String description, - String className, Map<String, String> initParameters) { - // Do nothing + public FilterRegistration.Dynamic addFilter(String filterName, + String className) { + return null; } - public void addFilterMappingForServletNames(String filterName, - EnumSet<DispatcherType> dispatcherTypes, boolean isMatchAfter, - String... servletNames) { - // Do nothing + public ServletRegistration.Dynmaic addServlet(String servletName, + String className) { + return null; } - public void addFilterMappingForUrlPatterns(String filterName, - EnumSet<DispatcherType> dispatcherTypes, boolean isMatchAfter, - String... urlPatterns) { - // Do nothing + public EnumSet<SessionTrackingMode> getDefaultSessionTrackingModes() { + return EnumSet.noneOf(SessionTrackingMode.class); } - public void addServlet(String servletName, String description, - String className, Map<String, String> initParameters, - int loadOnStartup) throws IllegalArgumentException, - IllegalStateException { - // Do nothing + public EnumSet<SessionTrackingMode> getEffectiveSessionTrackingModes() { + return EnumSet.noneOf(SessionTrackingMode.class); } - public void addServletMapping(String servletName, String[] urlPatterns) { + public SessionCookieConfig getSessionCookieConfig() { + return null; + } + + + public void setSessionTrackingModes( + EnumSet<SessionTrackingMode> sessionTrackingModes) { // Do nothing } - public EnumSet<SessionTrackingMode> getDefaultSessionTrackingModes() { - return EnumSet.noneOf(SessionTrackingMode.class); + public Dynamic addFilter(String filterName, Filter filter) { + return null; } - public EnumSet<SessionTrackingMode> getEffectiveSessionTrackingModes() { - return EnumSet.noneOf(SessionTrackingMode.class); + public Dynamic addFilter(String filterName, + Class<? extends Filter> filterClass) { + return null; } - public SessionCookieConfig getSessionCookieConfig() { + public javax.servlet.Registration.Dynamic addServlet(String servletName, + Servlet servlet) { return null; } - public void setSessionCookieConfig(SessionCookieConfig sessionCookieConfig) { - // Do nothing + public javax.servlet.Registration.Dynamic addServlet(String servletName, + Class<? extends Servlet> servletClass) { + return null; } - public void setSessionTrackingModes( - EnumSet<SessionTrackingMode> sessionTrackingModes) { - // Do nothing + public <T extends Filter> T createFilter(Class<T> c) + throws ServletException { + return null; } - public AsyncDispatcher getAsyncDispatcher(String path) { - // Do nothing + public <T extends Servlet> T createServlet(Class<T> c) + throws ServletException { return null; } + + public FilterRegistration findFilterRegistration(String filterName) { + return null; + } + + + public ServletRegistration findServletRegistration(String servletName) { + return null; + } + + + public boolean setInitParameter(String name, String value) { + return false; + } + } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
