svn commit: r666567 - /webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/TransportTokenBuilder.java

[nandana]

Author: nandana
Date: Wed Jun 11 01:39:07 2008
New Revision: 666567

URL: http://svn.apache.org/viewvc?rev=666567&view=rev
Log:
RAMPART-169 Applying Stefan's patch, thanks Stefan

Modified:
    
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/TransportTokenBuilder.java

Modified: 
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/TransportTokenBuilder.java
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/TransportTokenBuilder.java?rev=666567&r1=666566&r2=666567&view=diff
==============================================================================
--- 
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/TransportTokenBuilder.java
 (original)
+++ 
webservices/rampart/trunk/java/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/TransportTokenBuilder.java
 Wed Jun 11 01:39:07 2008
@@ -20,7 +20,6 @@
 
 import javax.xml.namespace.QName;
 
-import org.apache.axiom.om.OMAttribute;
 import org.apache.axiom.om.OMElement;
 import org.apache.neethi.Assertion;
 import org.apache.neethi.AssertionBuilderFactory;
@@ -67,9 +66,15 @@
                 OMElement element = 
primtive.getValue().getFirstChildWithName(SPConstants.POLICY);
                 
                 if (element != null) {
-
-                    if 
(element.getFirstChildWithName(SP12Constants.REQUIRE_CLIENT_CERTIFICATE) != 
null) {
-                        httpsToken.setRequireClientCertificate(true);
+                    OMElement child = element.getFirstElement();
+                    if (child != null) {
+                        if 
(SP12Constants.HTTP_BASIC_AUTHENTICATION.equals(child.getQName())) {
+                            httpsToken.setHttpBasicAuthentication(true);
+                        } else if 
(SP12Constants.HTTP_DIGEST_AUTHENTICATION.equals(child.getQName())) {
+                            httpsToken.setHttpDigestAuthentication(true);
+                        } else if 
(SP12Constants.REQUIRE_CLIENT_CERTIFICATE.equals(child.getQName())) {
+                            httpsToken.setRequireClientCertificate(true);
+                        }
                     }
                 }