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 3F1D41788C for ; Fri, 24 Apr 2015 14:35:26 +0000 (UTC) Received: (qmail 90716 invoked by uid 500); 24 Apr 2015 14:35:26 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 90657 invoked by uid 500); 24 Apr 2015 14:35:26 -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 90648 invoked by uid 99); 24 Apr 2015 14:35:26 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Apr 2015 14:35:26 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A6E99DFDAC; Fri, 24 Apr 2015 14:35:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: coheigea@apache.org To: commits@cxf.apache.org Date: Fri, 24 Apr 2015 14:35:26 -0000 Message-Id: <9ad5c6250baf433487f60050a2887908@git.apache.org> In-Reply-To: <87f4c0edc9604ce79c75e45e590b8e6a@git.apache.org> References: <87f4c0edc9604ce79c75e45e590b8e6a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] cxf git commit: Removing old configuration tag Removing old configuration tag Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/16ffa0f1 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/16ffa0f1 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/16ffa0f1 Branch: refs/heads/master Commit: 16ffa0f10dac874cd5727d312ac56a78b13e5ca9 Parents: 03eadad Author: Colm O hEigeartaigh Authored: Fri Apr 24 15:32:37 2015 +0100 Committer: Colm O hEigeartaigh Committed: Fri Apr 24 15:35:20 2015 +0100 ---------------------------------------------------------------------- .../systest/jaxrs/security/saml/JAXRSSamlTest.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/16ffa0f1/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java ---------------------------------------------------------------------- diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java index cb18ea3..ccbabf4 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/saml/JAXRSSamlTest.java @@ -60,7 +60,7 @@ public class JAXRSSamlTest extends AbstractBusClientServerTestBase { public void testGetBookSAMLTokenAsHeader() throws Exception { String address = "https://localhost:" + PORT + "/samlheader/bookstore/books/123"; - WebClient wc = createWebClient(address, new SamlHeaderOutInterceptor(), null, true); + WebClient wc = createWebClient(address, new SamlHeaderOutInterceptor(), null); try { Book book = wc.get(Book.class); @@ -100,8 +100,7 @@ public class JAXRSSamlTest extends AbstractBusClientServerTestBase { String address = "https://localhost:" + PORT + "/samlform/bookstore/books"; FormEncodingProvider
formProvider = new FormEncodingProvider(); formProvider.setExpectedEncoded(true); - WebClient wc = createWebClient(address, new SamlFormOutInterceptor(), - formProvider, true); + WebClient wc = createWebClient(address, new SamlFormOutInterceptor(), formProvider); wc.type(MediaType.APPLICATION_FORM_URLENCODED).accept(MediaType.APPLICATION_XML); try { @@ -179,8 +178,7 @@ public class JAXRSSamlTest extends AbstractBusClientServerTestBase { public void doTestEnvelopedSAMLToken(boolean signed) throws Exception { String address = "https://localhost:" + PORT + "/samlxml/bookstore/books"; - WebClient wc = createWebClient(address, new SamlEnvelopedOutInterceptor(!signed), - null, signed); + WebClient wc = createWebClient(address, new SamlEnvelopedOutInterceptor(!signed), null); XmlSigOutInterceptor xmlSig = new XmlSigOutInterceptor(); if (signed) { xmlSig.setStyle(XmlSigOutInterceptor.DETACHED_SIG); @@ -205,8 +203,7 @@ public class JAXRSSamlTest extends AbstractBusClientServerTestBase { private WebClient createWebClient(String address, Interceptor outInterceptor, - Object provider, - boolean selfSign) { + Object provider) { JAXRSClientFactoryBean bean = new JAXRSClientFactoryBean(); bean.setAddress(address); @@ -223,9 +220,6 @@ public class JAXRSSamlTest extends AbstractBusClientServerTestBase { properties.put("security.signature.username", "alice"); properties.put("security.signature.properties", "org/apache/cxf/systest/jaxrs/security/alice.properties"); - if (selfSign) { - properties.put("ws-security.self-sign-saml-assertion", "true"); - } bean.setProperties(properties); bean.getOutInterceptors().add(outInterceptor);