Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 25A1A9A2B for ; Thu, 1 Mar 2012 10:43:38 +0000 (UTC) Received: (qmail 53541 invoked by uid 500); 1 Mar 2012 10:43:38 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 53496 invoked by uid 500); 1 Mar 2012 10:43:38 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 53488 invoked by uid 99); 1 Mar 2012 10:43:38 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Mar 2012 10:43:38 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 01 Mar 2012 10:43:34 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E58A323888D2; Thu, 1 Mar 2012 10:43:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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/ Date: Thu, 01 Mar 2012 10:43:13 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120301104313.E58A323888D2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 parameters = new HashMap(); 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. oauth.data.provider-class - org.apache.cxf.rs.security.oauth.test.MemoryOAuthDataProvider + org.apache.cxf.systest.jaxrs.security.oauth.MemoryOAuthDataProvider