Author: markt
Date: Sat Oct 22 21:14:59 2011
New Revision: 1187798
URL: http://svn.apache.org/viewvc?rev=1187798&view=rev
Log:
Whitespace removal from /java/org/apache/catalina/ssi
Modified:
tomcat/trunk/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java
tomcat/trunk/java/org/apache/catalina/ssi/ExpressionParseTree.java
tomcat/trunk/java/org/apache/catalina/ssi/ExpressionTokenizer.java
tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
tomcat/trunk/java/org/apache/catalina/ssi/SSICommand.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIConditional.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIConditionalState.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIConfig.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIEcho.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIExec.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIExternalResolver.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIFlastmod.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIFsize.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIInclude.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIMediator.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIPrintenv.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIProcessor.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIServlet.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIServletRequestUtil.java
tomcat/trunk/java/org/apache/catalina/ssi/SSISet.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIStopProcessingException.java
Modified:
tomcat/trunk/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java?rev=1187798&r1=1187797&r2=1187798&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/ByteArrayServletOutputStream.java
Sat Oct 22 21:14:59 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/trunk/java/org/apache/catalina/ssi/ExpressionParseTree.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/ExpressionParseTree.java?rev=1187798&r1=1187797&r2=1187798&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/ExpressionParseTree.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/ExpressionParseTree.java Sat Oct
22 21:14:59 2011
@@ -24,7 +24,7 @@ import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
/**
* Represents a parsed expression.
- *
+ *
* @version $Revision$
* @author Paul Speed
*/
@@ -352,7 +352,7 @@ public class ExpressionParseTree {
protected int compareBranches() {
String val1 = ((StringNode)left).getValue();
String val2 = ((StringNode)right).getValue();
-
+
int val2Len = val2.length();
if (val2Len > 1 && val2.charAt(0) == '/' &&
val2.charAt(val2Len - 1) == '/') {
Modified: tomcat/trunk/java/org/apache/catalina/ssi/ExpressionTokenizer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/ExpressionTokenizer.java?rev=1187798&r1=1187797&r2=1187798&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/ExpressionTokenizer.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/ExpressionTokenizer.java Sat Oct
22 21:14:59 2011
@@ -21,7 +21,7 @@ package org.apache.catalina.ssi;
* Parses an expression string to return the individual tokens. This is
* patterned similar to the StreamTokenizer in the JDK but customized for SSI
* conditional expression parsing.
- *
+ *
* @version $Revision$
* @author Paul Speed
*/
Modified: tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java?rev=1187798&r1=1187797&r2=1187798&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/ResponseIncludeWrapper.java Sat
Oct 22 21:14:59 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.
@@ -36,7 +36,7 @@ import org.apache.tomcat.util.ExceptionU
/**
* A HttpServletResponseWrapper, used from
* <code>SSIServletExternalResolver</code>
- *
+ *
* @author Bip Thelin
* @author David Becker
* @version $Id$
@@ -59,7 +59,7 @@ public class ResponseIncludeWrapper exte
protected ServletOutputStream captureServletOutputStream;
protected ServletOutputStream servletOutputStream;
protected PrintWriter printWriter;
-
+
private ServletContext context;
private HttpServletRequest request;
@@ -67,17 +67,17 @@ public class ResponseIncludeWrapper exte
RFC1123_FORMAT = new SimpleDateFormat(RFC1123_PATTERN, Locale.US);
RFC1123_FORMAT.setTimeZone(TimeZone.getTimeZone("GMT"));
}
-
+
/**
* Initialize our wrapper with the current HttpServletResponse and
* ServletOutputStream.
- *
+ *
* @param context The servlet context
* @param request The HttpServletResponse to use
* @param response The response to use
* @param captureServletOutputStream The ServletOutputStream to use
*/
- public ResponseIncludeWrapper(ServletContext context,
+ public ResponseIncludeWrapper(ServletContext context,
HttpServletRequest request, HttpServletResponse response,
ServletOutputStream captureServletOutputStream) {
super(response);
@@ -105,7 +105,7 @@ public class ResponseIncludeWrapper exte
/**
* Return a printwriter, throws and exception if a OutputStream already
* been returned.
- *
+ *
* @return a PrintWriter object
* @exception java.io.IOException
* if the outputstream already been called
@@ -128,7 +128,7 @@ public class ResponseIncludeWrapper exte
/**
* Return a OutputStream, throws and exception if a printwriter already
* been returned.
- *
+ *
* @return a OutputStream object
* @exception java.io.IOException
* if the printwriter already been called
@@ -143,17 +143,17 @@ public class ResponseIncludeWrapper exte
}
throw new IllegalStateException();
}
-
-
+
+
/**
* Returns the value of the <code>last-modified</code> header field. The
* result is the number of milliseconds since January 1, 1970 GMT.
*
* @return the date the resource referenced by this
* <code>ResponseIncludeWrapper</code> was last modified, or -1 if not
- * known.
+ * known.
*/
- public long getLastModified() {
+ public long getLastModified() {
if (lastModified == -1) {
// javadocs say to return -1 if date not known, if you want another
// default, put it here
@@ -193,7 +193,7 @@ public class ResponseIncludeWrapper exte
}
return contentType;
}
-
+
/**
* Sets the value of the <code>content-type</code> header field.
*
Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSICommand.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSICommand.java?rev=1187798&r1=1187797&r2=1187798&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/SSICommand.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSICommand.java Sat Oct 22
21:14:59 2011
@@ -21,7 +21,7 @@ import java.io.PrintWriter;
/**
* The interface that all SSI commands ( SSIEcho, SSIInclude, ...) must
* implement.
- *
+ *
* @author Bip Thelin
* @author Dan Sandberg
* @author David Becker
@@ -30,7 +30,7 @@ import java.io.PrintWriter;
public interface SSICommand {
/**
* Write the output of the command to the writer.
- *
+ *
* @param ssiMediator
* the ssi mediator
* @param commandName
Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIConditional.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIConditional.java?rev=1187798&r1=1187797&r2=1187798&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIConditional.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIConditional.java Sat Oct 22
21:14:59 2011
@@ -21,7 +21,7 @@ import java.io.PrintWriter;
import java.text.ParseException;
/**
* SSI command that handles all conditional directives.
- *
+ *
* @version $Revision$
* @author Paul Speed
* @author David Becker
Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIConditionalState.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIConditionalState.java?rev=1187798&r1=1187797&r2=1187798&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIConditionalState.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIConditionalState.java Sat Oct
22 21:14:59 2011
@@ -21,7 +21,7 @@ package org.apache.catalina.ssi;
* This class is used by SSIMediator and SSIConditional to keep track of state
* information necessary to process the nested conditional commands ( if, elif,
* else, endif ).
- *
+ *
* @version $Revision$
* @author Dan Sandberg
* @author Paul Speed
Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIConfig.java?rev=1187798&r1=1187797&r2=1187798&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIConfig.java Sat Oct 22
21:14:59 2011
@@ -20,7 +20,7 @@ package org.apache.catalina.ssi;
import java.io.PrintWriter;
/**
* Implements the Server-side #exec command
- *
+ *
* @author Bip Thelin
* @author Paul Speed
* @author Dan Sandberg
Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIEcho.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIEcho.java?rev=1187798&r1=1187797&r2=1187798&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIEcho.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIEcho.java Sat Oct 22 21:14:59
2011
@@ -20,7 +20,7 @@ package org.apache.catalina.ssi;
import java.io.PrintWriter;
/**
* Return the result associated with the supplied Server Variable.
- *
+ *
* @author Bip Thelin
* @author Paul Speed
* @author Dan Sandberg
Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIExec.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIExec.java?rev=1187798&r1=1187797&r2=1187798&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIExec.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIExec.java Sat Oct 22 21:14:59
2011
@@ -25,7 +25,7 @@ import java.io.PrintWriter;
import org.apache.catalina.util.IOTools;
/**
* Implements the Server-side #exec command
- *
+ *
* @author Bip Thelin
* @author Amy Roh
* @author Paul Speed
@@ -67,7 +67,7 @@ public class SSIExec implements SSIComma
IOTools.flow(stdErrReader, writer, buf);
IOTools.flow(stdOutReader, writer, buf);
proc.waitFor();
- lastModified = System.currentTimeMillis();
+ lastModified = System.currentTimeMillis();
} catch (InterruptedException e) {
ssiMediator.log("Couldn't exec file: " + substitutedValue, e);
writer.write(configErrMsg);
Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIExternalResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIExternalResolver.java?rev=1187798&r1=1187797&r2=1187798&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIExternalResolver.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIExternalResolver.java Sat Oct
22 21:14:59 2011
@@ -23,14 +23,14 @@ import java.util.Date;
/**
* Interface used by SSIMediator to talk to the 'outside world' ( usually a
* servlet )
- *
+ *
* @author Dan Sandberg
* @version $Id$
*/
public interface SSIExternalResolver {
/**
* Adds any external variables to the variableNames collection.
- *
+ *
* @param variableNames
* the collection to add to
*/
@@ -44,7 +44,7 @@ public interface SSIExternalResolver {
* Set the named variable to the specified value. If value is null, then
* the variable will be removed ( ie. a call to getVariableValue will
* return null )
- *
+ *
* @param name
* of the variable
* @param value
@@ -57,7 +57,7 @@ public interface SSIExternalResolver {
* Returns the current date. This is useful for putting the SSI stuff in a
* regression test. Since you can make the current date a constant, it
* makes testing easier since the output won't change.
- *
+ *
* @return the data
*/
public Date getCurrentDate();
Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java?rev=1187798&r1=1187797&r2=1187798&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIFilter.java Sat Oct 22
21:14:59 2011
@@ -41,7 +41,7 @@ import org.apache.catalina.Globals;
/**
* Filter to process SSI requests within a webpage. Mapped to a content types
* from within web.xml.
- *
+ *
* @author David Becker
* @version $Id$
* @see org.apache.catalina.ssi.SSIServlet
@@ -66,14 +66,14 @@ public class SSIFilter implements Filter
//----------------- Public methods.
/**
* Initialize this servlet.
- *
+ *
* @exception ServletException
* if an error occurs
*/
@Override
public void init(FilterConfig config) throws ServletException {
this.config = config;
-
+
if (config.getInitParameter("debug") != null) {
debug = Integer.parseInt(config.getInitParameter("debug"));
}
@@ -84,7 +84,7 @@ public class SSIFilter implements Filter
contentTypeRegEx = shtmlRegEx;
}
- isVirtualWebappRelative =
+ isVirtualWebappRelative =
Boolean.parseBoolean(config.getInitParameter("isVirtualWebappRelative"));
if (config.getInitParameter("expires") != null)
@@ -103,9 +103,9 @@ public class SSIFilter implements Filter
// cast once
HttpServletRequest req = (HttpServletRequest)request;
HttpServletResponse res = (HttpServletResponse)response;
-
+
// indicate that we're in SSI processing
- req.setAttribute(Globals.SSI_FLAG_ATTR, "true");
+ req.setAttribute(Globals.SSI_FLAG_ATTR, "true");
// setup to capture output
ByteArrayServletOutputStream basos = new
ByteArrayServletOutputStream();
@@ -126,28 +126,28 @@ public class SSIFilter implements Filter
if (contentTypeRegEx.matcher(contentType).matches()) {
String encoding = res.getCharacterEncoding();
- // set up SSI processing
+ // set up SSI processing
SSIExternalResolver ssiExternalResolver =
new SSIServletExternalResolver(config.getServletContext(), req,
res, isVirtualWebappRelative, debug, encoding);
SSIProcessor ssiProcessor = new SSIProcessor(ssiExternalResolver,
debug, allowExec);
-
+
// prepare readers/writers
Reader reader =
new InputStreamReader(new ByteArrayInputStream(bytes),
encoding);
ByteArrayOutputStream ssiout = new ByteArrayOutputStream();
PrintWriter writer =
new PrintWriter(new OutputStreamWriter(ssiout, encoding));
-
- // do SSI processing
+
+ // do SSI processing
long lastModified = ssiProcessor.process(reader,
responseIncludeWrapper.getLastModified(), writer);
-
+
// set output bytes
writer.flush();
bytes = ssiout.toByteArray();
-
+
// override headers
if (expires != null) {
res.setDateHeader("expires", (new java.util.Date()).getTime()
@@ -157,7 +157,7 @@ public class SSIFilter implements Filter
res.setDateHeader("last-modified", lastModified);
}
res.setContentLength(bytes.length);
-
+
Matcher shtmlMatcher =
shtmlRegEx.matcher(responseIncludeWrapper.getContentType());
if (shtmlMatcher.matches()) {
Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIFlastmod.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIFlastmod.java?rev=1187798&r1=1187797&r2=1187798&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIFlastmod.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIFlastmod.java Sat Oct 22
21:14:59 2011
@@ -25,7 +25,7 @@ import org.apache.catalina.util.DateTool
import org.apache.catalina.util.Strftime;
/**
* Implements the Server-side #flastmod command
- *
+ *
* @author Bip Thelin
* @author Paul Speed
* @author Dan Sandberg
Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIFsize.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIFsize.java?rev=1187798&r1=1187797&r2=1187798&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIFsize.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIFsize.java Sat Oct 22 21:14:59
2011
@@ -22,7 +22,7 @@ import java.io.PrintWriter;
import java.text.DecimalFormat;
/**
* Implements the Server-side #fsize command
- *
+ *
* @author Bip Thelin
* @author Paul Speed
* @author Dan Sandberg
Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIInclude.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIInclude.java?rev=1187798&r1=1187797&r2=1187798&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIInclude.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIInclude.java Sat Oct 22
21:14:59 2011
@@ -21,7 +21,7 @@ import java.io.IOException;
import java.io.PrintWriter;
/**
* Implements the Server-side #include command
- *
+ *
* @author Bip Thelin
* @author Paul Speed
* @author Dan Sandberg
Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIMediator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIMediator.java?rev=1187798&r1=1187797&r2=1187798&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIMediator.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIMediator.java Sat Oct 22
21:14:59 2011
@@ -33,7 +33,7 @@ import org.apache.tomcat.util.http.HttpM
/**
* Allows the different SSICommand implementations to share data/talk to each
* other
- *
+ *
* @author Bip Thelin
* @author Amy Roh
* @author Paul Speed
@@ -211,7 +211,7 @@ public class SSIMediator {
// If it has no references or HTML entities then no work
// need to be done
if (val.indexOf('$') < 0 && val.indexOf('&') < 0) return val;
-
+
// HTML decoding
val = val.replace("<", "<");
val = val.replace(">", ">");
Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIPrintenv.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIPrintenv.java?rev=1187798&r1=1187797&r2=1187798&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIPrintenv.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIPrintenv.java Sat Oct 22
21:14:59 2011
@@ -22,7 +22,7 @@ import java.util.Collection;
import java.util.Iterator;
/**
* Implements the Server-side #printenv command
- *
+ *
* @author Dan Sandberg
* @author David Becker
* @version $Id$
Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIProcessor.java?rev=1187798&r1=1187797&r2=1187798&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIProcessor.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIProcessor.java Sat Oct 22
21:14:59 2011
@@ -30,7 +30,7 @@ import org.apache.catalina.util.IOTools;
* The entry point to SSI processing. This class does the actual parsing,
* delegating to the SSIMediator, SSICommand, and SSIExternalResolver as
* necessary[
- *
+ *
* @author Dan Sandberg
* @author David Becker
* @version $Id$
@@ -85,7 +85,7 @@ public class SSIProcessor {
* Process a file with server-side commands, reading from reader and
* writing the processed version to writer. NOTE: We really should be doing
* this in a streaming way rather than converting it to an array first.
- *
+ *
* @param reader
* the reader to read the file containing SSIs from
* @param writer
@@ -161,7 +161,7 @@ public class SSIProcessor {
paramNames, paramValues,
writer);
if (lmd > lastModifiedDate) {
lastModifiedDate = lmd;
- }
+ }
}
}
if (errorMessage != null) {
@@ -185,7 +185,7 @@ public class SSIProcessor {
/**
* Parse a StringBuilder and take out the param type token. Called from
* <code>requestHandler</code>
- *
+ *
* @param cmd
* a value of type 'StringBuilder'
* @return a value of type 'String[]'
@@ -235,7 +235,7 @@ public class SSIProcessor {
/**
* Parse a StringBuilder and take out the param token. Called from
* <code>requestHandler</code>
- *
+ *
* @param cmd
* a value of type 'StringBuilder'
* @return a value of type 'String[]'
@@ -286,7 +286,7 @@ public class SSIProcessor {
/**
* Parse a StringBuilder and take out the command token. Called from
* <code>requestHandler</code>
- *
+ *
* @param cmd
* a value of type 'StringBuilder'
* @return a value of type 'String', or null if there is none
@@ -325,7 +325,7 @@ public class SSIProcessor {
protected boolean isSpace(char c) {
return c == ' ' || c == '\n' || c == '\t' || c == '\r';
}
-
+
protected boolean isQuote(char c) {
return c == '\'' || c == '\"' || c == '`';
}
Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIServlet.java?rev=1187798&r1=1187797&r2=1187798&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIServlet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIServlet.java Sat Oct 22
21:14:59 2011
@@ -37,7 +37,7 @@ import org.apache.catalina.Globals;
/**
* Servlet to process SSI requests within a webpage. Mapped to a path from
* within web.xml.
- *
+ *
* @author Bip Thelin
* @author Amy Roh
* @author Dan Sandberg
@@ -66,29 +66,29 @@ public class SSIServlet extends HttpServ
//----------------- Public methods.
/**
* Initialize this servlet.
- *
+ *
* @exception ServletException
* if an error occurs
*/
@Override
public void init() throws ServletException {
-
+
if (getServletConfig().getInitParameter("debug") != null)
debug =
Integer.parseInt(getServletConfig().getInitParameter("debug"));
-
- isVirtualWebappRelative =
+
+ isVirtualWebappRelative =
Boolean.parseBoolean(getServletConfig().getInitParameter("isVirtualWebappRelative"));
-
+
if (getServletConfig().getInitParameter("expires") != null)
expires =
Long.valueOf(getServletConfig().getInitParameter("expires"));
-
+
buffered =
Boolean.parseBoolean(getServletConfig().getInitParameter("buffered"));
-
+
inputEncoding = getServletConfig().getInitParameter("inputEncoding");
-
+
if (getServletConfig().getInitParameter("outputEncoding") != null)
outputEncoding =
getServletConfig().getInitParameter("outputEncoding");
-
+
allowExec = Boolean.parseBoolean(
getServletConfig().getInitParameter("allowExec"));
@@ -100,7 +100,7 @@ public class SSIServlet extends HttpServ
/**
* Process and forward the GET request to our
<code>requestHandler()</code>*
- *
+ *
* @param req
* a value of type 'HttpServletRequest'
* @param res
@@ -121,7 +121,7 @@ public class SSIServlet extends HttpServ
/**
* Process and forward the POST request to our
* <code>requestHandler()</code>.
- *
+ *
* @param req
* a value of type 'HttpServletRequest'
* @param res
@@ -141,7 +141,7 @@ public class SSIServlet extends HttpServ
/**
* Process our request and locate right SSI command.
- *
+ *
* @param req
* a value of type 'HttpServletRequest'
* @param res
Modified:
tomcat/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java?rev=1187798&r1=1187797&r2=1187798&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIServletExternalResolver.java
Sat Oct 22 21:14:59 2011
@@ -40,7 +40,7 @@ import org.apache.tomcat.util.buf.B2CCon
/**
* An implementation of SSIExternalResolver that is used with servlets.
- *
+ *
* @author Dan Sandberg
* @author David Becker
* @version $Id$
@@ -247,10 +247,10 @@ public class SSIServletExternalResolver
// Use default as a last resort
String queryStringEncoding =
Constants.DEFAULT_CHARACTER_ENCODING;
-
+
String uriEncoding = null;
boolean useBodyEncodingForURI = false;
-
+
// Get encoding settings from request / connector if
// possible
String requestEncoding = req.getCharacterEncoding();
@@ -260,7 +260,7 @@ public class SSIServletExternalResolver
useBodyEncodingForURI = ((Request)req)
.getConnector().getUseBodyEncodingForURI();
}
-
+
// If valid, apply settings from request / connector
if (uriEncoding != null) {
queryStringEncoding = uriEncoding;
@@ -269,10 +269,10 @@ public class SSIServletExternalResolver
queryStringEncoding = requestEncoding;
}
}
-
+
try {
retVal = URLDecoder.decode(queryString,
- queryStringEncoding);
+ queryStringEncoding);
} catch (UnsupportedEncodingException e) {
retVal = queryString;
}
Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIServletRequestUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIServletRequestUtil.java?rev=1187798&r1=1187797&r2=1187798&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIServletRequestUtil.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIServletRequestUtil.java Sat
Oct 22 21:14:59 2011
@@ -26,7 +26,7 @@ public class SSIServletRequestUtil {
* Return the relative path associated with this servlet. Taken from
* DefaultServlet.java. Perhaps this should be put in
* org.apache.catalina.util somewhere? Seems like it would be widely used.
- *
+ *
* @param request
* The servlet request we are processing
*/
Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSISet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSISet.java?rev=1187798&r1=1187797&r2=1187798&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/SSISet.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSISet.java Sat Oct 22 21:14:59
2011
@@ -20,7 +20,7 @@ package org.apache.catalina.ssi;
import java.io.PrintWriter;
/**
* Implements the Server-side #set command
- *
+ *
* @author Paul Speed
* @author Dan Sandberg
* @author David Becker
Modified:
tomcat/trunk/java/org/apache/catalina/ssi/SSIStopProcessingException.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIStopProcessingException.java?rev=1187798&r1=1187797&r2=1187798&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ssi/SSIStopProcessingException.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ssi/SSIStopProcessingException.java
Sat Oct 22 21:14:59 2011
@@ -21,7 +21,7 @@ package org.apache.catalina.ssi;
* Exception used to tell SSIProcessor that it should stop processing SSI
* commands. This is used to mimic the Apache behavior in #set with invalid
* attributes.
- *
+ *
* @author Paul Speed
* @author Dan Sandberg
* @version $Id$
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
