From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 1 Apr 2011 11:16:02 +0000 (+0000)
Subject: Consistent naming
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=e7f3d30cf574aa3b330c878b6d20ab2b6850bfd2;p=tomcat7.0

Consistent naming

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1087651 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java b/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
index e862864ba..a6389b1a1 100644
--- a/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
+++ b/java/org/apache/catalina/authenticator/SpnegoAuthenticator.java
@@ -59,13 +59,13 @@ public class SpnegoAuthenticator extends AuthenticatorBase {
         this.loginConfigName = loginConfigName;
     }
 
-    private boolean storeDelegatedCredentials = true;
-    public boolean isStoreDelegatedCredentials() {
-        return storeDelegatedCredentials;
+    private boolean storeDelegatedCredential = true;
+    public boolean isStoreDelegatedCredential() {
+        return storeDelegatedCredential;
     }
-    public void setStoreDelegatedCredentials(
-            boolean storeDelegatedCredentials) {
-        this.storeDelegatedCredentials = storeDelegatedCredentials;
+    public void setStoreDelegatedCredential(
+            boolean storeDelegatedCredential) {
+        this.storeDelegatedCredential = storeDelegatedCredential;
     }
 
 
@@ -221,7 +221,7 @@ public class SpnegoAuthenticator extends AuthenticatorBase {
             }
 
             principal = context.getRealm().authenticate(gssContext,
-                    storeDelegatedCredentials);
+                    storeDelegatedCredential);
         } catch (GSSException e) {
             if (log.isDebugEnabled()) {
                 log.debug(sm.getString("spnegoAuthenticator.ticketValidateFail",
diff --git a/webapps/docs/config/valve.xml b/webapps/docs/config/valve.xml
index 8cd90ab8d..bc8add1e4 100644
--- a/webapps/docs/config/valve.xml
+++ b/webapps/docs/config/valve.xml
@@ -891,9 +891,9 @@
         specified, the platform default provider will be used.</p>
       </attribute>
 
-      <attribute name="storeDelegatedCredentials" required="false">
-        <p>Controls if the user&apos; delegated credentials will be stored in
-        the user Principal. If available, the delegated credentials will be
+      <attribute name="storeDelegatedCredential" required="false">
+        <p>Controls if the user&apos; delegated credential will be stored in
+        the user Principal. If available, the delegated credential will be
         available to applications (e.g. for onward authentication to external
         services) via the <code>org.apache.catalina.realm.GSS_CREDENTIAL</code>
         request attribute.If not set, the default value of <code>true</code>