Author: kkolinko Date: Thu Nov 10 05:40:04 2011 New Revision: 1200163 URL: http://svn.apache.org/viewvc?rev=1200163&view=rev Log: Merging revision 1187801 from tomcat/trunk: Whitespace removal from remaining /java/org/apache/catalina Part 8, the last one. Updated mergeinfo.
Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/Wrapper.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/Constants.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/mbeans-descriptors.xml Propchange: tomcat/tc7.0.x/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Nov 10 05:40:04 2011 @@ -1 +1 @@ -/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,1173333,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187 755,1187775,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1199418,1199432,1199436,1199513,1199529,1199980,1199996,1200106 +/tomcat/trunk:1156115,1156171,1156276,1156304,1156519,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166693,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172556,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096 ,1173241,1173256,1173288,1173333,1173342,1173461,1173614,1173630,1173659,1173722,1174061,1174239,1174322,1174325,1174329-1174330,1174337-1174339,1174343,1174353,1174799,1174882,1174884,1174983,1175155,1175158,1175167,1175182,1175190,1175201,1175272,1175275,1175283,1175582,1175589-1175590,1175594,1175602,1175613,1175633,1175690,1175713,1175798,1175889,1175896,1175907,1176584,1176590,1176799,1177050,1177060,1177125,1177152,1177160,1177245,1177850,1177862,1177978,1178209,1178228,1178233,1178449,1178542,1178681,1178684,1178721,1179268,1179274,1180261,1180865,1180891,1180894,1180907,1181028,1181123,1181125,1181136,1181291,1181743,1182796,1183078,1183105,1183142,1183328,1183339-1183340,1183492-1183494,1183605,1184917,1184919,1185018,1185020,1185200,1185588,1185626,1185756,1185758,1186011,1186042-1186045,1186104,1186123,1186137,1186153,1186254,1186257,1186377-1186379,1186479-1186480,1186712,1186743,1186750,1186763,1186890-1186892,1186894,1186949,1187018,1187027-1187028,1187381,1187 755,1187775,1187801,1187806,1187809,1187827,1188301,1188303-1188305,1188399,1188822,1188930-1188931,1189116,1189129,1189183,1189240,1189256,1189386,1189413-1189414,1189477,1189685,1189805,1189857,1189864,1189882,1190034,1190185,1190279,1190339,1190371,1190388-1190389,1190474,1190481,1194915,1195222-1195223,1195531,1195899,1195905,1195943,1195949,1195953,1195955,1195965,1195968,1196175,1196212,1196223,1196304-1196305,1196735,1196825,1196827,1197158,1197261,1197263,1197299-1197300,1197305,1197339-1197340,1197343,1197382,1197386-1197387,1197480,1197578,1198497,1198528,1198552,1198602,1198604,1198607,1198622,1198640,1199418,1199432,1199436,1199513,1199529,1199980,1199996,1200106 Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/Wrapper.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/Wrapper.java?rev=1200163&r1=1200162&r2=1200163&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/Wrapper.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/Wrapper.java Thu Nov 10 05:40:04 2011 @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -54,7 +54,7 @@ public interface Wrapper extends Contain * Container event for adding a wrapper. */ public static final String ADD_MAPPING_EVENT = "addMapping"; - + /** * Container event for removing a wrapper. */ @@ -146,12 +146,12 @@ public interface Wrapper extends Contain */ public boolean isUnavailable(); - + /** * Return the associated servlet instance. */ public Servlet getServlet(); - + /** * Set the associated servlet instance @@ -180,7 +180,7 @@ public interface Wrapper extends Contain /** * Add a mapping associated with the Wrapper. - * + * * @param mapping The new wrapper mapping */ public void addMapping(String mapping); @@ -341,31 +341,31 @@ public interface Wrapper extends Contain * returned. */ public MultipartConfigElement getMultipartConfigElement(); - - + + /** * Set the multi-part configuration for the associated servlet. To clear the * multi-part configuration specify <code>null</code> as the new value. */ public void setMultipartConfigElement( MultipartConfigElement multipartConfig); - + /** * Does the associated Servlet support async processing? Defaults to * <code>true</code> */ public boolean isAsyncSupported(); - + /** * Set the async support for the associated servlet. */ public void setAsyncSupported(boolean asyncSupport); - + /** * Is the associated Servlet enabled? Defaults to <code>true</code>. */ public boolean isEnabled(); - + /** * Sets the enabled attribute for the associated servlet. */ @@ -375,18 +375,18 @@ public interface Wrapper extends Contain * Set the flag that indicates * {@link javax.servlet.annotation.ServletSecurity} annotations must be * scanned when the Servlet is first used. - * + * * @param b The new value of the flag */ public void setServletSecurityAnnotationScanRequired(boolean b); - + /** * Scan for (if necessary) and process (if found) the * {@link javax.servlet.annotation.ServletSecurity} annotations for the * Servlet associated with this wrapper. */ public void servletSecurityAnnotationScan() throws ServletException; - + /** * Is the Servlet overridable by a ServletContainerInitializer? */ Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java?rev=1200163&r1=1200162&r2=1200163&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java Thu Nov 10 05:40:04 2011 @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -302,7 +302,7 @@ public final class CGIServlet extends Ht if (getServletConfig().getInitParameter("debug") != null) debug = Integer.parseInt(getServletConfig().getInitParameter("debug")); cgiPathPrefix = getServletConfig().getInitParameter("cgiPathPrefix"); - boolean passShellEnvironment = + boolean passShellEnvironment = Boolean.valueOf(getServletConfig().getInitParameter("passShellEnvironment")).booleanValue(); if (passShellEnvironment) { @@ -598,7 +598,7 @@ public final class CGIServlet extends Ht if (!cgiEnv.isValid()) { res.setStatus(404); } - + if (debug >= 10) { ServletOutputStream out = res.getOutputStream(); @@ -730,7 +730,7 @@ public final class CGIServlet extends Ht * * @param req HttpServletRequest for information provided by * the Servlet API - * @throws UnsupportedEncodingException + * @throws UnsupportedEncodingException */ protected void setupFromRequest(HttpServletRequest req) throws UnsupportedEncodingException { @@ -956,8 +956,8 @@ public final class CGIServlet extends Ht // The app has not been deployed in exploded form webAppRootDir = tmpDir.toString(); expandCGIScript(); - } - + } + sCGINames = findCGI(sPathInfoOrig, webAppRootDir, contextPath, @@ -1101,7 +1101,7 @@ public final class CGIServlet extends Ht } /** - * Extracts requested resource from web app archive to context work + * Extracts requested resource from web app archive to context work * directory to enable CGI script to be executed. */ protected void expandCGIScript() { @@ -1143,7 +1143,7 @@ public final class CGIServlet extends Ht if (f.exists()) { // Don't need to expand if it already exists return; - } + } // create directories String dirPath = destPath.toString().substring( @@ -1179,7 +1179,7 @@ public final class CGIServlet extends Ht } } } catch (IOException ioe) { - // delete in case file is corrupted + // delete in case file is corrupted if (f.exists()) { if (!f.delete() && debug >= 2) { log("expandCGIScript: failed to delete '" + @@ -1611,7 +1611,7 @@ public final class CGIServlet extends Ht proc = rt.exec( cmdAndArgs.toArray(new String[cmdAndArgs.size()]), hashToStringArray(env), wd); - + String sContentLength = env.get("CONTENT_LENGTH"); if(!"".equals(sContentLength)) { @@ -1643,7 +1643,7 @@ public final class CGIServlet extends Ht new HTTPHeaderInputStream(proc.getInputStream()); cgiHeaderReader = new BufferedReader(new InputStreamReader(cgiHeaderStream)); - + while (isRunning) { try { //set headers @@ -1659,7 +1659,7 @@ public final class CGIServlet extends Ht String header = line.substring(0, line.indexOf(":")).trim(); String value = - line.substring(line.indexOf(":") + 1).trim(); + line.substring(line.indexOf(":") + 1).trim(); if (header.equalsIgnoreCase("status")) { response.setStatus(getSCFromCGIStatusHeader(value)); } else { @@ -1669,13 +1669,13 @@ public final class CGIServlet extends Ht log("runCGI: bad header line \"" + line + "\""); } } - + //write output byte[] bBuf = new byte[2048]; - + OutputStream out = response.getOutputStream(); cgiOutput = proc.getInputStream(); - + try { while ((bufRead = cgiOutput.read(bBuf)) != -1) { if (debug >= 4) { @@ -1694,11 +1694,11 @@ public final class CGIServlet extends Ht } } } - + proc.exitValue(); // Throws exception if alive - + isRunning = false; - + } catch (IllegalThreadStateException e) { try { Thread.sleep(500); @@ -1707,7 +1707,7 @@ public final class CGIServlet extends Ht } } } //replacement for Process.waitFor() - + } catch (IOException e){ log ("Caught exception " + e); @@ -1750,22 +1750,22 @@ public final class CGIServlet extends Ht /** * Parses the Status-Line and extracts the status code. - * + * * @param line The HTTP Status-Line (RFC2616, section 6.1) * @return The extracted status code or the code representing an - * internal error if a valid status code cannot be extracted. + * internal error if a valid status code cannot be extracted. */ private int getSCFromHttpStatusLine(String line) { int statusStart = line.indexOf(' ') + 1; - + if (statusStart < 1 || line.length() < statusStart + 3) { // Not a valid HTTP Status-Line log ("runCGI: invalid HTTP Status-Line:" + line); return HttpServletResponse.SC_INTERNAL_SERVER_ERROR; } - + String status = line.substring(statusStart, statusStart + 3); - + int statusCode; try { statusCode = Integer.parseInt(status); @@ -1774,17 +1774,17 @@ public final class CGIServlet extends Ht log ("runCGI: invalid status code:" + status); return HttpServletResponse.SC_INTERNAL_SERVER_ERROR; } - + return statusCode; } /** * Parses the CGI Status Header value and extracts the status code. - * + * * @param value The CGI Status value of the form <code> * digit digit digit SP reason-phrase</code> * @return The extracted status code or the code representing an - * internal error if a valid status code cannot be extracted. + * internal error if a valid status code cannot be extracted. */ private int getSCFromCGIStatusHeader(String value) { if (value.length() < 3) { @@ -1792,9 +1792,9 @@ public final class CGIServlet extends Ht log ("runCGI: invalid status value:" + value); return HttpServletResponse.SC_INTERNAL_SERVER_ERROR; } - + String status = value.substring(0, 3); - + int statusCode; try { statusCode = Integer.parseInt(status); @@ -1803,10 +1803,10 @@ public final class CGIServlet extends Ht log ("runCGI: invalid status code:" + status); return HttpServletResponse.SC_INTERNAL_SERVER_ERROR; } - + return statusCode; } - + private void sendToLog(BufferedReader rdr) { String line = null; int lineCount = 0 ; @@ -1841,10 +1841,10 @@ public final class CGIServlet extends Ht private static final int STATE_FIRST_LF = 2; private static final int STATE_SECOND_CR = 3; private static final int STATE_HEADER_END = 4; - + private InputStream input; private int state; - + HTTPHeaderInputStream(InputStream theInput) { input = theInput; state = STATE_CHARACTER; @@ -1876,7 +1876,7 @@ public final class CGIServlet extends Ht // |(CR) ^(LF) // | | // (CR2)-->--- - + if (i == 10) { // LF switch(state) { @@ -1909,8 +1909,8 @@ public final class CGIServlet extends Ht } else { state = STATE_CHARACTER; } - - return i; + + return i; } } // class HTTPHeaderInputStream Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/Constants.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/Constants.java?rev=1200163&r1=1200162&r2=1200163&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/Constants.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/Constants.java Thu Nov 10 05:40:04 2011 @@ -5,9 +5,9 @@ * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1200163&r1=1200162&r2=1200163&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Thu Nov 10 05:40:04 2011 @@ -110,7 +110,7 @@ import org.apache.tomcat.util.res.String * </pre> * <p> * Then a request to <code>/context/static/images/tomcat.jpg</code> will succeed - * while a request to <code>/context/images/tomcat2.jpg</code> will fail. + * while a request to <code>/context/images/tomcat2.jpg</code> will fail. * </p> * @author Craig R. McClanahan * @author Remy Maucherat @@ -171,8 +171,8 @@ public class DefaultServlet * Allow customized directory listing per context. */ protected String contextXsltFile = null; - - + + /** * Allow customized directory listing per instance. */ @@ -196,13 +196,13 @@ public class DefaultServlet * the platform default is used. */ protected String fileEncoding = null; - - + + /** * Minimum size for sendfile usage in bytes. */ protected int sendfileSize = 48 * 1024; - + /** * Should the Accept-Ranges: bytes header be send with static resources? */ @@ -212,8 +212,8 @@ public class DefaultServlet * Full range marker. */ protected static ArrayList<Range> FULL = new ArrayList<Range>(); - - + + // ----------------------------------------------------- Static Initializer @@ -288,7 +288,7 @@ public class DefaultServlet readOnly = Boolean.parseBoolean(getServletConfig().getInitParameter("readonly")); if (getServletConfig().getInitParameter("sendfileSize") != null) - sendfileSize = + sendfileSize = Integer.parseInt(getServletConfig().getInitParameter("sendfileSize")) * 1024; fileEncoding = getServletConfig().getInitParameter("fileEncoding"); @@ -383,7 +383,7 @@ public class DefaultServlet /** * Determines the appropriate path to prepend resources with - * when generating directory listings. Depending on the behaviour of + * when generating directory listings. Depending on the behaviour of * {@link #getRelativePath(HttpServletRequest)} this will change. * @param request the request to determine the path for * @return the prefix to apply to all resources in the listing. @@ -443,7 +443,7 @@ public class DefaultServlet * * @param resp the {@link HttpServletResponse} object that * contains the response the servlet returns - * to the client + * to the client * * @exception IOException if an input or output error occurs * while the servlet is handling the @@ -472,11 +472,11 @@ public class DefaultServlet } // Always allow options allow.append(", OPTIONS"); - + resp.setHeader("Allow", allow.toString()); } - - + + /** * Process a POST request for the specified resource. * @@ -746,7 +746,7 @@ public class DefaultServlet throws IOException, ServletException { boolean serveContent = content; - + // Identify the requested resource path String path = getRelativePath(request); if (debug > 0) { @@ -761,7 +761,7 @@ public class DefaultServlet CacheEntry cacheEntry = resources.lookupCache(path); if (!cacheEntry.exists) { - // Check if we're included so we can return the appropriate + // Check if we're included so we can return the appropriate // missing resource name in the error String requestUri = (String) request.getAttribute( RequestDispatcher.INCLUDE_REQUEST_URI); @@ -784,7 +784,7 @@ public class DefaultServlet // ends with "/" or "\", return NOT FOUND if (cacheEntry.context == null) { if (path.endsWith("/") || (path.endsWith("\\"))) { - // Check if we're included so we can return the appropriate + // Check if we're included so we can return the appropriate // missing resource name in the error String requestUri = (String) request.getAttribute( RequestDispatcher.INCLUDE_REQUEST_URI); @@ -841,13 +841,13 @@ public class DefaultServlet // Accept ranges header response.setHeader("Accept-Ranges", "bytes"); } - + // Parse range specifier ranges = parseRange(request, response, cacheEntry.attributes); - + // ETag header response.setHeader("ETag", cacheEntry.attributes.getETag()); - + // Last-Modified header response.setHeader("Last-Modified", cacheEntry.attributes.getLastModifiedHttp()); @@ -903,7 +903,7 @@ public class DefaultServlet if (contentWritten > 0) { ranges = FULL; } - + if ( (cacheEntry.context != null) || isError || ( ((ranges == null) || (ranges.isEmpty())) @@ -1247,7 +1247,7 @@ public class DefaultServlet return renderHtml(contextPath, cacheEntry); } return renderXml(contextPath, cacheEntry, xsltInputStream); - + } /** @@ -1282,7 +1282,7 @@ public class DefaultServlet // Render the directory entries within this directory NamingEnumeration<NameClassPair> enumeration = resources.list(cacheEntry.name); - + // rewriteUrl(contextPath) is expensive. cache result for later reuse String rewrittenContextPath = rewriteUrl(contextPath); @@ -1385,7 +1385,7 @@ public class DefaultServlet PrintWriter writer = new PrintWriter(osWriter); StringBuilder sb = new StringBuilder(); - + // rewriteUrl(contextPath) is expensive. cache result for later reuse String rewrittenContextPath = rewriteUrl(contextPath); @@ -1656,8 +1656,8 @@ public class DefaultServlet } return false; } - - + + /** * Check if the if-match condition is satisfied. * @@ -1838,7 +1838,7 @@ public class DefaultServlet * (even in the face of an exception). * * @param cacheEntry The cache entry for the source resource - * @param is The input stream to read the source resource from + * @param is The input stream to read the source resource from * @param ostream The output stream to write to * * @exception IOException if an input/output error occurs @@ -1885,7 +1885,7 @@ public class DefaultServlet * (even in the face of an exception). * * @param cacheEntry The cache entry for the source resource - * @param is The input stream to read the source resource from + * @param is The input stream to read the source resource from * @param writer The writer to write to * * @exception IOException if an input/output error occurs @@ -2100,7 +2100,7 @@ public class DefaultServlet return new IOException(sm.getString("defaultservlet.skipfail", Long.valueOf(skipped), Long.valueOf(start))); } - + IOException exception = null; long bytesToRead = end - start + 1; Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java?rev=1200163&r1=1200162&r2=1200163&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/servlets/WebdavServlet.java Thu Nov 10 05:40:04 2011 @@ -270,7 +270,7 @@ public class WebdavServlet /** * Is access allowed via WebDAV to the special paths (/WEB-INF and - * /META-INF)? + * /META-INF)? */ private boolean allowSpecialPaths = false; @@ -341,7 +341,7 @@ public class WebdavServlet throws ServletException, IOException { final String path = getRelativePath(req); - + // Block access to special subdirectories. // DefaultServlet assumes it services resources from the root of the web app // and doesn't add any special path protection @@ -528,18 +528,18 @@ public class WebdavServlet } Node propNode = null; - + if (req.getContentLength() > 0) { DocumentBuilder documentBuilder = getDocumentBuilder(); - + try { Document document = documentBuilder.parse (new InputSource(req.getInputStream())); - + // Get the root element of the document Element rootElement = document.getDocumentElement(); NodeList childList = rootElement.getChildNodes(); - + for (int i=0; i < childList.getLength(); i++) { Node currentNode = childList.item(i); switch (currentNode.getNodeType()) { @@ -661,7 +661,7 @@ public class WebdavServlet // Stack of the objects one level below Stack<String> stackBelow = new Stack<String>(); - + while ((!stack.isEmpty()) && (depth >= 0)) { String currentPath = stack.pop(); @@ -2807,11 +2807,11 @@ public class WebdavServlet */ private static class WebdavResolver implements EntityResolver { private ServletContext context; - + public WebdavResolver(ServletContext theContext) { context = theContext; } - + @Override public InputSource resolveEntity (String publicId, String systemId) { context.log(sm.getString("webdavservlet.enternalEntityIgnored", Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/mbeans-descriptors.xml URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/mbeans-descriptors.xml?rev=1200163&r1=1200162&r2=1200163&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/mbeans-descriptors.xml (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/valves/mbeans-descriptors.xml Thu Nov 10 05:40:04 2011 @@ -22,7 +22,7 @@ domain="Catalina" group="Valve" type="org.apache.catalina.valves.AccessLogValve"> - + <attribute name="asyncSupported" description="Does this valve support async reporting." is="true" @@ -107,7 +107,7 @@ <attribute name="suffix" description="The suffix that is added to log file filenames" type="java.lang.String"/> - + <operation name="rotate" description="Move the existing log file to a new name" impact="ACTION" @@ -116,7 +116,7 @@ description="File name to move the log file to." type="java.lang.String"/> </operation> - + </mbean> <mbean name="CrawlerSessionManagerValve" @@ -124,7 +124,7 @@ domain="Catalina" group="Valve" type="org.apache.catalina.valves.CrawlerSessionManagerValve"> - + <attribute name="asyncSupported" description="Does this valve support async reporting." is="true" @@ -154,7 +154,7 @@ description="The name of the LifecycleState that this component is currently in" type="java.lang.String" writeable="false"/> - + </mbean> <mbean name="ErrorReportValve" @@ -287,12 +287,12 @@ domain="Catalina" group="Valve" type="org.apache.catalina.valves.SemaphoreValve"> - + <attribute name="asyncSupported" description="Does this valve support async reporting." is="true" type="boolean"/> - + <attribute name="block" description="Should this be blocked until a permit is available?" type="boolean"/> @@ -309,16 +309,16 @@ <attribute name="fairness" description="Use a fair semaphore" type="boolean"/> - + <attribute name="info" description="Information about this implementation" type="java.lang.String" writeable="false"/> - + <attribute name="interruptible" description="Should this be blocked interruptibly until a permit is availabl?" type="boolean"/> - + <attribute name="stateName" description="The name of the LifecycleState that this component is currently in" type="java.lang.String" @@ -443,7 +443,7 @@ domain="Catalina" group="Valve" type="org.apache.catalina.valves.RemoteIpValve"> - + <attribute name="asyncSupported" description="Does this valve support async reporting." is="true" @@ -453,42 +453,42 @@ description="Value returned by ServletRequest.getServerPort() when the protocolHeader indicates http protocol" type="java.lang.String" writeable="false" /> - + <attribute name="httpsServerPort" description="Value returned by ServletRequest.getServerPort() when the protocolHeader indicates https protocol" type="java.lang.String" writeable="false" /> - + <attribute name="info" description="Information about this implementation" type="java.lang.String" writeable="false"/> - + <attribute name="internalProxies" description="Regular expression that matches IP addresses of internal proxies" type="java.lang.String" writeable="false" /> - + <attribute name="protocolHeader" description="The protocol header (e.g. "X-Forwarded-Proto")" type="java.lang.String" writeable="false" /> - + <attribute name="protocolHeaderHttpsValue" description="The value of the protocol header for incoming https request (e.g. "https")" type="java.lang.String" writeable="false" /> - + <attribute name="proxiesHeader" description="The proxies header name (e.g. "X-Forwarded-By")" type="java.lang.String" writeable="false" /> - + <attribute name="remoteIpHeader" description="The remote IP header name (e.g. "X-Forwarded-For")" type="java.lang.String" writeable="false" /> - + <attribute name="stateName" description="The name of the LifecycleState that this component is currently in" type="java.lang.String" @@ -498,7 +498,7 @@ description="Regular expression that matches IP addresses of trusted proxies" type="java.lang.String" writeable="false" /> - + </mbean> <mbean name="StuckThreadDetectionValve" --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org