Author: dvaleri
Date: Sat Aug 21 04:27:47 2010
New Revision: 987693
URL: http://svn.apache.org/viewvc?rev=987693&view=rev
Log:
[CXF-2953] Fixed regression and updated Ant plug-in version of interopfest
wstrust10.
Modified:
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/pom.xml
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
Modified:
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/pom.xml?rev=987693&r1=987692&r2=987693&view=diff
==============================================================================
---
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/pom.xml
(original)
+++
cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/pom.xml
Sat Aug 21 04:27:47 2010
@@ -59,7 +59,7 @@
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
<executions>
<execution>
<id>download-certs-wsdl</id>
Modified:
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java?rev=987693&r1=987692&r2=987693&view=diff
==============================================================================
---
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
(original)
+++
cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
Sat Aug 21 04:27:47 2010
@@ -504,8 +504,6 @@ public abstract class AbstractBindingBui
throw new Fault(e);
}
-
addSupportingElement(cloneElement(sig.getSecRef().getElement()));
-
if (suppTokens.isEncryptedToken()) {
encryptedTokensIdList.add(secToken.getId());
}
@@ -564,6 +562,8 @@ public abstract class AbstractBindingBui
WSSecSignatureHelper tempSig = (WSSecSignatureHelper) tempTok;
if ((WSConstants.WSS_SAML_NS + WSConstants.SAML_ASSERTION_ID).
equals(tempSig.getSecRef().getKeyIdentifierValueType())) {
+
+
addSupportingElement(cloneElement(tempSig.getSecRef().getElement()));
// NOTE: This usage of WSEncryptionPart is a workaroud
that is
// coupled with WSSecSignatureHelper. This approach is
used so that
