Fixing backmerge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b7b6b2d3 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b7b6b2d3 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b7b6b2d3 Branch: refs/heads/2.7.x-fixes Commit: b7b6b2d347a4317a69ef2158e6b4b99464dcb2e3 Parents: 5b9ea8d Author: Colm O hEigeartaigh <[email protected]> Authored: Tue Jan 20 15:56:55 2015 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Tue Jan 20 15:56:55 2015 +0000 ---------------------------------------------------------------------- .../wss4j/PolicyBasedWSS4JInInterceptor.java | 19 - .../policyhandlers/AbstractBindingBuilder.java | 63 +--- .../policyhandlers/TransportBindingHandler.java | 19 +- .../apache/cxf/systest/ws/parts/PartsTest.java | 18 +- .../cxf/systest/ws/parts/DoubleItParts.wsdl | 7 +- .../org/apache/cxf/systest/ws/parts/client.xml | 348 ------------------- .../cxf/systest/ws/parts/client/client.xml | 22 ++ .../org/apache/cxf/systest/ws/parts/server.xml | 331 ------------------ .../cxf/systest/ws/parts/server/server.xml | 26 ++ 9 files changed, 63 insertions(+), 790 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/b7b6b2d3/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java index d889fed..1394a0b 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java @@ -481,29 +481,10 @@ public class PolicyBasedWSS4JInInterceptor extends WSS4JInInterceptor { xpaths = p.getXPathExpressions(); } -<<<<<<< HEAD if (xpaths != null) { if (namespaces != null) { xpath.setNamespaceContext(new MapNamespaceContext(namespaces)); } -======= - RequiredElements elements = (RequiredElements)ai.getAssertion(); - - if (elements != null && elements.getXPaths() != null - && !elements.getXPaths().isEmpty()) { - List<String> expressions = new ArrayList<String>(); - MapNamespaceContext namespaceContext = new MapNamespaceContext(); - - for (org.apache.wss4j.policy.model.XPath xPath : elements.getXPaths()) { - expressions.add(xPath.getXPath()); - Map<String, String> namespaceMap = xPath.getPrefixNamespaceMap(); - if (namespaceMap != null) { - namespaceContext.addNamespaces(namespaceMap); - } - } - - xpath.setNamespaceContext(namespaceContext); ->>>>>>> 5c8f473... [CXF-6209][CXF-6210] - Bug in processing Signed/Encrypted Elements policies with multiple XPaths try { CryptoCoverageUtil.checkCoverage(soapEnvelope, refs, xpath, xpaths, type, scope); http://git-wip-us.apache.org/repos/asf/cxf/blob/b7b6b2d3/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java index c23d0d3..6137da6 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java @@ -1245,27 +1245,11 @@ public abstract class AbstractBindingBuilder { result.addAll(this.getParts(sign, includeBody, parts, found)); // Handle sign/enc elements -<<<<<<< HEAD - try { - result.addAll(this.getElements("Element", xpaths, namespaces, found, sign)); - } catch (XPathExpressionException e) { - LOG.log(Level.FINE, e.getMessage(), e); - // REVISIT - } + result.addAll(this.getElements("Element", xpaths, namespaces, found, sign)); // Handle content encrypted elements - try { - result.addAll(this.getElements("Content", contentXpaths, cnamespaces, found, sign)); - } catch (XPathExpressionException e) { - LOG.log(Level.FINE, e.getMessage(), e); - // REVISIT -======= - result.addAll(this.getElements("Element", xpaths, found, sign)); - if (!sign) { - // Handle content encrypted elements - result.addAll(this.getElements("Content", contentXpaths, found, sign)); ->>>>>>> 5c8f473... [CXF-6209][CXF-6210] - Bug in processing Signed/Encrypted Elements policies with multiple XPaths + result.addAll(this.getElements("Content", contentXpaths, cnamespaces, found, sign)); } return result; @@ -1389,37 +1373,10 @@ public abstract class AbstractBindingBuilder { if (namespaces != null) { xpath.setNamespaceContext(new MapNamespaceContext(namespaces)); } - -<<<<<<< HEAD - NodeList list = (NodeList)xpath.evaluate(expression, saaj.getSOAPPart().getEnvelope(), - XPathConstants.NODESET); - for (int x = 0; x < list.getLength(); x++) { - Element el = (Element)list.item(x); - - if (!found.contains(el)) { - String id = null; - if (forceId) { - id = this.addWsuIdToElement(el); - } else { - //not forcing an ID on this. Use one if there is one - //there already, but don't force one - Attr idAttr = el.getAttributeNodeNS(null, "Id"); - if (idAttr == null) { - //then try the wsu:Id value - idAttr = el.getAttributeNodeNS(PolicyConstants.WSU_NAMESPACE_URI, "Id"); - } - if (idAttr != null) { - id = idAttr.getValue(); - } - } - WSEncryptionPart part = - new WSEncryptionPart(id, encryptionModifier); - part.setElement(el); - part.setXpath(expression); -======= + NodeList list = null; try { - list = (NodeList)xpath.evaluate(xPath.getXPath(), saaj.getSOAPPart().getEnvelope(), + list = (NodeList)xpath.evaluate(expression, saaj.getSOAPPart().getEnvelope(), XPathConstants.NODESET); } catch (XPathExpressionException e) { LOG.log(Level.WARNING, "Failure in evaluating an XPath expression", e); @@ -1428,14 +1385,13 @@ public abstract class AbstractBindingBuilder { if (list != null) { for (int x = 0; x < list.getLength(); x++) { Element el = (Element)list.item(x); ->>>>>>> 5c8f473... [CXF-6209][CXF-6210] - Bug in processing Signed/Encrypted Elements policies with multiple XPaths if (!found.contains(el)) { String id = setIdOnElement(el, forceId); WSEncryptionPart part = new WSEncryptionPart(id, encryptionModifier); part.setElement(el); - part.setXpath(xPath.getXPath()); + part.setXpath(expression); result.add(part); } @@ -1447,10 +1403,6 @@ public abstract class AbstractBindingBuilder { return result; } -<<<<<<< HEAD - protected WSSecEncryptedKey getEncryptedKeyBuilder(TokenWrapper wrapper, - Token token) throws WSSecurityException { -======= private String setIdOnElement(Element element, boolean forceId) { if (forceId) { return this.addWsuIdToElement(element); @@ -1470,9 +1422,8 @@ public abstract class AbstractBindingBuilder { return null; } - protected WSSecEncryptedKey getEncryptedKeyBuilder(AbstractTokenWrapper wrapper, - AbstractToken token) throws WSSecurityException { ->>>>>>> 5c8f473... [CXF-6209][CXF-6210] - Bug in processing Signed/Encrypted Elements policies with multiple XPaths + protected WSSecEncryptedKey getEncryptedKeyBuilder(TokenWrapper wrapper, + Token token) throws WSSecurityException { WSSecEncryptedKey encrKey = new WSSecEncryptedKey(wssConfig); Crypto crypto = getEncryptionCrypto(wrapper); message.getExchange().put(SecurityConstants.ENCRYPT_CRYPTO, crypto); http://git-wip-us.apache.org/repos/asf/cxf/blob/b7b6b2d3/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java index 03fc377..0760e0c 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/TransportBindingHandler.java @@ -601,23 +601,12 @@ public class TransportBindingHandler extends AbstractBindingBuilder { if (signedElements != null) { // Handle SignedElements -<<<<<<< HEAD - try { - result.addAll( - this.getElements( - "Element", signedElements.getXPathExpressions(), - signedElements.getDeclaredNamespaces(), found, true - ) - ); - } catch (XPathExpressionException e) { - LOG.log(Level.FINE, e.getMessage(), e); - // REVISIT - } -======= result.addAll( - this.getElements("Element", signedElements.getXPaths(), found, true) + this.getElements( + "Element", signedElements.getXPathExpressions(), + signedElements.getDeclaredNamespaces(), found, true + ) ); ->>>>>>> 5c8f473... [CXF-6209][CXF-6210] - Bug in processing Signed/Encrypted Elements policies with multiple XPaths } return result; http://git-wip-us.apache.org/repos/asf/cxf/blob/b7b6b2d3/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsTest.java ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsTest.java index 5e8793c..7731cd6 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsTest.java @@ -304,12 +304,8 @@ public class PartsTest extends AbstractBusClientServerTestBase { @org.junit.Test public void testMultipleEncryptedElements() throws Exception { - if (test.isStreaming() || STAX_PORT.equals(test.getPort())) { - return; - } - SpringBusFactory bf = new SpringBusFactory(); - URL busFile = PartsTest.class.getResource("client.xml"); + URL busFile = PartsTest.class.getResource("client/client.xml"); Bus bus = bf.createBus(busFile.toString()); SpringBusFactory.setDefaultBus(bus); @@ -321,22 +317,14 @@ public class PartsTest extends AbstractBusClientServerTestBase { // Successful invocation QName portQName = new QName(NAMESPACE, "DoubleItEncryptedElementsPort3"); DoubleItPortType port = service.getPort(portQName, DoubleItPortType.class); - updateAddressPort(port, test.getPort()); - - if (test.isStreaming()) { - SecurityTestUtil.enableStreaming(port); - } + updateAddressPort(port, PORT); port.doubleIt(25); // This should fail, as the service requires that the header must be encrypted portQName = new QName(NAMESPACE, "DoubleItEncryptedElementsPort2"); port = service.getPort(portQName, DoubleItPortType.class); - updateAddressPort(port, test.getPort()); - - if (test.isStreaming()) { - SecurityTestUtil.enableStreaming(port); - } + updateAddressPort(port, PORT); try { port.doubleIt(25); http://git-wip-us.apache.org/repos/asf/cxf/blob/b7b6b2d3/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl index 6049718..590d609 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl @@ -90,16 +90,11 @@ <wsdl:port name="DoubleItEncryptedElementsPort2" binding="tns:DoubleItStandardBinding"> <soap:address location="http://localhost:9010/DoubleItEncryptedElements2"; /> </wsdl:port> -<<<<<<< HEAD - <wsdl:port name="DoubleItContentEncryptedElementsPort" binding="tns:DoubleItStandardBinding"> - <soap:address location="http://localhost:9010/DoubleItContentEncryptedElements"; /> -======= <wsdl:port name="DoubleItEncryptedElementsPort3" binding="tns:DoubleItStandardBinding"> <soap:address location="http://localhost:9010/DoubleItEncryptedElements3"/> </wsdl:port> <wsdl:port name="DoubleItContentEncryptedElementsPort" binding="tns:DoubleItStandardBinding"> - <soap:address location="http://localhost:9010/DoubleItContentEncryptedElements"/> ->>>>>>> 5c8f473... [CXF-6209][CXF-6210] - Bug in processing Signed/Encrypted Elements policies with multiple XPaths + <soap:address location="http://localhost:9010/DoubleItContentEncryptedElements"; /> </wsdl:port> <wsdl:port name="DoubleItContentEncryptedElementsPort2" binding="tns:DoubleItStandardBinding"> <soap:address location="http://localhost:9010/DoubleItContentEncryptedElements2"; /> http://git-wip-us.apache.org/repos/asf/cxf/blob/b7b6b2d3/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/client.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/client.xml deleted file mode 100644 index 6aa97be..0000000 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/client.xml +++ /dev/null @@ -1,348 +0,0 @@ -<?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. ---> -<beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:http="http://cxf.apache.org/transports/http/configuration"; xmlns:jaxws="http://cxf.apache.org/jaxws"; xmlns:cxf="http://cxf.apache.org/core"; xmlns:p="http://cxf.apache.org/policy"; xmlns:sec="http://cxf.apache.org/configuration/security"; xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.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 http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/policy http://cxf.apache.org/schemas/poli cy.xsd http://www.w3.org/ns/ws-policy http://www.w3.org/2007/02/ws-policy.xsd";> - <cxf:bus> - <cxf:features> - <p:policies/> - <cxf:logging/> - </cxf:features> - </cxf:bus> - <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItRequiredPartsPort"; createdFromAPI="true"> - <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> - </jaxws:properties> - <jaxws:features> - <p:policies> - <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"; URI="classpath:/org/apache/cxf/systest/ws/parts/addr-policy.xml"/> - </p:policies> - </jaxws:features> - </jaxws:client> - <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItRequiredPartsPort2"; createdFromAPI="true"> - <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> - </jaxws:properties> - <jaxws:features> - <p:policies> - <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"; URI="classpath:/org/apache/cxf/systest/ws/parts/addr-policy.xml"/> - </p:policies> - </jaxws:features> - </jaxws:client> - <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItRequiredElementsPort"; createdFromAPI="true"> - <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> - </jaxws:properties> - <jaxws:features> - <p:policies> - <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"; URI="classpath:/org/apache/cxf/systest/ws/parts/addr-policy.xml"/> - </p:policies> - </jaxws:features> - </jaxws:client> - <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItRequiredElementsPort2"; createdFromAPI="true"> - <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> - </jaxws:properties> - <jaxws:features> - <p:policies> - <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"; URI="classpath:/org/apache/cxf/systest/ws/parts/addr-policy.xml"/> - </p:policies> - </jaxws:features> - </jaxws:client> - <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSignedPartsPort"; createdFromAPI="true"> - <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> - </jaxws:properties> - <jaxws:features> - <p:policies> - <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"; URI="classpath:/org/apache/cxf/systest/ws/parts/signed-parts-policy.xml"/> - </p:policies> - </jaxws:features> - </jaxws:client> - <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSignedPartsPort2"; createdFromAPI="true"> - <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> - </jaxws:properties> - <jaxws:features> - <p:policies> - <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"; URI="classpath:/org/apache/cxf/systest/ws/parts/signed-addr-policy.xml"/> - </p:policies> - </jaxws:features> - </jaxws:client> - <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSignedPartsPort3"; createdFromAPI="true"> - <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> - </jaxws:properties> - <jaxws:features> - <p:policies> - <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"; URI="classpath:/org/apache/cxf/systest/ws/parts/signed-body-policy.xml"/> - </p:policies> - </jaxws:features> - </jaxws:client> - <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSignedElementsPort"; createdFromAPI="true"> - <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> - </jaxws:properties> - <jaxws:features> - <p:policies> - <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"; URI="classpath:/org/apache/cxf/systest/ws/parts/signed-elements-policy.xml"/> - </p:policies> - </jaxws:features> - </jaxws:client> - <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSignedElementsPort2"; createdFromAPI="true"> - <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> - </jaxws:properties> - <jaxws:features> - <p:policies> - <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"; URI="classpath:/org/apache/cxf/systest/ws/parts/addr-policy.xml"/> - </p:policies> - </jaxws:features> - </jaxws:client> - <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItEncryptedPartsPort"; createdFromAPI="true"> - <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> - </jaxws:properties> - <jaxws:features> - <p:policies> - <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"; URI="classpath:/org/apache/cxf/systest/ws/parts/encrypted-parts-policy.xml"/> - </p:policies> - </jaxws:features> - </jaxws:client> - <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItEncryptedPartsPort2"; createdFromAPI="true"> - <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> - </jaxws:properties> - <jaxws:features> - <p:policies> - <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"; URI="classpath:/org/apache/cxf/systest/ws/parts/encrypted-addr-policy.xml"/> - </p:policies> - </jaxws:features> - </jaxws:client> - <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItEncryptedPartsPort3"; createdFromAPI="true"> - <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> - </jaxws:properties> - <jaxws:features> - <p:policies> - <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"; URI="classpath:/org/apache/cxf/systest/ws/parts/encrypted-body-policy.xml"/> - </p:policies> - </jaxws:features> - </jaxws:client> - <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItEncryptedElementsPort"; createdFromAPI="true"> - <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> - </jaxws:properties> - <jaxws:features> - <p:policies> - <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"; URI="classpath:/org/apache/cxf/systest/ws/parts/encrypted-elements-policy.xml"/> - </p:policies> - </jaxws:features> - </jaxws:client> - <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItEncryptedElementsPort2"; createdFromAPI="true"> - <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> - </jaxws:properties> - <jaxws:features> - <p:policies> - <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"; URI="classpath:/org/apache/cxf/systest/ws/parts/addr-policy.xml"/> - </p:policies> - </jaxws:features> - </jaxws:client> - <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItEncryptedElementsPort3"; createdFromAPI="true"> - <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> - </jaxws:properties> - <jaxws:features> - <p:policies> - <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"; URI="classpath:/org/apache/cxf/systest/ws/parts/multiple-encrypted-elements-policy.xml"/> - </p:policies> - </jaxws:features> - </jaxws:client> - <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItContentEncryptedElementsPort"; createdFromAPI="true"> - <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> - </jaxws:properties> - <jaxws:features> - <p:policies> - <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"; URI="classpath:/org/apache/cxf/systest/ws/parts/content-encrypted-elements-policy.xml"/> - </p:policies> - </jaxws:features> - </jaxws:client> - <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItContentEncryptedElementsPort2"; createdFromAPI="true"> - <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> - </jaxws:properties> - <jaxws:features> - <p:policies> - <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"; URI="classpath:/org/apache/cxf/systest/ws/parts/addr-policy.xml"/> - </p:policies> - </jaxws:features> - </jaxws:client> - - <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSignedAttachmentsPort"; createdFromAPI="true"> - <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> - </jaxws:properties> - <jaxws:features> - <p:policies> - <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"; - URI="classpath:/org/apache/cxf/systest/ws/parts/signed-attachments-policy.xml"/> - </p:policies> - </jaxws:features> - </jaxws:client> - <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSignedAttachmentsPort2"; createdFromAPI="true"> - <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> - </jaxws:properties> - <jaxws:features> - <p:policies> - <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"; - URI="classpath:/org/apache/cxf/systest/ws/parts/signed-body-policy.xml"/> - </p:policies> - </jaxws:features> - </jaxws:client> - <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItEncryptedAttachmentsPort"; createdFromAPI="true"> - <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> - </jaxws:properties> - <jaxws:features> - <p:policies> - <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"; - URI="classpath:/org/apache/cxf/systest/ws/parts/encrypted-attachments-policy.xml"/> - </p:policies> - </jaxws:features> - </jaxws:client> - <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItEncryptedAttachmentsPort2"; createdFromAPI="true"> - <jaxws:properties> - <entry key="ws-security.username" value="Alice"/> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.encryption.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="bob"/> - <entry key="ws-security.signature.properties" value="alice.properties"/> - <entry key="ws-security.signature.username" value="alice"/> - </jaxws:properties> - <jaxws:features> - <p:policies> - <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"; - URI="classpath:/org/apache/cxf/systest/ws/parts/encrypted-body-policy.xml"/> - </p:policies> - </jaxws:features> - </jaxws:client> - -</beans> http://git-wip-us.apache.org/repos/asf/cxf/blob/b7b6b2d3/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/client/client.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/client/client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/client/client.xml index 1ef6e8f..b15bd56 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/client/client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/client/client.xml @@ -349,6 +349,28 @@ </jaxws:client> <jaxws:client + name="{http://www.example.org/contract/DoubleIt}DoubleItEncryptedElementsPort3"; + createdFromAPI="true"> + <jaxws:properties> + <entry key="ws-security.username" value="Alice" /> + <entry key="ws-security.callback-handler" + value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" /> + <entry key="ws-security.encryption.properties" + value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" /> + <entry key="ws-security.encryption.username" value="bob" /> + <entry key="ws-security.signature.properties" + value="org/apache/cxf/systest/ws/wssec10/client/alice.properties" /> + <entry key="ws-security.signature.username" value="alice" /> + </jaxws:properties> + <jaxws:features> + <p:policies> + <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"; + URI="classpath:/org/apache/cxf/systest/ws/parts/multiple-encrypted-elements-policy.xml" /> + </p:policies> + </jaxws:features> + </jaxws:client> + + <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItContentEncryptedElementsPort"; createdFromAPI="true"> <jaxws:properties> http://git-wip-us.apache.org/repos/asf/cxf/blob/b7b6b2d3/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server.xml deleted file mode 100644 index 40f10f1..0000000 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server.xml +++ /dev/null @@ -1,331 +0,0 @@ -<?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. ---> -<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: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:cxf="http://cxf.apache.org/core"; xmlns:p="http://cxf.apache.org/policy"; xsi:schemaLocation=" http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apa che.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://www.w3.org/ns/ws-policy http://www.w3.org/2007/02/ws-policy.xsd "> - <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/> - <cxf:bus> - <cxf:features> - <p:policies/> - <cxf:logging/> - </cxf:features> - </cxf:bus> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="RequiredParts" address="http://localhost:${testutil.ports.Server}/DoubleItRequiredParts"; serviceName="s:DoubleItService" endpointName="s:DoubleItRequiredPartsPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl"> - <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> - </jaxws:properties> - <jaxws:features> - <p:policies> - <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"; URI="classpath:/org/apache/cxf/systest/ws/parts/req-parts-policy.xml"/> - </p:policies> - </jaxws:features> - </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="RequiredParts2" address="http://localhost:${testutil.ports.Server}/DoubleItRequiredParts2"; serviceName="s:DoubleItService" endpointName="s:DoubleItRequiredPartsPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl"> - <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> - </jaxws:properties> - <jaxws:features> - <p:policies> - <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"; URI="classpath:/org/apache/cxf/systest/ws/parts/bad-req-parts-policy.xml"/> - </p:policies> - </jaxws:features> - </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="RequiredElements" address="http://localhost:${testutil.ports.Server}/DoubleItRequiredElements"; serviceName="s:DoubleItService" endpointName="s:DoubleItRequiredElementsPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl"> - <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> - </jaxws:properties> - <jaxws:features> - <p:policies> - <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"; URI="classpath:/org/apache/cxf/systest/ws/parts/req-elements-policy.xml"/> - </p:policies> - </jaxws:features> - </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="RequiredElements2" address="http://localhost:${testutil.ports.Server}/DoubleItRequiredElements2"; serviceName="s:DoubleItService" endpointName="s:DoubleItRequiredElementsPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl"> - <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> - </jaxws:properties> - <jaxws:features> - <p:policies> - <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"; URI="classpath:/org/apache/cxf/systest/ws/parts/bad-req-elements-policy.xml"/> - </p:policies> - </jaxws:features> - </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedParts" address="http://localhost:${testutil.ports.Server}/DoubleItSignedParts"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedPartsPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl"> - <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> - </jaxws:properties> - <jaxws:features> - <p:policies> - <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"; URI="classpath:/org/apache/cxf/systest/ws/parts/signed-parts-policy.xml"/> - </p:policies> - </jaxws:features> - </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedParts2" address="http://localhost:${testutil.ports.Server}/DoubleItSignedParts2"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedPartsPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl"> - <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> - </jaxws:properties> - <jaxws:features> - <p:policies> - <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"; URI="classpath:/org/apache/cxf/systest/ws/parts/signed-parts-policy.xml"/> - </p:policies> - </jaxws:features> - </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedParts3" address="http://localhost:${testutil.ports.Server}/DoubleItSignedParts3"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedPartsPort3" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl"> - <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> - </jaxws:properties> - <jaxws:features> - <p:policies> - <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"; URI="classpath:/org/apache/cxf/systest/ws/parts/signed-parts-policy.xml"/> - </p:policies> - </jaxws:features> - </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedElements" address="http://localhost:${testutil.ports.Server}/DoubleItSignedElements"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedElementsPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl"> - <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> - </jaxws:properties> - <jaxws:features> - <p:policies> - <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"; URI="classpath:/org/apache/cxf/systest/ws/parts/signed-elements-policy.xml"/> - </p:policies> - </jaxws:features> - </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedElements2" address="http://localhost:${testutil.ports.Server}/DoubleItSignedElements2"; serviceName="s:DoubleItService" endpointName="s:DoubleItSignedElementsPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl"> - <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> - </jaxws:properties> - <jaxws:features> - <p:policies> - <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"; URI="classpath:/org/apache/cxf/systest/ws/parts/signed-elements-policy.xml"/> - </p:policies> - </jaxws:features> - </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="EncryptedParts" address="http://localhost:${testutil.ports.Server}/DoubleItEncryptedParts"; serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedPartsPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl"> - <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="alice"/> - <entry key="ws-security.encryption.properties" value="alice.properties"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> - </jaxws:properties> - <jaxws:features> - <p:policies> - <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"; URI="classpath:/org/apache/cxf/systest/ws/parts/encrypted-parts-policy.xml"/> - </p:policies> - </jaxws:features> - </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="EncryptedParts2" address="http://localhost:${testutil.ports.Server}/DoubleItEncryptedParts2"; serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedPartsPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl"> - <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="alice"/> - <entry key="ws-security.encryption.properties" value="alice.properties"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> - </jaxws:properties> - <jaxws:features> - <p:policies> - <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"; URI="classpath:/org/apache/cxf/systest/ws/parts/encrypted-parts-policy.xml"/> - </p:policies> - </jaxws:features> - </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="EncryptedParts3" address="http://localhost:${testutil.ports.Server}/DoubleItEncryptedParts3"; serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedPartsPort3" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl"> - <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="alice"/> - <entry key="ws-security.encryption.properties" value="alice.properties"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> - </jaxws:properties> - <jaxws:features> - <p:policies> - <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"; URI="classpath:/org/apache/cxf/systest/ws/parts/encrypted-parts-policy.xml"/> - </p:policies> - </jaxws:features> - </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="EncryptedElements" address="http://localhost:${testutil.ports.Server}/DoubleItEncryptedElements"; serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedElementsPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl"> - <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="alice"/> - <entry key="ws-security.encryption.properties" value="alice.properties"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> - </jaxws:properties> - <jaxws:features> - <p:policies> - <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"; URI="classpath:/org/apache/cxf/systest/ws/parts/encrypted-elements-policy.xml"/> - </p:policies> - </jaxws:features> - </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="EncryptedElements2" address="http://localhost:${testutil.ports.Server}/DoubleItEncryptedElements2"; serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedElementsPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl"> - <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="alice"/> - <entry key="ws-security.encryption.properties" value="alice.properties"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> - </jaxws:properties> - <jaxws:features> - <p:policies> - <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"; URI="classpath:/org/apache/cxf/systest/ws/parts/encrypted-elements-policy.xml"/> - </p:policies> - </jaxws:features> - </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="EncryptedElements3" address="http://localhost:${testutil.ports.Server}/DoubleItEncryptedElements3"; serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedElementsPort3" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl"> - <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="alice"/> - <entry key="ws-security.encryption.properties" value="alice.properties"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> - </jaxws:properties> - <jaxws:features> - <p:policies> - <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"; URI="classpath:/org/apache/cxf/systest/ws/parts/multiple-encrypted-elements-policy.xml"/> - </p:policies> - </jaxws:features> - </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="ContentEncryptedElements" address="http://localhost:${testutil.ports.Server}/DoubleItContentEncryptedElements"; serviceName="s:DoubleItService" endpointName="s:DoubleItContentEncryptedElementsPort" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl"> - <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="alice"/> - <entry key="ws-security.encryption.properties" value="alice.properties"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> - </jaxws:properties> - <jaxws:features> - <p:policies> - <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"; URI="classpath:/org/apache/cxf/systest/ws/parts/content-encrypted-elements-policy.xml"/> - </p:policies> - </jaxws:features> - </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="ContentEncryptedElements2" address="http://localhost:${testutil.ports.Server}/DoubleItContentEncryptedElements2"; serviceName="s:DoubleItService" endpointName="s:DoubleItContentEncryptedElementsPort2" implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl"> - <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="alice"/> - <entry key="ws-security.encryption.properties" value="alice.properties"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> - </jaxws:properties> - <jaxws:features> - <p:policies> - <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"; URI="classpath:/org/apache/cxf/systest/ws/parts/content-encrypted-elements-policy.xml"/> - </p:policies> - </jaxws:features> - </jaxws:endpoint> - - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedAttachments" - address="http://localhost:${testutil.ports.Server}/DoubleItSignedAttachments"; - serviceName="s:DoubleItService" endpointName="s:DoubleItSignedAttachmentsPort" - implementor="org.apache.cxf.systest.ws.parts.DoubleIt3Impl" - wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl"> - <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> - </jaxws:properties> - <jaxws:features> - <p:policies> - <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"; - URI="classpath:/org/apache/cxf/systest/ws/parts/signed-attachments-policy.xml"/> - </p:policies> - </jaxws:features> - </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="SignedAttachments2" - address="http://localhost:${testutil.ports.Server}/DoubleItSignedAttachments2"; - serviceName="s:DoubleItService" endpointName="s:DoubleItSignedAttachmentsPort2" - implementor="org.apache.cxf.systest.ws.parts.DoubleIt3Impl" - wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl"> - <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> - </jaxws:properties> - <jaxws:features> - <p:policies> - <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"; - URI="classpath:/org/apache/cxf/systest/ws/parts/signed-attachments-policy.xml"/> - </p:policies> - </jaxws:features> - </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="EncryptedAttachments" - address="http://localhost:${testutil.ports.Server}/DoubleItEncryptedAttachments"; - serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedAttachmentsPort" - implementor="org.apache.cxf.systest.ws.parts.DoubleIt3Impl" - wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl"> - <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> - </jaxws:properties> - <jaxws:features> - <p:policies> - <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"; - URI="classpath:/org/apache/cxf/systest/ws/parts/encrypted-attachments-policy.xml"/> - </p:policies> - </jaxws:features> - </jaxws:endpoint> - <jaxws:endpoint xmlns:s="http://www.example.org/contract/DoubleIt"; id="EncryptedAttachments2" - address="http://localhost:${testutil.ports.Server}/DoubleItEncryptedAttachments2"; - serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedAttachmentsPort2" - implementor="org.apache.cxf.systest.ws.parts.DoubleIt3Impl" - wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl"> - <jaxws:properties> - <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.UTPasswordCallback"/> - <entry key="ws-security.signature.properties" value="bob.properties"/> - <entry key="ws-security.encryption.username" value="useReqSigCert"/> - <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> - </jaxws:properties> - <jaxws:features> - <p:policies> - <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"; - URI="classpath:/org/apache/cxf/systest/ws/parts/encrypted-attachments-policy.xml"/> - </p:policies> - </jaxws:features> - </jaxws:endpoint> - -</beans> http://git-wip-us.apache.org/repos/asf/cxf/blob/b7b6b2d3/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server/server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server/server.xml index c749f7e..c154785 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server/server.xml @@ -390,6 +390,32 @@ </jaxws:endpoint> + <jaxws:endpoint id="EncryptedElements3" + address="http://localhost:${testutil.ports.Server}/DoubleItEncryptedElements3"; + serviceName="s:DoubleItService" endpointName="s:DoubleItEncryptedElementsPort3" + xmlns:s="http://www.example.org/contract/DoubleIt"; + implementor="org.apache.cxf.systest.ws.common.DoubleItImpl" + wsdlLocation="org/apache/cxf/systest/ws/parts/DoubleItParts.wsdl"> + + <jaxws:properties> + <entry key="ws-security.callback-handler" + value="org.apache.cxf.systest.ws.wssec10.client.UTPasswordCallback" /> + <entry key="ws-security.signature.properties" + value="org/apache/cxf/systest/ws/wssec10/client/bob.properties" /> + <entry key="ws-security.encryption.username" value="alice" /> + <entry key="ws-security.encryption.properties" + value="org/apache/cxf/systest/ws/wssec10/client/alice.properties" /> + <entry key="ws-security.subject.cert.constraints" value=".*O=apache.org.*"/> + </jaxws:properties> + <jaxws:features> + <p:policies> + <wsp:PolicyReference xmlns:wsp="http://www.w3.org/ns/ws-policy"; + URI="classpath:/org/apache/cxf/systest/ws/parts/multiple-encrypted-elements-policy.xml" /> + </p:policies> + </jaxws:features> + + </jaxws:endpoint> + <jaxws:endpoint id="ContentEncryptedElements" address="http://localhost:${testutil.ports.Server}/DoubleItContentEncryptedElements"; serviceName="s:DoubleItService" endpointName="s:DoubleItContentEncryptedElementsPort"
