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 47BF5916B for ; Thu, 12 Apr 2012 10:18:18 +0000 (UTC) Received: (qmail 35206 invoked by uid 500); 12 Apr 2012 10:18:18 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 35154 invoked by uid 500); 12 Apr 2012 10:18:18 -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 35145 invoked by uid 99); 12 Apr 2012 10:18:17 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Apr 2012 10:18:17 +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, 12 Apr 2012 10:18:16 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id CD10C23888EA; Thu, 12 Apr 2012 10:17:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1325185 - in /cxf/branches/2.5.x-fixes: ./ systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/ Date: Thu, 12 Apr 2012 10:17:55 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120412101755.CD10C23888EA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: sergeyb Date: Thu Apr 12 10:17:55 2012 New Revision: 1325185 URL: http://svn.apache.org/viewvc?rev=1325185&view=rev Log: Merged revisions 1325180 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1325180 | sergeyb | 2012-04-12 11:04:04 +0100 (Thu, 12 Apr 2012) | 1 line [CXF-4238] Updating the tests to use the specific service name and wildcards ........ Added: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client4.xml - copied unchanged from r1325180, cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client4.xml Modified: cxf/branches/2.5.x-fixes/ (props changed) cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSHttpsBookTest.java cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client3.xml Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/trunk:r1325180 Propchange: cxf/branches/2.5.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSHttpsBookTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSHttpsBookTest.java?rev=1325185&r1=1325184&r2=1325185&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSHttpsBookTest.java (original) +++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/JAXRSHttpsBookTest.java Thu Apr 12 10:17:55 2012 @@ -43,7 +43,8 @@ public class JAXRSHttpsBookTest extends "org/apache/cxf/systest/jaxrs/security/jaxrs-https-client2.xml"; private static final String CLIENT_CONFIG_FILE3 = "org/apache/cxf/systest/jaxrs/security/jaxrs-https-client3.xml"; - + private static final String CLIENT_CONFIG_FILE4 = + "org/apache/cxf/systest/jaxrs/security/jaxrs-https-client4.xml"; @BeforeClass public static void startServers() throws Exception { assertTrue("server did not launch correctly", @@ -73,9 +74,17 @@ public class JAXRSHttpsBookTest extends @Test public void testGetBook123ProxyFromSpring() throws Exception { + doTestGetBook123ProxyFromSpring(CLIENT_CONFIG_FILE3); + } + @Test + public void testGetBook123ProxyFromSpringWildcard() throws Exception { + doTestGetBook123ProxyFromSpring(CLIENT_CONFIG_FILE4); + } + + private void doTestGetBook123ProxyFromSpring(String cfgFile) throws Exception { ClassPathXmlApplicationContext ctx = - new ClassPathXmlApplicationContext(new String[] {CLIENT_CONFIG_FILE3}); + new ClassPathXmlApplicationContext(new String[] {cfgFile}); Object bean = ctx.getBean("bookService.proxyFactory"); assertNotNull(bean); JAXRSClientFactoryBean cfb = (JAXRSClientFactoryBean) bean; Modified: cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client3.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client3.xml?rev=1325185&r1=1325184&r2=1325185&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client3.xml (original) +++ cxf/branches/2.5.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/security/jaxrs-https-client3.xml Thu Apr 12 10:17:55 2012 @@ -35,7 +35,7 @@ under the License. - + @@ -51,6 +51,7 @@ under the License.