You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by sh...@apache.org on 2010/12/21 10:51:11 UTC
svn commit: r1051436 - in
/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder:
AsymmetricBindingBuilder.java BindingBuilder.java
TransportBindingBuilder.java
Author: shankar
Date: Tue Dec 21 09:51:10 2010
New Revision: 1051436
URL: http://svn.apache.org/viewvc?rev=1051436&view=rev
Log:
Fixing issue RAMPART-307
Deprecating getSignatureBuider and creating a new method getSignatureBuilder
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java
Modified: axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java?rev=1051436&r1=1051435&r2=1051436&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java Tue Dec 21 09:51:10 2010
@@ -616,7 +616,7 @@ public class AsymmetricBindingBuilder ex
if (!(supportingSigToken instanceof X509Token)) {
return;
}
- supportingSig = this.getSignatureBuider(rmd, supportingSigToken,
+ supportingSig = this.getSignatureBuilder(rmd, supportingSigToken,
((X509Token) supportingSigToken).getUserCertAlias());
Element bstElem = supportingSig.getBinarySecurityTokenElement();
if (bstElem != null) {
@@ -719,7 +719,7 @@ public class AsymmetricBindingBuilder ex
}
} else {
- sig = this.getSignatureBuider(rmd, sigToken);
+ sig = this.getSignatureBuilder(rmd, sigToken);
Element bstElem = sig.getBinarySecurityTokenElement();
if(bstElem != null) {
bstElem = RampartUtil.insertSiblingAfter(rmd, this
Modified: axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java?rev=1051436&r1=1051435&r2=1051436&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java Tue Dec 21 09:51:10 2010
@@ -231,13 +231,27 @@ public abstract class BindingBuilder {
}
}
- protected WSSecSignature getSignatureBuider(RampartMessageData rmd, Token token)
- throws RampartException {
- return getSignatureBuider(rmd, token, null);
+ //Deprecated after 1.5 release
+ @Deprecated
+ protected WSSecSignature getSignatureBuider(RampartMessageData rmd,
+ Token token) throws RampartException {
+ return getSignatureBuilder(rmd, token, null);
}
-
+
+ //Deprecated after 1.5 release
+ @Deprecated
protected WSSecSignature getSignatureBuider(RampartMessageData rmd, Token token,
- String userCertAlias) throws RampartException {
+ String userCertAlias) throws RampartException {
+ return getSignatureBuilder(rmd, token, userCertAlias);
+ }
+
+ protected WSSecSignature getSignatureBuilder(RampartMessageData rmd,
+ Token token)throws RampartException {
+ return getSignatureBuilder(rmd, token, null);
+ }
+
+ protected WSSecSignature getSignatureBuilder(RampartMessageData rmd, Token token,
+ String userCertAlias) throws RampartException {
RampartPolicyData rpd = rmd.getPolicyData();
@@ -370,7 +384,7 @@ public abstract class BindingBuilder {
//We have to use a cert
//Prepare X509 signature
- WSSecSignature sig = this.getSignatureBuider(rmd, token);
+ WSSecSignature sig = this.getSignatureBuilder(rmd, token);
Element bstElem = sig.getBinarySecurityTokenElement();
if(bstElem != null) {
bstElem = RampartUtil.insertSiblingAfter(rmd,
Modified: axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java?rev=1051436&r1=1051435&r2=1051436&view=diff
==============================================================================
--- axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java (original)
+++ axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java Tue Dec 21 09:51:10 2010
@@ -256,7 +256,7 @@ public class TransportBindingBuilder ext
} else {
try {
- WSSecSignature sig = this.getSignatureBuider(rmd, token);
+ WSSecSignature sig = this.getSignatureBuilder(rmd, token);
sig.appendBSTElementToHeader(rmd.getSecHeader());