Picking up some changes from SANTUARIO-536
diff --git a/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSSecurePart.java b/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSSecurePart.java
index 4d5e4b2..102c134 100644
--- a/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSSecurePart.java
+++ b/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSSecurePart.java
@@ -29,6 +29,10 @@
private String idToReference;
+ public WSSSecurePart(Modifier modifier) {
+ super(modifier);
+ }
+
public WSSSecurePart(QName name, Modifier modifier) {
super(name, modifier);
}
@@ -64,4 +68,4 @@
public void setIdToReference(String idToReference) {
this.idToReference = idToReference;
}
-}
\ No newline at end of file
+}
diff --git a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptOutputProcessor.java b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptOutputProcessor.java
index 5f2baa1..6bff9a6 100644
--- a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptOutputProcessor.java
+++ b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptOutputProcessor.java
@@ -110,10 +110,10 @@
outputProcessorChain.getSecurityContext().getAsMap(WSSConstants.SIGNATURE_PARTS);
if (dynamicSecureParts != null && securePart.getName() != null
&& securePart.equals(dynamicSecureParts.get(securePart.getName()))) {
- securePart.setIdToSign(encryptionPartDef.getEncRefId());
+ securePart.setIdToSecure(encryptionPartDef.getEncRefId());
outputProcessorChain.getSecurityContext().putAsMap(
WSSConstants.SIGNATURE_PARTS,
- securePart.getIdToSign(),
+ securePart.getIdToSecure(),
securePart
);
}
diff --git a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SAMLTokenOutputProcessor.java b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SAMLTokenOutputProcessor.java
index 6e22962..f500ad5 100644
--- a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SAMLTokenOutputProcessor.java
+++ b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SAMLTokenOutputProcessor.java
@@ -186,7 +186,7 @@
securityProperties.getSignatureSecureParts().iterator();
while (signaturePartsIterator.hasNext()) {
SecurePart securePart = signaturePartsIterator.next();
- if (samlAssertionWrapper.getId().equals(securePart.getIdToSign())
+ if (samlAssertionWrapper.getId().equals(securePart.getIdToSecure())
|| assertionName.equals(securePart.getName())) {
includeSTR = true;
signaturePartsIterator.remove();
@@ -214,7 +214,7 @@
WSSSecurePart securePart =
new WSSSecurePart(
new QName(WSSConstants.SOAPMESSAGE_NS10_STR_TRANSFORM), SecurePart.Modifier.Element);
- securePart.setIdToSign(tokenId);
+ securePart.setIdToSecure(tokenId);
securePart.setIdToReference(securityTokenReferenceId);
outputProcessorChain.getSecurityContext().putAsMap(WSSConstants.SIGNATURE_PARTS, tokenId, securePart);
}
diff --git a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityHeaderOutputProcessor.java b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityHeaderOutputProcessor.java
index d589d83..546fe50 100644
--- a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityHeaderOutputProcessor.java
+++ b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityHeaderOutputProcessor.java
@@ -70,7 +70,7 @@
// Check to see if the wrong SOAP NS was used
changeSOAPNamespace(securePart, soapMessageVersion);
- if (securePart.getIdToSign() == null) {
+ if (securePart.getIdToSecure() == null) {
outputProcessorChain.getSecurityContext().putAsMap(
WSSConstants.ENCRYPTION_PARTS,
securePart.getName(),
@@ -79,7 +79,7 @@
} else {
outputProcessorChain.getSecurityContext().putAsMap(
WSSConstants.ENCRYPTION_PARTS,
- securePart.getIdToSign(),
+ securePart.getIdToSecure(),
securePart
);
}
@@ -91,7 +91,7 @@
// Check to see if the wrong SOAP NS was used
changeSOAPNamespace(securePart, soapMessageVersion);
- if (securePart.getIdToSign() == null) {
+ if (securePart.getIdToSecure() == null) {
outputProcessorChain.getSecurityContext().putAsMap(
WSSConstants.SIGNATURE_PARTS,
securePart.getName(),
@@ -100,7 +100,7 @@
} else {
outputProcessorChain.getSecurityContext().putAsMap(
WSSConstants.SIGNATURE_PARTS,
- securePart.getIdToSign(),
+ securePart.getIdToSecure(),
securePart
);
}
diff --git a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureOutputProcessor.java b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureOutputProcessor.java
index 53420d3..ffd3839 100644
--- a/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureOutputProcessor.java
+++ b/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureOutputProcessor.java
@@ -98,7 +98,7 @@
signaturePartDef.setDigestAlgo(getSecurityProperties().getSignatureDigestAlgorithm());
}
- if (securePart.getIdToSign() == null) {
+ if (securePart.getIdToSecure() == null) {
signaturePartDef.setGenerateXPointer(securePart.isGenerateXPointer());
signaturePartDef.setSigRefId(IDGenerator.generateID(null));
@@ -121,7 +121,7 @@
};
signaturePartDef.setTransforms(transforms);
} else {
- signaturePartDef.setSigRefId(securePart.getIdToSign());
+ signaturePartDef.setSigRefId(securePart.getIdToSecure());
}
}
