cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject svn commit: r1293430 - in /cxf/branches/2.5.x-fixes: ./ systests/rs-security/pom.xml systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth/TemporaryCredentialServiceTest.java
Date Fri, 24 Feb 2012 21:29:30 GMT
Author: ay
Date: Fri Feb 24 21:29:29 2012
New Revision: 1293430

URL: http://svn.apache.org/viewvc?rev=1293430&view=rev
Log:
Merged revisions 1293413 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1293413 | ay | 2012-02-24 21:56:37 +0100 (Fri, 24 Feb 2012) | 1 line
  
  remove unexistent cxf-rt-rs-security-oauth-test ref from systests/rs-security
........

Modified:
    cxf/branches/2.5.x-fixes/   (props changed)
    cxf/branches/2.5.x-fixes/systests/rs-security/pom.xml
    cxf/branches/2.5.x-fixes/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth/TemporaryCredentialServiceTest.java

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Feb 24 21:29:29 2012
@@ -1 +1 @@
-/cxf/trunk:1291943,1292763,1292792,1292839,1293064,1293255,1293326
+/cxf/trunk:1291943,1292763,1292792,1292839,1293064,1293255,1293326,1293413

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.5.x-fixes/systests/rs-security/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/rs-security/pom.xml?rev=1293430&r1=1293429&r2=1293430&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/rs-security/pom.xml (original)
+++ cxf/branches/2.5.x-fixes/systests/rs-security/pom.xml Fri Feb 24 21:29:29 2012
@@ -87,12 +87,6 @@
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-rs-security-oauth-test</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>  
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-bindings-http</artifactId>
             <version>${project.version}</version>
         </dependency>

Modified: cxf/branches/2.5.x-fixes/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth/TemporaryCredentialServiceTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth/TemporaryCredentialServiceTest.java?rev=1293430&r1=1293429&r2=1293430&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth/TemporaryCredentialServiceTest.java
(original)
+++ cxf/branches/2.5.x-fixes/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth/TemporaryCredentialServiceTest.java
Fri Feb 24 21:29:29 2012
@@ -34,13 +34,13 @@ import net.oauth.ParameterStyle;
 
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.common.util.StringUtils;
-import org.apache.cxf.rs.security.oauth.test.OAuthTestUtils;
 import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
 
 import org.eclipse.jetty.http.HttpHeaders;
 
 import org.junit.Assert;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
 
 public class TemporaryCredentialServiceTest extends AbstractBusClientServerTestBase {
@@ -56,6 +56,7 @@ public class TemporaryCredentialServiceT
                    launchServer(OAuthServer.class, true));
     }
     
+    @Ignore
     @Test
     public void testGetTemporaryCredentialsURIQuery() throws Exception {
         Map<String, String> parameters = new HashMap<String, String>();



Mime
View raw message