cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [3/3] git commit: Fixing build
Date Fri, 25 Jul 2014 13:39:38 GMT
Fixing build


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3d4f1474
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3d4f1474
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3d4f1474

Branch: refs/heads/2.7.x-fixes
Commit: 3d4f1474efa7368992a57ffae33c8d8ad9006461
Parents: 3983089
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Fri Jul 25 14:39:27 2014 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Fri Jul 25 14:39:27 2014 +0100

----------------------------------------------------------------------
 .../cxf/systest/ws/x509/X509TokenTest.java      |  71 +--
 .../cxf/systest/ws/x509/DoubleItX509.wsdl       | 527 +------------------
 2 files changed, 4 insertions(+), 594 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/3d4f1474/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
index 32a5904..61e8866 100644
--- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
+++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java
@@ -70,25 +70,12 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
         );
     }
     
-<<<<<<< HEAD
-=======
-    @Parameters(name = "{0}")
-    public static Collection<TestParam[]> data() {
-       
-        return Arrays.asList(new TestParam[][] {{new TestParam(PORT, false)},
-                                               // {new TestParam(PORT, true)},
-                                                //{new TestParam(STAX_PORT, false)},
-                                               // {new TestParam(STAX_PORT, true)},
-        });
-    }
-    
->>>>>>> 43c9a1c... Fixing a SAML SSO validation issue
     @org.junit.AfterClass
     public static void cleanup() throws Exception {
         SecurityTestUtil.cleanup();
         stopAllServers();
     }
-/*
+
     @org.junit.Test
     public void testKeyIdentifier() throws Exception {
 
@@ -204,61 +191,8 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
         ((java.io.Closeable)x509Port).close();
         bus.shutdown(true);
     }
-    */
-    @org.junit.Test
-<<<<<<< HEAD
-=======
-    public void testSymmetricThumbprintEndorsing() throws Exception {
-
-        SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = X509TokenTest.class.getResource("client.xml");
-
-        Bus bus = bf.createBus(busFile.toString());
-        SpringBusFactory.setDefaultBus(bus);
-        SpringBusFactory.setThreadDefaultBus(bus);
-
-        URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl");
-        Service service = Service.create(wsdl, SERVICE_QNAME);
-        QName portQName = new QName(NAMESPACE, "DoubleItSymmetricThumbprintEndorsingPort");
-        DoubleItPortType x509Port = 
-                service.getPort(portQName, DoubleItPortType.class);
-        updateAddressPort(x509Port, test.getPort());
-        
-        if (!test.isStreaming()) {
-            x509Port.doubleIt(25);
-        }
-        
-        ((java.io.Closeable)x509Port).close();
-        bus.shutdown(true);
-    }
-    /*
-    @org.junit.Test
-    public void testSymmetricEndorsingEncrypted() throws Exception {
-
-        SpringBusFactory bf = new SpringBusFactory();
-        URL busFile = X509TokenTest.class.getResource("client.xml");
-
-        Bus bus = bf.createBus(busFile.toString());
-        SpringBusFactory.setDefaultBus(bus);
-        SpringBusFactory.setThreadDefaultBus(bus);
-
-        URL wsdl = X509TokenTest.class.getResource("DoubleItX509.wsdl");
-        Service service = Service.create(wsdl, SERVICE_QNAME);
-        QName portQName = new QName(NAMESPACE, "DoubleItSymmetricEndorsingEncryptedPort");
-        DoubleItPortType x509Port = 
-                service.getPort(portQName, DoubleItPortType.class);
-        updateAddressPort(x509Port, test.getPort());
-        
-        if (!test.isStreaming()) {
-            x509Port.doubleIt(25);
-        }
-        
-        ((java.io.Closeable)x509Port).close();
-        bus.shutdown(true);
-    }
     
     @org.junit.Test
->>>>>>> 43c9a1c... Fixing a SAML SSO validation issue
     public void testContentEncryptedElements() throws Exception {
 
         SpringBusFactory bf = new SpringBusFactory();
@@ -964,5 +898,6 @@ public class X509TokenTest extends AbstractBusClientServerTestBase {
         ((java.io.Closeable)port).close();
         bus.shutdown(true);
     }
-    */
+    
 }
+

http://git-wip-us.apache.org/repos/asf/cxf/blob/3d4f1474/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl
----------------------------------------------------------------------
diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl
b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl
index a2418f5..c756796 100644
--- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl
+++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl
@@ -598,7 +598,6 @@
         <wsp:ExactlyOne>
             <wsp:All>
                 <sp:SymmetricBinding>
-<<<<<<< HEAD
                   <wsp:Policy>
                     <sp:ProtectionToken>
                        <wsp:Policy>
@@ -625,531 +624,6 @@
                     </sp:AlgorithmSuite>
                  </wsp:Policy>
               </sp:SymmetricBinding>
-=======
-                    <wsp:Policy>
-                        <sp:ProtectionToken>
-                            <wsp:Policy>
-                                <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
-                                    <wsp:Policy>
-                                        <sp:WssX509V3Token10/>
-                                        <sp:RequireKeyIdentifierReference/>
-                                    </wsp:Policy>
-                                </sp:X509Token>
-                            </wsp:Policy>
-                        </sp:ProtectionToken>
-                        <sp:Layout>
-                            <wsp:Policy>
-                                <sp:Lax/>
-                            </wsp:Policy>
-                        </sp:Layout>
-                        <sp:IncludeTimestamp/>
-                        <sp:OnlySignEntireHeadersAndBody/>
-                        <sp:AlgorithmSuite>
-                            <wsp:Policy>
-                                <sp:Basic128/>
-                            </wsp:Policy>
-                        </sp:AlgorithmSuite>
-                    </wsp:Policy>
-                </sp:SymmetricBinding>
-            </wsp:All>
-        </wsp:ExactlyOne>
-    </wsp:Policy>
-    <wsp:Policy wsu:Id="DoubleItKeyIdentifierDerivedPolicy">
-        <wsp:ExactlyOne>
-            <wsp:All>
-                <sp:SymmetricBinding>
-                    <wsp:Policy>
-                        <sp:ProtectionToken>
-                            <wsp:Policy>
-                                <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
-                                    <wsp:Policy>
-                                        <sp:WssX509V3Token10/>
-                                        <sp:RequireKeyIdentifierReference/>
-                                        <sp:RequireDerivedKeys/>
-                                    </wsp:Policy>
-                                </sp:X509Token>
-                            </wsp:Policy>
-                        </sp:ProtectionToken>
-                        <sp:Layout>
-                            <wsp:Policy>
-                                <sp:Lax/>
-                            </wsp:Policy>
-                        </sp:Layout>
-                        <sp:IncludeTimestamp/>
-                        <sp:OnlySignEntireHeadersAndBody/>
-                        <sp:AlgorithmSuite>
-                            <wsp:Policy>
-                                <sp:Basic128/>
-                            </wsp:Policy>
-                        </sp:AlgorithmSuite>
-                    </wsp:Policy>
-                </sp:SymmetricBinding>
-            </wsp:All>
-        </wsp:ExactlyOne>
-    </wsp:Policy>
-    <wsp:Policy wsu:Id="DoubleItKeyIdentifierEncryptBeforeSigningPolicy">
-        <wsp:ExactlyOne>
-            <wsp:All>
-                <sp:SymmetricBinding>
-                    <wsp:Policy>
-                        <sp:ProtectionToken>
-                            <wsp:Policy>
-                                <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
-                                    <wsp:Policy>
-                                        <sp:WssX509V3Token10/>
-                                        <sp:RequireKeyIdentifierReference/>
-                                    </wsp:Policy>
-                                </sp:X509Token>
-                            </wsp:Policy>
-                        </sp:ProtectionToken>
-                        <sp:Layout>
-                            <wsp:Policy>
-                                <sp:Lax/>
-                            </wsp:Policy>
-                        </sp:Layout>
-                        <sp:IncludeTimestamp/>
-                        <sp:OnlySignEntireHeadersAndBody/>
-                        <sp:EncryptBeforeSigning/>
-                        <sp:AlgorithmSuite>
-                            <wsp:Policy>
-                                <sp:Basic128/>
-                            </wsp:Policy>
-                        </sp:AlgorithmSuite>
-                    </wsp:Policy>
-                </sp:SymmetricBinding>
-            </wsp:All>
-        </wsp:ExactlyOne>
-    </wsp:Policy>
-    <wsp:Policy wsu:Id="DoubleItKeyIdentifierEncryptBeforeSigningDerivedPolicy">
-        <wsp:ExactlyOne>
-            <wsp:All>
-                <sp:SymmetricBinding>
-                    <wsp:Policy>
-                        <sp:ProtectionToken>
-                            <wsp:Policy>
-                                <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
-                                    <wsp:Policy>
-                                        <sp:WssX509V3Token10/>
-                                        <sp:RequireKeyIdentifierReference/>
-                                        <sp:RequireDerivedKeys/>
-                                    </wsp:Policy>
-                                </sp:X509Token>
-                            </wsp:Policy>
-                        </sp:ProtectionToken>
-                        <sp:Layout>
-                            <wsp:Policy>
-                                <sp:Lax/>
-                            </wsp:Policy>
-                        </sp:Layout>
-                        <sp:IncludeTimestamp/>
-                        <sp:OnlySignEntireHeadersAndBody/>
-                        <sp:EncryptBeforeSigning/>
-                        <sp:AlgorithmSuite>
-                            <wsp:Policy>
-                                <sp:Basic128/>
-                            </wsp:Policy>
-                        </sp:AlgorithmSuite>
-                    </wsp:Policy>
-                </sp:SymmetricBinding>
-            </wsp:All>
-        </wsp:ExactlyOne>
-    </wsp:Policy>
-    <wsp:Policy wsu:Id="DoubleItIssuerSerialPolicy">
-        <wsp:ExactlyOne>
-            <wsp:All>
-                <sp:SymmetricBinding>
-                    <wsp:Policy>
-                        <sp:ProtectionToken>
-                            <wsp:Policy>
-                                <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
-                                    <wsp:Policy>
-                                        <sp:WssX509V3Token11/>
-                                        <sp:RequireIssuerSerialReference/>
-                                    </wsp:Policy>
-                                </sp:X509Token>
-                            </wsp:Policy>
-                        </sp:ProtectionToken>
-                        <sp:Layout>
-                            <wsp:Policy>
-                                <sp:Lax/>
-                            </wsp:Policy>
-                        </sp:Layout>
-                        <sp:IncludeTimestamp/>
-                        <sp:OnlySignEntireHeadersAndBody/>
-                        <sp:AlgorithmSuite>
-                            <wsp:Policy>
-                                <sp:Basic128/>
-                            </wsp:Policy>
-                        </sp:AlgorithmSuite>
-                    </wsp:Policy>
-                </sp:SymmetricBinding>
-            </wsp:All>
-        </wsp:ExactlyOne>
-    </wsp:Policy>
-    <wsp:Policy wsu:Id="DoubleItThumbprintPolicy">
-        <wsp:ExactlyOne>
-            <wsp:All>
-                <sp:SymmetricBinding>
-                    <wsp:Policy>
-                        <sp:ProtectionToken>
-                            <wsp:Policy>
-                                <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
-                                    <wsp:Policy>
-                                        <sp:WssX509V3Token11/>
-                                        <sp:RequireThumbprintReference/>
-                                    </wsp:Policy>
-                                </sp:X509Token>
-                            </wsp:Policy>
-                        </sp:ProtectionToken>
-                        <sp:Layout>
-                            <wsp:Policy>
-                                <sp:Lax/>
-                            </wsp:Policy>
-                        </sp:Layout>
-                        <sp:IncludeTimestamp/>
-                        <sp:OnlySignEntireHeadersAndBody/>
-                        <sp:SignBeforeEncrypting/>
-                        <sp:AlgorithmSuite>
-                            <wsp:Policy>
-                                <sp:Basic128/>
-                            </wsp:Policy>
-                        </sp:AlgorithmSuite>
-                    </wsp:Policy>
-                </sp:SymmetricBinding>
-            </wsp:All>
-        </wsp:ExactlyOne>
-    </wsp:Policy>
-    <wsp:Policy wsu:Id="DoubleItSymmetricThumbprintEndorsingPolicy">
-        <wsp:ExactlyOne>
-            <wsp:All>
-                <sp:SymmetricBinding>
-                    <wsp:Policy>
-                        <sp:ProtectionToken>
-                            <wsp:Policy>
-                                <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
-                                    <wsp:Policy>
-                                        <sp:WssX509V3Token10/>
-                                        <sp:RequireThumbprintReference/>
-                                    </wsp:Policy>
-                                </sp:X509Token>
-                            </wsp:Policy>
-                        </sp:ProtectionToken>
-                        <sp:Layout>
-                            <wsp:Policy>
-                                <sp:Strict/>
-                            </wsp:Policy>
-                        </sp:Layout>
-                        <sp:IncludeTimestamp/>
-                        <sp:OnlySignEntireHeadersAndBody/>
-                        <sp:AlgorithmSuite>
-                            <wsp:Policy>
-                                <sp:Basic128/>
-                            </wsp:Policy>
-                        </sp:AlgorithmSuite>
-                    </wsp:Policy>
-                </sp:SymmetricBinding>
-                <sp:EndorsingSupportingTokens>
-                    <wsp:Policy>
-                        <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
-                            <wsp:Policy>
-                                <sp:RequireThumbprintReference/>
-                                <sp:WssX509V3Token10/>
-                            </wsp:Policy>
-                        </sp:X509Token>
-                    </wsp:Policy>
-                </sp:EndorsingSupportingTokens>
-            </wsp:All>
-        </wsp:ExactlyOne>
-    </wsp:Policy>
-    <wsp:Policy wsu:Id="DoubleItSymmetricEndorsingEncryptedPolicy">
-        <wsp:ExactlyOne>
-            <wsp:All>
-                <sp:SymmetricBinding>
-                    <wsp:Policy>
-                        <sp:ProtectionToken>
-                            <wsp:Policy>
-                                <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
-                                    <wsp:Policy>
-                                        <sp:WssX509V3Token10/>
-                                        <sp:RequireDerivedKeys/>
-                                        <sp:RequireThumbprintReference/>
-                                    </wsp:Policy>
-                                </sp:X509Token>
-                            </wsp:Policy>
-                        </sp:ProtectionToken>
-                        <sp:Layout>
-                            <wsp:Policy>
-                                <sp:Strict/>
-                            </wsp:Policy>
-                        </sp:Layout>
-                        <sp:IncludeTimestamp/>
-                        <sp:EncryptSignature/>
-                        <sp:OnlySignEntireHeadersAndBody/>
-                        <sp:AlgorithmSuite>
-                            <wsp:Policy>
-                                <sp:Basic128/>
-                            </wsp:Policy>
-                        </sp:AlgorithmSuite>
-                    </wsp:Policy>
-                </sp:SymmetricBinding>
-                <sp:EndorsingEncryptedSupportingTokens>
-                    <wsp:Policy>
-                        <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
-                            <wsp:Policy>
-                                <sp:RequireThumbprintReference/>
-                                <sp:WssX509V3Token10/>
-                            </wsp:Policy>
-                        </sp:X509Token>
-                    </wsp:Policy>
-                </sp:EndorsingEncryptedSupportingTokens>
-            </wsp:All>
-        </wsp:ExactlyOne>
-    </wsp:Policy>
-    <wsp:Policy wsu:Id="DoubleItAsymmetricIssuerSerialPolicy">
-        <wsp:ExactlyOne>
-            <wsp:All>
-                <sp:AsymmetricBinding>
-                    <wsp:Policy>
-                        <sp:InitiatorToken>
-                            <wsp:Policy>
-                                <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
-                                    <wsp:Policy>
-                                        <sp:WssX509V3Token10/>
-                                        <sp:RequireIssuerSerialReference/>
-                                    </wsp:Policy>
-                                </sp:X509Token>
-                            </wsp:Policy>
-                        </sp:InitiatorToken>
-                        <sp:RecipientToken>
-                            <wsp:Policy>
-                                <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
-                                    <wsp:Policy>
-                                        <sp:WssX509V3Token10/>
-                                        <sp:RequireIssuerSerialReference/>
-                                    </wsp:Policy>
-                                </sp:X509Token>
-                            </wsp:Policy>
-                        </sp:RecipientToken>
-                        <sp:Layout>
-                            <wsp:Policy>
-                                <sp:Lax/>
-                            </wsp:Policy>
-                        </sp:Layout>
-                        <sp:IncludeTimestamp/>
-                        <sp:OnlySignEntireHeadersAndBody/>
-                        <sp:AlgorithmSuite>
-                            <wsp:Policy>
-                                <sp:Basic128/>
-                            </wsp:Policy>
-                        </sp:AlgorithmSuite>
-                    </wsp:Policy>
-                </sp:AsymmetricBinding>
-            </wsp:All>
-        </wsp:ExactlyOne>
-    </wsp:Policy>
-    <wsp:Policy wsu:Id="DoubleItAsymmetricNoInitiatorReferencePolicy">
-        <wsp:ExactlyOne>
-            <wsp:All>
-                <sp:AsymmetricBinding>
-                    <wsp:Policy>
-                        <sp:InitiatorToken>
-                            <wsp:Policy>
-                                <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
-                                    <wsp:Policy>
-                                        <sp:WssX509V3Token10/>
-                                    </wsp:Policy>
-                                </sp:X509Token>
-                            </wsp:Policy>
-                        </sp:InitiatorToken>
-                        <sp:RecipientToken>
-                            <wsp:Policy>
-                                <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
-                                    <wsp:Policy>
-                                        <sp:WssX509V3Token10/>
-                                        <sp:RequireIssuerSerialReference/>
-                                    </wsp:Policy>
-                                </sp:X509Token>
-                            </wsp:Policy>
-                        </sp:RecipientToken>
-                        <sp:Layout>
-                            <wsp:Policy>
-                                <sp:Lax/>
-                            </wsp:Policy>
-                        </sp:Layout>
-                        <sp:IncludeTimestamp/>
-                        <sp:OnlySignEntireHeadersAndBody/>
-                        <sp:AlgorithmSuite>
-                            <wsp:Policy>
-                                <sp:Basic128/>
-                            </wsp:Policy>
-                        </sp:AlgorithmSuite>
-                    </wsp:Policy>
-                </sp:AsymmetricBinding>
-            </wsp:All>
-        </wsp:ExactlyOne>
-    </wsp:Policy>
-    <wsp:Policy wsu:Id="DoubleItAsymmetricSP11Policy">
-        <wsp:ExactlyOne>
-            <wsp:All>
-                <sp:AsymmetricBinding xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
-                    <wsp:Policy>
-                        <sp:InitiatorToken>
-                            <wsp:Policy>
-                                <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
-                                    <wsp:Policy>
-                                        <sp:WssX509V3Token10/>
-                                        <sp:RequireIssuerSerialReference/>
-                                    </wsp:Policy>
-                                </sp:X509Token>
-                            </wsp:Policy>
-                        </sp:InitiatorToken>
-                        <sp:RecipientToken>
-                            <wsp:Policy>
-                                <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToInitiator">
-                                    <wsp:Policy>
-                                        <sp:WssX509V3Token10/>
-                                        <sp:RequireIssuerSerialReference/>
-                                    </wsp:Policy>
-                                </sp:X509Token>
-                            </wsp:Policy>
-                        </sp:RecipientToken>
-                        <sp:Layout>
-                            <wsp:Policy>
-                                <sp:Lax/>
-                            </wsp:Policy>
-                        </sp:Layout>
-                        <sp:IncludeTimestamp/>
-                        <sp:OnlySignEntireHeadersAndBody/>
-                        <sp:AlgorithmSuite>
-                            <wsp:Policy>
-                                <sp:Basic128/>
-                            </wsp:Policy>
-                        </sp:AlgorithmSuite>
-                    </wsp:Policy>
-                </sp:AsymmetricBinding>
-            </wsp:All>
-        </wsp:ExactlyOne>
-    </wsp:Policy>
-    <wsp:Policy wsu:Id="DoubleItAsymmetricSHA256Policy">
-        <wsp:ExactlyOne>
-            <wsp:All>
-                <sp:AsymmetricBinding>
-                    <wsp:Policy>
-                        <sp:InitiatorToken>
-                            <wsp:Policy>
-                                <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
-                                    <wsp:Policy>
-                                        <sp:WssX509V3Token10/>
-                                    </wsp:Policy>
-                                </sp:X509Token>
-                            </wsp:Policy>
-                        </sp:InitiatorToken>
-                        <sp:RecipientToken>
-                            <wsp:Policy>
-                                <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
-                                    <wsp:Policy>
-                                        <sp:WssX509V3Token10/>
-                                    </wsp:Policy>
-                                </sp:X509Token>
-                            </wsp:Policy>
-                        </sp:RecipientToken>
-                        <sp:IncludeTimestamp/>
-                        <sp:OnlySignEntireHeadersAndBody/>
-                        <sp:AlgorithmSuite>
-                            <wsp:Policy>
-                                <sp:Basic128Sha256/>
-                            </wsp:Policy>
-                        </sp:AlgorithmSuite>
-                    </wsp:Policy>
-                </sp:AsymmetricBinding>
-                <sp:Layout>
-                    <wsp:Policy>
-                        <sp:Lax/>
-                    </wsp:Policy>
-                </sp:Layout>
-            </wsp:All>
-        </wsp:ExactlyOne>
-    </wsp:Policy>
-    <wsp:Policy wsu:Id="DoubleItAsymmetricThumbprintPolicy">
-        <wsp:ExactlyOne>
-            <wsp:All>
-                <sp:AsymmetricBinding>
-                    <wsp:Policy>
-                        <sp:InitiatorToken>
-                            <wsp:Policy>
-                                <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
-                                    <wsp:Policy>
-                                        <sp:WssX509V3Token10/>
-                                        <sp:RequireThumbprintReference/>
-                                    </wsp:Policy>
-                                </sp:X509Token>
-                            </wsp:Policy>
-                        </sp:InitiatorToken>
-                        <sp:RecipientToken>
-                            <wsp:Policy>
-                                <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
-                                    <wsp:Policy>
-                                        <sp:WssX509V3Token10/>
-                                        <sp:RequireThumbprintReference/>
-                                    </wsp:Policy>
-                                </sp:X509Token>
-                            </wsp:Policy>
-                        </sp:RecipientToken>
-                        <sp:Layout>
-                            <wsp:Policy>
-                                <sp:Lax/>
-                            </wsp:Policy>
-                        </sp:Layout>
-                        <sp:IncludeTimestamp/>
-                        <sp:OnlySignEntireHeadersAndBody/>
-                        <sp:AlgorithmSuite>
-                            <wsp:Policy>
-                                <sp:Basic128/>
-                            </wsp:Policy>
-                        </sp:AlgorithmSuite>
-                    </wsp:Policy>
-                </sp:AsymmetricBinding>
-            </wsp:All>
-        </wsp:ExactlyOne>
-    </wsp:Policy>
-    <wsp:Policy wsu:Id="DoubleItAsymmetricPKIPathPolicy">
-        <wsp:ExactlyOne>
-            <wsp:All>
-                <sp:AsymmetricBinding>
-                    <wsp:Policy>
-                        <sp:InitiatorToken>
-                            <wsp:Policy>
-                                <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
-                                    <wsp:Policy>
-                                        <sp:WssX509PkiPathV1Token11/>
-                                    </wsp:Policy>
-                                </sp:X509Token>
-                            </wsp:Policy>
-                        </sp:InitiatorToken>
-                        <sp:RecipientToken>
-                            <wsp:Policy>
-                                <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
-                                    <wsp:Policy>
-                                        <sp:WssX509V3Token10/>
-                                    </wsp:Policy>
-                                </sp:X509Token>
-                            </wsp:Policy>
-                        </sp:RecipientToken>
-                        <sp:Layout>
-                            <wsp:Policy>
-                                <sp:Lax/>
-                            </wsp:Policy>
-                        </sp:Layout>
-                        <sp:IncludeTimestamp/>
-                        <sp:OnlySignEntireHeadersAndBody/>
-                        <sp:AlgorithmSuite>
-                            <wsp:Policy>
-                                <sp:Basic128/>
-                            </wsp:Policy>
-                        </sp:AlgorithmSuite>
-                    </wsp:Policy>
-                </sp:AsymmetricBinding>
->>>>>>> 43c9a1c... Fixing a SAML SSO validation issue
             </wsp:All>
         </wsp:ExactlyOne>
     </wsp:Policy>
@@ -2055,3 +1529,4 @@
    </wsp:Policy>
     
 </wsdl:definitions>
+


Mime
View raw message