You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2013/10/24 10:16:42 UTC
svn commit: r1535305 - in
/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token:
BinarySecurity.java DerivedKeyToken.java Reference.java
SecurityTokenReference.java
Author: coheigea
Date: Thu Oct 24 08:16:42 2013
New Revision: 1535305
URL: http://svn.apache.org/r1535305
Log:
[WSS-483] - wsse:Reference withhout ValueType
Modified:
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/BinarySecurity.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/DerivedKeyToken.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/Reference.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/SecurityTokenReference.java
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/BinarySecurity.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/BinarySecurity.java?rev=1535305&r1=1535304&r2=1535305&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/BinarySecurity.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/BinarySecurity.java Thu Oct 24 08:16:42 2013
@@ -151,7 +151,9 @@ public class BinarySecurity {
* @param type
*/
public void setValueType(String type) {
- element.setAttributeNS(null, "ValueType", type);
+ if (type != null) {
+ element.setAttributeNS(null, "ValueType", type);
+ }
}
/**
@@ -169,7 +171,9 @@ public class BinarySecurity {
* @param encoding
*/
public void setEncodingType(String encoding) {
- element.setAttributeNS(null, "EncodingType", encoding);
+ if (encoding != null) {
+ element.setAttributeNS(null, "EncodingType", encoding);
+ }
}
/**
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/DerivedKeyToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/DerivedKeyToken.java?rev=1535305&r1=1535304&r2=1535305&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/DerivedKeyToken.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/DerivedKeyToken.java Thu Oct 24 08:16:42 2013
@@ -510,7 +510,9 @@ public class DerivedKeyToken {
* DerivedKeyToken
*/
public void setAlgorithm(String algo) {
- element.setAttributeNS(ns, "Algorithm", algo);
+ if (algo != null) {
+ element.setAttributeNS(ns, "Algorithm", algo);
+ }
}
/**
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/Reference.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/Reference.java?rev=1535305&r1=1535304&r2=1535305&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/Reference.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/Reference.java Thu Oct 24 08:16:42 2013
@@ -112,7 +112,9 @@ public class Reference {
* @param valueType the ValueType attribute to set
*/
public void setValueType(String valueType) {
- element.setAttributeNS(null, "ValueType", valueType);
+ if (valueType != null) {
+ element.setAttributeNS(null, "ValueType", valueType);
+ }
}
/**
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/SecurityTokenReference.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/SecurityTokenReference.java?rev=1535305&r1=1535304&r2=1535305&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/SecurityTokenReference.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/SecurityTokenReference.java Thu Oct 24 08:16:42 2013
@@ -130,12 +130,14 @@ public class SecurityTokenReference {
* @param tokenType the wsse11:TokenType attribute to add
*/
public void addTokenType(String tokenType) {
- WSSecurityUtil.setNamespace(element, WSConstants.WSSE11_NS, WSConstants.WSSE11_PREFIX);
- element.setAttributeNS(
- WSConstants.WSSE11_NS,
- WSConstants.WSSE11_PREFIX + ":" + WSConstants.TOKEN_TYPE,
- tokenType
- );
+ if (tokenType != null) {
+ WSSecurityUtil.setNamespace(element, WSConstants.WSSE11_NS, WSConstants.WSSE11_PREFIX);
+ element.setAttributeNS(
+ WSConstants.WSSE11_NS,
+ WSConstants.WSSE11_PREFIX + ":" + WSConstants.TOKEN_TYPE,
+ tokenType
+ );
+ }
}
/**