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 2016/01/28 14:14:46 UTC
[1/2] cxf git commit: Adding names for the permissions
Repository: cxf
Updated Branches:
refs/heads/3.0.x-fixes 10704bee9 -> 202340fdf
Adding names for the permissions
# Conflicts:
# systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/OAuthDataProviderImpl.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/70315c87
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/70315c87
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/70315c87
Branch: refs/heads/3.0.x-fixes
Commit: 70315c87d5fef7cbfc37bb5542817f54ef299294
Parents: 10704be
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Jan 28 13:07:23 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Jan 28 13:10:39 2016 +0000
----------------------------------------------------------------------
.../oauth2/common/OAuthDataProviderImpl.java | 24 ++++++++++++++++++++
1 file changed, 24 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/70315c87/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/OAuthDataProviderImpl.java
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/OAuthDataProviderImpl.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/OAuthDataProviderImpl.java
index 41bff6e..0f52259 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/OAuthDataProviderImpl.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/OAuthDataProviderImpl.java
@@ -123,8 +123,12 @@ public class OAuthDataProviderImpl extends DefaultEHCacheCodeDataProvider {
List<OAuthPermission> permissions = new ArrayList<OAuthPermission>();
for (String requestedScope : requestedScopes) {
if ("read_book".equals(requestedScope)) {
+<<<<<<< HEAD
OAuthPermission permission = new OAuthPermission();
permission.setPermission("read_book");
+=======
+ OAuthPermission permission = new OAuthPermission("read_book");
+>>>>>>> 39c2acb... Adding names for the permissions
permission.setHttpVerbs(Collections.singletonList("GET"));
List<String> uris = new ArrayList<String>();
String partnerAddress = "/secured/bookstore/books/*";
@@ -133,8 +137,12 @@ public class OAuthDataProviderImpl extends DefaultEHCacheCodeDataProvider {
permissions.add(permission);
} else if ("create_book".equals(requestedScope)) {
+<<<<<<< HEAD
OAuthPermission permission = new OAuthPermission();
permission.setPermission("create_book");
+=======
+ OAuthPermission permission = new OAuthPermission("create_book");
+>>>>>>> 39c2acb... Adding names for the permissions
permission.setHttpVerbs(Collections.singletonList("POST"));
List<String> uris = new ArrayList<String>();
String partnerAddress = "/secured/bookstore/books/*";
@@ -143,8 +151,12 @@ public class OAuthDataProviderImpl extends DefaultEHCacheCodeDataProvider {
permissions.add(permission);
} else if ("create_image".equals(requestedScope)) {
+<<<<<<< HEAD
OAuthPermission permission = new OAuthPermission();
permission.setPermission("create_image");
+=======
+ OAuthPermission permission = new OAuthPermission("create_image");
+>>>>>>> 39c2acb... Adding names for the permissions
permission.setHttpVerbs(Collections.singletonList("POST"));
List<String> uris = new ArrayList<String>();
String partnerAddress = "/secured/bookstore/image/*";
@@ -153,8 +165,12 @@ public class OAuthDataProviderImpl extends DefaultEHCacheCodeDataProvider {
permissions.add(permission);
} else if ("read_balance".equals(requestedScope)) {
+<<<<<<< HEAD
OAuthPermission permission = new OAuthPermission();
permission.setPermission("read_balance");
+=======
+ OAuthPermission permission = new OAuthPermission("read_balance");
+>>>>>>> 39c2acb... Adding names for the permissions
permission.setHttpVerbs(Collections.singletonList("GET"));
List<String> uris = new ArrayList<String>();
String partnerAddress = "/partners/balance/*";
@@ -163,8 +179,12 @@ public class OAuthDataProviderImpl extends DefaultEHCacheCodeDataProvider {
permissions.add(permission);
} else if ("create_balance".equals(requestedScope)) {
+<<<<<<< HEAD
OAuthPermission permission = new OAuthPermission();
permission.setPermission("create_balance");
+=======
+ OAuthPermission permission = new OAuthPermission("create_balance");
+>>>>>>> 39c2acb... Adding names for the permissions
permission.setHttpVerbs(Collections.singletonList("POST"));
List<String> uris = new ArrayList<String>();
String partnerAddress = "/partners/balance/*";
@@ -173,8 +193,12 @@ public class OAuthDataProviderImpl extends DefaultEHCacheCodeDataProvider {
permissions.add(permission);
} else if ("read_data".equals(requestedScope)) {
+<<<<<<< HEAD
OAuthPermission permission = new OAuthPermission();
permission.setPermission("read_data");
+=======
+ OAuthPermission permission = new OAuthPermission("read_data");
+>>>>>>> 39c2acb... Adding names for the permissions
permission.setHttpVerbs(Collections.singletonList("GET"));
List<String> uris = new ArrayList<String>();
String partnerAddress = "/partners/data/*";
[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/202340fd
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/202340fd
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/202340fd
Branch: refs/heads/3.0.x-fixes
Commit: 202340fdf02da559d79e0d603c7d97d981799e7c
Parents: 70315c8
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Jan 28 13:14:40 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Jan 28 13:14:40 2016 +0000
----------------------------------------------------------------------
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/202340fd/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 491f6f4..fffb921 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -133,6 +133,7 @@ B 3913cbf504bb863e48ed5fcff25edc06e25f52c0
B 393cffc9c5ab323ef81eeaebe4137126e3403ff2
B 3948f2f0b08f40bdffc8c829429bf33b52ac26e5
B 39ac2b4eb848be0142d4f3e3da2bb6eb00ea55e5
+B 39c2acb412b6f1ee9ea807d1ac93934597f0ba2e
B 3a080015474d27075b0b03aa9ec74ab443504ebd
B 3aec3e286e4732918589c239ea1b8f7e1d3a9836
B 3b1a8cc3a8c1b213a8f6728ae9154cf14c9c1300