You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by mi...@apache.org on 2015/08/11 11:58:59 UTC
svn commit: r1695237 - in /httpcomponents/httpclient/trunk:
httpclient-win/src/main/java/org/apache/http/impl/auth/win/
httpclient-win/src/test/java/org/apache/http/impl/auth/win/
httpclient/src/main/java/org/apache/http/auth/ httpclient/src/main/java/...
Author: michaelo
Date: Tue Aug 11 09:58:58 2015
New Revision: 1695237
URL: http://svn.apache.org/r1695237
Log:
Correct spelling of method 'getPrincipal' newly introduced in AuthScheme interface
Modified:
httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNegotiateScheme.java
httpcomponents/httpclient/trunk/httpclient-win/src/test/java/org/apache/http/impl/auth/win/TestWindowsNegotiateScheme.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthScheme.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicScheme.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/DigestScheme.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMScheme.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultUserTokenHandler.java
Modified: httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNegotiateScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNegotiateScheme.java?rev=1695237&r1=1695236&r2=1695237&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNegotiateScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-win/src/main/java/org/apache/http/impl/auth/win/WindowsNegotiateScheme.java Tue Aug 11 09:58:58 2015
@@ -170,7 +170,7 @@ public class WindowsNegotiateScheme impl
}
@Override
- public Principal getPrinciple() {
+ public Principal getPrincipal() {
return new BasicUserPrincipal(getCurrentUsername());
}
Modified: httpcomponents/httpclient/trunk/httpclient-win/src/test/java/org/apache/http/impl/auth/win/TestWindowsNegotiateScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-win/src/test/java/org/apache/http/impl/auth/win/TestWindowsNegotiateScheme.java?rev=1695237&r1=1695236&r2=1695237&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-win/src/test/java/org/apache/http/impl/auth/win/TestWindowsNegotiateScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-win/src/test/java/org/apache/http/impl/auth/win/TestWindowsNegotiateScheme.java Tue Aug 11 09:58:58 2015
@@ -90,7 +90,7 @@ public class TestWindowsNegotiateScheme
Assume.assumeTrue("Test can only be run on Windows", WinHttpClients.isWinAuthAvailable());
// HTTPCLIENT-1545
- // If a service principle name (SPN) from outside your Windows domain tree (e.g., HTTP/example.com) is used,
+ // If a service principal name (SPN) from outside your Windows domain tree (e.g., HTTP/example.com) is used,
// InitializeSecurityContext will return SEC_E_DOWNGRADE_DETECTED (decimal: -2146892976, hex: 0x80090350).
// Because WindowsNegotiateScheme wasn't setting the completed state correctly when authentication fails,
// HttpClient goes into an infinite loop, constantly retrying the negotiate authentication to kingdom
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthScheme.java?rev=1695237&r1=1695236&r2=1695237&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthScheme.java Tue Aug 11 09:58:58 2015
@@ -41,7 +41,7 @@ import org.apache.http.protocol.HttpCont
* Care must be taken when re-using connections authorized through a connection based
* authentication scheme and they may carry a particular security context and be authorized
* for a particular user identity. It is important that such schemes always provide
- * the user identity they represent through the {@link #getPrinciple()} method.
+ * the user identity they represent through the {@link #getPrincipal()} method.
* <p>
* Authentication scheme are expected to transition through a series of standard phases or
* states.
@@ -162,13 +162,13 @@ public interface AuthScheme {
* an authentication response. Connection based schemes are required
* to return a user {@link Principal} if authorization applies to
* for the entire life span of connection.
- * @return user principle
+ * @return user principal
*
* @see #isConnectionBased()
*
* @since 5.0
*/
- Principal getPrinciple();
+ Principal getPrincipal();
/**
* Generates an authorization response based on the current state. Some authentication
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicScheme.java?rev=1695237&r1=1695236&r2=1695237&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicScheme.java Tue Aug 11 09:58:58 2015
@@ -154,7 +154,7 @@ public class BasicScheme implements Auth
}
@Override
- public Principal getPrinciple() {
+ public Principal getPrincipal() {
return null;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/DigestScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/DigestScheme.java?rev=1695237&r1=1695236&r2=1695237&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/DigestScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/DigestScheme.java Tue Aug 11 09:58:58 2015
@@ -190,7 +190,7 @@ public class DigestScheme implements Aut
}
@Override
- public Principal getPrinciple() {
+ public Principal getPrincipal() {
return null;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java?rev=1695237&r1=1695236&r2=1695237&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java Tue Aug 11 09:58:58 2015
@@ -167,7 +167,7 @@ public abstract class GGSSchemeBase impl
}
@Override
- public Principal getPrinciple() {
+ public Principal getPrincipal() {
return null;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMScheme.java?rev=1695237&r1=1695236&r2=1695237&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMScheme.java Tue Aug 11 09:58:58 2015
@@ -139,7 +139,7 @@ public class NTLMScheme implements AuthS
}
@Override
- public Principal getPrinciple() {
+ public Principal getPrincipal() {
return this.credentials != null ? this.credentials.getUserPrincipal() : null;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultUserTokenHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultUserTokenHandler.java?rev=1695237&r1=1695236&r2=1695237&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultUserTokenHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultUserTokenHandler.java Tue Aug 11 09:58:58 2015
@@ -47,7 +47,7 @@ import org.apache.http.protocol.HttpCont
* persistent connections created with a particular user identity within
* a particular security context can be reused by the same user only.
* <p>
- * DefaultUserTokenHandler will use the user principle of connection
+ * DefaultUserTokenHandler will use the user principal of connection
* based authentication schemes such as NTLM or that of the SSL session
* with the client authentication turned on. If both are unavailable,
* {@code null} token will be returned.
@@ -91,7 +91,7 @@ public class DefaultUserTokenHandler imp
private static Principal getAuthPrincipal(final AuthExchange authState) {
final AuthScheme scheme = authState.getAuthScheme();
if (scheme != null && scheme.isConnectionBased()) {
- return scheme.getPrinciple();
+ return scheme.getPrincipal();
}
return null;
}