svn commit: r1127185 - in /cxf/branches/2.3.x-fixes: ./ rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/UsernameToken.java

[dkulp]

Author: dkulp
Date: Tue May 24 17:48:28 2011
New Revision: 1127185

URL: http://svn.apache.org/viewvc?rev=1127185&view=rev
Log:
Merged revisions 1124688 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1124688 | coheigea | 2011-05-19 07:29:56 -0400 (Thu, 19 May 2011) | 1 line
  
  Write out UsernameToken sp13 elements in the WSDL.
........

Modified:
    cxf/branches/2.3.x-fixes/   (props changed)
    
cxf/branches/2.3.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/model/UsernameToken.java

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

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=1127185&r1=1127184&r2=1127185&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 17:48:28 2011
@@ -23,6 +23,7 @@ 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 {
@@ -141,6 +142,15 @@ public class UsernameToken extends Token
                     writer.writeStartElement(prefix, 
SPConstants.REQUIRE_IMPLIED_DERIVED_KEYS, namespaceURI);
                     writer.writeEndElement();
                 }
+                
+                if (isRequireCreated()) {
+                    writer.writeStartElement(SP13Constants.SP_PREFIX, 
"Created", SP13Constants.SP_NS);
+                    writer.writeEndElement();
+                }
+                if (isRequireNonce()) {
+                    writer.writeStartElement(SP13Constants.SP_PREFIX, "Nonce", 
SP13Constants.SP_NS);
+                    writer.writeEndElement();
+                }
 
             }
             writer.writeEndElement();