You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by ja...@apache.org on 2005/03/18 03:29:38 UTC

cvs commit: ws-fx/wss4j/src/org/apache/ws/security/conversation ConversationEngine.java

jaliya      2005/03/17 18:29:38

  Modified:    wss4j/src/org/apache/ws/security/conversation
                        ConversationEngine.java
  Log:
  Corrected a wrong import statement
  
  Revision  Changes    Path
  1.10      +11 -29    ws-fx/wss4j/src/org/apache/ws/security/conversation/ConversationEngine.java
  
  Index: ConversationEngine.java
  ===================================================================
  RCS file: /home/cvs/ws-fx/wss4j/src/org/apache/ws/security/conversation/ConversationEngine.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ConversationEngine.java	17 Mar 2005 10:54:31 -0000	1.9
  +++ ConversationEngine.java	18 Mar 2005 02:29:38 -0000	1.10
  @@ -17,6 +17,16 @@
   
   package org.apache.ws.security.conversation;
   
  +import java.util.HashMap;
  +import java.util.Vector;
  +
  +import javax.crypto.SecretKey;
  +import javax.crypto.spec.SecretKeySpec;
  +import javax.security.auth.callback.Callback;
  +import javax.security.auth.callback.CallbackHandler;
  +import javax.security.auth.callback.UnsupportedCallbackException;
  +import javax.xml.namespace.QName;
  +
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   import org.apache.ws.axis.security.conversation.ConvHandlerConstants;
  @@ -33,14 +43,7 @@
   import org.apache.ws.security.conversation.message.info.DerivedKeyInfo;
   import org.apache.ws.security.conversation.message.info.SecurityContextInfo;
   import org.apache.ws.security.conversation.message.token.DerivedKeyToken;
  -import org
  -    .apache
  -    .ws
  -    .security
  -    .conversation
  -    .message
  -    .token
  -    .RequestSecurityTokenResponse;
  +import org.apache.ws.security.conversation.message.token.RequestSecurityTokenResponse;
   import org.apache.ws.security.conversation.message.token.RequestedProofToken;
   import org.apache.ws.security.conversation.message.token.SecurityContextToken;
   import org.apache.ws.security.handler.WSHandlerConstants;
  @@ -57,10 +60,6 @@
   import org.apache.xml.security.keys.KeyInfo;
   import org.apache.xml.security.signature.XMLSignature;
   import org.apache.xml.security.signature.XMLSignatureException;
  -import org.apache.xml.security.utils.XMLUtils;
  -import org.opensaml.SAMLAssertion;
  -import org.opensaml.SAMLAuthenticationStatement;
  -import org.opensaml.SAMLException;
   import org.w3c.dom.Attr;
   import org.w3c.dom.Document;
   import org.w3c.dom.Element;
  @@ -68,23 +67,6 @@
   import org.w3c.dom.NodeList;
   import org.w3c.dom.Text;
   
  -import com.sun.rsasign.t;
  -
  -import javax.crypto.KeyGenerator;
  -import javax.crypto.SecretKey;
  -import javax.crypto.spec.SecretKeySpec;
  -import javax.security.auth.callback.Callback;
  -import javax.security.auth.callback.CallbackHandler;
  -import javax.security.auth.callback.UnsupportedCallbackException;
  -import javax.xml.namespace.QName;
  -
  -import java.io.ByteArrayOutputStream;
  -import java.io.IOException;
  -import java.io.UnsupportedEncodingException;
  -import java.util.HashMap;
  -import java.util.Iterator;
  -import java.util.Vector;
  -
   /**
    * Conversation Engine follows the basic structure of SecurityEngine<link>
    *