cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [3/4] cxf git commit: Renaming tests
Date Mon, 15 Feb 2016 16:21:02 GMT
http://git-wip-us.apache.org/repos/asf/cxf/blob/b5101535/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/DoubleIt.wsdl
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/DoubleIt.wsdl
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/DoubleIt.wsdl
deleted file mode 100644
index ff9ca36..0000000
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/DoubleIt.wsdl
+++ /dev/null
@@ -1,430 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
- 
- http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<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="DoubleItSymmetricSAML1Binding" type="tns:DoubleItPortType">
-        <wsp:PolicyReference URI="#DoubleItSymmetricBindingSAML1Policy"/>
-        <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="DoubleItSymmetricSAML2Binding" type="tns:DoubleItPortType">
-        <wsp:PolicyReference URI="#DoubleItSymmetricBindingSAML2Policy"/>
-        <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="DoubleItSymmetricSAML2EndorsingBinding" type="tns:DoubleItPortType">
-        <wsp:PolicyReference URI="#DoubleItSymmetricBindingSAML2EndorsingPolicy"/>
-        <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="DoubleItSymmetricSAML2SupportingBinding" type="tns:DoubleItPortType">
-        <wsp:PolicyReference URI="#DoubleItSymmetricBindingSAML2SupportingPolicy"/>
-        <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="DoubleItSymmetricSAML1Port" binding="tns:DoubleItSymmetricSAML1Binding">
-            <soap:address location="http://localhost:8082/doubleit/services/doubleitsymmetricsaml1"/>
-        </wsdl:port>
-        <wsdl:port name="DoubleItSymmetricSAML2Port" binding="tns:DoubleItSymmetricSAML2Binding">
-            <soap:address location="http://localhost:8082/doubleit/services/doubleitsymmetricsaml2"/>
-        </wsdl:port>
-        <wsdl:port name="DoubleItSymmetricSAML2EndorsingPort" binding="tns:DoubleItSymmetricSAML2EndorsingBinding">
-            <soap:address location="http://localhost:8082/doubleit/services/doubleitsymmetricsaml2endorsing"/>
-        </wsdl:port>
-        <wsdl:port name="DoubleItSymmetricSAML2SupportingPort" binding="tns:DoubleItSymmetricSAML2SupportingBinding">
-            <soap:address location="http://localhost:8082/doubleit/services/doubleitsymmetricsaml2supporting"/>
-        </wsdl:port>
-    </wsdl:service>
-    <wsp:Policy wsu:Id="DoubleItSymmetricBindingSAML1Policy">
-        <wsp:ExactlyOne>
-            <wsp:All>
-                <wsam:Addressing wsp:Optional="false">
-                    <wsp:Policy/>
-                </wsam:Addressing>
-                <sp:SymmetricBinding>
-                    <wsp:Policy>
-                        <sp:ProtectionToken>
-                            <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/SymmetricKey</t:KeyType>
-                                        <t:KeySize>128</t:KeySize>
-                                    </sp:RequestSecurityTokenTemplate>
-                                    <wsp:Policy>
-                                        <sp:RequireInternalReference/>
-                                    </wsp:Policy>
-                                    <sp:Issuer>
-                                        <wsaw:Address>http://localhost:8080/SecurityTokenService/UT
-                                                                                </wsaw:Address>
-                                        <wsaw:Metadata>
-                                            <wsx:Metadata>
-                                                <wsx:MetadataSection>
-                                                    <wsx:MetadataReference>
-                                                        <wsaw:Address>http://localhost:8080/SecurityTokenService/UT/mex
-                                                                                        
                       </wsaw:Address>
-                                                    </wsx:MetadataReference>
-                                                </wsx:MetadataSection>
-                                            </wsx:Metadata>
-                                        </wsaw:Metadata>
-                                    </sp:Issuer>
-                                </sp:IssuedToken>
-                            </wsp:Policy>
-                        </sp:ProtectionToken>
-                        <sp:Layout>
-                            <wsp:Policy>
-                                <sp:Lax/>
-                            </wsp:Policy>
-                        </sp:Layout>
-                        <sp:IncludeTimestamp/>
-                        <sp:OnlySignEntireHeadersAndBody/>
-                        <sp:AlgorithmSuite>
-                            <wsp:Policy>
-                                <sp:Basic128/>
-                            </wsp:Policy>
-                        </sp:AlgorithmSuite>
-                    </wsp:Policy>
-                </sp:SymmetricBinding>
-                <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="DoubleItSymmetricBindingSAML2Policy">
-        <wsp:ExactlyOne>
-            <wsp:All>
-                <wsam:Addressing wsp:Optional="false">
-                    <wsp:Policy/>
-                </wsam:Addressing>
-                <sp:SymmetricBinding>
-                    <wsp:Policy>
-                        <sp:ProtectionToken>
-                            <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#SAMLV2.0</t:TokenType>
-                                        <t:KeyType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/SymmetricKey</t:KeyType>
-                                        <t:KeySize>128</t:KeySize>
-                                    </sp:RequestSecurityTokenTemplate>
-                                    <wsp:Policy>
-                                        <sp:RequireInternalReference/>
-                                    </wsp:Policy>
-                                    <sp:Issuer>
-                                        <wsaw:Address>http://localhost:8080/SecurityTokenService/UT
-                                                                                </wsaw:Address>
-                                        <wsaw:Metadata>
-                                            <wsx:Metadata>
-                                                <wsx:MetadataSection>
-                                                    <wsx:MetadataReference>
-                                                        <wsaw:Address>http://localhost:8080/SecurityTokenService/UT/mex
-                                                                                        
                       </wsaw:Address>
-                                                    </wsx:MetadataReference>
-                                                </wsx:MetadataSection>
-                                            </wsx:Metadata>
-                                        </wsaw:Metadata>
-                                    </sp:Issuer>
-                                </sp:IssuedToken>
-                            </wsp:Policy>
-                        </sp:ProtectionToken>
-                        <sp:Layout>
-                            <wsp:Policy>
-                                <sp:Lax/>
-                            </wsp:Policy>
-                        </sp:Layout>
-                        <sp:IncludeTimestamp/>
-                        <sp:OnlySignEntireHeadersAndBody/>
-                        <sp:AlgorithmSuite>
-                            <wsp:Policy>
-                                <sp:Basic128/>
-                            </wsp:Policy>
-                        </sp:AlgorithmSuite>
-                    </wsp:Policy>
-                </sp:SymmetricBinding>
-                <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="DoubleItSymmetricBindingSAML2EndorsingPolicy">
-        <wsp:ExactlyOne>
-            <wsp:All>
-                <wsam:Addressing wsp:Optional="false">
-                    <wsp:Policy/>
-                </wsam:Addressing>
-                <sp:SymmetricBinding>
-                    <wsp:Policy>
-                        <sp:ProtectionToken>
-                            <wsp:Policy>
-                                <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
-                                    <wsp:Policy>
-                                        <sp:RequireThumbprintReference/>
-                                        <sp:WssX509V3Token10/>
-                                    </wsp:Policy>
-                                </sp:X509Token>
-                            </wsp:Policy>
-                        </sp:ProtectionToken>
-                        <sp:Layout>
-                            <wsp:Policy>
-                                <sp:Lax/>
-                            </wsp:Policy>
-                        </sp:Layout>
-                        <sp:IncludeTimestamp/>
-                        <sp:OnlySignEntireHeadersAndBody/>
-                        <sp:EncryptSignature/>
-                        <sp:AlgorithmSuite>
-                            <wsp:Policy>
-                                <sp:Basic128/>
-                            </wsp:Policy>
-                        </sp:AlgorithmSuite>
-                    </wsp:Policy>
-                </sp:SymmetricBinding>
-                <sp:EndorsingSupportingTokens>
-                    <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#SAMLV2.0</t:TokenType>
-                                <t:KeyType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/SymmetricKey</t:KeyType>
-                                <t:KeySize>128</t:KeySize>
-                            </sp:RequestSecurityTokenTemplate>
-                            <wsp:Policy>
-                                <sp:RequireInternalReference/>
-                            </wsp:Policy>
-                            <sp:Issuer>
-                                <wsaw:Address>http://localhost:8080/SecurityTokenService/UT
-                                        </wsaw:Address>
-                                <wsaw:Metadata>
-                                    <wsx:Metadata>
-                                        <wsx:MetadataSection>
-                                            <wsx:MetadataReference>
-                                                <wsaw:Address>http://localhost:8080/SecurityTokenService/UT/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="DoubleItSymmetricBindingSAML2SupportingPolicy">
-        <wsp:ExactlyOne>
-            <wsp:All>
-                <wsam:Addressing wsp:Optional="false">
-                    <wsp:Policy/>
-                </wsam:Addressing>
-                <sp:SymmetricBinding>
-                    <wsp:Policy>
-                        <sp:ProtectionToken>
-                            <wsp:Policy>
-                                <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
-                                    <wsp:Policy>
-                                        <sp:RequireThumbprintReference/>
-                                        <sp:WssX509V3Token10/>
-                                    </wsp:Policy>
-                                </sp:X509Token>
-                            </wsp:Policy>
-                        </sp:ProtectionToken>
-                        <sp:Layout>
-                            <wsp:Policy>
-                                <sp:Lax/>
-                            </wsp:Policy>
-                        </sp:Layout>
-                        <sp:IncludeTimestamp/>
-                        <sp:OnlySignEntireHeadersAndBody/>
-                        <sp:AlgorithmSuite>
-                            <wsp:Policy>
-                                <sp:Basic128/>
-                            </wsp:Policy>
-                        </sp:AlgorithmSuite>
-                    </wsp:Policy>
-                </sp:SymmetricBinding>
-                <sp:SignedEncryptedSupportingTokens>
-                    <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#SAMLV2.0</t:TokenType>
-                                <t:KeyType>http://docs.oasis-open.org/ws-sx/ws-trust/200512/Bearer</t:KeyType>
-                            </sp:RequestSecurityTokenTemplate>
-                            <wsp:Policy>
-                                <sp:RequireInternalReference/>
-                            </wsp:Policy>
-                            <sp:Issuer>
-                                <wsaw:Address>http://localhost:8080/SecurityTokenService/UT
-                                        </wsaw:Address>
-                                <wsaw:Metadata>
-                                    <wsx:Metadata>
-                                        <wsx:MetadataSection>
-                                            <wsx:MetadataReference>
-                                                <wsaw:Address>http://localhost:8080/SecurityTokenService/UT/mex
-                                                        </wsaw:Address>
-                                            </wsx:MetadataReference>
-                                        </wsx:MetadataSection>
-                                    </wsx:Metadata>
-                                </wsaw:Metadata>
-                            </sp:Issuer>
-                        </sp:IssuedToken>
-                    </wsp:Policy>
-                </sp:SignedEncryptedSupportingTokens>
-                <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>
-</wsdl:definitions>

http://git-wip-us.apache.org/repos/asf/cxf/blob/b5101535/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-client.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-client.xml
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-client.xml
deleted file mode 100644
index 9afda0c..0000000
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-client.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
- 
- http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:jaxws="http://cxf.apache.org/jaxws" xmlns:cxf="http://cxf.apache.org/core" xmlns:http="http://cxf.apache.org/transports/http/configuration"
xmlns:sec="http://cxf.apache.org/configuration/security" xsi:schemaLocation=" http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://cxf.apache.org/core
http://cxf.apache.org/schemas/core.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/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd">
-    <cxf:bus>
-        <cxf:features>
-            <cxf:logging/>
-        </cxf:features>
-    </cxf:bus>
-    <bean id="stsClient" class="org.apache.cxf.ws.security.trust.STSClient">
-        <constructor-arg ref="cxf"/>
-        <property name="wsdlLocation" value="http://localhost:8080/SecurityTokenService/X509?wsdl"/>
-        <property name="serviceName" value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService"/>
-        <property name="endpointName" value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}X509_Port"/>
-        <property name="properties">
-            <map>
-                <entry key="security.signature.username" value="myclientkey"/>
-                <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-                <entry key="security.signature.properties" value="clientKeystore.properties"/>
-                <entry key="security.encryption.properties" value="clientKeystore.properties"/>
-                <entry key="security.encryption.username" value="mystskey"/>
-            </map>
-        </property>
-    </bean>
-    <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetricSAML1Port"
createdFromAPI="true">
-        <jaxws:properties>
-            <entry key="security.sts.client" value-ref="stsClient"/>
-        </jaxws:properties>
-    </jaxws:client>
-    <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetricSAML2Port"
createdFromAPI="true">
-        <jaxws:properties>
-            <entry key="security.sts.client" value-ref="stsClient"/>
-        </jaxws:properties>
-    </jaxws:client>
-    <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetricSAML2EndorsingPort"
createdFromAPI="true">
-        <jaxws:properties>
-            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
-            <entry key="security.encryption.username" value="myservicekey"/>
-            <entry key="security.sts.client" value-ref="stsClient"/>
-        </jaxws:properties>
-    </jaxws:client>
-    
-    <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetricSAML2SupportingPort"
createdFromAPI="true">
-        <jaxws:properties>
-            <entry key="security.encryption.properties" value="clientKeystore.properties"/>
-            <entry key="security.encryption.username" value="myservicekey"/>
-            <entry key="security.sts.client" value-ref="stsClient"/>
-        </jaxws:properties>
-    </jaxws:client>
-</beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/b5101535/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-service.xml
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-service.xml
deleted file mode 100644
index 8b5f41c..0000000
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-service.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
- 
- http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<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"/>
-    
-    <cxf:bus>
-        <cxf:features>
-            <cxf:logging/>
-        </cxf:features>
-    </cxf:bus>
-    
-    <bean id="stsclient" class="org.apache.cxf.ws.security.trust.STSClient">
-        <constructor-arg ref="cxf"/>
-        <property name="wsdlLocation" value="http://localhost:${testutil.ports.STSServer.2}/SecurityTokenService/X509?wsdl"/>
-        <property name="serviceName" value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService"/>
-        <property name="endpointName" value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}X509_Port"/>
-        <property name="properties">
-            <map>
-                <entry key="security.signature.username" value="myservicekey"/>
-                <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-                <entry key="security.signature.properties" value="serviceKeystore.properties"/>
-                <entry key="security.encryption.properties" value="serviceKeystore.properties"/>
-                <entry key="security.encryption.username" value="mystskey"/>
-            </map>
-        </property>
-    </bean>
-    
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitsymmetricsaml1"
implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItSymmetricSAML1Port"
serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.x509_symmetric.Server}/doubleit/services/doubleitsymmetricsaml1"
wsdlLocation="org/apache/cxf/systest/sts/x509_symmetric/DoubleIt.wsdl">
-        <jaxws:properties>
-            <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
-            <entry key="ws-security.is-bsp-compliant" value="false"/>
-            <entry key="ws-security.saml1.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="doubleitsymmetricsaml2"
implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItSymmetricSAML2Port"
serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.x509_symmetric.Server}/doubleit/services/doubleitsymmetricsaml2"
wsdlLocation="org/apache/cxf/systest/sts/x509_symmetric/DoubleIt.wsdl">
-        <jaxws:properties>
-            <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
-            <entry key="ws-security.is-bsp-compliant" value="false"/>
-            <entry key="ws-security.saml2.validator">
-                <bean class="org.apache.cxf.ws.security.trust.STSTokenValidator">
-                    <constructor-arg value="true"/>
-                </bean>
-            </entry>
-            <entry key="security.sts.client">
-                <ref bean="stsclient"/>
-            </entry>
-        </jaxws:properties>
-    </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitsymmetricsaml2endorsing"
implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItSymmetricSAML2EndorsingPort"
serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.x509_symmetric.Server}/doubleit/services/doubleitsymmetricsaml2endorsing"
wsdlLocation="org/apache/cxf/systest/sts/x509_symmetric/DoubleIt.wsdl">
-        <jaxws:properties>
-            <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
-            <entry key="ws-security.is-bsp-compliant" value="false"/>
-        </jaxws:properties>
-    </jaxws:endpoint>
-    
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitsymmetricsaml2supporting"
implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItSymmetricSAML2SupportingPort"
serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.x509_symmetric.Server}/doubleit/services/doubleitsymmetricsaml2supporting"
wsdlLocation="org/apache/cxf/systest/sts/x509_symmetric/DoubleIt.wsdl">
-        <jaxws:properties>
-            <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
-            <entry key="ws-security.is-bsp-compliant" value="false"/>
-        </jaxws:properties>
-    </jaxws:endpoint>
-</beans>

http://git-wip-us.apache.org/repos/asf/cxf/blob/b5101535/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-stax-service.xml
----------------------------------------------------------------------
diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-stax-service.xml
b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-stax-service.xml
deleted file mode 100644
index be5f158..0000000
--- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/x509_symmetric/cxf-stax-service.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
- 
- http://www.apache.org/licenses/LICENSE-2.0
- 
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<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"/>
-    
-    <cxf:bus>
-        <cxf:features>
-            <cxf:logging/>
-        </cxf:features>
-    </cxf:bus>
-    
-    <bean id="stsclient" class="org.apache.cxf.ws.security.trust.STSClient">
-        <constructor-arg ref="cxf"/>
-        <property name="wsdlLocation" value="http://localhost:${testutil.ports.StaxSTSServer.2}/SecurityTokenService/X509?wsdl"/>
-        <property name="serviceName" value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}SecurityTokenService"/>
-        <property name="endpointName" value="{http://docs.oasis-open.org/ws-sx/ws-trust/200512/}X509_Port"/>
-        <property name="properties">
-            <map>
-                <entry key="security.signature.username" value="myservicekey"/>
-                <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-                <entry key="security.signature.properties" value="serviceKeystore.properties"/>
-                <entry key="security.encryption.properties" value="serviceKeystore.properties"/>
-                <entry key="security.encryption.username" value="mystskey"/>
-            </map>
-        </property>
-    </bean>
-    
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitsymmetricsaml1"
implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItSymmetricSAML1Port"
serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.x509_symmetric.StaxServer}/doubleit/services/doubleitsymmetricsaml1"
wsdlLocation="org/apache/cxf/systest/sts/x509_symmetric/DoubleIt.wsdl">
-        <jaxws:properties>
-            <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
-            <entry key="ws-security.is-bsp-compliant" value="false"/>
-            <entry key="ws-security.saml1.validator">
-                <bean class="org.apache.cxf.ws.security.trust.STSStaxTokenValidator">
-                    <constructor-arg value="true"/>
-                </bean>
-            </entry>
-            <entry key="security.sts.client">
-                <ref bean="stsclient"/>
-            </entry>
-            <entry key="ws-security.enable.streaming" value="true"/>
-        </jaxws:properties>
-    </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitsymmetricsaml2"
implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItSymmetricSAML2Port"
serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.x509_symmetric.StaxServer}/doubleit/services/doubleitsymmetricsaml2"
wsdlLocation="org/apache/cxf/systest/sts/x509_symmetric/DoubleIt.wsdl">
-        <jaxws:properties>
-            <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
-            <entry key="ws-security.is-bsp-compliant" value="false"/>
-            <entry key="ws-security.saml2.validator">
-                <bean class="org.apache.cxf.ws.security.trust.STSStaxTokenValidator"/>
-            </entry>
-            <entry key="ws-security.enable.streaming" value="true"/>
-        </jaxws:properties>
-    </jaxws:endpoint>
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitsymmetricsaml2endorsing"
implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItSymmetricSAML2EndorsingPort"
serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.x509_symmetric.StaxServer}/doubleit/services/doubleitsymmetricsaml2endorsing"
wsdlLocation="org/apache/cxf/systest/sts/x509_symmetric/DoubleIt.wsdl">
-        <jaxws:properties>
-            <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
-            <entry key="ws-security.is-bsp-compliant" value="false"/>
-            <entry key="ws-security.enable.streaming" value="true"/>
-        </jaxws:properties>
-    </jaxws:endpoint>
-    
-    <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt" id="doubleitsymmetricsaml2supporting"
implementor="org.apache.cxf.systest.sts.common.DoubleItPortTypeImpl" endpointName="s:DoubleItSymmetricSAML2SupportingPort"
serviceName="s:DoubleItService" address="http://localhost:${testutil.ports.x509_symmetric.StaxServer}/doubleit/services/doubleitsymmetricsaml2supporting"
wsdlLocation="org/apache/cxf/systest/sts/x509_symmetric/DoubleIt.wsdl">
-        <jaxws:properties>
-            <entry key="security.callback-handler" value="org.apache.cxf.systest.sts.common.CommonCallbackHandler"/>
-            <entry key="security.signature.properties" value="serviceKeystore.properties"/>
-            <entry key="ws-security.is-bsp-compliant" value="false"/>
-            <entry key="ws-security.enable.streaming" value="true"/>
-        </jaxws:properties>
-    </jaxws:endpoint>
-</beans>


Mime
View raw message