You are viewing a plain text version of this content. The canonical link for it is here.
Posted to rampart-dev@ws.apache.org by na...@apache.org on 2008/01/28 10:07:43 UTC
svn commit: r615776 -
/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java
Author: nandana
Date: Mon Jan 28 01:07:39 2008
New Revision: 615776
URL: http://svn.apache.org/viewvc?rev=615776&view=rev
Log:
rampart-policy related changes to support WS Security Policy 1.2
Modified:
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java
Modified: webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java?rev=615776&r1=615775&r2=615776&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java Mon Jan 28 01:07:39 2008
@@ -26,7 +26,7 @@
import org.apache.rampart.RampartMessageData;
import org.apache.rampart.policy.RampartPolicyData;
import org.apache.rampart.util.RampartUtil;
-import org.apache.ws.secpolicy.Constants;
+import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.model.AlgorithmSuite;
import org.apache.ws.secpolicy.model.Header;
import org.apache.ws.secpolicy.model.IssuedToken;
@@ -255,8 +255,7 @@
sig.appendBSTElementToHeader(rmd.getSecHeader());
if (rpd.isTokenProtection()
- && !Constants.INCLUDE_NEVER
- .equals(token.getInclusion())) {
+ && !(SPConstants.INCLUDE_TOKEN_NEVER == token.getInclusion())) {
sigParts.add(new WSEncryptionPart(sig.getBSTTokenId()));
}
@@ -292,7 +291,7 @@
//Get the issued token
String id = RampartUtil.getIssuedToken(rmd, (IssuedToken)token);
- String inclusion = token.getInclusion();
+ int inclusion = token.getInclusion();
org.apache.rahas.Token tok = null;
try {
tok = rmd.getTokenStorage().getToken(id);
@@ -303,9 +302,9 @@
boolean tokenIncluded = false;
- if(inclusion.equals(Constants.INCLUDE_ALWAYS) ||
- ((inclusion.equals(Constants.INCLUDE_ALWAYS_TO_RECIPIENT)
- || inclusion.equals(Constants.INCLUDE_ONCE))
+ if(inclusion == SPConstants.INCLUDE_TOEKN_ALWAYS ||
+ ((inclusion == SPConstants.INCLUDE_TOEKN_ALWAYS_TO_RECIPIENT
+ || inclusion == SPConstants.INCLUDE_TOKEN_ONCE)
&& rmd.isInitiator())) {
//Add the token