Author: coheigea
Date: Wed Mar 20 17:05:14 2013
New Revision: 1458954
URL: http://svn.apache.org/r1458954
Log:
Fixing cxf-rt-ws-security
Modified:
cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/EncryptedPartsBuilder.java
cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RequiredPartsBuilder.java
cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SignedPartsBuilder.java
Modified:
cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/EncryptedPartsBuilder.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/EncryptedPartsBuilder.java?rev=1458954&r1=1458953&r2=1458954&view=diff
==============================================================================
---
cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/EncryptedPartsBuilder.java
(original)
+++
cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/EncryptedPartsBuilder.java
Wed Mar 20 17:05:14 2013
@@ -74,16 +74,7 @@ public class EncryptedPartsBuilder imple
if (nameAttribute == null) {
nameAttribute = "";
}
-<<<<<<< HEAD
- String namespaceAttribute =
element.getAttribute(SPConstants.NAMESPACE);
-=======
String namespaceAttribute = element.getAttributeNS(null,
SPConstants.NAMESPACE);
- if ("".equals(namespaceAttribute)) {
- throw new IllegalArgumentException(
- "sp:EncryptedParts/sp:Header@Namespace must have a value"
- );
- }
->>>>>>> ba4d301... Merged revisions 1458929 via git cherry-pick from
parent.addHeader(new Header(nameAttribute, namespaceAttribute));
} else if ("Body".equals(element.getLocalName())) {
Modified:
cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RequiredPartsBuilder.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RequiredPartsBuilder.java?rev=1458954&r1=1458953&r2=1458954&view=diff
==============================================================================
---
cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RequiredPartsBuilder.java
(original)
+++
cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/RequiredPartsBuilder.java
Wed Mar 20 17:05:14 2013
@@ -60,16 +60,7 @@ public class RequiredPartsBuilder implem
nameAttribute = "";
}
-<<<<<<< HEAD
- String namespaceAttribute =
element.getAttribute(SPConstants.NAMESPACE);
-=======
String namespaceAttribute = element.getAttributeNS(null,
SPConstants.NAMESPACE);
- if ("".equals(namespaceAttribute)) {
- throw new IllegalArgumentException(
- "sp:RequiredParts/sp:Header@Namespace must have a value"
- );
- }
->>>>>>> ba4d301... Merged revisions 1458929 via git cherry-pick from
parent.addHeader(new Header(nameAttribute, namespaceAttribute));
}
}
Modified:
cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SignedPartsBuilder.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SignedPartsBuilder.java?rev=1458954&r1=1458953&r2=1458954&view=diff
==============================================================================
---
cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SignedPartsBuilder.java
(original)
+++
cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SignedPartsBuilder.java
Wed Mar 20 17:05:14 2013
@@ -76,17 +76,7 @@ public class SignedPartsBuilder implemen
if (nameAttribute == null) {
nameAttribute = "";
}
-<<<<<<< HEAD
- String namespaceAttribute =
element.getAttribute(SPConstants.NAMESPACE);
-=======
String namespaceAttribute = element.getAttributeNS(null,
SPConstants.NAMESPACE);
- if ("".equals(namespaceAttribute)) {
- throw new IllegalArgumentException(
- "sp:SignedParts/sp:Header@Namespace must have a value"
- );
- }
->>>>>>> ba4d301... Merged revisions 1458929 via git cherry-pick from
-
parent.addHeader(new Header(nameAttribute, namespaceAttribute));
} else if ("Body".equals(element.getLocalName())) {
