Author: sergeyb
Date: Mon Aug 23 10:07:36 2010
New Revision: 988057
URL: http://svn.apache.org/viewvc?rev=988057&view=rev
Log:
Merged revisions 987693 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r987693 | dvaleri | 2010-08-21 05:27:47 +0100 (Sat, 21 Aug 2010) | 1 line
[CXF-2953] Fixed regression and updated Ant plug-in version of interopfest
wstrust10.
........
Modified:
cxf/branches/2.2.x-fixes/ (props changed)
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/pom.xml
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
svn:mergeinfo = /cxf/trunk:987693
Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/pom.xml?rev=988057&r1=988056&r2=988057&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/pom.xml
(original)
+++
cxf/branches/2.2.x-fixes/distribution/src/main/release/samples/ws_security/interopfest/wstrust10/pom.xml
Mon Aug 23 10:07:36 2010
@@ -54,7 +54,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/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java?rev=988057&r1=988056&r2=988057&view=diff
==============================================================================
---
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
(original)
+++
cxf/branches/2.2.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/AbstractBindingBuilder.java
Mon Aug 23 10:07:36 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
