Author: markt
Date: Fri Dec 19 14:52:40 2014
New Revision: 1646754
URL: http://svn.apache.org/r1646754
Log:
Should use containerLog rather than own log
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/LocalStrings.properties
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/SingleSignOn.java
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Dec 19 14:52:40 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,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646718
+/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-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646719
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/LocalStrings.properties?rev=1646754&r1=1646753&r2=1646754&view=diff
==============================================================================
---
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/LocalStrings.properties
(original)
+++
tomcat/tc8.0.x/trunk/java/org/apache/catalina/authenticator/LocalStrings.properties
Fri Dec 19 14:52:40 2014
@@ -31,12 +31,12 @@ formAuthenticator.forwardLoginFail=Unexp
formAuthenticator.noErrorPage=No error page was defined for FORM
authentication in context [{0}]
formAuthenticator.noLoginPage=No login page was defined for FORM
authentication in context [{0}]
-singleSignOn.sessionExpire.engineNull=Unable to expire session [{0}] because
the Engine was null
-singleSignOn.sessionExpire.hostNotFound=Unable to expire session [{0}] because
the Host could not be found
-singleSignOn.sessionExpire.contextNotFound=Unable to expire session [{0}]
because the Context could not be found
-singleSignOn.sessionExpire.managerNotFound=Unable to expire session [{0}]
because the Manager could not be found
-singleSignOn.sessionExpire.managerError=Unable to expire session [{0}] because
the Manager threw an Exception when searching for the session
-singleSignOn.sessionExpire.sessionNotFound=Unable to expire session [{0}]
because the Session could not be found
+singleSignOn.sessionExpire.engineNull=SSO unable to expire session [{0}]
because the Engine was null
+singleSignOn.sessionExpire.hostNotFound=SSO unable to expire session [{0}]
because the Host could not be found
+singleSignOn.sessionExpire.contextNotFound=SSO unable to expire session [{0}]
because the Context could not be found
+singleSignOn.sessionExpire.managerNotFound=SSO unable to expire session [{0}]
because the Manager could not be found
+singleSignOn.sessionExpire.managerError=SSO unable to expire session [{0}]
because the Manager threw an Exception when searching for the session
+singleSignOn.sessionExpire.sessionNotFound=SSO unable to expire session [{0}]
because the Session could not be found
spnegoAuthenticator.authHeaderNoToken=The Negotiate authorization header sent
by the client did not include a token
spnegoAuthenticator.authHeaderNotNego=The authorization header sent by the
client did not start with Negotiate
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=1646754&r1=1646753&r2=1646754&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:52:40 2014
@@ -36,8 +36,6 @@ import org.apache.catalina.SessionListen
import org.apache.catalina.connector.Request;
import org.apache.catalina.connector.Response;
import org.apache.catalina.valves.ValveBase;
-import org.apache.juli.logging.Log;
-import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.res.StringManager;
/**
@@ -61,7 +59,6 @@ import org.apache.tomcat.util.res.String
*/
public class SingleSignOn extends ValveBase implements SessionListener {
- private static final Log log = LogFactory.getLog(SingleSignOn.class);
private static final StringManager sm =
StringManager.getManager(SingleSignOn.class);
/* The engine at the top of the container hierarchy in which this SSO Valve
@@ -410,33 +407,33 @@ public class SingleSignOn extends ValveB
private void expire(SingleSignOnSessionKey key) {
if (engine == null) {
- log.warn(sm.getString("singleSignOn.sessionExpire.engineNull",
key));
+
containerLog.warn(sm.getString("singleSignOn.sessionExpire.engineNull", key));
return;
}
Container host = engine.findChild(key.getHostName());
if (host == null) {
- log.warn(sm.getString("singleSignOn.sessionExpire.hostNotFound",
key));
+
containerLog.warn(sm.getString("singleSignOn.sessionExpire.hostNotFound", key));
return;
}
Context context = (Context) host.findChild(key.getContextName());
if (context == null) {
-
log.warn(sm.getString("singleSignOn.sessionExpire.contextNotFound", key));
+
containerLog.warn(sm.getString("singleSignOn.sessionExpire.contextNotFound",
key));
return;
}
Manager manager = context.getManager();
if (manager == null) {
-
log.warn(sm.getString("singleSignOn.sessionExpire.managerNotFound", key));
+
containerLog.warn(sm.getString("singleSignOn.sessionExpire.managerNotFound",
key));
return;
}
Session session = null;
try {
session = manager.findSession(key.getSessionId());
} catch (IOException e) {
- log.warn(sm.getString("singleSignOn.sessionExpire.managerError",
key), e);
+
containerLog.warn(sm.getString("singleSignOn.sessionExpire.managerError", key),
e);
return;
}
if (session == null) {
-
log.warn(sm.getString("singleSignOn.sessionExpire.sessionNotFound", key));
+
containerLog.warn(sm.getString("singleSignOn.sessionExpire.sessionNotFound",
key));
return;
}
session.expire();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
