Author: kkolinko
Date: Thu Nov 10 05:30:28 2011
New Revision: 1200156
URL: http://svn.apache.org/viewvc?rev=1200156&view=rev
Log:
Merging revision 1187801 from tomcat/trunk:
Whitespace removal from remaining /java/org/apache/catalina
Part 1 of n
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/AccessLog.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Authenticator.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/CatalinaFactory.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Cluster.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/AccessLog.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/AccessLog.java?rev=1200156&r1=1200155&r2=1200156&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/AccessLog.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/AccessLog.java Thu Nov 10
05:30:28 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.
@@ -60,26 +60,26 @@ public interface AccessLog {
*/
public static final String SERVER_PORT_ATTRIBUTE =
"org.apache.catalina.AccessLog.ServerPort";
-
+
/**
* Add the request/response to the access log using the specified
processing
* time.
- *
+ *
* @param request Request (associated with the response) to log
* @param response Response (associated with the request) to log
* @param time Time taken to process the request/response in
- * milliseconds (use 0 if not known)
+ * milliseconds (use 0 if not known)
*/
public void log(Request request, Response response, long time);
-
+
/**
* Should this valve set request attributes for IP address, Hostname,
* protocol and port used for the request? This are typically used in
* conjunction with the {@link org.apache.catalina.valves.AccessLogValve}
* which will otherwise log the original values.
* Default is <code>true</code>.
- *
+ *
* The attributes set are:
* <ul>
* <li>org.apache.catalina.RemoteAddr</li>
@@ -87,13 +87,13 @@ public interface AccessLog {
* <li>org.apache.catalina.Protocol</li>
* <li>org.apache.catalina.ServerPost</li>
* </ul>
- *
+ *
* @param requestAttributesEnabled <code>true</code> causes the attributes
* to be set, <code>false</code> disables
- * the setting of the attributes.
+ * the setting of the attributes.
*/
public void setRequestAttributesEnabled(boolean requestAttributesEnabled);
-
+
/**
* @see #setRequestAttributesEnabled(boolean)
* @return <code>true</code> if the attributes will be logged, otherwise
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/Authenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/Authenticator.java?rev=1200156&r1=1200155&r2=1200156&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/Authenticator.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/Authenticator.java Thu Nov 10
05:30:28 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.catalina.deploy.LoginC
*/
public interface Authenticator {
-
+
/**
* Authenticate the user making this request, based on the specified
* login configuration. Return <code>true</code> if any specified
@@ -52,7 +52,7 @@ public interface Authenticator {
*/
public boolean authenticate(Request request, HttpServletResponse response,
LoginConfig config) throws IOException;
-
+
public void login(String userName, String password, Request request)
throws ServletException;
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/CatalinaFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/CatalinaFactory.java?rev=1200156&r1=1200155&r2=1200156&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/CatalinaFactory.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/CatalinaFactory.java Thu Nov
10 05:30:28 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.
@@ -25,21 +25,21 @@ import org.apache.catalina.core.Standard
* other components. The current implementation is as simple as possible. If
* there is demand it can be extended to support alternative factories and/or
* alternative defaults.
- *
+ *
* TODO: Create the other standard components via this factory
*/
public class CatalinaFactory {
-
+
private static CatalinaFactory factory = new CatalinaFactory();
-
+
public static CatalinaFactory getFactory() {
return factory;
}
-
+
private CatalinaFactory() {
// Hide the default constructor
}
-
+
public String getDefaultPipelineClassName() {
return StandardPipeline.class.getName();
}
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/Cluster.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/Cluster.java?rev=1200156&r1=1200155&r2=1200156&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/Cluster.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/Cluster.java Thu Nov 10
05:30:28 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.
@@ -101,15 +101,15 @@ public interface Cluster {
* associated
*/
public Manager createManager(String name);
-
+
/**
- * Register a manager with the cluster. If the cluster is not responsible
- * for creating a manager, then the container will at least notify the
+ * Register a manager with the cluster. If the cluster is not responsible
+ * for creating a manager, then the container will at least notify the
* cluster that this manager is participating in the cluster.
* @param manager Manager
*/
public void registerManager(Manager manager);
-
+
/**
* Removes a manager from the cluster
* @param manager Manager
@@ -117,8 +117,8 @@ public interface Cluster {
public void removeManager(Manager manager);
// --------------------------------------------------------- Cluster Wide
Deployments
-
-
+
+
/**
* Execute a periodic task, such as reloading, etc. This method will be
* invoked inside the classloading context of this container. Unexpected
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
