You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2014/06/16 15:15:29 UTC

[1/3] git commit: Recording .gitmergeinfo Changes

Repository: cxf
Updated Branches:
  refs/heads/2.7.x-fixes 3a96429f6 -> 9884c8e29


Recording .gitmergeinfo Changes


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

Branch: refs/heads/2.7.x-fixes
Commit: c8de240ed80ee8fa95bbfb6667d86478a72e6b0d
Parents: 591f949
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Jun 16 12:12:58 2014 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Jun 16 12:12:58 2014 +0100

----------------------------------------------------------------------
 .gitmergeinfo | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/c8de240e/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index c97d41c..0d0c384 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -42,6 +42,7 @@ B 07c97db7b2254096156240a98762af0a51808be1
 B 07ea01d2707936d9e7f5a205d327238b37ac819b
 B 080bd762e7e09f7fe1d1fa2d7c55bc6626f539d9
 B 0877b2a7bfc496b6d8d57083abbee2fbfd50c221
+B 08f29acf03e6aa1b227bf4c12b1c76c64d31c625
 B 0918a1bc99d40bc7fb3079570380b2b3094cae6b
 B 0919edd76e4909f06216c546628a6f7d586479b2
 B 0946fd921cca26b62812a8e91620b1fe1237daf1
@@ -588,6 +589,7 @@ B 820b2468e2b55bbd2ba8366121aa041c4cc6f38e
 B 8210839483dad6dc7021520baae7f5f3f5c55557
 B 822012675021b70aac4d56e9c5e1a9fd8bfe87bd
 B 8254d79be898f4b1e8bdc24ed3465a0a7a3b9ac2
+B 82606afa235a9b50544017ac91028093c92788a9
 B 82774ce60cc8fc708fad3239975151157a56ffc3
 B 82b3dbac1454207399520935759560ed51639091
 B 82b48aa2209d58a3a9fc33cf3a30421ac4801111
@@ -653,6 +655,7 @@ B 901d2a520b71479151032ffe8b662c6b19dea3f8
 B 90271b287605b558eb6beb6797e97d041e4dfb59
 B 902a89c5a404d0a541af92a99ec223a7adc18619
 B 902eaae78a838e2e5aabc0a082418bd2b6b55610
+B 90404af4e86e252c7e8724a282eb6190fe9e273f
 B 905487796650f6e5ecea37bb3790a599d5f75387
 B 90ab5afdd29f5daef5af01453cdaa4f40ef099bf
 B 90c163306e79d9f2d38c094ac6b8996fc7c62bcc
@@ -1516,6 +1519,7 @@ M aaa3c63bf37240ea52a3c89a0f1c69e9824376a0
 M ac0cb8fce9a8145b6c1ba0d3f6b0cd2f6ab7a183
 M ac22376d18e8d202026882f8d51de202d62974b8
 M ac24b66124844cb577e18c0659fdb1d69c496654
+M ad4e3dde6751873629b024dd8c0327f9ed21404c
 M adc6a4666165dfa5d4c5b25e02a06dabe64084cf
 M add1748d867d7d2841cee5b8892cd924eccd763e
 M ae9468de2c91817cdfd0046ea22509dc6e47c8a7

[2/3] git commit: Adding a SOAP 1.1 test with WS-MEX

Posted by co...@apache.org.
Adding a SOAP 1.1 test with WS-MEX

Conflicts:
	services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/DoubleIt.wsdl
	services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-client.xml
	services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-service.xml
	services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-sts-transport.xml
	services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/ws-trust-1.4-service.wsdl


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

Branch: refs/heads/2.7.x-fixes
Commit: 591f949cdc4d911caa6dc9cafb7daec0fc3f44aa
Parents: 3a96429
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Jun 16 12:11:25 2014 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Jun 16 12:12:58 2014 +0100

----------------------------------------------------------------------
 .../cxf/systest/sts/issuer/IssuerTest.java      |  24 +++
 .../apache/cxf/systest/sts/issuer/DoubleIt.wsdl | 209 +++++++++++++++++++
 .../cxf/systest/sts/issuer/cxf-client.xml       |  34 +++
 .../cxf/systest/sts/issuer/cxf-service.xml      |  54 +++++
 .../systest/sts/issuer/cxf-sts-transport.xml    |  14 ++
 .../sts/issuer/ws-trust-1.4-service.wsdl        | 181 ++++++++++++++++
 6 files changed, 516 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/591f949c/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 369fc10..a0149bd 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
@@ -135,6 +135,30 @@ public class IssuerTest extends AbstractBusClientServerTestBase {
         ((java.io.Closeable)transportSaml2Port).close();
         bus.shutdown(true);
     }
+    
+    // Test getting the STS details via WS-MEX + SOAP 1.2
+    @org.junit.Test
+    public void testSAML2MEXSoap12() throws Exception {
+        
+        SpringBusFactory bf = new SpringBusFactory();
+        URL busFile = IssuerTest.class.getResource("cxf-client.xml");
+
+        Bus bus = bf.createBus(busFile.toString());
+        SpringBusFactory.setDefaultBus(bus);
+        SpringBusFactory.setThreadDefaultBus(bus);
+
+        URL wsdl = IssuerTest.class.getResource("DoubleIt.wsdl");
+        Service service = Service.create(wsdl, SERVICE_QNAME);
+        QName portQName = new QName(NAMESPACE, "DoubleItTransportSAML2Soap12Port");
+        DoubleItPortType transportSaml2Port = 
+            service.getPort(portQName, DoubleItPortType.class);
+        updateAddressPort(transportSaml2Port, PORT);
+
+        doubleIt(transportSaml2Port, 25);
+
+        ((java.io.Closeable)transportSaml2Port).close();
+        bus.shutdown(true);
+    }
 
     private static void doubleIt(DoubleItPortType port, int numToDouble) {
         int resp = port.doubleIt(numToDouble);

http://git-wip-us.apache.org/repos/asf/cxf/blob/591f949c/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 c742bee..867143d 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,6 +16,7 @@
  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"
@@ -85,6 +86,78 @@
 							<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">
+        <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:binding name="DoubleItTransportSAML2Soap12Binding" type="tns:DoubleItPortType">
+        <wsp:PolicyReference URI="#DoubleItBindingTransportSAML2Soap12Policy"/>
+        <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:port name="DoubleItTransportSAML2Soap12Port" binding="tns:DoubleItTransportSAML2Soap12Binding">
+            <soap:address location="https://localhost:8081/doubleit/services/doubleittransportsaml2soap12"/>
+        </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/>
+>>>>>>> ad4e3dd... Adding a SOAP 1.1 test with WS-MEX
                                 </sp:HttpsToken>
 							</wsp:Policy>
 						</sp:TransportToken>
@@ -195,6 +268,7 @@
                         </sp:IssuedToken>
                     </wsp:Policy>
                 </sp:EndorsingSupportingTokens>
+<<<<<<< HEAD
 				<sp:Wss11>
 					<wsp:Policy>
 						<sp:MustSupportRefIssuerSerial />
@@ -267,4 +341,139 @@
 			</wsp:All>
 		</wsp:ExactlyOne>
 	</wsp:Policy>
+=======
+                <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="DoubleItBindingTransportSAML2Soap12Policy">
+        <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/>
+                                </sp:HttpsToken>
+                            </wsp:Policy>
+                        </sp:TransportToken>
+                        <sp:AlgorithmSuite>
+                            <wsp:Policy>
+                                <sp:TripleDes/>
+                            </wsp:Policy>
+                        </sp:AlgorithmSuite>
+                        <sp:Layout>
+                            <wsp:Policy>
+                                <sp:Lax/>
+                            </wsp:Policy>
+                        </sp:Layout>
+                        <sp:IncludeTimestamp/>
+                    </wsp:Policy>
+                </sp:TransportBinding>
+                <sp:EndorsingSupportingTokens xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                    <wsp:Policy>
+                        <sp:IssuedToken sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
+                            <sp:RequestSecurityTokenTemplate>
+                                <t:TokenType>http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV1.1</t:TokenType>
+                                <t:KeyType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/PublicKey</t:KeyType>
+                            </sp:RequestSecurityTokenTemplate>
+                            <wsp:Policy>
+                                <sp:RequireInternalReference/>
+                            </wsp:Policy>
+                            <sp:Issuer>
+                                <wsaw:Address>https://localhost:30101/SecurityTokenService/TransportSoap12</wsaw:Address>
+                                <wsaw:Metadata>
+                                    <wsx:Metadata>
+                                        <wsx:MetadataSection>
+                                            <wsx:MetadataReference>
+                                                <wsaw:Address>https://localhost:30101/SecurityTokenService/TransportSoap12/mex</wsaw:Address>
+                                            </wsx:MetadataReference>
+                                        </wsx:MetadataSection>
+                                    </wsx:Metadata>
+                                </wsaw:Metadata>
+                            </sp:Issuer>
+                        </sp:IssuedToken>
+                    </wsp:Policy>
+                </sp:EndorsingSupportingTokens>
+                <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>
+>>>>>>> ad4e3dd... Adding a SOAP 1.1 test with WS-MEX
 </wsdl:definitions>

http://git-wip-us.apache.org/repos/asf/cxf/blob/591f949c/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 39a6caa..6d0a939 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,6 +55,7 @@ http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/confi
                    </property>
                 </bean>
             </entry>
+<<<<<<< HEAD
        </jaxws:properties>
    </jaxws:client>
    
@@ -80,5 +81,38 @@ 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/591f949c/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 8b3298f..0d3a6cb 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,6 +16,7 @@
  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"
@@ -100,5 +101,58 @@
    </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/591f949c/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 161f929..be33168 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,6 +172,7 @@
         <property name="relationships" ref="relationships" />
         <property name="samlRealmCodec" ref="samlRealmCodec" />
     </bean>
+<<<<<<< HEAD
 
     <jaxws:endpoint id="transportSTS" implementor="#transportSTSProviderBean"
         address="https://localhost:30101/SecurityTokenService/Transport"
@@ -179,11 +180,15 @@
         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"
@@ -201,6 +206,15 @@
 
     <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"/>
+        </jaxws:properties>
+    </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/591f949c/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 2c74f20..6f53818 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,6 +99,7 @@
 
   <!-- 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"/>
@@ -689,6 +690,145 @@
       </wsp:ExactlyOne>
     </wsp:Policy>
 
+=======
+    <wsdl:portType name="SecurityTokenResponseService">
+        <wsdl:operation name="RequestSecurityTokenResponse">
+            <wsdl:input message="tns:RequestSecurityTokenResponseMsg"/>
+        </wsdl:operation>
+    </wsdl:portType>
+    <wsdl:binding name="Transport_Soap12_Binding" type="wstrust:STS" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" >
+        <wsp:PolicyReference URI="#Transport_policy"/>
+        <soap12:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+        <wsdl:operation name="Issue">
+            <soap12:operation soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Issue"/>
+            <wsdl:input>
+                <wsp:PolicyReference URI="#Input_policy"/>
+                <soap12:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output>
+                <wsp:PolicyReference URI="#Output_policy"/>
+                <soap12:body use="literal"/>
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="Validate">
+            <soap12:operation soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Validate"/>
+            <wsdl:input>
+                <wsp:PolicyReference URI="#Input_policy"/>
+                <soap12:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output>
+                <wsp:PolicyReference URI="#Output_policy"/>
+                <soap12:body use="literal"/>
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="Cancel">
+            <soap12:operation soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Cancel"/>
+            <wsdl:input>
+                <soap12:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output>
+                <soap12:body use="literal"/>
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="Renew">
+            <soap12:operation soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Renew"/>
+            <wsdl:input>
+                <soap12:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output>
+                <soap12:body use="literal"/>
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="KeyExchangeToken">
+            <soap12:operation soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/KeyExchangeToken"/>
+            <wsdl:input>
+                <soap12:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output>
+                <soap12:body use="literal"/>
+            </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="RequestCollection">
+            <soap12:operation soapAction="http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/RequestCollection"/>
+            <wsdl:input>
+                <soap12:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output>
+                <soap12: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:service name="SecurityTokenService">
+        <wsdl:port name="Transport_Port" binding="tns:Transport_Binding">
+            <soap:address location="https://localhost:8443/SecurityTokenService/Transport"/>
+        </wsdl:port>
+        <wsdl:port name="Transport_Soap12_Port" binding="tns:Transport_Soap12_Binding">
+            <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>
@@ -767,6 +907,7 @@
             </wsp:All>
         </wsp:ExactlyOne>
     </wsp:Policy>
+<<<<<<< HEAD
    
    <wsp:Policy wsu:Id="Transport_SAML_policy">
         <wsp:ExactlyOne>
@@ -906,4 +1047,44 @@
       </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>
+>>>>>>> ad4e3dd... Adding a SOAP 1.1 test with WS-MEX
 </wsdl:definitions>

[3/3] git commit: Backporting STS test

Posted by co...@apache.org.
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 <co...@apache.org>
Authored: Mon Jun 16 14:15:16 2014 +0100
Committer: Colm O hEigeartaigh <co...@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>