[Neuclear-develop] neuclear-xmlsig/src/java/org/neuclear/xml/soap XMLInputStreamServlet.java,1.2,1.3

[<pe...@us...>]

Update of /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml/soap
In directory sc8-pr-cvs1:/tmp/cvs-serv17047/src/java/org/neuclear/xml/soap

Modified Files:
	XMLInputStreamServlet.java 
Log Message:
All unit tests in commons, id and xmlsec now work.
AssetController now successfully processes payments in the unit test.
Payment Web App has working form that creates a TransferRequest presents it to the signer
and forwards it to AssetControlServlet. (Which throws an XML Parser Exception) I think the XMLReaderServlet is bust.

Index: XMLInputStreamServlet.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml/soap/XMLInputStreamServlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** XMLInputStreamServlet.java	21 Nov 2003 04:44:30 -0000	1.2
--- XMLInputStreamServlet.java	22 Nov 2003 00:23:18 -0000	1.3
***************
*** 1,8 ****
--- 1,13 ----
  package org.neuclear.xml.soap;
  
+ import org.neuclear.commons.Utility;
+ import org.neuclear.commons.crypto.Base64;
+ import org.neuclear.commons.crypto.CryptoException;
+ 
  import javax.servlet.ServletException;
  import javax.servlet.http.HttpServlet;
  import javax.servlet.http.HttpServletRequest;
  import javax.servlet.http.HttpServletResponse;
+ import java.io.ByteArrayInputStream;
  import java.io.IOException;
  import java.io.InputStream;
***************
*** 29,32 ****
--- 34,43 ----
  $Id$
  $Log$
+ Revision 1.3  2003/11/22 00:23:18  pelle
+ All unit tests in commons, id and xmlsec now work.
+ AssetController now successfully processes payments in the unit test.
+ Payment Web App has working form that creates a TransferRequest presents it to the signer
+ and forwards it to AssetControlServlet. (Which throws an XML Parser Exception) I think the XMLReaderServlet is bust.
+ 
  Revision 1.2  2003/11/21 04:44:30  pelle
  EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
***************
*** 49,53 ****
  
  /**
-  * 
   * User: pelleb
   * Date: Sep 25, 2003
--- 60,63 ----
***************
*** 70,77 ****
  
      protected void doPost(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException {
!         if (request.getContentType().equals("text/xml")) {
!             final InputStream is = request.getInputStream();
              handleInputStream(is, request, response);
          }
      }
  
--- 80,97 ----
  
      protected void doPost(final HttpServletRequest request, final HttpServletResponse response) throws ServletException, IOException {
!         try {
!             InputStream is = null;
! 
!             if (request.getContentType().equals("text/xml")) {
!                 is = request.getInputStream();
!             }
!             if (!Utility.isEmpty(request.getParameter("base64xml"))) {
!                 is = new ByteArrayInputStream(Base64.decode(request.getParameter("base64xml")));
!             }
              handleInputStream(is, request, response);
+         } catch (CryptoException e) {
+             throw new ServletException(e);
          }
+ 
      }