cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [2/2] cxf git commit: Removing old configuration tag
Date Fri, 24 Apr 2015 14:35:26 GMT
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 <coheigea@apache.org>
Authored: Fri Apr 24 15:32:37 2015 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
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<Form> formProvider = new FormEncodingProvider<Form>();
         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<Message> 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);


Mime
View raw message