You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2015/11/23 18:32:49 UTC
[2/2] cxf git commit: Spelling correction
Spelling correction
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f4dd2d51
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f4dd2d51
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f4dd2d51
Branch: refs/heads/master
Commit: f4dd2d51a5d60ef41100c0ccf81bc7f3b134e382
Parents: 6714602
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Nov 23 17:23:54 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Nov 23 17:32:41 2015 +0000
----------------------------------------------------------------------
.../org/apache/cxf/rs/security/oauth2/common/UserSubject.java | 5 +++++
.../org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/f4dd2d51/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/UserSubject.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/UserSubject.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/UserSubject.java
index 6972220..55f575b 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/UserSubject.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/common/UserSubject.java
@@ -134,7 +134,12 @@ public class UserSubject implements Serializable {
return am;
}
+ @Deprecated
public void setAthenticationMethod(AuthenticationMethod method) {
+ setAuthenticationMethod(method);
+ }
+
+ public void setAuthenticationMethod(AuthenticationMethod method) {
this.am = method;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/f4dd2d51/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java
index 51a67a2..74270a3 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java
@@ -121,7 +121,7 @@ public final class OAuthUtils {
UserSubject subject = new UserSubject(securityContext.getUserPrincipal().getName(), roleNames);
Message m = JAXRSUtils.getCurrentMessage();
if (m != null && m.get(AuthenticationMethod.class) != null) {
- subject.setAthenticationMethod(m.get(AuthenticationMethod.class));
+ subject.setAuthenticationMethod(m.get(AuthenticationMethod.class));
}
return subject;
}