You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kk...@apache.org on 2011/11/10 06:33:31 UTC
svn commit: r1200159 - in /tomcat/tc7.0.x/trunk/java/org/apache/catalina:
Engine.java Executor.java Globals.java Group.java Host.java
InstanceEvent.java InstanceListener.java Lifecycle.java
Author: kkolinko
Date: Thu Nov 10 05:33:31 2011
New Revision: 1200159
URL: http://svn.apache.org/viewvc?rev=1200159&view=rev
Log:
Merging revision 1187801 from tomcat/trunk:
Whitespace removal from remaining /java/org/apache/catalina
Part 4
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Engine.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Executor.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Globals.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Group.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Host.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/InstanceEvent.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/InstanceListener.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Lifecycle.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/Engine.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/Engine.java?rev=1200159&r1=1200158&r2=1200159&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/Engine.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/Engine.java Thu Nov 10 05:33:31 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/Executor.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/Executor.java?rev=1200159&r1=1200158&r2=1200159&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/Executor.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/Executor.java Thu Nov 10 05:33:31 2011
@@ -21,13 +21,13 @@ import java.util.concurrent.TimeUnit;
public interface Executor extends java.util.concurrent.Executor, Lifecycle {
public String getName();
-
+
/**
* Executes the given command at some time in the future. The command
* may execute in a new thread, in a pooled thread, or in the calling
* thread, at the discretion of the <tt>Executor</tt> implementation.
* If no threads are available, it will be added to the work queue.
- * If the work queue is full, the system will wait for the specified
+ * If the work queue is full, the system will wait for the specified
* time until it throws a RejectedExecutionException
*
* @param command the runnable task
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/Globals.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/Globals.java?rev=1200159&r1=1200158&r2=1200159&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/Globals.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/Globals.java Thu Nov 10 05:33:31 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.
@@ -30,9 +30,9 @@ public final class Globals {
/**
* The servlet context attribute under which we store the alternate
- * deployment descriptor for this web application
+ * deployment descriptor for this web application
*/
- public static final String ALT_DD_ATTR =
+ public static final String ALT_DD_ATTR =
"org.apache.catalina.deploy.alt_dd";
@@ -57,14 +57,14 @@ public final class Globals {
/**
* Request dispatcher state.
*/
- public static final String DISPATCHER_TYPE_ATTR =
+ public static final String DISPATCHER_TYPE_ATTR =
"org.apache.catalina.core.DISPATCHER_TYPE";
/**
* Request dispatcher path.
*/
- public static final String DISPATCHER_REQUEST_PATH_ATTR =
+ public static final String DISPATCHER_REQUEST_PATH_ATTR =
"org.apache.catalina.core.DISPATCHER_REQUEST_PATH";
@@ -156,13 +156,13 @@ public final class Globals {
public static final String SUBJECT_ATTR =
"javax.security.auth.subject";
-
+
public static final String GSS_CREDENTIAL_ATTR =
"org.apache.catalina.realm.GSS_CREDENTIAL";
/**
- * The master flag which controls strict servlet specification
+ * The master flag which controls strict servlet specification
* compliance.
*/
public static final boolean STRICT_SERVLET_COMPLIANCE =
@@ -174,14 +174,14 @@ public final class Globals {
*/
public static final boolean IS_SECURITY_ENABLED =
(System.getSecurityManager() != null);
-
+
/**
- *
+ *
*/
- public static final String ASYNC_SUPPORTED_ATTR =
+ public static final String ASYNC_SUPPORTED_ATTR =
"org.apache.catalina.ASYNC_SUPPORTED";
-
+
/**
* Default domain for MBeans if none can be determined
*/
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/Group.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/Group.java?rev=1200159&r1=1200158&r2=1200159&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/Group.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/Group.java Thu Nov 10 05:33:31 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/Host.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/Host.java?rev=1200159&r1=1200158&r2=1200159&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/Host.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/Host.java Thu Nov 10 05:33:31 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.
@@ -74,7 +74,7 @@ public interface Host extends Container
* ${catalina.base}/conf/<engine name>/<host name> directory
*/
public String getXmlBase();
-
+
/**
* Set the Xml root for this Host. This can be an absolute
* pathname, a relative pathname, or a URL.
@@ -101,8 +101,8 @@ public interface Host extends Container
/**
- * Return the value of the auto deploy flag. If true, it indicates that
- * this host's child webapps should be discovered and automatically
+ * Return the value of the auto deploy flag. If true, it indicates that
+ * this host's child webapps should be discovered and automatically
* deployed dynamically.
*/
public boolean getAutoDeploy();
@@ -110,7 +110,7 @@ public interface Host extends Container
/**
* Set the auto deploy flag value for this host.
- *
+ *
* @param autoDeploy The new auto deploy flag
*/
public void setAutoDeploy(boolean autoDeploy);
@@ -122,7 +122,7 @@ public interface Host extends Container
*/
public String getConfigClass();
-
+
/**
* Set the Java class name of the context configuration class
* for new web applications.
@@ -131,10 +131,10 @@ public interface Host extends Container
*/
public void setConfigClass(String configClass);
-
+
/**
- * Return the value of the deploy on startup flag. If true, it indicates
- * that this host's child webapps should be discovered and automatically
+ * Return the value of the deploy on startup flag. If true, it indicates
+ * that this host's child webapps should be discovered and automatically
* deployed.
*/
public boolean getDeployOnStartup();
@@ -142,7 +142,7 @@ public interface Host extends Container
/**
* Set the deploy on startup flag value for this host.
- *
+ *
* @param deployOnStartup The new deploy on startup flag
*/
public void setDeployOnStartup(boolean deployOnStartup);
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/InstanceEvent.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/InstanceEvent.java?rev=1200159&r1=1200158&r2=1200159&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/InstanceEvent.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/InstanceEvent.java Thu Nov 10 05:33:31 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.
@@ -316,7 +316,7 @@ public final class InstanceEvent extends
/**
* The exception that was thrown during the processing being reported
- * by this event (AFTER_INIT_EVENT, AFTER_SERVICE_EVENT,
+ * by this event (AFTER_INIT_EVENT, AFTER_SERVICE_EVENT,
* AFTER_DESTROY_EVENT, AFTER_DISPATCH_EVENT, and AFTER_FILTER_EVENT only).
*/
private Throwable exception = null;
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/InstanceListener.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/InstanceListener.java?rev=1200159&r1=1200158&r2=1200159&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/InstanceListener.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/InstanceListener.java Thu Nov 10 05:33:31 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/Lifecycle.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/Lifecycle.java?rev=1200159&r1=1200158&r2=1200159&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/Lifecycle.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/Lifecycle.java Thu Nov 10 05:33:31 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.
@@ -62,38 +62,38 @@ package org.apache.catalina;
* | |
* | stop() |
* --->------------------------------>------------------------------
- *
+ *
* Any state can transition to FAILED.
- *
+ *
* Calling start() while a component is in states STARTING_PREP, STARTING or
* STARTED has no effect.
- *
+ *
* Calling start() while a component is in state NEW will cause init() to be
* called immediately after the start() method is entered.
- *
+ *
* Calling stop() while a component is in states STOPPING_PREP, STOPPING or
* STOPPED has no effect.
- *
+ *
* Calling stop() while a component is in state NEW transitions the component
* to STOPPED. This is typically encountered when a component fails to start and
* does not start all its sub-components. When the component is stopped, it will
* try to stop all sub-components - even those it didn't start.
- *
+ *
* MUST_STOP is used to indicate that the {@link #stop()} should be called on
* the component as soon as {@link #start()} exits. It is typically used when a
* component has failed to start.
- *
+ *
* MUST_DESTROY is used to indicate that the {@link #stop()} should be called on
* the component as soon as {@link #stop()} exits. It is typically used when a
* component is not designed to be restarted.
- *
+ *
* Attempting any other transition will throw {@link LifecycleException}.
- *
+ *
* </pre>
* The {@link LifecycleEvent}s fired during state changes are defined in the
* methods that trigger the changed. No {@link LifecycleEvent}s are fired if the
* attempted transition is not valid.
- *
+ *
* TODO: Not all components may transition from STOPPED to STARTING_PREP. These
* components should use MUST_DESTROY to signal this.
*
@@ -180,7 +180,7 @@ public interface Lifecycle {
*/
public static final String CONFIGURE_START_EVENT = "configure_start";
-
+
/**
* The LifecycleEvent type for the "configure_stop" event. Used by those
* components that use a separate component to perform configuration and
@@ -189,7 +189,7 @@ public interface Lifecycle {
*/
public static final String CONFIGURE_STOP_EVENT = "configure_stop";
-
+
// --------------------------------------------------------- Public Methods
@@ -202,7 +202,7 @@ public interface Lifecycle {
/**
- * Get the life cycle listeners associated with this life cycle. If this
+ * Get the life cycle listeners associated with this life cycle. If this
* component has no listeners registered, a zero-length array is returned.
*/
public LifecycleListener[] findLifecycleListeners();
@@ -224,7 +224,7 @@ public interface Lifecycle {
* <li>INIT_EVENT: On the successful completion of component
* initialization.</li>
* </ol>
- *
+ *
* @exception LifecycleException if this component detects a fatal error
* that prevents this component from being used
*/
@@ -245,7 +245,7 @@ public interface Lifecycle {
* any child components. It is at this point that the
* state transitions to {@link LifecycleState#STARTING}
* and that the public methods other than property
- * getters/setters and life cycle methods may be
+ * getters/setters and life cycle methods may be
* used.</li>
* <li>AFTER_START_EVENT: At the end of the method, immediately before it
* returns. It is at this point that the state
@@ -280,13 +280,13 @@ public interface Lifecycle {
* transitions to {@link LifecycleState#STOPPED}.
* </li>
* </ol>
- *
+ *
* Note that if transitioning from {@link LifecycleState#FAILED} then the
* three events above will be fired but the component will transition
* directly from {@link LifecycleState#FAILED} to
* {@link LifecycleState#STOPPING}, bypassing
* {@link LifecycleState#STOPPING_PREP}
- *
+ *
* @exception LifecycleException if this component detects a fatal error
* that needs to be reported
*/
@@ -299,7 +299,7 @@ public interface Lifecycle {
* <li>DESTROY_EVENT: On the successful completion of component
* destruction.</li>
* </ol>
- *
+ *
* @exception LifecycleException if this component detects a fatal error
* that prevents this component from being used
*/
@@ -308,12 +308,12 @@ public interface Lifecycle {
/**
* Obtain the current state of the source component.
- *
+ *
* @return The current state of the source component.
*/
public LifecycleState getState();
-
-
+
+
/**
* Obtain a textual representation of the current component state. Useful
* for JMX.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org