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:09:39 UTC
svn commit: r615779 -
/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
Author: nandana
Date: Mon Jan 28 01:09:37 2008
New Revision: 615779
URL: http://svn.apache.org/viewvc?rev=615779&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/util/RampartUtil.java
Modified: webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java?rev=615779&r1=615778&r2=615779&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java Mon Jan 28 01:09:37 2008
@@ -41,7 +41,7 @@
import org.apache.rampart.policy.RampartPolicyData;
import org.apache.rampart.policy.model.CryptoConfig;
import org.apache.rampart.policy.model.RampartConfig;
-import org.apache.ws.secpolicy.Constants;
+import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.model.IssuedToken;
import org.apache.ws.secpolicy.model.SecureConversationToken;
import org.apache.ws.secpolicy.model.SupportingToken;
@@ -292,9 +292,9 @@
log.debug("Creating RSTTemplate for an SCT request");
OMFactory fac = OMAbstractFactory.getOMFactory();
- OMNamespace wspNs = fac.createOMNamespace(Constants.SP_NS, "wsp");
+ OMNamespace wspNs = fac.createOMNamespace(SPConstants.P_NS, "wsp");
OMElement rstTempl = fac.createOMElement(
- Constants.REQUEST_SECURITY_TOKEN_TEMPLATE.getLocalPart(),
+ SPConstants.REQUEST_SECURITY_TOKEN_TEMPLATE,
wspNs);
//Create TokenType element and set the value
@@ -868,7 +868,7 @@
public static void setKeyIdentifierType(RampartPolicyData rpd, WSSecBase secBase,org.apache.ws.secpolicy.model.Token token) {
- if (token.getInclusion().equals(Constants.INCLUDE_NEVER)) {
+ if (token.getInclusion() == SPConstants.INCLUDE_TOKEN_NEVER) {
boolean tokenTypeSet = false;