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 <[email protected]> Authored: Thu Jan 28 13:07:23 2016 +0000 Committer: Colm O hEigeartaigh <[email protected]> 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/*";
