Author: markt
Date: Fri Dec 19 14:35:55 2014
New Revision: 1646735
URL: http://svn.apache.org/r1646735
Log:
Whitespace clean-up
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 19 14:35:55 2014
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1646302,1646304,1646420
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886,1644890,1644892
,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1646098,1646302,1646304,1646420
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java?rev=1646735&r1=1646734&r2=1646735&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
Fri Dec 19 14:35:55 2014
@@ -14,11 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.catalina.authenticator;
-
import java.io.IOException;
import java.security.Principal;
import java.util.HashMap;
@@ -35,7 +32,6 @@ import org.apache.catalina.connector.Req
import org.apache.catalina.connector.Response;
import org.apache.catalina.valves.ValveBase;
-
/**
* A <strong>Valve</strong> that supports a "single sign on" user experience,
* where the security identity of a user who successfully authenticates to one
@@ -58,12 +54,13 @@ import org.apache.catalina.valves.ValveB
public class SingleSignOn extends ValveBase implements SessionListener {
//------------------------------------------------------ Constructor
+
public SingleSignOn() {
super(true);
}
- // ----------------------------------------------------- Instance Variables
+ // ----------------------------------------------------- Instance Variables
/**
* The cache of SingleSignOnEntry instances for authenticated Principals,
@@ -91,6 +88,7 @@ public class SingleSignOn extends ValveB
*/
private String cookieDomain;
+
// ------------------------------------------------------------- Properties
/**
@@ -102,6 +100,8 @@ public class SingleSignOn extends ValveB
public String getCookieDomain() {
return cookieDomain;
}
+
+
/**
* Sets the domain to be used for sso cookies.
*
@@ -115,6 +115,7 @@ public class SingleSignOn extends ValveB
}
}
+
/**
* Gets whether each request needs to be reauthenticated (by an
* Authenticator downstream in the pipeline) to the security
@@ -132,8 +133,7 @@ public class SingleSignOn extends ValveB
*
* @see #setRequireReauthentication
*/
- public boolean getRequireReauthentication()
- {
+ public boolean getRequireReauthentication() {
return requireReauthentication;
}
@@ -178,15 +178,13 @@ public class SingleSignOn extends ValveB
*
* @see AuthenticatorBase#reauthenticateFromSSO
*/
- public void setRequireReauthentication(boolean required)
- {
+ public void setRequireReauthentication(boolean required) {
this.requireReauthentication = required;
}
// ------------------------------------------------ SessionListener Methods
-
/**
* Acknowledge the occurrence of the specified event.
*
@@ -344,7 +342,6 @@ public class SingleSignOn extends ValveB
// ------------------------------------------------------ Protected Methods
-
/**
* Associate the specified single sign on identifier with the
* specified Session.
@@ -368,6 +365,7 @@ public class SingleSignOn extends ValveB
}
+
/**
* Deregister the specified session. If it is the last session,
* then also get rid of the single sign on identifier
@@ -441,6 +439,7 @@ public class SingleSignOn extends ValveB
}
+
/**
* Attempts reauthentication to the given <code>Realm</code> using
* the credentials associated with the single sign-on session
@@ -609,5 +608,4 @@ public class SingleSignOn extends ValveB
deregister(ssoId);
}
}
-
}
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java?rev=1646735&r1=1646734&r2=1646735&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/ha/authenticator/ClusterSingleSignOn.java
Fri Dec 19 14:35:55 2014
@@ -14,11 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.catalina.ha.authenticator;
-
import java.security.Principal;
import org.apache.catalina.Container;
@@ -33,8 +30,6 @@ import org.apache.catalina.ha.ClusterVal
import org.apache.catalina.realm.GenericPrincipal;
import org.apache.tomcat.util.ExceptionUtils;
-
-
/**
* A <strong>Valve</strong> that supports a "single sign on" user experience on
* each nodes of a cluster, where the security identity of a user who
successfully
@@ -76,7 +71,6 @@ public class ClusterSingleSignOn extends
// ------------------------------------------------------ Lifecycle Methods
-
/**
* Start this component and implement the requirements
* of {@link org.apache.catalina.util.LifecycleBase#startInternal()}.
@@ -135,7 +129,6 @@ public class ClusterSingleSignOn extends
// ------------------------------------------------------ Protected Methods
-
/**
* Notify the cluster of the addition of a Session to
* an SSO session and associate the specified single
@@ -169,15 +162,14 @@ public class ClusterSingleSignOn extends
}
associateLocal(ssoId, session);
-
}
- protected void associateLocal(String ssoId, Session session) {
+ protected void associateLocal(String ssoId, Session session) {
super.associate(ssoId, session);
-
}
+
/**
* Notify the cluster of the removal of a Session from an
* SSO session and deregister the specified session. If it is the last
@@ -210,15 +202,14 @@ public class ClusterSingleSignOn extends
}
deregisterLocal(ssoId, session);
-
}
- protected void deregisterLocal(String ssoId, Session session) {
+ protected void deregisterLocal(String ssoId, Session session) {
super.deregister(ssoId, session);
-
}
+
/**
* Notifies the cluster that a single sign on session
* has been terminated due to a user logout, deregister
@@ -245,15 +236,14 @@ public class ClusterSingleSignOn extends
}
deregisterLocal(ssoId);
-
}
- protected void deregisterLocal(String ssoId) {
+ protected void deregisterLocal(String ssoId) {
super.deregister(ssoId);
-
}
+
/**
* Notifies the cluster of the creation of a new SSO entry
* and register the specified Principal as being associated
@@ -292,14 +282,12 @@ public class ClusterSingleSignOn extends
}
registerLocal(ssoId, principal, authType, username, password);
-
}
+
protected void registerLocal(String ssoId, Principal principal, String
authType,
String username, String password) {
-
super.register(ssoId, principal, authType, username, password);
-
}
@@ -355,14 +343,12 @@ public class ClusterSingleSignOn extends
}
updateLocal(ssoId, principal, authType, username, password);
-
}
+
protected void updateLocal(String ssoId, Principal principal, String
authType,
String username, String password) {
-
super.update(ssoId, principal, authType, username, password);
-
}
@@ -399,10 +385,8 @@ public class ClusterSingleSignOn extends
removeSessionLocal(ssoId, session);
}
- protected void removeSessionLocal(String ssoId, Session session) {
+ protected void removeSessionLocal(String ssoId, Session session) {
super.removeSession(ssoId, session);
-
}
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
