tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r967284 - in /tomcat/trunk/java/org/apache/catalina: connector/ deploy/ filters/ loader/ mbeans/ util/
Date Fri, 23 Jul 2010 22:04:33 GMT
Author: markt
Date: Fri Jul 23 22:04:32 2010
New Revision: 967284

URL: http://svn.apache.org/viewvc?rev=967284&view=rev
Log:
More tab police - misc packages

Modified:
    tomcat/trunk/java/org/apache/catalina/connector/Constants.java
    tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
    tomcat/trunk/java/org/apache/catalina/connector/CoyoteWriter.java
    tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
    tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
    tomcat/trunk/java/org/apache/catalina/connector/Request.java
    tomcat/trunk/java/org/apache/catalina/deploy/FilterMap.java
    tomcat/trunk/java/org/apache/catalina/deploy/Injectable.java
    tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java
    tomcat/trunk/java/org/apache/catalina/filters/WebdavFixFilter.java
    tomcat/trunk/java/org/apache/catalina/loader/StandardClassLoader.java
    tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
    tomcat/trunk/java/org/apache/catalina/util/URLEncoder.java

Modified: tomcat/trunk/java/org/apache/catalina/connector/Constants.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Constants.java?rev=967284&r1=967283&r2=967284&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Constants.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Constants.java Fri Jul 23 22:04:32 2010
@@ -14,21 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-
 package org.apache.catalina.connector;
 
-
 /**
  * Static constants for this package.
  */
-
 public final class Constants {
 
-	
-    // -------------------------------------------------------------- Constants
-
-
     public static final String Package = "org.apache.catalina.connector";
 
     public static final int DEFAULT_CONNECTION_LINGER = -1;
@@ -38,6 +30,4 @@ public final class Constants {
 
     public static final int PROCESSOR_IDLE = 0;
     public static final int PROCESSOR_ACTIVE = 1;
-
-
 }

Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=967284&r1=967283&r2=967284&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Fri Jul 23 22:04:32
2010
@@ -55,7 +55,6 @@ import org.apache.tomcat.util.net.Socket
  * @author Remy Maucherat
  * @version $Id$
  */
-
 public class CoyoteAdapter implements Adapter {
     
     private static final Log log = LogFactory.getLog(CoyoteAdapter.class);
@@ -355,7 +354,7 @@ public class CoyoteAdapter implements Ad
      * Service method.
      */
     public void service(org.apache.coyote.Request req, 
-    	                org.apache.coyote.Response res)
+                        org.apache.coyote.Response res)
         throws Exception {
 
         Request request = (Request) req.getNote(ADAPTER_NOTES);
@@ -500,7 +499,7 @@ public class CoyoteAdapter implements Ad
      */
     protected boolean postParseRequest(org.apache.coyote.Request req, 
                                        Request request,
-    		                       org.apache.coyote.Response res, 
+                                       org.apache.coyote.Response res, 
                                        Response response)
             throws Exception {
 

Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteWriter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteWriter.java?rev=967284&r1=967283&r2=967284&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteWriter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteWriter.java Fri Jul 23 22:04:32
2010
@@ -158,7 +158,7 @@ public class CoyoteWriter
 
     @Override
     public void write(char buf[]) {
-	write(buf, 0, buf.length);
+        write(buf, 0, buf.length);
     }
 
 

Modified: tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java?rev=967284&r1=967283&r2=967284&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java Fri Jul 23 22:04:32 2010
@@ -177,7 +177,7 @@ public class InputBuffer extends Reader
      * @param coyoteRequest Associated Coyote request
      */
     public void setRequest(Request coyoteRequest) {
-	this.coyoteRequest = coyoteRequest;
+        this.coyoteRequest = coyoteRequest;
     }
 
 
@@ -273,7 +273,7 @@ public class InputBuffer extends Reader
      * @throws IOException An underlying IOException occurred
      */
     public int realReadBytes(byte cbuf[], int off, int len)
-	throws IOException {
+            throws IOException {
 
         if (closed)
             return -1;

Modified: tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java?rev=967284&r1=967283&r2=967284&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/OutputBuffer.java Fri Jul 23 22:04:32
2010
@@ -170,7 +170,7 @@ public class OutputBuffer extends Writer
      * @param coyoteResponse Associated Coyote response
      */
     public void setResponse(Response coyoteResponse) {
-	this.coyoteResponse = coyoteResponse;
+        this.coyoteResponse = coyoteResponse;
     }
 
 
@@ -341,7 +341,7 @@ public class OutputBuffer extends Writer
      * @throws IOException An underlying IOException occurred
      */
     public void realWriteBytes(byte buf[], int off, int cnt)
-	throws IOException {
+            throws IOException {
 
         if (closed)
             return;

Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=967284&r1=967283&r2=967284&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Fri Jul 23 22:04:32 2010
@@ -1436,7 +1436,7 @@ public class Request
      * @param value The associated value
      */
     public void setAttribute(String name, Object value) {
-	
+
         // Name cannot be null
         if (name == null)
             throw new IllegalArgumentException

Modified: tomcat/trunk/java/org/apache/catalina/deploy/FilterMap.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/FilterMap.java?rev=967284&r1=967283&r2=967284&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/FilterMap.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/FilterMap.java Fri Jul 23 22:04:32 2010
@@ -169,23 +169,23 @@ public class FilterMap implements Serial
     }
 
     public String[] getDispatcherNames() {
-    	ArrayList<String> result = new ArrayList<String>();
-    	if ((dispatcherMapping & FORWARD) > 0) {
-    		result.add(DispatcherType.FORWARD.name());
-    	}
-    	if ((dispatcherMapping & INCLUDE) > 0) {
-    		result.add(DispatcherType.INCLUDE.name());
-    	}
-    	if ((dispatcherMapping & REQUEST) > 0) {
-    		result.add(DispatcherType.REQUEST.name());
-    	}
-    	if ((dispatcherMapping & ERROR) > 0) {
-    		result.add(DispatcherType.ERROR.name());
-    	}
-    	if ((dispatcherMapping & ASYNC) > 0) {
-    		result.add(DispatcherType.ASYNC.name());
-    	}
-    	return result.toArray(new String[result.size()]);
+        ArrayList<String> result = new ArrayList<String>();
+        if ((dispatcherMapping & FORWARD) > 0) {
+            result.add(DispatcherType.FORWARD.name());
+        }
+        if ((dispatcherMapping & INCLUDE) > 0) {
+            result.add(DispatcherType.INCLUDE.name());
+        }
+        if ((dispatcherMapping & REQUEST) > 0) {
+            result.add(DispatcherType.REQUEST.name());
+        }
+        if ((dispatcherMapping & ERROR) > 0) {
+            result.add(DispatcherType.ERROR.name());
+        }
+        if ((dispatcherMapping & ASYNC) > 0) {
+            result.add(DispatcherType.ASYNC.name());
+        }
+        return result.toArray(new String[result.size()]);
     }
 
     // --------------------------------------------------------- Public Methods

Modified: tomcat/trunk/java/org/apache/catalina/deploy/Injectable.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/deploy/Injectable.java?rev=967284&r1=967283&r2=967284&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/deploy/Injectable.java (original)
+++ tomcat/trunk/java/org/apache/catalina/deploy/Injectable.java Fri Jul 23 22:04:32 2010
@@ -23,7 +23,7 @@ package org.apache.catalina.deploy;
 import java.util.List;
 
 public interface Injectable {
-	public String getName();
+    public String getName();
     public void addInjectionTarget(String injectionTargetName, String jndiName);
     public List<InjectionTarget> getInjectionTargets();
 }

Modified: tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java?rev=967284&r1=967283&r2=967284&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/RequestDumperFilter.java Fri Jul 23 22:04:32
2010
@@ -239,7 +239,7 @@ public class RequestDumperFilter impleme
         doLog("END TIME          ", getTimestamp());
         doLog("==================",
                 "============================================");
-	}
+    }
 
     private void doLog(String attribute, String value) {
         StringBuilder sb = new StringBuilder(80);

Modified: tomcat/trunk/java/org/apache/catalina/filters/WebdavFixFilter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/WebdavFixFilter.java?rev=967284&r1=967283&r2=967284&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/WebdavFixFilter.java (original)
+++ tomcat/trunk/java/org/apache/catalina/filters/WebdavFixFilter.java Fri Jul 23 22:04:32
2010
@@ -78,51 +78,51 @@ public class WebdavFixFilter implements 
         // NOOP
     }
 
-	public void destroy() {
-	    // NOOP
-	}
+    public void destroy() {
+        // NOOP
+    }
 
     /**
      * Check for the broken MS WebDAV client and if detected issue a re-direct
      * that hopefully will cause the non-broken client to be used.
      */
-	public void doFilter(ServletRequest request, ServletResponse response,
-			FilterChain chain) throws IOException, ServletException {
-	    if (!(request instanceof HttpServletRequest) ||
-	            !(response instanceof HttpServletResponse)) {
+    public void doFilter(ServletRequest request, ServletResponse response,
+            FilterChain chain) throws IOException, ServletException {
+        if (!(request instanceof HttpServletRequest) ||
+                !(response instanceof HttpServletResponse)) {
             chain.doFilter(request, response);
             return;
         }
-		HttpServletRequest httpRequest = ((HttpServletRequest) request);
-		HttpServletResponse httpResponse = ((HttpServletResponse) response);
-		String ua = httpRequest.getHeader("User-Agent");
-		
-		if (ua == null || ua.length() == 0 ||
-		        !ua.startsWith(UA_MINIDIR_START)) {
-	        // No UA or starts with non MS value
-		    // Hope everything just works...
-		    chain.doFilter(request, response);
-		} else if (ua.startsWith(UA_MINIDIR_5_1_2600)) {
-		    // XP 32-bit SP3 - needs redirect with explicit port
-		    httpResponse.sendRedirect(buildRedirect(httpRequest));
-		} else if (ua.startsWith(UA_MINIDIR_5_2_3790)) {
-		    // XP 64-bit SP2
-		    if (!"".equals(httpRequest.getContextPath())) {
-		        log(request,
-		                "XP-x64-SP2 clients only work with the root context");
-		    }
-		    // Namespace issue maybe
-		    // see http://greenbytes.de/tech/webdav/webdav-redirector-list.html
-		    log(request, "XP-x64-SP2 is known not to work with WebDAV Servlet");
-		    
-		    chain.doFilter(request, response);
-		} else {
-		    // Don't know which MS client it is - try the redirect with an
-		    // explicit port in the hope that it moves the client to a different
-		    // WebDAV implementation that works
-			httpResponse.sendRedirect(buildRedirect(httpRequest));
-		}		
-	}
+        HttpServletRequest httpRequest = ((HttpServletRequest) request);
+        HttpServletResponse httpResponse = ((HttpServletResponse) response);
+        String ua = httpRequest.getHeader("User-Agent");
+        
+        if (ua == null || ua.length() == 0 ||
+                !ua.startsWith(UA_MINIDIR_START)) {
+            // No UA or starts with non MS value
+            // Hope everything just works...
+            chain.doFilter(request, response);
+        } else if (ua.startsWith(UA_MINIDIR_5_1_2600)) {
+            // XP 32-bit SP3 - needs redirect with explicit port
+            httpResponse.sendRedirect(buildRedirect(httpRequest));
+        } else if (ua.startsWith(UA_MINIDIR_5_2_3790)) {
+            // XP 64-bit SP2
+            if (!"".equals(httpRequest.getContextPath())) {
+                log(request,
+                        "XP-x64-SP2 clients only work with the root context");
+            }
+            // Namespace issue maybe
+            // see http://greenbytes.de/tech/webdav/webdav-redirector-list.html
+            log(request, "XP-x64-SP2 is known not to work with WebDAV Servlet");
+            
+            chain.doFilter(request, response);
+        } else {
+            // Don't know which MS client it is - try the redirect with an
+            // explicit port in the hope that it moves the client to a different
+            // WebDAV implementation that works
+            httpResponse.sendRedirect(buildRedirect(httpRequest));
+        }        
+    }
 
     private String buildRedirect(HttpServletRequest request) {
         StringBuilder location =

Modified: tomcat/trunk/java/org/apache/catalina/loader/StandardClassLoader.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/StandardClassLoader.java?rev=967284&r1=967283&r2=967284&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/StandardClassLoader.java (original)
+++ tomcat/trunk/java/org/apache/catalina/loader/StandardClassLoader.java Fri Jul 23 22:04:32
2010
@@ -34,7 +34,7 @@ public class StandardClassLoader
     extends URLClassLoader
     implements StandardClassLoaderMBean {
 
-	public StandardClassLoader(URL repositories[]) {
+    public StandardClassLoader(URL repositories[]) {
         super(repositories);
     }
 

Modified: tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java?rev=967284&r1=967283&r2=967284&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java Fri Jul 23 22:04:32 2010
@@ -313,8 +313,8 @@ public class MBeanFactory {
      * @exception Exception if an MBean cannot be created or registered
      */
     public String createHttpConnector(String parent, String address, int port)
-        throws Exception {
-	return createConnector(parent, address, port, false, false);
+            throws Exception {
+        return createConnector(parent, address, port, false, false);
     }
 
     /**
@@ -376,7 +376,7 @@ public class MBeanFactory {
      * @exception Exception if an MBean cannot be created or registered
      */
     public String createJDBCRealm(String parent, String driverName, 
-    	String connectionName, String connectionPassword, String connectionURL)
+        String connectionName, String connectionPassword, String connectionURL)
         throws Exception {
 
         // Create a new JDBCRealm instance
@@ -660,7 +660,7 @@ public class MBeanFactory {
         host.setDeployOnStartup(deployOnStartup);
         host.setDeployXML(deployXML);
         host.setUnpackWARs(unpackWARs);
-	
+    
         // add HostConfig for active reloading
         HostConfig hostConfig = new HostConfig();
         host.addLifecycleListener(hostConfig);

Modified: tomcat/trunk/java/org/apache/catalina/util/URLEncoder.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/URLEncoder.java?rev=967284&r1=967283&r2=967284&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/util/URLEncoder.java (original)
+++ tomcat/trunk/java/org/apache/catalina/util/URLEncoder.java Fri Jul 23 22:04:32 2010
@@ -54,7 +54,7 @@ public class URLEncoder {
     }
 
     public void addSafeCharacter( char c ) {
-	safeCharacters.set( c );
+        safeCharacters.set( c );
     }
 
     public String encode( String path ) {



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message