svn commit: r1438295 - in /axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws: secpolicy/model/UsernameToken.java secpolicy11/builders/UsernameTokenBuilder.java

[ruchithf]

Author: ruchithf
Date: Fri Jan 25 02:22:28 2013
New Revision: 1438295

URL: http://svn.apache.org/viewvc?rev=1438295&view=rev
Log:
Fixed RAMPART-384

Modified:
    
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/UsernameToken.java
    
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/UsernameToken.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/UsernameToken.java?rev=1438295&r1=1438294&r2=1438295&view=diff
==============================================================================
--- 
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/UsernameToken.java
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/UsernameToken.java
 Fri Jan 25 02:22:28 2013
@@ -109,46 +109,41 @@ public class UsernameToken extends Token
         if (inclusion != null) {
             writeAttribute(writer, prefix, namespaceURI, 
SPConstants.ATTR_INCLUDE_TOKEN, inclusion);
         }
-
-        if (isUseUTProfile10() || isUseUTProfile11()) {
-            // <wsp:Policy>
-            writeStartElement(writer, SPConstants.POLICY);
-
-            // CHECKME
-            if (isUseUTProfile10()) {
-                // <sp:WssUsernameToken10 />
-                writeStartElement(writer, prefix, SPConstants.USERNAME_TOKEN10 
, namespaceURI);
-            } else {
-                // <sp:WssUsernameToken11 />
-                writeStartElement(writer, prefix, SPConstants.USERNAME_TOKEN11 
, namespaceURI);
+        
+        // <wsp:Policy>
+        writeStartElement(writer, SPConstants.POLICY);
+        
+        if (version == SPConstants.SP_V12) {
+            
+            if (isNoPassword()) {
+                writeEmptyElement(writer, prefix, SPConstants.NO_PASSWORD, 
namespaceURI);
+            } else if (isHashPassword()){
+                writeEmptyElement(writer, prefix, SPConstants.HASH_PASSWORD, 
namespaceURI);
             }
             
-            if (version == SPConstants.SP_V12) {
-                
-                if (isNoPassword()) {
-                    writeEmptyElement(writer, prefix, SPConstants.NO_PASSWORD, 
namespaceURI);
-                } else if (isHashPassword()){
-                    writeEmptyElement(writer, prefix, 
SPConstants.HASH_PASSWORD, namespaceURI);
-                }
-                
-                if (isDerivedKeys()) {
-                    writeEmptyElement(writer, prefix, 
SPConstants.REQUIRE_DERIVED_KEYS, namespaceURI);
-                } else if (isExplicitDerivedKeys()) {
-                    writeEmptyElement(writer, prefix, 
SPConstants.REQUIRE_EXPLICIT_DERIVED_KEYS, namespaceURI);
-                } else if (isImpliedDerivedKeys()) {
-                    writeEmptyElement(writer, prefix, 
SPConstants.REQUIRE_IMPLIED_DERIVED_KEYS, namespaceURI);
-                }
-                
+            if (isDerivedKeys()) {
+                writeEmptyElement(writer, prefix, 
SPConstants.REQUIRE_DERIVED_KEYS, namespaceURI);
+            } else if (isExplicitDerivedKeys()) {
+                writeEmptyElement(writer, prefix, 
SPConstants.REQUIRE_EXPLICIT_DERIVED_KEYS, namespaceURI);
+            } else if (isImpliedDerivedKeys()) {
+                writeEmptyElement(writer, prefix, 
SPConstants.REQUIRE_IMPLIED_DERIVED_KEYS, namespaceURI);
             }
-            writer.writeEndElement();
-
-            // </wsp:Policy>
-            writer.writeEndElement();
-
+            
+        }
+        
+        if (isUseUTProfile10()) {
+            // <sp:WssUsernameToken10 />
+               writeEmptyElement(writer, prefix, SPConstants.USERNAME_TOKEN10 
, namespaceURI);
+        } else if(isUseUTProfile11()) {
+            // <sp:WssUsernameToken11 />
+               writeEmptyElement(writer, prefix, SPConstants.USERNAME_TOKEN11 
, namespaceURI);
         }
 
+        // </wsp:Policy>
         writer.writeEndElement();
+
         // </sp:UsernameToken>
+        writer.writeEndElement();
 
     }
 }

Modified: 
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java?rev=1438295&r1=1438294&r2=1438295&view=diff
==============================================================================
--- 
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java
 (original)
+++ 
axis/axis2/java/rampart/trunk/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java
 Fri Jan 25 02:22:28 2013
@@ -53,7 +53,7 @@ public class UsernameTokenBuilder implem
         
         OMElement policyElement = element.getFirstElement();
         
-        if (policyElement != null && 
!policyElement.getQName().equals(org.apache.neethi.Constants.Q_ELEM_POLICY)) {
+        if (policyElement != null && 
policyElement.getQName().equals(org.apache.neethi.Constants.Q_ELEM_POLICY)) {
         
             Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
             policy = (Policy) policy.normalize(false);