svn commit: r1295505 - in /cxf/branches/2.5.x-fixes: ./ systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth/ systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/oauth/server/WEB-INF/

[sergeyb]

Author: sergeyb
Date: Thu Mar  1 10:43:12 2012
New Revision: 1295505

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

........
  r1295504 | sergeyb | 2012-03-01 10:40:27 +0000 (Thu, 01 Mar 2012) | 1 line
  
  Re-enabling oauth10 test
........

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

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar  1 10:43:12 2012
@@ -1 +1 @@
-/cxf/trunk:1295026,1295466
+/cxf/trunk:1295026,1295466,1295504

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

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=1295505&r1=1295504&r2=1295505&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
 Thu Mar  1 10:43:12 2012
@@ -40,7 +40,6 @@ import org.eclipse.jetty.http.HttpHeader
 
 import org.junit.Assert;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class TemporaryCredentialServiceTest extends 
AbstractBusClientServerTestBase {
@@ -56,7 +55,7 @@ public class TemporaryCredentialServiceT
                    launchServer(OAuthServer.class, true));
     }
     
-    @Ignore
+    
     @Test
     public void testGetTemporaryCredentialsURIQuery() throws Exception {
         Map<String, String> parameters = new HashMap<String, String>();

Modified: 
cxf/branches/2.5.x-fixes/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/oauth/server/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/oauth/server/WEB-INF/web.xml?rev=1295505&r1=1295504&r2=1295505&view=diff
==============================================================================
--- 
cxf/branches/2.5.x-fixes/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/oauth/server/WEB-INF/web.xml
 (original)
+++ 
cxf/branches/2.5.x-fixes/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/oauth/server/WEB-INF/web.xml
 Thu Mar  1 10:43:12 2012
@@ -24,7 +24,7 @@ under the License.
 
     <context-param>
         <param-name>oauth.data.provider-class</param-name>
-        
<param-value>org.apache.cxf.rs.security.oauth.test.MemoryOAuthDataProvider</param-value>
+        
<param-value>org.apache.cxf.systest.jaxrs.security.oauth.MemoryOAuthDataProvider</param-value>
     </context-param>
 
     <context-param>