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 2011/12/01 17:41:21 UTC
svn commit: r1209144 [2/2] - in /cxf/trunk/systests/ws-security: ./
src/test/java/org/apache/cxf/systest/ws/common/
src/test/java/org/apache/cxf/systest/ws/saml/
src/test/java/org/apache/cxf/systest/ws/saml/server/
src/test/java/org/apache/cxf/systest/...
Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server/server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server/server.xml?rev=1209144&r1=1209143&r2=1209144&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server/server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server/server.xml Thu Dec 1 16:41:08 2011
@@ -23,8 +23,6 @@
xmlns:http="http://cxf.apache.org/transports/http/configuration"
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
xmlns:sec="http://cxf.apache.org/configuration/security"
- xmlns:security="http://schemas.iona.com/soa/security-config"
- xmlns:interop="http://WSSec/wssec10"
xmlns:cxf="http://cxf.apache.org/core"
xmlns:p="http://cxf.apache.org/policy"
xsi:schemaLocation="
@@ -35,7 +33,6 @@
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://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd
- http://schemas.iona.com/soa/security-config http://schemas.iona.com/soa/security-config.xsd
">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
@@ -77,9 +74,9 @@
address="https://localhost:${testutil.ports.Server.2}/DoubleItSaml1Transport"
serviceName="s:DoubleItService"
endpointName="s:DoubleItSaml1TransportPort"
- xmlns:s="http://WSSec/saml"
- implementor="org.apache.cxf.systest.ws.saml.server.DoubleItImpl"
- wsdlLocation="wsdl_systest_wssec/saml/DoubleItSaml.wsdl"
+ xmlns:s="http://www.example.org/contract/DoubleIt"
+ implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl"
+ wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl"
depends-on="tls-settings">
<jaxws:properties>
@@ -92,9 +89,9 @@
address="http://localhost:${testutil.ports.Server}/DoubleItSaml2Symmetric"
serviceName="s:DoubleItService"
endpointName="s:DoubleItSaml2SymmetricPort"
- xmlns:s="http://WSSec/saml"
- implementor="org.apache.cxf.systest.ws.saml.server.DoubleItImpl"
- wsdlLocation="wsdl_systest_wssec/saml/DoubleItSaml.wsdl">
+ xmlns:s="http://www.example.org/contract/DoubleIt"
+ implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl"
+ wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl">
<jaxws:properties>
<entry key="ws-security.callback-handler"
@@ -112,9 +109,9 @@
address="http://localhost:${testutil.ports.Server}/DoubleItSaml2Asymmetric"
serviceName="s:DoubleItService"
endpointName="s:DoubleItSaml2AsymmetricPort"
- xmlns:s="http://WSSec/saml"
- implementor="org.apache.cxf.systest.ws.saml.server.DoubleItImpl"
- wsdlLocation="wsdl_systest_wssec/saml/DoubleItSaml.wsdl">
+ xmlns:s="http://www.example.org/contract/DoubleIt"
+ implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl"
+ wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl">
<jaxws:properties>
<entry key="ws-security.username" value="bob"/>
@@ -136,9 +133,9 @@
address="https://localhost:${testutil.ports.Server.2}/DoubleItSaml1SelfSignedTransport"
serviceName="s:DoubleItService"
endpointName="s:DoubleItSaml1SelfSignedTransportPort"
- xmlns:s="http://WSSec/saml"
- implementor="org.apache.cxf.systest.ws.saml.server.DoubleItImpl"
- wsdlLocation="wsdl_systest_wssec/saml/DoubleItSaml.wsdl">
+ xmlns:s="http://www.example.org/contract/DoubleIt"
+ implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl"
+ wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl">
<jaxws:properties>
<entry key="ws-security.callback-handler"
@@ -154,9 +151,9 @@
address="https://localhost:${testutil.ports.Server.2}/DoubleItSaml2EndorsingTransport"
serviceName="s:DoubleItService"
endpointName="s:DoubleItSaml2EndorsingTransportPort"
- xmlns:s="http://WSSec/saml"
- implementor="org.apache.cxf.systest.ws.saml.server.DoubleItImpl"
- wsdlLocation="wsdl_systest_wssec/saml/DoubleItSaml.wsdl">
+ xmlns:s="http://www.example.org/contract/DoubleIt"
+ implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl"
+ wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl">
<jaxws:properties>
<entry key="ws-security.callback-handler"
@@ -172,9 +169,9 @@
address="http://localhost:${testutil.ports.Server}/DoubleItAsymmetricSamlInitiator"
serviceName="s:DoubleItService"
endpointName="s:DoubleItAsymmetricSamlInitiatorPort"
- xmlns:s="http://WSSec/saml"
- implementor="org.apache.cxf.systest.ws.saml.server.DoubleItImpl"
- wsdlLocation="wsdl_systest_wssec/saml/DoubleItSaml.wsdl">
+ xmlns:s="http://www.example.org/contract/DoubleIt"
+ implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl"
+ wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl">
<jaxws:properties>
<entry key="ws-security.username" value="bob"/>
@@ -196,9 +193,9 @@
address="http://localhost:${testutil.ports.Server}/DoubleItSaml2SymmetricSignedElements"
serviceName="s:DoubleItService"
endpointName="s:DoubleItSaml2SymmetricSignedElementsPort"
- xmlns:s="http://WSSec/saml"
- implementor="org.apache.cxf.systest.ws.saml.server.DoubleItImpl"
- wsdlLocation="wsdl_systest_wssec/saml/DoubleItSaml.wsdl">
+ xmlns:s="http://www.example.org/contract/DoubleIt"
+ implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl"
+ wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl">
<jaxws:properties>
<entry key="ws-security.callback-handler"
@@ -214,9 +211,9 @@
address="http://localhost:${testutil.ports.Server}/DoubleItSaml2AsymmetricSignedEncrypted"
serviceName="s:DoubleItService"
endpointName="s:DoubleItSaml2AsymmetricSignedEncryptedPort"
- xmlns:s="http://WSSec/saml"
- implementor="org.apache.cxf.systest.ws.saml.server.DoubleItImpl"
- wsdlLocation="wsdl_systest_wssec/saml/DoubleItSaml.wsdl">
+ xmlns:s="http://www.example.org/contract/DoubleIt"
+ implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl"
+ wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl">
<jaxws:properties>
<entry key="ws-security.username" value="bob"/>
@@ -238,9 +235,9 @@
address="http://localhost:${testutil.ports.Server}/DoubleItSaml2AsymmetricEncrypted"
serviceName="s:DoubleItService"
endpointName="s:DoubleItSaml2AsymmetricEncryptedPort"
- xmlns:s="http://WSSec/saml"
- implementor="org.apache.cxf.systest.ws.saml.server.DoubleItImpl"
- wsdlLocation="wsdl_systest_wssec/saml/DoubleItSaml.wsdl">
+ xmlns:s="http://www.example.org/contract/DoubleIt"
+ implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl"
+ wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl">
<jaxws:properties>
<entry key="ws-security.username" value="bob"/>
@@ -260,9 +257,9 @@
address="https://localhost:${testutil.ports.Server.2}/DoubleItSaml2EndorsingEncryptedTransport"
serviceName="s:DoubleItService"
endpointName="s:DoubleItSaml2EndorsingEncryptedTransportPort"
- xmlns:s="http://WSSec/saml"
- implementor="org.apache.cxf.systest.ws.saml.server.DoubleItImpl"
- wsdlLocation="wsdl_systest_wssec/saml/DoubleItSaml.wsdl">
+ xmlns:s="http://www.example.org/contract/DoubleIt"
+ implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl"
+ wsdlLocation="org/apache/cxf/systest/ws/saml/DoubleItSaml.wsdl">
<jaxws:properties>
<entry key="ws-security.callback-handler"
Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/DoubleIt.wsdl (from r1209101, cxf/trunk/systests/ws-security/src/test/resources/wsdl_systest_wssec/DoubleIt.wsdl)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/DoubleIt.wsdl?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/DoubleIt.wsdl&p1=cxf/trunk/systests/ws-security/src/test/resources/wsdl_systest_wssec/DoubleIt.wsdl&r1=1209101&r2=1209144&rev=1209144&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/wsdl_systest_wssec/DoubleIt.wsdl (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/DoubleIt.wsdl Thu Dec 1 16:41:08 2011
@@ -1,84 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- * 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.
+ 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 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:tns="http://cxf.apache.org/policytest/DoubleIt"
- targetNamespace="http://cxf.apache.org/policytest/DoubleIt" xmlns:wsp="http://www.w3.org/ns/ws-policy"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.example.org/contract/DoubleIt"
+ targetNamespace="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:wsaws="http://www.w3.org/2005/08/addressing" xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
xmlns:wspp="http://java.sun.com/xml/ns/wsit/policy">
- <wsdl:types>
- <xsd:schema targetNamespace="http://cxf.apache.org/policytest/DoubleIt">
- <xsd:element name="DoubleIt">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="numberToDouble">
- <xsd:simpleType>
- <xsd:restriction base="xsd:integer">
- <xsd:minInclusive value="0"/>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="DoubleItResponse">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="doubledNumber" type="xsd:integer" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="DoubleItFault">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="reason" type="xsd:string" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="DoubleItHeader" type="xsd:int"/>
- </xsd:schema>
- </wsdl:types>
- <wsdl:message name="DoubleItRequest">
- <wsdl:part element="tns:DoubleIt" name="parameters" />
- </wsdl:message>
- <wsdl:message name="DoubleItRequestHeader">
- <wsdl:part element="tns:DoubleIt" name="parameters" />
- <wsdl:part element="tns:DoubleItHeader" name="header" />
- </wsdl:message>
- <wsdl:message name="DoubleItResponse">
- <wsdl:part element="tns:DoubleItResponse" name="parameters" />
- </wsdl:message>
- <wsdl:message name="DoubleItFault">
- <wsdl:part element="tns:DoubleItFault" name="fault" />
- </wsdl:message>
- <wsdl:portType name="DoubleItPortType">
- <wsdl:operation name="DoubleIt">
- <wsdl:input message="tns:DoubleItRequest" />
- <wsdl:output message="tns:DoubleItResponse" />
- <wsdl:fault name="DoubleItFault" message="tns:DoubleItFault" />
- </wsdl:operation>
- </wsdl:portType>
- <wsdl:portType name="DoubleItPortTypeHeader">
- <wsdl:operation name="DoubleIt">
- <wsdl:input message="tns:DoubleItRequestHeader" />
- <wsdl:output message="tns:DoubleItResponse" />
- <wsdl:fault name="DoubleItFault" message="tns:DoubleItFault" />
- </wsdl:operation>
- </wsdl:portType>
+
+ <wsdl:import location="src/test/resources/DoubleItLogical.wsdl"
+ namespace="http://www.example.org/contract/DoubleIt"/>
+
<wsdl:binding name="DoubleItBinding" type="tns:DoubleItPortType">
<wsp:PolicyReference URI="#DoubleItBindingPolicy" />
<soap:binding style="document"
Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/https_config.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/https_config.xml?rev=1209144&r1=1209143&r2=1209144&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/https_config.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/https_config.xml Thu Dec 1 16:41:08 2011
@@ -65,7 +65,7 @@ under the License.
<!-- -->
<!-- HTTP/S configuration for clients -->
<!-- -->
- <http:conduit name="{http://cxf.apache.org/policytest/DoubleIt}DoubleItPortHttps.http-conduit">
+ <http:conduit name="{http://www.example.org/contract/DoubleIt}DoubleItPortHttps.http-conduit">
<http:tlsClientParameters disableCNCheck="true">
<sec:keyManagers keyPassword="password">
<sec:keyStore type="JKS" password="password"
Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl (from r1209101, cxf/trunk/systests/ws-security/src/test/resources/wsdl_systest_wssec/ut/DoubleItUt.wsdl)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl&p1=cxf/trunk/systests/ws-security/src/test/resources/wsdl_systest_wssec/ut/DoubleItUt.wsdl&r1=1209101&r2=1209144&rev=1209144&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/wsdl_systest_wssec/ut/DoubleItUt.wsdl (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl Thu Dec 1 16:41:08 2011
@@ -19,60 +19,17 @@
-->
<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:tns="http://WSSec/ut"
- targetNamespace="http://WSSec/ut"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.example.org/contract/DoubleIt"
+ targetNamespace="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:wsaws="http://www.w3.org/2005/08/addressing"
xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
xmlns:sp13="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200802">
- <wsdl:types>
- <xsd:schema targetNamespace="http://WSSec/ut">
- <xsd:element name="DoubleIt">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="numberToDouble">
- <xsd:simpleType>
- <xsd:restriction base="xsd:integer">
- <xsd:minInclusive value="0"/>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="DoubleItResponse">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="doubledNumber" type="xsd:integer" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="DoubleItFault">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="reason" type="xsd:string" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- </wsdl:types>
- <wsdl:message name="DoubleItRequest">
- <wsdl:part element="tns:DoubleIt" name="parameters" />
- </wsdl:message>
- <wsdl:message name="DoubleItResponse">
- <wsdl:part element="tns:DoubleItResponse" name="parameters" />
- </wsdl:message>
- <wsdl:message name="DoubleItFault">
- <wsdl:part element="tns:DoubleItFault" name="fault" />
- </wsdl:message>
- <wsdl:portType name="DoubleItPortType">
- <wsdl:operation name="DoubleIt">
- <wsdl:input message="tns:DoubleItRequest" />
- <wsdl:output message="tns:DoubleItResponse" />
- <wsdl:fault name="DoubleItFault" message="tns:DoubleItFault" />
- </wsdl:operation>
- </wsdl:portType>
+
+ <wsdl:import location="src/test/resources/DoubleItLogical.wsdl"
+ namespace="http://www.example.org/contract/DoubleIt"/>
+
<wsdl:binding name="DoubleItPlaintextBinding" type="tns:DoubleItPortType">
<wsp:PolicyReference URI="#DoubleItPlaintextPolicy" />
<soap:binding style="document"
Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client/client.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client/client.xml?rev=1209144&r1=1209143&r2=1209144&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client/client.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/client/client.xml Thu Dec 1 16:41:08 2011
@@ -50,7 +50,7 @@
</http:tlsClientParameters>
</http:conduit>
- <jaxws:client name="{http://WSSec/ut}DoubleItPlaintextPort"
+ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItPlaintextPort"
createdFromAPI="true">
<jaxws:properties>
<entry key="ws-security.username" value="Alice"/>
@@ -59,7 +59,7 @@
</jaxws:properties>
</jaxws:client>
- <jaxws:client name="{http://WSSec/ut}DoubleItPlaintextCreatedPort"
+ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItPlaintextCreatedPort"
createdFromAPI="true">
<jaxws:properties>
<entry key="ws-security.username" value="Alice"/>
@@ -68,7 +68,7 @@
</jaxws:properties>
</jaxws:client>
- <jaxws:client name="{http://WSSec/ut}DoubleItHashedPort"
+ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItHashedPort"
createdFromAPI="true">
<jaxws:properties>
<entry key="ws-security.username" value="Alice"/>
@@ -77,7 +77,7 @@
</jaxws:properties>
</jaxws:client>
- <jaxws:client name="{http://WSSec/ut}DoubleItNoPasswordPort"
+ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItNoPasswordPort"
createdFromAPI="true">
<jaxws:properties>
<entry key="ws-security.username" value="Alice"/>
@@ -86,7 +86,7 @@
</jaxws:properties>
</jaxws:client>
- <jaxws:client name="{http://WSSec/ut}DoubleItSignedEndorsingPort"
+ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSignedEndorsingPort"
createdFromAPI="true">
<jaxws:properties>
<entry key="ws-security.username" value="Alice"/>
@@ -99,7 +99,7 @@
</jaxws:client>
- <jaxws:client name="{http://WSSec/ut}DoubleItSignedEncryptedPort"
+ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSignedEncryptedPort"
createdFromAPI="true">
<jaxws:properties>
<entry key="ws-security.username" value="Alice"/>
@@ -111,7 +111,7 @@
</jaxws:properties>
</jaxws:client>
- <jaxws:client name="{http://WSSec/ut}DoubleItEncryptedPort"
+ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItEncryptedPort"
createdFromAPI="true">
<jaxws:properties>
<entry key="ws-security.username" value="Alice"/>
Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/server.xml?rev=1209144&r1=1209143&r2=1209144&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server/server.xml Thu Dec 1 16:41:08 2011
@@ -23,8 +23,6 @@
xmlns:http="http://cxf.apache.org/transports/http/configuration"
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
xmlns:sec="http://cxf.apache.org/configuration/security"
- xmlns:security="http://schemas.iona.com/soa/security-config"
- xmlns:interop="http://WSSec/wssec10"
xmlns:cxf="http://cxf.apache.org/core"
xmlns:p="http://cxf.apache.org/policy"
xsi:schemaLocation="
@@ -35,7 +33,6 @@
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://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd
- http://schemas.iona.com/soa/security-config http://schemas.iona.com/soa/security-config.xsd
">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
@@ -77,9 +74,9 @@
address="https://localhost:${testutil.ports.Server}/DoubleItUTPlaintext"
serviceName="s:DoubleItService"
endpointName="s:DoubleItPlaintextPort"
- xmlns:s="http://WSSec/ut"
- implementor="org.apache.cxf.systest.ws.saml.server.DoubleItImpl"
- wsdlLocation="wsdl_systest_wssec/ut/DoubleItUt.wsdl"
+ xmlns:s="http://www.example.org/contract/DoubleIt"
+ implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl"
+ wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl"
depends-on="tls-settings">
<jaxws:properties>
@@ -94,9 +91,9 @@
address="https://localhost:${testutil.ports.Server}/DoubleItUTPlaintextCreated"
serviceName="s:DoubleItService"
endpointName="s:DoubleItPlaintextCreatedPort"
- xmlns:s="http://WSSec/ut"
- implementor="org.apache.cxf.systest.ws.saml.server.DoubleItImpl"
- wsdlLocation="wsdl_systest_wssec/ut/DoubleItUt.wsdl"
+ xmlns:s="http://www.example.org/contract/DoubleIt"
+ implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl"
+ wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl"
depends-on="tls-settings">
<jaxws:properties>
@@ -111,9 +108,9 @@
address="https://localhost:${testutil.ports.Server}/DoubleItUTHashed"
serviceName="s:DoubleItService"
endpointName="s:DoubleItHashedPort"
- xmlns:s="http://WSSec/ut"
- implementor="org.apache.cxf.systest.ws.saml.server.DoubleItImpl"
- wsdlLocation="wsdl_systest_wssec/ut/DoubleItUt.wsdl"
+ xmlns:s="http://www.example.org/contract/DoubleIt"
+ implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl"
+ wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl"
depends-on="tls-settings">
<jaxws:properties>
@@ -128,9 +125,9 @@
address="https://localhost:${testutil.ports.Server}/DoubleItUTNoPassword"
serviceName="s:DoubleItService"
endpointName="s:DoubleItNoPasswordPort"
- xmlns:s="http://WSSec/ut"
- implementor="org.apache.cxf.systest.ws.saml.server.DoubleItImpl"
- wsdlLocation="wsdl_systest_wssec/ut/DoubleItUt.wsdl"
+ xmlns:s="http://www.example.org/contract/DoubleIt"
+ implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl"
+ wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl"
depends-on="tls-settings">
<jaxws:properties>
@@ -145,9 +142,9 @@
address="https://localhost:${testutil.ports.Server}/DoubleItUTSignedEndorsing"
serviceName="s:DoubleItService"
endpointName="s:DoubleItSignedEndorsingPort"
- xmlns:s="http://WSSec/ut"
- implementor="org.apache.cxf.systest.ws.saml.server.DoubleItImpl"
- wsdlLocation="wsdl_systest_wssec/ut/DoubleItUt.wsdl"
+ xmlns:s="http://www.example.org/contract/DoubleIt"
+ implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl"
+ wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl"
depends-on="tls-settings">
<jaxws:properties>
@@ -164,9 +161,9 @@
address="https://localhost:${testutil.ports.Server}/DoubleItUTSignedEncrypted"
serviceName="s:DoubleItService"
endpointName="s:DoubleItSignedEncryptedPort"
- xmlns:s="http://WSSec/ut"
- implementor="org.apache.cxf.systest.ws.saml.server.DoubleItImpl"
- wsdlLocation="wsdl_systest_wssec/ut/DoubleItUt.wsdl"
+ xmlns:s="http://www.example.org/contract/DoubleIt"
+ implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl"
+ wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl"
depends-on="tls-settings">
<jaxws:properties>
@@ -183,9 +180,9 @@
address="https://localhost:${testutil.ports.Server}/DoubleItUTEncrypted"
serviceName="s:DoubleItService"
endpointName="s:DoubleItEncryptedPort"
- xmlns:s="http://WSSec/ut"
- implementor="org.apache.cxf.systest.ws.saml.server.DoubleItImpl"
- wsdlLocation="wsdl_systest_wssec/ut/DoubleItUt.wsdl"
+ xmlns:s="http://www.example.org/contract/DoubleIt"
+ implementor="org.apache.cxf.systest.ws.common.DoubleItPortTypeImpl"
+ wsdlLocation="org/apache/cxf/systest/ws/ut/DoubleItUt.wsdl"
depends-on="tls-settings">
<jaxws:properties>
Copied: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl (from r1209101, cxf/trunk/systests/ws-security/src/test/resources/wsdl_systest_wssec/x509/DoubleItX509.wsdl)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl?p2=cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl&p1=cxf/trunk/systests/ws-security/src/test/resources/wsdl_systest_wssec/x509/DoubleItX509.wsdl&r1=1209101&r2=1209144&rev=1209144&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/wsdl_systest_wssec/x509/DoubleItX509.wsdl (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl Thu Dec 1 16:41:08 2011
@@ -19,60 +19,17 @@
-->
<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:tns="http://WSSec/x509"
- targetNamespace="http://WSSec/x509"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.example.org/contract/DoubleIt"
+ targetNamespace="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:wsaws="http://www.w3.org/2005/08/addressing"
xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
xmlns:sp13="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200802">
- <wsdl:types>
- <xsd:schema targetNamespace="http://WSSec/x509">
- <xsd:element name="DoubleIt">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="numberToDouble">
- <xsd:simpleType>
- <xsd:restriction base="xsd:integer">
- <xsd:minInclusive value="0"/>
- </xsd:restriction>
- </xsd:simpleType>
- </xsd:element>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="DoubleItResponse">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="doubledNumber" type="xsd:integer" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="DoubleItFault">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="reason" type="xsd:string" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- </wsdl:types>
- <wsdl:message name="DoubleItRequest">
- <wsdl:part element="tns:DoubleIt" name="parameters" />
- </wsdl:message>
- <wsdl:message name="DoubleItResponse">
- <wsdl:part element="tns:DoubleItResponse" name="parameters" />
- </wsdl:message>
- <wsdl:message name="DoubleItFault">
- <wsdl:part element="tns:DoubleItFault" name="fault" />
- </wsdl:message>
- <wsdl:portType name="DoubleItPortType">
- <wsdl:operation name="DoubleIt">
- <wsdl:input message="tns:DoubleItRequest" />
- <wsdl:output message="tns:DoubleItResponse" />
- <wsdl:fault name="DoubleItFault" message="tns:DoubleItFault" />
- </wsdl:operation>
- </wsdl:portType>
+
+ <wsdl:import location="src/test/resources/DoubleItLogical.wsdl"
+ namespace="http://www.example.org/contract/DoubleIt"/>
+
<wsdl:binding name="DoubleItKeyIdentifierBinding" type="tns:DoubleItPortType">
<wsp:PolicyReference URI="#DoubleItKeyIdentifierPolicy" />
<soap:binding style="document"
Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client/client.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client/client.xml?rev=1209144&r1=1209143&r2=1209144&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client/client.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client/client.xml Thu Dec 1 16:41:08 2011
@@ -39,7 +39,7 @@
</cxf:features>
</cxf:bus>
- <jaxws:client name="{http://WSSec/x509}DoubleItKeyIdentifierPort"
+ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItKeyIdentifierPort"
createdFromAPI="true">
<jaxws:properties>
<entry key="ws-security.encryption.properties"
@@ -48,7 +48,7 @@
</jaxws:properties>
</jaxws:client>
- <jaxws:client name="{http://WSSec/x509}DoubleItIssuerSerialPort"
+ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItIssuerSerialPort"
createdFromAPI="true">
<jaxws:properties>
<entry key="ws-security.encryption.properties"
@@ -57,7 +57,7 @@
</jaxws:properties>
</jaxws:client>
- <jaxws:client name="{http://WSSec/x509}DoubleItThumbprintPort"
+ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItThumbprintPort"
createdFromAPI="true">
<jaxws:properties>
<entry key="ws-security.encryption.properties"
@@ -66,7 +66,7 @@
</jaxws:properties>
</jaxws:client>
- <jaxws:client name="{http://WSSec/x509}DoubleItAsymmetricIssuerSerialPort"
+ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricIssuerSerialPort"
createdFromAPI="true">
<jaxws:properties>
<entry key="ws-security.encryption.properties"
@@ -80,7 +80,7 @@
</jaxws:properties>
</jaxws:client>
- <jaxws:client name="{http://WSSec/x509}DoubleItAsymmetricProtectTokensPort"
+ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItAsymmetricProtectTokensPort"
createdFromAPI="true">
<jaxws:properties>
<entry key="ws-security.encryption.properties"
@@ -94,7 +94,7 @@
</jaxws:properties>
</jaxws:client>
- <jaxws:client name="{http://WSSec/x509}DoubleItSymmetricProtectTokensPort"
+ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetricProtectTokensPort"
createdFromAPI="true">
<jaxws:properties>
<entry key="ws-security.encryption.properties"
@@ -103,7 +103,7 @@
</jaxws:properties>
</jaxws:client>
- <jaxws:client name="{http://WSSec/x509}DoubleItTransportEndorsingPort"
+ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportEndorsingPort"
createdFromAPI="true">
<jaxws:properties>
<entry key="ws-security.signature.properties"
@@ -114,7 +114,7 @@
</jaxws:properties>
</jaxws:client>
- <jaxws:client name="{http://WSSec/x509}DoubleItTransportSignedEndorsingPort"
+ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSignedEndorsingPort"
createdFromAPI="true">
<jaxws:properties>
<entry key="ws-security.signature.properties"
@@ -125,7 +125,7 @@
</jaxws:properties>
</jaxws:client>
- <jaxws:client name="{http://WSSec/x509}DoubleItTransportEndorsingEncryptedPort"
+ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportEndorsingEncryptedPort"
createdFromAPI="true">
<jaxws:properties>
<entry key="ws-security.signature.properties"
@@ -136,7 +136,7 @@
</jaxws:properties>
</jaxws:client>
- <jaxws:client name="{http://WSSec/x509}DoubleItTransportSignedEndorsingEncryptedPort"
+ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItTransportSignedEndorsingEncryptedPort"
createdFromAPI="true">
<jaxws:properties>
<entry key="ws-security.signature.properties"
Modified: cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml?rev=1209144&r1=1209143&r2=1209144&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml (original)
+++ cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml Thu Dec 1 16:41:08 2011
@@ -23,8 +23,6 @@
xmlns:http="http://cxf.apache.org/transports/http/configuration"
xmlns:httpj="http://cxf.apache.org/transports/http-jetty/configuration"
xmlns:sec="http://cxf.apache.org/configuration/security"
- xmlns:security="http://schemas.iona.com/soa/security-config"
- xmlns:interop="http://WSSec/wssec10"
xmlns:cxf="http://cxf.apache.org/core"
xmlns:p="http://cxf.apache.org/policy"
xsi:schemaLocation="
@@ -35,7 +33,6 @@
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://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd
- http://schemas.iona.com/soa/security-config http://schemas.iona.com/soa/security-config.xsd
">
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
@@ -74,9 +71,9 @@
address="http://localhost:${testutil.ports.Server}/DoubleItX509KeyIdentifier"
serviceName="s:DoubleItService"
endpointName="s:DoubleItKeyIdentifierPort"
- xmlns:s="http://WSSec/x509"
- implementor="org.apache.cxf.systest.ws.x509.server.DoubleItImpl"
- wsdlLocation="wsdl_systest_wssec/x509/DoubleItX509.wsdl">
+ xmlns:s="http://www.example.org/contract/DoubleIt"
+ implementor="org.apache.cxf.systest.ws.common.DoubleItImpl"
+ wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
<jaxws:properties>
<entry key="ws-security.callback-handler"
@@ -92,9 +89,9 @@
address="http://localhost:${testutil.ports.Server}/DoubleItX509IssuerSerial"
serviceName="s:DoubleItService"
endpointName="s:DoubleItIssuerSerialPort"
- xmlns:s="http://WSSec/x509"
- implementor="org.apache.cxf.systest.ws.x509.server.DoubleItImpl"
- wsdlLocation="wsdl_systest_wssec/x509/DoubleItX509.wsdl">
+ xmlns:s="http://www.example.org/contract/DoubleIt"
+ implementor="org.apache.cxf.systest.ws.common.DoubleItImpl"
+ wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
<jaxws:properties>
<entry key="ws-security.callback-handler"
@@ -110,9 +107,9 @@
address="http://localhost:${testutil.ports.Server}/DoubleItX509Thumbprint"
serviceName="s:DoubleItService"
endpointName="s:DoubleItThumbprintPort"
- xmlns:s="http://WSSec/x509"
- implementor="org.apache.cxf.systest.ws.x509.server.DoubleItImpl"
- wsdlLocation="wsdl_systest_wssec/x509/DoubleItX509.wsdl">
+ xmlns:s="http://www.example.org/contract/DoubleIt"
+ implementor="org.apache.cxf.systest.ws.common.DoubleItImpl"
+ wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
<jaxws:properties>
<entry key="ws-security.callback-handler"
@@ -128,9 +125,9 @@
address="http://localhost:${testutil.ports.Server}/DoubleItX509Asymmetric"
serviceName="s:DoubleItService"
endpointName="s:DoubleItAsymmetricIssuerSerialPort"
- xmlns:s="http://WSSec/x509"
- implementor="org.apache.cxf.systest.ws.x509.server.DoubleItImpl"
- wsdlLocation="wsdl_systest_wssec/x509/DoubleItX509.wsdl">
+ xmlns:s="http://www.example.org/contract/DoubleIt"
+ implementor="org.apache.cxf.systest.ws.common.DoubleItImpl"
+ wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
<jaxws:properties>
<entry key="ws-security.callback-handler"
@@ -149,9 +146,9 @@
address="http://localhost:${testutil.ports.Server}/DoubleItX509AsymmetricProtect"
serviceName="s:DoubleItService"
endpointName="s:DoubleItAsymmetricProtectTokensPort"
- xmlns:s="http://WSSec/x509"
- implementor="org.apache.cxf.systest.ws.x509.server.DoubleItImpl"
- wsdlLocation="wsdl_systest_wssec/x509/DoubleItX509.wsdl">
+ xmlns:s="http://www.example.org/contract/DoubleIt"
+ implementor="org.apache.cxf.systest.ws.common.DoubleItImpl"
+ wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
<jaxws:properties>
<entry key="ws-security.callback-handler"
@@ -170,9 +167,9 @@
address="http://localhost:${testutil.ports.Server}/DoubleItX509SymmetricProtect"
serviceName="s:DoubleItService"
endpointName="s:DoubleItSymmetricProtectTokensPort"
- xmlns:s="http://WSSec/x509"
- implementor="org.apache.cxf.systest.ws.x509.server.DoubleItImpl"
- wsdlLocation="wsdl_systest_wssec/x509/DoubleItX509.wsdl">
+ xmlns:s="http://www.example.org/contract/DoubleIt"
+ implementor="org.apache.cxf.systest.ws.common.DoubleItImpl"
+ wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl">
<jaxws:properties>
<entry key="ws-security.callback-handler"
@@ -188,9 +185,9 @@
address="https://localhost:${testutil.ports.Server.2}/DoubleItX509TransportEndorsing"
serviceName="s:DoubleItService"
endpointName="s:DoubleItTransportEndorsingPort"
- xmlns:s="http://WSSec/x509"
- implementor="org.apache.cxf.systest.ws.x509.server.DoubleItImpl"
- wsdlLocation="wsdl_systest_wssec/x509/DoubleItX509.wsdl"
+ xmlns:s="http://www.example.org/contract/DoubleIt"
+ implementor="org.apache.cxf.systest.ws.common.DoubleItImpl"
+ wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl"
depends-on="tls-settings">
<jaxws:properties>
@@ -205,9 +202,9 @@
address="https://localhost:${testutil.ports.Server.2}/DoubleItX509TransportSignedEndorsing"
serviceName="s:DoubleItService"
endpointName="s:DoubleItTransportSignedEndorsingPort"
- xmlns:s="http://WSSec/x509"
- implementor="org.apache.cxf.systest.ws.x509.server.DoubleItImpl"
- wsdlLocation="wsdl_systest_wssec/x509/DoubleItX509.wsdl"
+ xmlns:s="http://www.example.org/contract/DoubleIt"
+ implementor="org.apache.cxf.systest.ws.common.DoubleItImpl"
+ wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl"
depends-on="tls-settings">
<jaxws:properties>
@@ -222,9 +219,9 @@
address="https://localhost:${testutil.ports.Server.2}/DoubleItX509TransportEndorsingEncrypted"
serviceName="s:DoubleItService"
endpointName="s:DoubleItTransportEndorsingEncryptedPort"
- xmlns:s="http://WSSec/x509"
- implementor="org.apache.cxf.systest.ws.x509.server.DoubleItImpl"
- wsdlLocation="wsdl_systest_wssec/x509/DoubleItX509.wsdl"
+ xmlns:s="http://www.example.org/contract/DoubleIt"
+ implementor="org.apache.cxf.systest.ws.common.DoubleItImpl"
+ wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl"
depends-on="tls-settings">
<jaxws:properties>
@@ -239,9 +236,9 @@
address="https://localhost:${testutil.ports.Server.2}/DoubleItX509TransportSignedEndorsingEncrypted"
serviceName="s:DoubleItService"
endpointName="s:DoubleItTransportSignedEndorsingEncryptedPort"
- xmlns:s="http://WSSec/x509"
- implementor="org.apache.cxf.systest.ws.x509.server.DoubleItImpl"
- wsdlLocation="wsdl_systest_wssec/x509/DoubleItX509.wsdl"
+ xmlns:s="http://www.example.org/contract/DoubleIt"
+ implementor="org.apache.cxf.systest.ws.common.DoubleItImpl"
+ wsdlLocation="org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl"
depends-on="tls-settings">
<jaxws:properties>