[ebxmlms-commits] ebxmlms/src/hk/hku/cecid/phoenix/message/transport Http.java,1.1,1.2

[<kc...@us...>]

Update of /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/transport
In directory sc8-pr-cvs1:/tmp/cvs-serv6151/transport

Modified Files:
	Http.java 
Log Message:
1. get MIME header from ebxml message instead of from soap message
2. fix problem of throwing error if authorization needed
3. change variable name of mime headers of the soap message to avoid
   clashing with the name of the mime headers of ebxml message



Index: Http.java
===================================================================
RCS file: /cvsroot/ebxmlms/ebxmlms/src/hk/hku/cecid/phoenix/message/transport/Http.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Http.java	12 Jun 2003 02:37:22 -0000	1.1
--- Http.java	13 Jun 2003 06:39:46 -0000	1.2
***************
*** 73,77 ****
  import hk.hku.cecid.phoenix.message.handler.ErrorMessages;
  import hk.hku.cecid.phoenix.message.handler.InitializationException;
! import hk.hku.cecid.phoenix.message.handler.Utility;
  import hk.hku.cecid.phoenix.message.packaging.EbxmlMessage;
  import java.io.ByteArrayInputStream;
--- 73,77 ----
  import hk.hku.cecid.phoenix.message.handler.ErrorMessages;
  import hk.hku.cecid.phoenix.message.handler.InitializationException;
! // import hk.hku.cecid.phoenix.message.handler.Utility;
  import hk.hku.cecid.phoenix.message.packaging.EbxmlMessage;
  import java.io.ByteArrayInputStream;
***************
*** 85,93 ****
  import java.security.Security;
  import java.util.Iterator;
! // import java.util.Map;
  // import java.util.Map.Entry;
  import java.util.StringTokenizer;
  import javax.xml.soap.MessageFactory;
! import javax.xml.soap.MimeHeader;
  import javax.xml.soap.MimeHeaders;
  import javax.xml.soap.SOAPException;
--- 85,93 ----
  import java.security.Security;
  import java.util.Iterator;
! import java.util.Map;
  // import java.util.Map.Entry;
  import java.util.StringTokenizer;
  import javax.xml.soap.MessageFactory;
! // import javax.xml.soap.MimeHeader;
  import javax.xml.soap.MimeHeaders;
  import javax.xml.soap.SOAPException;
***************
*** 219,225 ****
  
              boolean hasAuthorization = false;
!             // Map headers = message.getMimeHeaders();
!             MimeHeaders headers = message.getSOAPMessage().getMimeHeaders();
!             for (Iterator i=headers.getAllHeaders() ; i.hasNext() ; ) {
                  MimeHeader header = (MimeHeader) i.next();
                  String[] values = headers.getHeader(header.getName());
--- 219,227 ----
  
              boolean hasAuthorization = false;
!             //MimeHeaders headers = message.getSOAPMessage().getMimeHeaders();
!             Map headers = message.getMimeHeaders(encoding);
!             //for (Iterator i=headers.getAllHeaders() ; i.hasNext() ; ) {
!             for (Iterator i=headers.entrySet().iterator() ; i.hasNext() ; ) {
!                 /*
                  MimeHeader header = (MimeHeader) i.next();
                  String[] values = headers.getHeader(header.getName());
***************
*** 230,248 ****
                      }
                  }
!                 /*
                  Map.Entry entry = (Map.Entry) i.next();
                  connection.setRequestProperty((String) entry.getKey(),
                                                (String) entry.getValue());
!                 */
!                 connection.setRequestProperty(header.getName(), value);
!                 hasAuthorization = header.getName().equals(AUTHORIZATION);
              }
  
!             if (!hasAuthorization) {
                  throw new Error("HTTP Authorization not yet implemented!");
              }
  
              OutputStream os = connection.getOutputStream();
!             message.writeTo(os);
              os.flush();
              os.close();
--- 232,250 ----
                      }
                  }
!                 connection.setRequestProperty(header.getName(), value);
!                 hasAuthorization = header.getName().equals(AUTHORIZATION);
!                 */
                  Map.Entry entry = (Map.Entry) i.next();
                  connection.setRequestProperty((String) entry.getKey(),
                                                (String) entry.getValue());
!                 hasAuthorization = entry.getKey().equals(AUTHORIZATION);
              }
  
!             if (hasAuthorization) {
                  throw new Error("HTTP Authorization not yet implemented!");
              }
  
              OutputStream os = connection.getOutputStream();
!             message.writeTo(os, encoding);
              os.flush();
              os.close();
***************
*** 251,255 ****
              int responseCode = connection.getResponseCode();
              if (responseCode == HttpURLConnection.HTTP_OK) {
!                 headers = new MimeHeaders();
                  String key = connection.getHeaderFieldKey(1);
                  String value = connection.getHeaderFieldKey(1);
--- 253,257 ----
              int responseCode = connection.getResponseCode();
              if (responseCode == HttpURLConnection.HTTP_OK) {
!                 MimeHeaders mimeHeaders = new MimeHeaders();
                  String key = connection.getHeaderFieldKey(1);
                  String value = connection.getHeaderFieldKey(1);
***************
*** 257,261 ****
                      StringTokenizer values = new StringTokenizer(value, ",");
                      while (values.hasMoreTokens()) {
!                         headers.addHeader(key, values.nextToken().trim());
                      }
                      key = connection.getHeaderFieldKey(i);
--- 259,263 ----
                      StringTokenizer values = new StringTokenizer(value, ",");
                      while (values.hasMoreTokens()) {
!                         mimeHeaders.addHeader(key, values.nextToken().trim());
                      }
                      key = connection.getHeaderFieldKey(i);
***************
*** 283,287 ****
                  if (bytes.length > 0) {
                      responseMessage = MessageFactory.newInstance().
!                         createMessage(headers, new ByteArrayInputStream(bytes));
                  }
              }
--- 285,290 ----
                  if (bytes.length > 0) {
                      responseMessage = MessageFactory.newInstance().
!                         createMessage(mimeHeaders, 
!                                       new ByteArrayInputStream(bytes));
                  }
              }