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 2015/08/07 17:49:36 UTC
[3/3] cxf git commit: Fixing merge
Fixing merge
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/9c572f6b
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/9c572f6b
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/9c572f6b
Branch: refs/heads/3.0.x-fixes
Commit: 9c572f6b5ab06e28b2a575992954bf2f3e5c877b
Parents: 1f29a70
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Aug 7 16:49:24 2015 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Aug 7 16:49:24 2015 +0100
----------------------------------------------------------------------
.../org/apache/cxf/ws/security/SecurityConstants.java | 7 +------
.../wss4j/policyhandlers/AbstractBindingBuilder.java | 13 +------------
.../org/apache/cxf/systest/ws/swa/policy-client.xml | 4 ++--
.../org/apache/cxf/systest/ws/swa/policy-server.xml | 4 ++--
.../apache/cxf/systest/ws/swa/stax-policy-server.xml | 4 ++--
5 files changed, 8 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/9c572f6b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
index c00f0ae..46f047e 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java
@@ -666,13 +666,8 @@ public final class SecurityConstants {
CACHE_IDENTIFIER, CACHE_ISSUED_TOKEN_IN_ENDPOINT, PREFER_WSMEX_OVER_STS_CLIENT_CONFIG,
DELEGATED_CREDENTIAL, KERBEROS_USE_CREDENTIAL_DELEGATION,
KERBEROS_IS_USERNAME_IN_SERVICENAME_FORM, STS_TOKEN_IMMINENT_EXPIRY_VALUE,
-<<<<<<< HEAD
KERBEROS_REQUEST_CREDENTIAL_DELEGATION, ENABLE_UNSIGNED_SAML_ASSERTION_PRINCIPAL,
- AUDIENCE_RESTRICTION_VALIDATION, STORE_BYTES_IN_ATTACHMENT
-=======
- KERBEROS_REQUEST_CREDENTIAL_DELEGATION, POLICY_VALIDATOR_MAP,
- STORE_BYTES_IN_ATTACHMENT, USE_ATTACHMENT_ENCRYPTION_CONTENT_ONLY_TRANSFORM
->>>>>>> eafa719... [CXF-6525] - Support for http://docs.oasis-open.org/wss/oasis-wss-SwAProfile-1.1#Attachment-Content-Only when using WSS-Policy. Thanks to Christian Koch for the patch. Tests added.
+ AUDIENCE_RESTRICTION_VALIDATION, STORE_BYTES_IN_ATTACHMENT, USE_ATTACHMENT_ENCRYPTION_CONTENT_ONLY_TRANSFORM
}));
ALL_PROPERTIES = Collections.unmodifiableSet(s);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/9c572f6b/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 f084f99..7d7055e 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
@@ -169,12 +169,6 @@ public abstract class AbstractBindingBuilder extends AbstractCommonBindingHandle
protected Element topDownElement;
protected Element bstElement;
protected Element lastEncryptedKeyElement;
-<<<<<<< HEAD
-
-=======
-
- protected final CallbackLookup callbackLookup;
->>>>>>> eafa719... [CXF-6525] - Support for http://docs.oasis-open.org/wss/oasis-wss-SwAProfile-1.1#Attachment-Content-Only when using WSS-Policy. Thanks to Christian Koch for the patch. Tests added.
protected boolean storeBytesInAttachment;
private Element lastSupportingTokenElement;
@@ -1095,18 +1089,13 @@ public abstract class AbstractBindingBuilder extends AbstractCommonBindingHandle
Attachments attachments = parts.getAttachments();
if (attachments != null) {
-<<<<<<< HEAD
- WSEncryptionPart wep = new WSEncryptionPart("cid:Attachments", "Element");
- signedParts.add(wep);
-=======
String encModifier = "Element";
if (MessageUtils.getContextualBoolean(
message, SecurityConstants.USE_ATTACHMENT_ENCRYPTION_CONTENT_ONLY_TRANSFORM, false)) {
encModifier = "Content";
}
WSEncryptionPart wep = new WSEncryptionPart("cid:Attachments", encModifier);
- securedParts.add(wep);
->>>>>>> eafa719... [CXF-6525] - Support for http://docs.oasis-open.org/wss/oasis-wss-SwAProfile-1.1#Attachment-Content-Only when using WSS-Policy. Thanks to Christian Koch for the patch. Tests added.
+ signedParts.add(wep);
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/9c572f6b/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 7bee138..bdb2bee 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
@@ -48,8 +48,8 @@
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSWAEncryptionContentPolicyPort" 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"/>
<entry key="ws-security.swa.encryption.attachment.transform.content" value="true"/>
</jaxws:properties>
</jaxws:client>
http://git-wip-us.apache.org/repos/asf/cxf/blob/9c572f6b/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 817cf97..45fe8a3 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
@@ -65,8 +65,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>
http://git-wip-us.apache.org/repos/asf/cxf/blob/9c572f6b/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 c587417..6426f3f 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
@@ -68,8 +68,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>