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/26 18:11:27 UTC
[4/4] cxf git commit: Fixing merge
Fixing merge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/bf3e0eb2
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/bf3e0eb2
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/bf3e0eb2
Branch: refs/heads/3.0.x-fixes
Commit: bf3e0eb2d682e4625fbf3f0a57d59d6f5805363d
Parents: f9e78fc
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Jan 26 17:11:07 2016 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Jan 26 17:11:07 2016 +0000
----------------------------------------------------------------------
.../security/oauth2/grants/AuthorizationGrantNegativeTest.java | 1 +
.../jaxrs/security/oauth2/grants/AuthorizationGrantTest.java | 4 ----
2 files changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/bf3e0eb2/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/AuthorizationGrantNegativeTest.java
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/AuthorizationGrantNegativeTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/AuthorizationGrantNegativeTest.java
index 3bf0457..271e2e3 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/AuthorizationGrantNegativeTest.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/AuthorizationGrantNegativeTest.java
@@ -457,6 +457,7 @@ public class AuthorizationGrantNegativeTest extends AbstractBusClientServerTestB
}
@org.junit.Test
+ @org.junit.Ignore
public void testAuthorizationCodeGrantWithUnknownAudience() throws Exception {
URL busFile = AuthorizationGrantTest.class.getResource("client.xml");
http://git-wip-us.apache.org/repos/asf/cxf/blob/bf3e0eb2/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/AuthorizationGrantTest.java
----------------------------------------------------------------------
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/AuthorizationGrantTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/AuthorizationGrantTest.java
index abdd55e..3de3041 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/AuthorizationGrantTest.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/grants/AuthorizationGrantTest.java
@@ -349,10 +349,6 @@ public class AuthorizationGrantTest extends AbstractBusClientServerTestBase {
assertNotNull(accessToken.getTokenKey());
assertNotNull(accessToken.getRefreshToken());
}
-<<<<<<< HEAD
*/
-=======
-
->>>>>>> dacc6f8... Adding some audience system tests
}