cvs commit: ws-fx/wss4j/src/org/apache/ws/security/conversation/message/token RequestSecurityToken.java

muthulee    2004/08/27 22:00:10

  Modified:    wss4j/src/org/apache/ws/security/conversation/message/token
                        RequestSecurityToken.java
  Log:
  Kaushalye's modifications to accomodate STSAgent
  
  Revision  Changes    Path
  1.6       +80 -48    
ws-fx/wss4j/src/org/apache/ws/security/conversation/message/token/RequestSecurityToken.java
  
  Index: RequestSecurityToken.java
  ===================================================================
  RCS file: 
/home/cvs/ws-fx/wss4j/src/org/apache/ws/security/conversation/message/token/RequestSecurityToken.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- RequestSecurityToken.java 9 Aug 2004 18:02:47 -0000       1.5
  +++ RequestSecurityToken.java 28 Aug 2004 05:00:10 -0000      1.6
  @@ -14,72 +14,104 @@
    *  limitations under the License.
    *
    */
  -
  + 
   package org.apache.ws.security.conversation.message.token;
  +/**
  + * @author Kaushalye, Dimuthu 
  + * @version 1.0
  + */
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  +import org.apache.ws.security.WSConstants;
   import org.apache.ws.security.WSSecurityException;
  -import org.apache.ws.security.trust.TrustConstants;
   import org.apache.ws.security.util.DOM2Writer;
  +import org.apache.ws.security.util.WSSecurityUtil;
  +import org.w3c.dom.Document;
   import org.w3c.dom.Element;
   
   import javax.xml.namespace.QName;
  -import javax.xml.soap.Node;
  +import javax.xml.soap.*;
  +import org.apache.ws.security.trust.TrustConstants;
   
   public class RequestSecurityToken {
   
  -    private static Log log =
  -            LogFactory.getLog(RequestSecurityTokenResponse.class.getName());
  +     private static Log log =
  +                             
LogFactory.getLog(RequestSecurityTokenResponse.class.getName());
   
  -    private Element element = null;
  -
  -    public static final QName TOKEN =
  -            new QName(TrustConstants.WST_NS,
  -                    TrustConstants.REQUEST_SECURITY_TOKEN_LN,
  -                    TrustConstants.WST_PREFIX);
  -
  -    public RequestSecurityToken(Element elem) throws WSSecurityException {
  -        //TODO :: Support only for SCT - for now
  -        this.element = elem;
  -        QName el =
  -                new QName(this.element.getNamespaceURI(),
  -                        this.element.getLocalName());
  -        if (!el.equals(TOKEN)) {
  -            throw new 
WSSecurityException(WSSecurityException.INVALID_SECURITY_TOKEN,
  -                    "badTokenType00",
  -                    new Object[]{el});
  -        }
  -
  -    }
  -
  -    public Element getElement() {
  -        return element;
  -    }
  -
  -    public void setElement(Element element) {
  -        this.element = element;
  -    }
  -
  -    public String toString() {
  -        return DOM2Writer.nodeToString((Node) this.element);
  -    }
  -
  -    public void addToken(Element childToken) {
  -        this.element.appendChild(childToken);
  -    }
  -
  -    public void removeToken(Element childToken) {
  -        this.element.removeChild(childToken);
  -    }
  +             private Element element = null;
  +             
  +     public static final QName TOKEN =
  +                     new QName(
  +                             TrustConstants.WST_NS,
  +                             TrustConstants.REQUEST_SECURITY_TOKEN_LN,
  +                             TrustConstants.WST_PREFIX);
  +
  +
  +     
  +     public RequestSecurityToken(Document doc) throws Exception{
  +
  +             this.element =
  +                     doc.createElementNS(
  +                             TOKEN.getNamespaceURI(),
  +                             TrustConstants.WST_PREFIX + ":" + 
TOKEN.getLocalPart());
  +             
  +             WSSecurityUtil.setNamespace(
  +                     this.element,
  +                     TOKEN.getNamespaceURI(),
  +                     TrustConstants.WST_PREFIX);
  +             
  +             this.element.appendChild(doc.createTextNode(""));
  +     }
  +     
  +     /**
  +      * @param elem
  +      * @throws WSSecurityException
  +      */
  +  public RequestSecurityToken(Element elem) throws WSSecurityException{
  +     //TODO :: Support only for SCT - for now
  +     this.element = elem;
  +     QName el =
  +             new QName(
  +                     this.element.getNamespaceURI(),
  +                     this.element.getLocalName());
  +     if (!el.equals(TOKEN)) {
  +             throw new WSSecurityException(
  +                     WSSecurityException.INVALID_SECURITY_TOKEN,
  +                     "badTokenType00",
  +                     new Object[] { el });
  +     }
  +
  +  }
  +
  +
  +  public Element getElement() {
  +       return element;
  +  }
  +  public void setElement(Element element) {
  +       this.element = element;
  +  }
  +
  +  public String toString() {
  +       return DOM2Writer.nodeToString((Node) this.element);
  +  }
  +  public void addToken(Element childToken) {
  +       this.element.appendChild(childToken);
  +  }
  +
  +  public void removeToken(Element childToken) {
  +       this.element.removeChild(childToken);
  +  }
   //  
   //  //TODO @context - added by kau
   //   public void setContext(String context){
  -//       this.element.setAttribute("Context", context);
  +//      this.element.setAttribute("Context", context);
   //   }
  -//    
  +//   
   //   public String getContext(){
  -//       return this.element.getAttribute("Context");
  +//      return this.element.getAttribute("Context");
   //   }
  +
  +
   
   }