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: Backporting STS test
Date Mon, 16 Jun 2014 13:15:31 GMT
Backporting STS test


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

Branch: refs/heads/2.7.x-fixes
Commit: 9884c8e29bc0ed228d4040f7791226b504c0a65e
Parents: c8de240
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Mon Jun 16 14:15:16 2014 +0100
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Mon Jun 16 14:15:16 2014 +0100

----------------------------------------------------------------------
 .../cxf/systest/sts/issuer/IssuerTest.java      |   4 +
 .../apache/cxf/systest/sts/issuer/DoubleIt.wsdl | 147 ----
 .../cxf/systest/sts/issuer/cxf-client.xml       |  45 +-
 .../cxf/systest/sts/issuer/cxf-service.xml      |  64 +-
 .../systest/sts/issuer/cxf-sts-transport.xml    |  30 +-
 .../sts/issuer/ws-trust-1.4-service.wsdl        | 735 -------------------
 6 files changed, 26 insertions(+), 999 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/9884c8e2/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issuer/IssuerTest.java
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issuer/IssuerTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issuer/IssuerTest.java
index a0149bd..5df952c 100644
--- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issuer/IssuerTest.java
+++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issuer/IssuerTest.java
@@ -139,6 +139,10 @@ public class IssuerTest extends AbstractBusClientServerTestBase {
     // Test getting the STS details via WS-MEX + SOAP 1.2
     @org.junit.Test
     public void testSAML2MEXSoap12() throws Exception {
+
+        if (!standalone) {
+            return;
+        }
         
         SpringBusFactory bf = new SpringBusFactory();
         URL busFile = IssuerTest.class.getResource("cxf-client.xml");

http://git-wip-us.apache.org/repos/asf/cxf/blob/9884c8e2/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/DoubleIt.wsdl
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/DoubleIt.wsdl b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/DoubleIt.wsdl
index 867143d..9bac590 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/DoubleIt.wsdl
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/DoubleIt.wsdl
@@ -16,77 +16,6 @@
  specific language governing permissions and limitations
  under the License.
 -->
-<<<<<<< HEAD
-<wsdl:definitions name="DoubleIt"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-	xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:di="http://www.example.org/schema/DoubleIt"
-	xmlns:tns="http://www.example.org/contract/DoubleIt" xmlns:wsp="http://www.w3.org/ns/ws-policy"
-	xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
-	xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
-	xmlns:t="http://docs.oasis-open.org/ws-sx/ws-trust/200512" xmlns:wsaw="http://www.w3.org/2005/08/addressing"
-	xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex" targetNamespace="http://www.example.org/contract/DoubleIt">
-
-    <wsdl:import location="src/test/resources/DoubleItLogical.wsdl" 
-                 namespace="http://www.example.org/contract/DoubleIt"/>
-
-	<wsdl:binding name="DoubleItTransportSAML1Binding" type="tns:DoubleItPortType">
-		<wsp:PolicyReference URI="#DoubleItBindingTransportSAML1Policy" />
-		<soap:binding style="document"
-			transport="http://schemas.xmlsoap.org/soap/http" />
-		<wsdl:operation name="DoubleIt">
-			<soap:operation soapAction="" />
-			<wsdl:input>
-				<soap:body use="literal" />
-				<wsp:PolicyReference URI="#DoubleItBinding_DoubleIt_Input_Policy" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-				<wsp:PolicyReference URI="#DoubleItBinding_DoubleIt_Output_Policy" />
-			</wsdl:output>
-		</wsdl:operation>
-	</wsdl:binding>
-	<wsdl:binding name="DoubleItTransportSAML2Binding" type="tns:DoubleItPortType">
-		<wsp:PolicyReference URI="#DoubleItBindingTransportSAML2Policy" />
-		<soap:binding style="document"
-			transport="http://schemas.xmlsoap.org/soap/http" />
-		<wsdl:operation name="DoubleIt">
-			<soap:operation soapAction="" />
-			<wsdl:input>
-				<soap:body use="literal" />
-				<wsp:PolicyReference URI="#DoubleItBinding_DoubleIt_Input_Policy" />
-			</wsdl:input>
-			<wsdl:output>
-				<soap:body use="literal" />
-				<wsp:PolicyReference URI="#DoubleItBinding_DoubleIt_Output_Policy" />
-			</wsdl:output>
-		</wsdl:operation>
-	</wsdl:binding>
-
-	<wsdl:service name="DoubleItService">
-		<wsdl:port name="DoubleItTransportSAML1Port" binding="tns:DoubleItTransportSAML1Binding">
-			<soap:address
-				location="https://localhost:8081/doubleit/services/doubleittransportsaml1" />
-		</wsdl:port>
-		<wsdl:port name="DoubleItTransportSAML2Port" binding="tns:DoubleItTransportSAML2Binding">
-			<soap:address
-				location="https://localhost:8081/doubleit/services/doubleittransportsaml2" />
-		</wsdl:port>
-	</wsdl:service>
-	
-	<wsp:Policy wsu:Id="DoubleItBindingTransportSAML1Policy">
-		<wsp:ExactlyOne>
-			<wsp:All>
-				<wsam:Addressing wsp:Optional="false">
-					<wsp:Policy />
-				</wsam:Addressing>
-				<sp:TransportBinding
-					xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
-					<wsp:Policy>
-						<sp:TransportToken>
-							<wsp:Policy>
-							    <sp:HttpsToken>
-                                   <wsp:Policy/>
-=======
 <wsdl:definitions xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:di="http://www.example.org/schema/DoubleIt" xmlns:tns="http://www.example.org/contract/DoubleIt" xmlns:wsp="http://www.w3.org/ns/ws-policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702" xmlns:t="http://docs.oasis-open.org/ws-sx/ws-trust/200512" xmlns:wsaw="http://www.w3.org/2005/08/addressing" xmlns:wsx="http://schemas.xmlsoap.org/ws/2004/09/mex" name="DoubleIt" targetNamespace="http://www.example.org/contract/DoubleIt">
     <wsdl:import location="src/test/resources/DoubleItLogical.wsdl" namespace="http://www.example.org/contract/DoubleIt"/>
     <wsdl:binding name="DoubleItTransportSAML1Binding" type="tns:DoubleItPortType">
@@ -157,7 +86,6 @@
                             <wsp:Policy>
                                 <sp:HttpsToken>
                                     <wsp:Policy/>
->>>>>>> ad4e3dd... Adding a SOAP 1.1 test with WS-MEX
                                 </sp:HttpsToken>
 							</wsp:Policy>
 						</sp:TransportToken>
@@ -268,80 +196,6 @@
                         </sp:IssuedToken>
                     </wsp:Policy>
                 </sp:EndorsingSupportingTokens>
-<<<<<<< HEAD
-				<sp:Wss11>
-					<wsp:Policy>
-						<sp:MustSupportRefIssuerSerial />
-						<sp:MustSupportRefThumbprint />
-						<sp:MustSupportRefEncryptedKey />
-					</wsp:Policy>
-				</sp:Wss11>
-				<sp:Trust13>
-					<wsp:Policy>
-						<sp:MustSupportIssuedTokens />
-						<sp:RequireClientEntropy />
-						<sp:RequireServerEntropy />
-					</wsp:Policy>
-				</sp:Trust13>
-			</wsp:All>
-		</wsp:ExactlyOne>
-	</wsp:Policy>
-	
-	<wsp:Policy wsu:Id="DoubleItBinding_DoubleIt_Input_Policy">
-		<wsp:ExactlyOne>
-			<wsp:All>
-				<sp:EncryptedParts>
-					<sp:Body />
-				</sp:EncryptedParts>
-				<sp:SignedParts>
-					<sp:Body />
-					<sp:Header Name="To" Namespace="http://www.w3.org/2005/08/addressing" />
-					<sp:Header Name="From" Namespace="http://www.w3.org/2005/08/addressing" />
-					<sp:Header Name="FaultTo" Namespace="http://www.w3.org/2005/08/addressing" />
-					<sp:Header Name="ReplyTo" Namespace="http://www.w3.org/2005/08/addressing" />
-					<sp:Header Name="MessageID" Namespace="http://www.w3.org/2005/08/addressing" />
-					<sp:Header Name="RelatesTo" Namespace="http://www.w3.org/2005/08/addressing" />
-					<sp:Header Name="Action" Namespace="http://www.w3.org/2005/08/addressing" />
-					<sp:Header Name="AckRequested"
-						Namespace="http://docs.oasis-open.org/ws-rx/wsrm/200702" />
-					<sp:Header Name="SequenceAcknowledgement"
-						Namespace="http://docs.oasis-open.org/ws-rx/wsrm/200702" />
-					<sp:Header Name="Sequence"
-						Namespace="http://docs.oasis-open.org/ws-rx/wsrm/200702" />
-					<sp:Header Name="CreateSequence"
-						Namespace="http://docs.oasis-open.org/ws-rx/wsrm/200702" />
-				</sp:SignedParts>
-			</wsp:All>
-		</wsp:ExactlyOne>
-	</wsp:Policy>
-	<wsp:Policy wsu:Id="DoubleItBinding_DoubleIt_Output_Policy">
-		<wsp:ExactlyOne>
-			<wsp:All>
-				<sp:EncryptedParts>
-					<sp:Body />
-				</sp:EncryptedParts>
-				<sp:SignedParts>
-					<sp:Body />
-					<sp:Header Name="To" Namespace="http://www.w3.org/2005/08/addressing" />
-					<sp:Header Name="From" Namespace="http://www.w3.org/2005/08/addressing" />
-					<sp:Header Name="FaultTo" Namespace="http://www.w3.org/2005/08/addressing" />
-					<sp:Header Name="ReplyTo" Namespace="http://www.w3.org/2005/08/addressing" />
-					<sp:Header Name="MessageID" Namespace="http://www.w3.org/2005/08/addressing" />
-					<sp:Header Name="RelatesTo" Namespace="http://www.w3.org/2005/08/addressing" />
-					<sp:Header Name="Action" Namespace="http://www.w3.org/2005/08/addressing" />
-					<sp:Header Name="AckRequested"
-						Namespace="http://docs.oasis-open.org/ws-rx/wsrm/200702" />
-					<sp:Header Name="SequenceAcknowledgement"
-						Namespace="http://docs.oasis-open.org/ws-rx/wsrm/200702" />
-					<sp:Header Name="Sequence"
-						Namespace="http://docs.oasis-open.org/ws-rx/wsrm/200702" />
-					<sp:Header Name="CreateSequence"
-						Namespace="http://docs.oasis-open.org/ws-rx/wsrm/200702" />
-				</sp:SignedParts>
-			</wsp:All>
-		</wsp:ExactlyOne>
-	</wsp:Policy>
-=======
                 <sp:Wss11>
                     <wsp:Policy>
                         <sp:MustSupportRefIssuerSerial/>
@@ -475,5 +329,4 @@
             </wsp:All>
         </wsp:ExactlyOne>
     </wsp:Policy>
->>>>>>> ad4e3dd... Adding a SOAP 1.1 test with WS-MEX
 </wsdl:definitions>

http://git-wip-us.apache.org/repos/asf/cxf/blob/9884c8e2/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-client.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-client.xml
index 6d0a939..9666434 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-client.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-client.xml
@@ -55,7 +55,6 @@ http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/confi
                    </property>
                 </bean>
             </entry>
-<<<<<<< HEAD
        </jaxws:properties>
    </jaxws:client>
    
@@ -69,6 +68,17 @@ http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/confi
            <entry key="ws-security.sts.token.usecert" value="true"/> 
        </jaxws:properties>
    </jaxws:client>
+
+   <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML2Soap12Port" createdFromAPI="true">
+        <jaxws:properties>
+            <entry key="ws-security.username" value="alice"/>
+            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+            <entry key="ws-security.sts.token.username" value="myclientkey"/>
+            <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
+            <entry key="ws-security.sts.token.usecert" value="true"/>
+            <entry key="ws-security.sts.client-soap12-binding" value="true"/>
+        </jaxws:properties>
+    </jaxws:client>
    
    <http:conduit name="https://localhost.*">
       <http:tlsClientParameters disableCNCheck="true">
@@ -81,38 +91,5 @@ http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/confi
       </http:tlsClientParameters>
    </http:conduit>
    
-=======
-        </jaxws:properties>
-    </jaxws:client>
-    <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML2Port" createdFromAPI="true">
-        <jaxws:properties>
-            <entry key="ws-security.username" value="alice"/>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.sts.token.username" value="myclientkey"/>
-            <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
-            <entry key="ws-security.sts.token.usecert" value="true"/>
-        </jaxws:properties>
-    </jaxws:client>
-    <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSAML2Soap12Port" createdFromAPI="true">
-        <jaxws:properties>
-            <entry key="ws-security.username" value="alice"/>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.sts.token.username" value="myclientkey"/>
-            <entry key="ws-security.sts.token.properties" value="clientKeystore.properties"/>
-            <entry key="ws-security.sts.token.usecert" value="true"/>
-            <entry key="ws-security.sts.client-soap12-binding" value="true"/>
-        </jaxws:properties>
-    </jaxws:client>
-    <http:conduit name="https://localhost.*">
-        <http:tlsClientParameters disableCNCheck="true">
-            <sec:keyManagers keyPassword="ckpass">
-                <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/>
-            </sec:keyManagers>
-            <sec:trustManagers>
-                <sec:keyStore type="jks" password="cspass" resource="clientstore.jks"/>
-            </sec:trustManagers>
-        </http:tlsClientParameters>
-    </http:conduit>
->>>>>>> ad4e3dd... Adding a SOAP 1.1 test with WS-MEX
 </beans>
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/9884c8e2/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-service.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-service.xml
index 0d3a6cb..80fa4066 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-service.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-service.xml
@@ -16,7 +16,6 @@
  specific language governing permissions and limitations
  under the License.
 -->
-<<<<<<< HEAD
 <beans xmlns="http://www.springframework.org/schema/beans"
   xmlns:cxf="http://cxf.apache.org/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -78,6 +77,16 @@
          </entry>
       </jaxws:properties> 
    </jaxws:endpoint>
+
+   <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml2soap12" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML2Soap12Port" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Server}/doubleit/services/doubleittransportsaml2soap12" wsdlLocation="org/apache/cxf/systest/sts/issuer/DoubleIt.wsdl">
+        <jaxws:properties>
+            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
+            <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
+            <entry key="ws-security.saml2.validator">
+                <bean class="org.apache.cxf.ws.security.trust.STSTokenValidator"/>
+            </entry>
+        </jaxws:properties>
+    </jaxws:endpoint>
    
    <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf">
    <httpj:engine port="${testutil.ports.Server}">
@@ -101,58 +110,5 @@
    </httpj:engine>
   </httpj:engine-factory>
   
-=======
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:cxf="http://cxf.apache.org/core" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:http="http://cxf.apache.org/transports/http/configuration" xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration" xmlns:jaxws="http://cxf.apache.org/jaxws" xsi:schemaLocation="             http://cxf.apache.org/core             http://cxf.apache.org/schemas/core.xsd             http://cxf.apache.org/configuration/security             http://cxf.apache.org/schemas/configuration/security.xsd             http://cxf.apache.org/jaxws             http://cxf.apache.org/schemas/jaxws.xsd             http://cxf.apache.org/transports/http/configuration             http://cxf.apache.org/schemas/configuration/http-conf.xsd             http://cxf.apache.org/transports/http-jetty/configuration             http://cxf.apache.org/schemas/configuration/http-jetty.xsd      
        http://www.springframework.org/schema/beans             http://www.springframework.org/schema/beans/spring-beans.xsd">
-    <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml1" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML1Port" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Server}/doubleit/services/doubleittransportsaml1" wsdlLocation="org/apache/cxf/systest/sts/issuer/DoubleIt.wsdl">
-        <jaxws:properties>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
-            <entry key="ws-security.saml1.validator">
-                <bean class="org.apache.cxf.ws.security.trust.STSTokenValidator"/>
-            </entry>
-            <entry key="ws-security.is-bsp-compliant" value="false"/>
-        </jaxws:properties>
-    </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml2" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML2Port" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Server}/doubleit/services/doubleittransportsaml2" wsdlLocation="org/apache/cxf/systest/sts/issuer/DoubleIt.wsdl">
-        <jaxws:properties>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
-            <entry key="ws-security.saml2.validator">
-                <bean class="org.apache.cxf.ws.security.trust.STSTokenValidator"/>
-            </entry>
-        </jaxws:properties>
-    </jaxws:endpoint>
-     <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleittransportsaml2soap12" implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItTransportSAML2Soap12Port" serviceName="s:DoubleItService" depends-on="ClientAuthHttpsSettings" address="https://localhost:${testutil.ports.Server}/doubleit/services/doubleittransportsaml2soap12" wsdlLocation="org/apache/cxf/systest/sts/issuer/DoubleIt.wsdl">
-        <jaxws:properties>
-            <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="ws-security.signature.properties" value="serviceKeystore.properties"/>
-            <entry key="ws-security.saml2.validator">
-                <bean class="org.apache.cxf.ws.security.trust.STSTokenValidator"/>
-            </entry>
-        </jaxws:properties>
-    </jaxws:endpoint>
-    <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf">
-        <httpj:engine port="${testutil.ports.Server}">
-            <httpj:tlsServerParameters>
-                <sec:keyManagers keyPassword="skpass">
-                    <sec:keyStore type="jks" password="sspass" resource="servicestore.jks"/>
-                </sec:keyManagers>
-                <sec:trustManagers>
-                    <sec:keyStore type="jks" password="stsspass" resource="stsstore.jks"/>
-                </sec:trustManagers>
-                <sec:cipherSuitesFilter>
-                    <sec:include>.*_EXPORT_.*</sec:include>
-                    <sec:include>.*_EXPORT1024_.*</sec:include>
-                    <sec:include>.*_WITH_DES_.*</sec:include>
-                    <sec:include>.*_WITH_AES_.*</sec:include>
-                    <sec:include>.*_WITH_NULL_.*</sec:include>
-                    <sec:exclude>.*_DH_anon_.*</sec:exclude>
-                </sec:cipherSuitesFilter>
-                <sec:clientAuthentication want="true" required="true"/>
-            </httpj:tlsServerParameters>
-        </httpj:engine>
-    </httpj:engine-factory>
->>>>>>> ad4e3dd... Adding a SOAP 1.1 test with WS-MEX
 </beans>
 

http://git-wip-us.apache.org/repos/asf/cxf/blob/9884c8e2/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-sts-transport.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-sts-transport.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-sts-transport.xml
index be33168..e849012 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-sts-transport.xml
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-sts-transport.xml
@@ -172,41 +172,14 @@
         <property name="relationships" ref="relationships" />
         <property name="samlRealmCodec" ref="samlRealmCodec" />
     </bean>
-<<<<<<< HEAD
-
-    <jaxws:endpoint id="transportSTS" implementor="#transportSTSProviderBean"
-        address="https://localhost:30101/SecurityTokenService/Transport"
-        wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl"
-        xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
-        serviceName="ns1:SecurityTokenService" endpointName="ns1:Transport_Port"
-                depends-on="ClientAuthHttpsSettings">
-=======
+
     <jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" id="transportSTS" implementor="#transportSTSProviderBean" address="https://localhost:30101/SecurityTokenService/Transport" wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/issuer/ws-trust-1.4-service.wsdl" serviceName="ns1:SecurityTokenService" endpointName="ns1:Transport_Port" depends-on="ClientAuthHttpsSettings">
->>>>>>> ad4e3dd... Adding a SOAP 1.1 test with WS-MEX
-        <jaxws:properties>
-            <entry key="ws-security.callback-handler"
-                value="org.apache.cxf.systest.sts.common.CommonCallbackHandler" />
-        </jaxws:properties>
-    </jaxws:endpoint>
-<<<<<<< HEAD
-    
-    
-    <jaxws:endpoint id="transportSTS-realmB" implementor="#transportSTSProviderBean2"
-        address="https://localhost:30101/SecurityTokenService/b-issuer/Transport"
-        wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/deployment/ws-trust-1.4-service.wsdl"
-        xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/"
-        serviceName="ns1:SecurityTokenService" endpointName="ns1:Transport_SAML_Port"
-                depends-on="ClientAuthHttpsSettings">
         <jaxws:properties>
             <entry key="ws-security.callback-handler"
                 value="org.apache.cxf.systest.sts.common.CommonCallbackHandler" />
-            <entry key="ws-security.signature.properties" value="stsKeystore.properties"/>
         </jaxws:properties>
     </jaxws:endpoint>
 
-    <httpj:engine-factory id="ClientAuthHttpsSettings"
-        bus="cxf">
-=======
     <jaxws:endpoint xmlns:ns1="http://docs.oasis-open.org/ws-sx/ws-trust/200512/" id="transportSTSSoap12" implementor="#transportSTSProviderBean" address="https://localhost:30101/SecurityTokenService/TransportSoap12" wsdlLocation="src/test/resources/org/apache/cxf/systest/sts/issuer/ws-trust-1.4-service.wsdl" serviceName="ns1:SecurityTokenService" endpointName="ns1:Transport_Soap12_Port" depends-on="ClientAuthHttpsSettings">
         <jaxws:properties>
             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
@@ -214,7 +187,6 @@
     </jaxws:endpoint>
     
     <httpj:engine-factory id="ClientAuthHttpsSettings" bus="cxf">
->>>>>>> ad4e3dd... Adding a SOAP 1.1 test with WS-MEX
         <httpj:engine port="30101">
             <httpj:tlsServerParameters>
                 <sec:keyManagers keyPassword="skpass">

http://git-wip-us.apache.org/repos/asf/cxf/blob/9884c8e2/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/ws-trust-1.4-service.wsdl
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/ws-trust-1.4-service.wsdl b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/ws-trust-1.4-service.wsdl
index 6f53818..a45b91f 100644
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/ws-trust-1.4-service.wsdl
+++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/ws-trust-1.4-service.wsdl
@@ -99,598 +99,6 @@
 
   <!-- This portType is an example of an endpoint that accepts 
          Unsolicited RequestSecurityTokenResponse messages -->
-<<<<<<< HEAD
-  <wsdl:portType name="SecurityTokenResponseService">
-    <wsdl:operation name="RequestSecurityTokenResponse">
-      <wsdl:input message="tns:RequestSecurityTokenResponseMsg"/>
-    </wsdl:operation>
-  </wsdl:portType>
-
-  <wsdl:binding name="UT_Binding" type="wstrust:STS">
-    <wsp:PolicyReference URI="#UT_policy" />
-    <soap:binding style="document"
-        transport="http://schemas.xmlsoap.org/soap/http" />
-    <wsdl:operation name="Issue">
-        <soap:operation
-            soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Issue" />
-        <wsdl:input>
-            <wsp:PolicyReference
-               URI="#Input_policy" />
-            <soap:body use="literal" />
-        </wsdl:input>
-        <wsdl:output>
-            <wsp:PolicyReference
-               URI="#Output_policy" />
-            <soap:body use="literal" />
-        </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="Validate">
-        <soap:operation
-            soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Validate" />
-        <wsdl:input>
-            <wsp:PolicyReference
-               URI="#Input_policy" />
-            <soap:body use="literal" />
-        </wsdl:input>
-        <wsdl:output>
-            <wsp:PolicyReference
-               URI="#Output_policy" />
-            <soap:body use="literal" />
-        </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="Cancel">
-        <soap:operation
-            soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Cancel" />
-        <wsdl:input>
-            <soap:body use="literal" />
-        </wsdl:input>
-        <wsdl:output>
-            <soap:body use="literal" />
-        </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="Renew">
-        <soap:operation
-            soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Renew" />
-        <wsdl:input>
-            <soap:body use="literal" />
-        </wsdl:input>
-        <wsdl:output>
-            <soap:body use="literal" />
-        </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="KeyExchangeToken">
-        <soap:operation
-            soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/KeyExchangeToken" />
-        <wsdl:input>
-            <soap:body use="literal" />
-        </wsdl:input>
-        <wsdl:output>
-            <soap:body use="literal" />
-        </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="RequestCollection">
-        <soap:operation
-            soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/RequestCollection" />
-        <wsdl:input>
-            <soap:body use="literal" />
-        </wsdl:input>
-        <wsdl:output>
-            <soap:body use="literal" />
-        </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  
-  <wsdl:binding name="UTEncrypted_Binding" type="wstrust:STS">
-    <wsp:PolicyReference URI="#UTEncrypted_policy" />
-    <soap:binding style="document"
-        transport="http://schemas.xmlsoap.org/soap/http" />
-    <wsdl:operation name="Issue">
-        <soap:operation
-            soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Issue" />
-        <wsdl:input>
-            <wsp:PolicyReference
-               URI="#Input_policy" />
-            <soap:body use="literal" />
-        </wsdl:input>
-        <wsdl:output>
-            <wsp:PolicyReference
-               URI="#Output_policy" />
-            <soap:body use="literal" />
-        </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="Validate">
-        <soap:operation
-            soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Validate" />
-        <wsdl:input>
-            <wsp:PolicyReference
-               URI="#Input_policy" />
-            <soap:body use="literal" />
-        </wsdl:input>
-        <wsdl:output>
-            <wsp:PolicyReference
-               URI="#Output_policy" />
-            <soap:body use="literal" />
-        </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="Cancel">
-        <soap:operation
-            soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Cancel" />
-        <wsdl:input>
-            <soap:body use="literal" />
-        </wsdl:input>
-        <wsdl:output>
-            <soap:body use="literal" />
-        </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="Renew">
-        <soap:operation
-            soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Renew" />
-        <wsdl:input>
-            <soap:body use="literal" />
-        </wsdl:input>
-        <wsdl:output>
-            <soap:body use="literal" />
-        </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="KeyExchangeToken">
-        <soap:operation
-            soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/KeyExchangeToken" />
-        <wsdl:input>
-            <soap:body use="literal" />
-        </wsdl:input>
-        <wsdl:output>
-            <soap:body use="literal" />
-        </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="RequestCollection">
-        <soap:operation
-            soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/RequestCollection" />
-        <wsdl:input>
-            <soap:body use="literal" />
-        </wsdl:input>
-        <wsdl:output>
-            <soap:body use="literal" />
-        </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  
-  <wsdl:binding name="X509_Binding" type="wstrust:STS">
-    <wsp:PolicyReference URI="#X509_policy" />
-    <soap:binding style="document"
-        transport="http://schemas.xmlsoap.org/soap/http" />
-    <wsdl:operation name="Issue">
-        <soap:operation
-            soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Issue" />
-        <wsdl:input>
-            <wsp:PolicyReference
-               URI="#Input_policy" />
-            <soap:body use="literal" />
-        </wsdl:input>
-        <wsdl:output>
-            <wsp:PolicyReference
-               URI="#Output_policy" />
-            <soap:body use="literal" />
-        </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="Validate">
-        <soap:operation
-            soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Validate" />
-        <wsdl:input>
-            <wsp:PolicyReference
-               URI="#Input_policy" />
-            <soap:body use="literal" />
-        </wsdl:input>
-        <wsdl:output>
-            <wsp:PolicyReference
-               URI="#Output_policy" />
-            <soap:body use="literal" />
-        </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="Cancel">
-        <soap:operation
-            soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Cancel" />
-        <wsdl:input>
-            <soap:body use="literal" />
-        </wsdl:input>
-        <wsdl:output>
-            <soap:body use="literal" />
-        </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="Renew">
-        <soap:operation
-            soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Renew" />
-        <wsdl:input>
-            <soap:body use="literal" />
-        </wsdl:input>
-        <wsdl:output>
-            <soap:body use="literal" />
-        </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="KeyExchangeToken">
-        <soap:operation
-            soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/KeyExchangeToken" />
-        <wsdl:input>
-            <soap:body use="literal" />
-        </wsdl:input>
-        <wsdl:output>
-            <soap:body use="literal" />
-        </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="RequestCollection">
-        <soap:operation
-            soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/RequestCollection" />
-        <wsdl:input>
-            <soap:body use="literal" />
-        </wsdl:input>
-        <wsdl:output>
-            <soap:body use="literal" />
-        </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  
-  <wsdl:binding name="Transport_Binding" type="wstrust:STS">
-    <wsp:PolicyReference URI="#Transport_policy" />
-    <soap:binding style="document"
-        transport="http://schemas.xmlsoap.org/soap/http" />
-    <wsdl:operation name="Issue">
-        <soap:operation
-            soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Issue" />
-        <wsdl:input>
-            <wsp:PolicyReference
-               URI="#Input_policy" />
-            <soap:body use="literal" />
-        </wsdl:input>
-        <wsdl:output>
-            <wsp:PolicyReference
-               URI="#Output_policy" />
-            <soap:body use="literal" />
-        </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="Validate">
-        <soap:operation
-            soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Validate" />
-        <wsdl:input>
-            <wsp:PolicyReference
-               URI="#Input_policy" />
-            <soap:body use="literal" />
-        </wsdl:input>
-        <wsdl:output>
-            <wsp:PolicyReference
-               URI="#Output_policy" />
-            <soap:body use="literal" />
-        </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="Cancel">
-        <soap:operation
-            soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Cancel" />
-        <wsdl:input>
-            <soap:body use="literal" />
-        </wsdl:input>
-        <wsdl:output>
-            <soap:body use="literal" />
-        </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="Renew">
-        <soap:operation
-            soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Renew" />
-        <wsdl:input>
-            <soap:body use="literal" />
-        </wsdl:input>
-        <wsdl:output>
-            <soap:body use="literal" />
-        </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="KeyExchangeToken">
-        <soap:operation
-            soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/KeyExchangeToken" />
-        <wsdl:input>
-            <soap:body use="literal" />
-        </wsdl:input>
-        <wsdl:output>
-            <soap:body use="literal" />
-        </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="RequestCollection">
-        <soap:operation
-            soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/RequestCollection" />
-        <wsdl:input>
-            <soap:body use="literal" />
-        </wsdl:input>
-        <wsdl:output>
-            <soap:body use="literal" />
-        </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  
-  <wsdl:binding name="Transport_SAML_Binding" type="wstrust:STS">
-    <wsp:PolicyReference URI="#Transport_SAML_policy" />
-    <soap:binding style="document"
-        transport="http://schemas.xmlsoap.org/soap/http" />
-    <wsdl:operation name="Issue">
-        <soap:operation
-            soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Issue" />
-        <wsdl:input>
-            <wsp:PolicyReference
-               URI="#Input_policy" />
-            <soap:body use="literal" />
-        </wsdl:input>
-        <wsdl:output>
-            <wsp:PolicyReference
-               URI="#Output_policy" />
-            <soap:body use="literal" />
-        </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="Validate">
-        <soap:operation
-            soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Validate" />
-        <wsdl:input>
-            <wsp:PolicyReference
-               URI="#Input_policy" />
-            <soap:body use="literal" />
-        </wsdl:input>
-        <wsdl:output>
-            <wsp:PolicyReference
-               URI="#Output_policy" />
-            <soap:body use="literal" />
-        </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="Cancel">
-        <soap:operation
-            soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Cancel" />
-        <wsdl:input>
-            <soap:body use="literal" />
-        </wsdl:input>
-        <wsdl:output>
-            <soap:body use="literal" />
-        </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="Renew">
-        <soap:operation
-            soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Renew" />
-        <wsdl:input>
-            <soap:body use="literal" />
-        </wsdl:input>
-        <wsdl:output>
-            <soap:body use="literal" />
-        </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="KeyExchangeToken">
-        <soap:operation
-            soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/KeyExchangeToken" />
-        <wsdl:input>
-            <soap:body use="literal" />
-        </wsdl:input>
-        <wsdl:output>
-            <soap:body use="literal" />
-        </wsdl:output>
-    </wsdl:operation>
-    <wsdl:operation name="RequestCollection">
-        <soap:operation
-            soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/RequestCollection" />
-        <wsdl:input>
-            <soap:body use="literal" />
-        </wsdl:input>
-        <wsdl:output>
-            <soap:body use="literal" />
-        </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  
-  <wsdl:service name="SecurityTokenService">
-      <wsdl:port name="UT_Port" binding="tns:UT_Binding">
-         <soap:address location="http://localhost:8080/SecurityTokenService/UT" />
-      </wsdl:port>
-      <wsdl:port name="X509_Port" binding="tns:X509_Binding">
-         <soap:address location="http://localhost:8080/SecurityTokenService/X509" />
-      </wsdl:port>
-      <wsdl:port name="Transport_Port" binding="tns:Transport_Binding">
-         <soap:address location="https://localhost:8443/SecurityTokenService/Transport" />
-      </wsdl:port>
-      <wsdl:port name="Transport_SAML_Port" binding="tns:Transport_SAML_Binding">
-         <soap:address location="https://localhost:8443/SecurityTokenService/Transport" />
-      </wsdl:port>       
-      <wsdl:port name="UTEncrypted_Port" binding="tns:UTEncrypted_Binding">
-         <soap:address location="http://localhost:8080/SecurityTokenService/UTEncrypted" />
-      </wsdl:port>
-  </wsdl:service>
-  
-  <wsp:Policy wsu:Id="UT_policy">
-      <wsp:ExactlyOne>
-         <wsp:All>
-            <wsap10:UsingAddressing/>
-            <sp:SymmetricBinding
-               xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
-               <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:RequireDerivedKeys />
-                              <sp:RequireThumbprintReference />
-                              <sp:WssX509V3Token10 />
-                           </wsp:Policy>
-                        </sp:X509Token>
-                     </wsp:Policy>
-                  </sp:ProtectionToken>
-                  <sp:AlgorithmSuite>
-                     <wsp:Policy>
-                        <sp:Basic128 />
-                     </wsp:Policy>
-                  </sp:AlgorithmSuite>
-                  <sp:Layout>
-                     <wsp:Policy>
-                        <sp:Lax />
-                     </wsp:Policy>
-                  </sp:Layout>
-                  <sp:IncludeTimestamp />
-                  <sp:EncryptSignature />
-                  <sp:OnlySignEntireHeadersAndBody />
-               </wsp:Policy>
-            </sp:SymmetricBinding>
-            <sp:SignedSupportingTokens
-               xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
-               <wsp:Policy>
-                  <sp:UsernameToken
-                     sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
-                     <wsp:Policy>
-                        <sp:WssUsernameToken10 />
-                     </wsp:Policy>
-                  </sp:UsernameToken>
-               </wsp:Policy>
-            </sp:SignedSupportingTokens>
-            <sp:Wss11
-               xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
-               <wsp:Policy>
-                  <sp:MustSupportRefKeyIdentifier />
-                  <sp:MustSupportRefIssuerSerial />
-                  <sp:MustSupportRefThumbprint />
-                  <sp:MustSupportRefEncryptedKey />
-               </wsp:Policy>
-            </sp:Wss11>
-            <sp:Trust13
-               xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
-               <wsp:Policy>
-                  <sp:MustSupportIssuedTokens />
-                  <sp:RequireClientEntropy />
-                  <sp:RequireServerEntropy />
-               </wsp:Policy>
-            </sp:Trust13>
-         </wsp:All>
-      </wsp:ExactlyOne>
-   </wsp:Policy>
-   
-   <wsp:Policy wsu:Id="UTEncrypted_policy">
-      <wsp:ExactlyOne>
-         <wsp:All>
-            <wsap10:UsingAddressing/>
-            <sp:SymmetricBinding
-               xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
-               <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:RequireDerivedKeys />
-                              <sp:RequireThumbprintReference />
-                              <sp:WssX509V3Token10 />
-                           </wsp:Policy>
-                        </sp:X509Token>
-                     </wsp:Policy>
-                  </sp:ProtectionToken>
-                  <sp:AlgorithmSuite>
-                     <wsp:Policy>
-                        <sp:Basic128 />
-                     </wsp:Policy>
-                  </sp:AlgorithmSuite>
-                  <sp:Layout>
-                     <wsp:Policy>
-                        <sp:Lax />
-                     </wsp:Policy>
-                  </sp:Layout>
-                  <sp:IncludeTimestamp />
-                  <sp:EncryptSignature />
-                  <sp:OnlySignEntireHeadersAndBody />
-               </wsp:Policy>
-            </sp:SymmetricBinding>
-            <sp:SignedSupportingTokens
-               xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
-               <wsp:Policy>
-                  <sp:UsernameToken
-                     sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
-                     <wsp:Policy>
-                        <sp:WssUsernameToken10 />
-                     </wsp:Policy>
-                  </sp:UsernameToken>
-               </wsp:Policy>
-            </sp:SignedSupportingTokens>
-            <sp:Wss11
-               xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
-               <wsp:Policy>
-                  <sp:MustSupportRefKeyIdentifier />
-                  <sp:MustSupportRefIssuerSerial />
-                  <sp:MustSupportRefThumbprint />
-                  <sp:MustSupportRefEncryptedKey />
-               </wsp:Policy>
-            </sp:Wss11>
-            <sp:Trust13
-               xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
-               <wsp:Policy>
-                  <sp:MustSupportIssuedTokens />
-                  <sp:RequireClientEntropy />
-                  <sp:RequireServerEntropy />
-               </wsp:Policy>
-            </sp:Trust13>
-         </wsp:All>
-      </wsp:ExactlyOne>
-   </wsp:Policy>
-   
-   <wsp:Policy wsu:Id="X509_policy">
-      <wsp:ExactlyOne>
-         <wsp:All>
-            <wsap10:UsingAddressing/>
-            <sp:AsymmetricBinding
-               xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
-               <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:AlgorithmSuite>
-                     <wsp:Policy>
-                        <sp:Basic128 />
-                     </wsp:Policy>
-                  </sp:AlgorithmSuite>
-                  <sp:Layout>
-                     <wsp:Policy>
-                        <sp:Lax />
-                     </wsp:Policy>
-                  </sp:Layout>
-                  <sp:IncludeTimestamp />
-                  <sp:EncryptSignature />
-                  <sp:OnlySignEntireHeadersAndBody />
-               </wsp:Policy>
-            </sp:AsymmetricBinding>
-            <sp:Wss11
-               xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
-               <wsp:Policy>
-                  <sp:MustSupportRefKeyIdentifier />
-                  <sp:MustSupportRefIssuerSerial />
-                  <sp:MustSupportRefThumbprint />
-                  <sp:MustSupportRefEncryptedKey />
-               </wsp:Policy>
-            </sp:Wss11>
-            <sp:Trust13
-               xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
-               <wsp:Policy>
-                  <sp:MustSupportIssuedTokens />
-                  <sp:RequireClientEntropy />
-                  <sp:RequireServerEntropy />
-               </wsp:Policy>
-            </sp:Trust13>
-         </wsp:All>
-      </wsp:ExactlyOne>
-    </wsp:Policy>
-
-=======
     <wsdl:portType name="SecurityTokenResponseService">
         <wsdl:operation name="RequestSecurityTokenResponse">
             <wsdl:input message="tns:RequestSecurityTokenResponseMsg"/>
@@ -828,7 +236,6 @@
             <soap:address location="https://localhost:8443/SecurityTokenService/TransportSoap12"/>
         </wsdl:port>
     </wsdl:service>
->>>>>>> ad4e3dd... Adding a SOAP 1.1 test with WS-MEX
     <wsp:Policy wsu:Id="Transport_policy">
         <wsp:ExactlyOne>
             <wsp:All>
@@ -907,147 +314,6 @@
             </wsp:All>
         </wsp:ExactlyOne>
     </wsp:Policy>
-<<<<<<< HEAD
-   
-   <wsp:Policy wsu:Id="Transport_SAML_policy">
-        <wsp:ExactlyOne>
-            <wsp:All>
-                <wsap10:UsingAddressing />
-                <sp:TransportBinding
-                    xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
-                    <wsp:Policy>
-                        <sp:TransportToken>
-                            <wsp:Policy>
-                                <sp:HttpsToken>
-                                    <wsp:Policy />
-                                </sp:HttpsToken>
-                            </wsp:Policy>
-                        </sp:TransportToken>
-                        <sp:AlgorithmSuite>
-                            <wsp:Policy>
-                                <sp:Basic128 />
-                            </wsp:Policy>
-                        </sp:AlgorithmSuite>
-                        <sp:Layout>
-                            <wsp:Policy>
-                                <sp:Lax />
-                            </wsp:Policy>
-                        </sp:Layout>
-                        <sp:IncludeTimestamp />
-                    </wsp:Policy>
-                </sp:TransportBinding>
-                <!-- <sp:SignedSupportingTokens xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"> 
-                    <wsp:Policy> <sp:UsernameToken sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient"> 
-                    <wsp:Policy> <sp:WssUsernameToken10 /> </wsp:Policy> </sp:UsernameToken> 
-                    </wsp:Policy> </sp:SignedSupportingTokens> -->
-                <sp:SignedSupportingTokens
-                    xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
-                    <wsp:Policy>
-                        <wsp:ExactlyOne>
-<!--                         
-                            <wsp:All>
-                                <wsp:Policy>
-                                    <sp:UsernameToken
-                                        sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
-                                        <wsp:Policy>
-                                            <sp:WssUsernameToken10 />
-                                        </wsp:Policy>
-                                    </sp:UsernameToken>
-                                </wsp:Policy>
-                            </wsp:All>
- -->                            
-                            <wsp:All>
-                                <wsp:Policy>
-                                    <sp:SamlToken
-                                        sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
-                                        <wsp:Policy>
-                                            <sp:WssSamlV20Token11 />
-                                        </wsp:Policy>
-                                    </sp:SamlToken>
-                                </wsp:Policy>
-                            </wsp:All>
-                        </wsp:ExactlyOne>
-                    </wsp:Policy>
-                </sp:SignedSupportingTokens>
-                <sp:Wss11
-                    xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
-                    <wsp:Policy>
-                        <sp:MustSupportRefKeyIdentifier />
-                        <sp:MustSupportRefIssuerSerial />
-                        <sp:MustSupportRefThumbprint />
-                        <sp:MustSupportRefEncryptedKey />
-                    </wsp:Policy>
-                </sp:Wss11>
-                <sp:Trust13
-                    xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
-                    <wsp:Policy>
-                        <sp:MustSupportIssuedTokens />
-                        <sp:RequireClientEntropy />
-                        <sp:RequireServerEntropy />
-                    </wsp:Policy>
-                </sp:Trust13>
-            </wsp:All>
-        </wsp:ExactlyOne>
-    </wsp:Policy>
-   <wsp:Policy wsu:Id="Input_policy">
-      <wsp:ExactlyOne>
-         <wsp:All>
-            <sp:SignedParts
-               xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
-               <sp:Body />
-               <sp:Header Name="To"
-                  Namespace="http://www.w3.org/2005/08/addressing" />
-               <sp:Header Name="From"
-                  Namespace="http://www.w3.org/2005/08/addressing" />
-               <sp:Header Name="FaultTo"
-                  Namespace="http://www.w3.org/2005/08/addressing" />
-               <sp:Header Name="ReplyTo"
-                  Namespace="http://www.w3.org/2005/08/addressing" />
-               <sp:Header Name="MessageID"
-                  Namespace="http://www.w3.org/2005/08/addressing" />
-               <sp:Header Name="RelatesTo"
-                  Namespace="http://www.w3.org/2005/08/addressing" />
-               <sp:Header Name="Action"
-                  Namespace="http://www.w3.org/2005/08/addressing" />
-            </sp:SignedParts>
-            <sp:EncryptedParts
-               xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
-               <sp:Body />
-            </sp:EncryptedParts>
-         </wsp:All>
-      </wsp:ExactlyOne>
-   </wsp:Policy>
-   
-   <wsp:Policy wsu:Id="Output_policy">
-      <wsp:ExactlyOne>
-         <wsp:All>
-            <sp:SignedParts
-               xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
-               <sp:Body />
-               <sp:Header Name="To"
-                  Namespace="http://www.w3.org/2005/08/addressing" />
-               <sp:Header Name="From"
-                  Namespace="http://www.w3.org/2005/08/addressing" />
-               <sp:Header Name="FaultTo"
-                  Namespace="http://www.w3.org/2005/08/addressing" />
-               <sp:Header Name="ReplyTo"
-                  Namespace="http://www.w3.org/2005/08/addressing" />
-               <sp:Header Name="MessageID"
-                  Namespace="http://www.w3.org/2005/08/addressing" />
-               <sp:Header Name="RelatesTo"
-                  Namespace="http://www.w3.org/2005/08/addressing" />
-               <sp:Header Name="Action"
-                  Namespace="http://www.w3.org/2005/08/addressing" />
-            </sp:SignedParts>
-            <sp:EncryptedParts
-               xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
-               <sp:Body />
-            </sp:EncryptedParts>
-         </wsp:All>
-      </wsp:ExactlyOne>
-   </wsp:Policy>
-
-=======
     <wsp:Policy wsu:Id="Input_policy">
         <wsp:ExactlyOne>
             <wsp:All>
@@ -1086,5 +352,4 @@
             </wsp:All>
         </wsp:ExactlyOne>
     </wsp:Policy>
->>>>>>> ad4e3dd... Adding a SOAP 1.1 test with WS-MEX
 </wsdl:definitions>


Mime
View raw message