You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2011/05/24 20:51:01 UTC
svn commit: r1127217 -
/cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/UsernameToken.java
Author: dkulp
Date: Tue May 24 18:51:01 2011
New Revision: 1127217
URL: http://svn.apache.org/viewvc?rev=1127217&view=rev
Log:
Revert commit that shouldn't have been merged to 2.3
Modified:
cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/UsernameToken.java
Modified: cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/UsernameToken.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/UsernameToken.java?rev=1127217&r1=1127216&r2=1127217&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/UsernameToken.java (original)
+++ cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/UsernameToken.java Tue May 24 18:51:01 2011
@@ -23,7 +23,6 @@ import javax.xml.stream.XMLStreamExcepti
import javax.xml.stream.XMLStreamWriter;
import org.apache.cxf.ws.security.policy.SP12Constants;
-import org.apache.cxf.ws.security.policy.SP13Constants;
import org.apache.cxf.ws.security.policy.SPConstants;
public class UsernameToken extends Token {
@@ -143,16 +142,6 @@ public class UsernameToken extends Token
writer.writeEndElement();
}
- if (isRequireCreated()) {
- writer.writeStartElement(SP13Constants.SP_PREFIX, "Created", SP13Constants.SP_NS);
- writer.writeNamespace(SP13Constants.SP_PREFIX, SP13Constants.SP_NS);
- writer.writeEndElement();
- }
- if (isRequireNonce()) {
- writer.writeStartElement(SP13Constants.SP_PREFIX, "Nonce", SP13Constants.SP_NS);
- writer.writeNamespace(SP13Constants.SP_PREFIX, SP13Constants.SP_NS);
- writer.writeEndElement();
- }
}
writer.writeEndElement();