Fixing backmerge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/cd5ac08a Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/cd5ac08a Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/cd5ac08a Branch: refs/heads/3.0.x-fixes Commit: cd5ac08a564ff7683bd2c7fee70b9ed7ac1a044e Parents: a100655 Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Thu Jun 18 16:36:31 2015 +0100 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Thu Jun 18 16:36:31 2015 +0100 ---------------------------------------------------------------------- .../wss4j/policyhandlers/SymmetricBindingHandler.java | 2 ++ .../org/apache/cxf/systest/ws/swa/policy-client.xml | 14 +++++++------- .../org/apache/cxf/systest/ws/swa/policy-server.xml | 12 ++++++------ .../apache/cxf/systest/ws/swa/stax-policy-server.xml | 12 ++++++------ 4 files changed, 21 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/cd5ac08a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java ---------------------------------------------------------------------- diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java index cb4e27f..0b70426 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/SymmetricBindingHandler.java @@ -398,6 +398,7 @@ public class SymmetricBindingHandler extends AbstractBindingBuilder { boolean atEnd) { try { WSSecDKEncrypt dkEncr = new WSSecDKEncrypt(wssConfig); + dkEncr.setAttachmentCallbackHandler(new AttachmentCallbackHandler(message)); if (recToken.getToken().getVersion() == SPConstants.SPVersion.SP11) { dkEncr.setWscVersion(ConversationConstants.VERSION_05_02); } @@ -625,6 +626,7 @@ public class SymmetricBindingHandler extends AbstractBindingBuilder { boolean included) throws WSSecurityException { Document doc = saaj.getSOAPPart(); WSSecDKSign dkSign = new WSSecDKSign(wssConfig); + dkSign.setAttachmentCallbackHandler(new AttachmentCallbackHandler(message)); if (policyAbstractTokenWrapper.getToken().getVersion() == SPConstants.SPVersion.SP11) { dkSign.setWscVersion(ConversationConstants.VERSION_05_02); } http://git-wip-us.apache.org/repos/asf/cxf/blob/cd5ac08a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-client.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-client.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-client.xml index 7bfb753..16acc8d 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-client.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-client.xml @@ -55,8 +55,8 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSWACombinedDerivedPolicyPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="security.encryption.properties" value="bob.properties"/> - <entry key="security.encryption.username" value="bob"/> + <entry key="ws-security.encryption.properties" value="bob.properties"/> + <entry key="ws-security.encryption.username" value="bob"/> </jaxws:properties> </jaxws:client> @@ -72,11 +72,11 @@ <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSWACombinedAsymmetricDerivedPolicyPort"; createdFromAPI="true"> <jaxws:properties> - <entry key="security.encryption.properties" value="bob.properties"/> - <entry key="security.encryption.username" value="bob"/> - <entry key="security.signature.properties" value="alice.properties"/> - <entry key="security.signature.username" value="alice"/> - <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> + <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"/> + <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> </jaxws:properties> </jaxws:client> http://git-wip-us.apache.org/repos/asf/cxf/blob/cd5ac08a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-server.xml index 708eb02..89d1ced 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-server.xml @@ -76,8 +76,8 @@ implementor="org.apache.cxf.systest.ws.swa.DoubleIt3Impl" wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl"> <jaxws:properties> - <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="security.signature.properties" value="bob.properties"/> + <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> + <entry key="ws-security.signature.properties" value="bob.properties"/> </jaxws:properties> </jaxws:endpoint> @@ -100,10 +100,10 @@ implementor="org.apache.cxf.systest.ws.swa.DoubleIt3Impl" wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl"> <jaxws:properties> - <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="security.signature.properties" value="bob.properties"/> - <entry key="security.encryption.properties" value="alice.properties"/> - <entry key="security.encryption.username" value="alice"/> + <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> + <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="ws-security.encryption.properties" value="alice.properties"/> + <entry key="ws-security.encryption.username" value="alice"/> </jaxws:properties> </jaxws:endpoint> http://git-wip-us.apache.org/repos/asf/cxf/blob/cd5ac08a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/stax-policy-server.xml ---------------------------------------------------------------------- diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/stax-policy-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/stax-policy-server.xml index d8523a2..28465ca 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/stax-policy-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/stax-policy-server.xml @@ -80,8 +80,8 @@ implementor="org.apache.cxf.systest.ws.swa.DoubleIt3Impl" wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl"> <jaxws:properties> - <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="security.signature.properties" value="bob.properties"/> + <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> + <entry key="ws-security.signature.properties" value="bob.properties"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint> @@ -106,10 +106,10 @@ implementor="org.apache.cxf.systest.ws.swa.DoubleIt3Impl" wsdlLocation="org/apache/cxf/systest/ws/swa/DoubleItSwa.wsdl"> <jaxws:properties> - <entry key="security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> - <entry key="security.signature.properties" value="bob.properties"/> - <entry key="security.encryption.properties" value="alice.properties"/> - <entry key="security.encryption.username" value="alice"/> + <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.common.KeystorePasswordCallback"/> + <entry key="ws-security.signature.properties" value="bob.properties"/> + <entry key="ws-security.encryption.properties" value="alice.properties"/> + <entry key="ws-security.encryption.username" value="alice"/> <entry key="ws-security.enable.streaming" value="true"/> </jaxws:properties> </jaxws:endpoint>
