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:33:14 UTC
[1/2] cxf git commit: Spelling correction
Repository: cxf
Updated Branches:
refs/heads/3.1.x-fixes 96d0e7c75 -> c0077dde9
Spelling correction
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7691c351
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7691c351
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7691c351
Branch: refs/heads/3.1.x-fixes
Commit: 7691c351318c8f600b5b0ff08c4369e3dc86c960
Parents: 96d0e7c
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:33:07 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/7691c351/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/7691c351/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;
}
[2/2] cxf git commit: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c0077dde
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c0077dde
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c0077dde
Branch: refs/heads/3.1.x-fixes
Commit: c0077dde9d9bab9987bf052b6641df9654b36402
Parents: 7691c35
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Nov 23 17:33:09 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Nov 23 17:33:09 2015 +0000
----------------------------------------------------------------------
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/c0077dde/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index b590b17..e195f7c 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -6,6 +6,7 @@ B 65e1e07fdb810ec9de135530ca3e3d23821836a3
B 7b7629682d15345518e66d46e575bf1ac334cf00
B 7fc957efa3a193a5f2ae178b8a608717ce4c5b26
B a261507ebd3104b1a00298801ec9815ed1e7a728
+B a7362dfaf2141cb4f303f81bbb94c6df81be75cb
B ced98c6e937bd93f92dac9043fa0406c696bfd84
B f0e08b7bea2660542e18294d490e68c7b14aaa4b
B f1b56150d6520e73d2ade2296c3b2f13839e63e5