Repository: cxf Updated Branches: refs/heads/3.0.x-fixes 202340fdf -> 8c568c084
Fixing last merge Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8c568c08 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8c568c08 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8c568c08 Branch: refs/heads/3.0.x-fixes Commit: 8c568c0843839ea92b12459fd84bdbe797ce20a9 Parents: 202340f Author: Colm O hEigeartaigh <[email protected]> Authored: Thu Jan 28 13:16:03 2016 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Thu Jan 28 13:16:03 2016 +0000 ---------------------------------------------------------------------- .../oauth2/common/OAuthDataProviderImpl.java | 24 -------------------- 1 file changed, 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/8c568c08/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 0f52259..41bff6e 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,12 +123,8 @@ 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/*"; @@ -137,12 +133,8 @@ 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/*"; @@ -151,12 +143,8 @@ 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/*"; @@ -165,12 +153,8 @@ 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/*"; @@ -179,12 +163,8 @@ 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/*"; @@ -193,12 +173,8 @@ 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/*";
