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:35:14 UTC
svn commit: r1200160 - in /tomcat/tc7.0.x/trunk/java/org/apache/catalina:
LifecycleEvent.java LifecycleException.java LifecycleListener.java
LifecycleState.java Loader.java Manager.java Pipeline.java Realm.java
Role.java
Author: kkolinko
Date: Thu Nov 10 05:35:13 2011
New Revision: 1200160
URL: http://svn.apache.org/viewvc?rev=1200160&view=rev
Log:
Merging revision 1187801 from tomcat/trunk:
Whitespace removal from remaining /java/org/apache/catalina
Part 5
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/LifecycleEvent.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/LifecycleException.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/LifecycleListener.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/LifecycleState.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Loader.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Manager.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Pipeline.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Realm.java
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Role.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/LifecycleEvent.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/LifecycleEvent.java?rev=1200160&r1=1200159&r2=1200160&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/LifecycleEvent.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/LifecycleEvent.java Thu Nov 10 05:35:13 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/LifecycleException.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/LifecycleException.java?rev=1200160&r1=1200159&r2=1200160&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/LifecycleException.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/LifecycleException.java Thu Nov 10 05:35:13 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/LifecycleListener.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/LifecycleListener.java?rev=1200160&r1=1200159&r2=1200160&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/LifecycleListener.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/LifecycleListener.java Thu Nov 10 05:35:13 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/LifecycleState.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/LifecycleState.java?rev=1200160&r1=1200159&r2=1200160&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/LifecycleState.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/LifecycleState.java Thu Nov 10 05:35:13 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,15 +36,15 @@ public enum LifecycleState {
FAILED(false, null),
MUST_STOP(true, null),
MUST_DESTROY(false, null);
-
+
private final boolean available;
private final String lifecycleEvent;
-
+
private LifecycleState(boolean available, String lifecycleEvent) {
this.available = available;
this.lifecycleEvent = lifecycleEvent;
}
-
+
/**
* May the public methods other than property getters/setters and lifecycle
* methods be called for a component in this state? It returns
@@ -59,9 +59,9 @@ public enum LifecycleState {
public boolean isAvailable() {
return available;
}
-
+
/**
- *
+ *
*/
public String getLifecycleEvent() {
return lifecycleEvent;
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/Loader.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/Loader.java?rev=1200160&r1=1200159&r2=1200160&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/Loader.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/Loader.java Thu Nov 10 05:35:13 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/Manager.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/Manager.java?rev=1200160&r1=1200159&r2=1200160&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/Manager.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/Manager.java Thu Nov 10 05:35:13 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.
@@ -122,7 +122,7 @@ public interface Manager {
public void setSessionIdLength(int idLength);
- /**
+ /**
* Returns the total number of sessions created by this manager.
*
* @return Total number of sessions created by this manager.
@@ -130,7 +130,7 @@ public interface Manager {
public long getSessionCounter();
- /**
+ /**
* Sets the total number of sessions created by this manager.
*
* @param sessionCounter Total number of sessions created by this manager.
@@ -158,7 +158,7 @@ public interface Manager {
public void setMaxActive(int maxActive);
- /**
+ /**
* Gets the number of currently active sessions.
*
* @return Number of currently active sessions
@@ -214,26 +214,26 @@ public interface Manager {
/**
* Gets the average time (in seconds) that expired sessions had been
* alive. This may be based on sample data.
- *
+ *
* @return Average time (in seconds) that expired sessions had been
* alive.
*/
public int getSessionAverageAliveTime();
-
+
/**
* Gets the current rate of session creation (in session per minute). This
* may be based on sample data.
- *
+ *
* @return The current rate (in sessions per minute) of session creation
*/
public int getSessionCreateRate();
-
+
/**
* Gets the current rate of session expiration (in session per minute). This
* may be based on sample data
- *
+ *
* @return The current rate (in sessions per minute) of session expiration
*/
public int getSessionExpireRate();
@@ -259,17 +259,17 @@ public interface Manager {
/**
* Change the session ID of the current session to a new randomly generated
* session ID.
- *
+ *
* @param session The session to change the session ID for
*/
public void changeSessionId(Session session);
-
-
+
+
/**
* Get a session from the recycled ones or create a new empty one.
* The PersistentManager manager does not need to create session data
* because it reads it from the Store.
- */
+ */
public Session createEmptySession();
@@ -277,9 +277,9 @@ public interface Manager {
* Construct and return a new session object, based on the default
* settings specified by this Manager's properties. The session
* id specified will be used as the session id.
- * If a new session cannot be created for any reason, return
+ * If a new session cannot be created for any reason, return
* <code>null</code>.
- *
+ *
* @param sessionId The session id which should be used to create the
* new session; if <code>null</code>, the session
* id will be assigned by this method, and available via the getId()
@@ -356,7 +356,7 @@ public interface Manager {
* @exception IOException if an input/output error occurs
*/
public void unload() throws IOException;
-
+
/**
* This method will be invoked by the context/container on a periodic
* basis and allows the manager to implement
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/Pipeline.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/Pipeline.java?rev=1200160&r1=1200159&r2=1200160&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/Pipeline.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/Pipeline.java Thu Nov 10 05:35:13 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.
@@ -83,7 +83,7 @@ public interface Pipeline {
* <p>Implementation note: Implementations are expected to trigger the
* {@link Container#ADD_VALVE_EVENT} for the associated container if this
* call is successful.</p>
- *
+ *
* @param valve Valve to be added
*
* @exception IllegalArgumentException if this Container refused to
@@ -124,7 +124,7 @@ public interface Pipeline {
* Valve for this Pipeline (if any).
*/
public Valve getFirst();
-
+
/**
* Returns true if all the valves in this pipeline support async, false otherwise
* @return true if all the valves in this pipeline support async, false otherwise
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/Realm.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/Realm.java?rev=1200160&r1=1200159&r2=1200160&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/Realm.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/Realm.java Thu Nov 10 05:35:13 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.
@@ -116,8 +116,8 @@ public interface Realm {
* credentials in the returned Principal?
*/
public Principal authenticate(GSSContext gssContext, boolean storeCreds);
-
-
+
+
/**
* Return the Principal associated with the specified chain of X509
* client certificates. If there is none, return <code>null</code>.
@@ -126,8 +126,8 @@ public interface Realm {
* the array being the certificate of the client itself.
*/
public Principal authenticate(X509Certificate certs[]);
-
-
+
+
/**
* Execute a periodic task, such as reloading, etc. This method will be
* invoked inside the classloading context of this container. Unexpected
@@ -144,8 +144,8 @@ public interface Realm {
*/
public SecurityConstraint [] findSecurityConstraints(Request request,
Context context);
-
-
+
+
/**
* Perform access control based on the specified authorization constraint.
* Return <code>true</code> if this constraint is satisfied and processing
@@ -163,8 +163,8 @@ public interface Realm {
SecurityConstraint [] constraint,
Context context)
throws IOException;
-
-
+
+
/**
* Return <code>true</code> if the specified Principal has the specified
* security role, within the context of this Realm; otherwise return
@@ -192,7 +192,7 @@ public interface Realm {
Response response,
SecurityConstraint []constraint)
throws IOException;
-
+
/**
* Remove a property change listener from this component.
*
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/Role.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/Role.java?rev=1200160&r1=1200159&r2=1200160&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/Role.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/Role.java Thu Nov 10 05:35:13 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.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org