[Neuclear-develop] neuclear-ledger/src/java/org/neuclear/ledger/servlets LedgerServlet.java,1.3,1.4

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

Update of /cvsroot/neuclear/neuclear-ledger/src/java/org/neuclear/ledger/servlets
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2857/src/java/org/neuclear/ledger/servlets

Modified Files:
	LedgerServlet.java 
Log Message:
The problem with Enveloped signatures has now been fixed. It was a problem in the way transforms work. I have bandaided it, but in the future if better support for transforms need to be made, we need to rethink it a bit. Perhaps using the new crypto channel's in neuclear-commons.

Index: LedgerServlet.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger/src/java/org/neuclear/ledger/servlets/LedgerServlet.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** LedgerServlet.java	2 Jan 2004 23:18:34 -0000	1.3
--- LedgerServlet.java	21 Mar 2004 00:48:36 -0000	1.4
***************
*** 4,17 ****
  import org.neuclear.commons.servlets.ServletTools;
  import org.neuclear.commons.sql.JNDIConnectionSource;
- import org.neuclear.commons.sql.statements.StatementFactory;
  import org.neuclear.commons.sql.statements.SimpleStatementFactory;
  import org.neuclear.commons.time.TimeTools;
  import org.neuclear.id.InvalidNamedObjectException;
  import org.neuclear.id.NSTools;
  import org.neuclear.ledger.LowlevelLedgerException;
- import org.neuclear.ledger.UnknownBookException;
- import org.neuclear.ledger.PopulateLedger;
  import org.neuclear.ledger.browser.BookBrowser;
! import org.neuclear.ledger.implementations.SQLLedger;
  
  import javax.servlet.ServletConfig;
--- 4,15 ----
  import org.neuclear.commons.servlets.ServletTools;
  import org.neuclear.commons.sql.JNDIConnectionSource;
  import org.neuclear.commons.sql.statements.SimpleStatementFactory;
+ import org.neuclear.commons.sql.statements.StatementFactory;
  import org.neuclear.commons.time.TimeTools;
  import org.neuclear.id.InvalidNamedObjectException;
  import org.neuclear.id.NSTools;
  import org.neuclear.ledger.LowlevelLedgerException;
  import org.neuclear.ledger.browser.BookBrowser;
! import org.neuclear.ledger.browser.LedgerBrowser;
  
  import javax.servlet.ServletConfig;
***************
*** 46,49 ****
--- 44,50 ----
  $Id$
  $Log$
+ Revision 1.4  2004/03/21 00:48:36  pelle
+ The problem with Enveloped signatures has now been fixed. It was a problem in the way transforms work. I have bandaided it, but in the future if better support for transforms need to be made, we need to rethink it a bit. Perhaps using the new crypto channel's in neuclear-commons.
+ 
  Revision 1.3  2004/01/02 23:18:34  pelle
  Added StatementFactory pattern and refactored the ledger to use it.
***************
*** 65,78 ****
  public class LedgerServlet extends HttpServlet {
      public void init(ServletConfig config) throws ServletException {
!         datasource = ServletTools.getInitParam("datasource",config);
!         serviceid = ServletTools.getInitParam("serviceid",config);
          try {
              fact = new SimpleStatementFactory(new JNDIConnectionSource(datasource));
!             ledger= new SQLLedger(
!                     fact,
!                         serviceid
!                 );
!             if (!ledger.bookExists("neu://alice@test"))
!                 PopulateLedger.main(null);
          } catch (Exception e) {
              throw new ServletException(e);
--- 66,79 ----
  public class LedgerServlet extends HttpServlet {
      public void init(ServletConfig config) throws ServletException {
!         datasource = ServletTools.getInitParam("datasource", config);
!         serviceid = ServletTools.getInitParam("serviceid", config);
          try {
              fact = new SimpleStatementFactory(new JNDIConnectionSource(datasource));
! //            ledger= new SQLLedger(
! //                    fact,
! //                        serviceid
! //                );
! //            if (!ledger.bookExists("neu://alice@test"))
! //                PopulateLedger.main(null);
          } catch (Exception e) {
              throw new ServletException(e);
***************
*** 83,102 ****
      protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
          response.setContentType("text/html");
!         PrintWriter out=response.getWriter();
!         ServletTools.printHeader(out,request,"Account Browser");
!         String url=ServletTools.getAbsoluteURL(request,request.getServletPath());
          try {
!             Principal user=request.getUserPrincipal();
!             String book=request.getPathInfo();
              if (Utility.isEmpty(book))
!                 book=serviceid;
              else
!                 book="neu:/"+book;
!             BookBrowser stmt=ledger.browse(ledger.getBook(book));
              out.println("<table><tr><th>Transaction ID</th><th>Time</th><th>Counterparty</th><th>Comment</th><th>Amount</th></tr>");
!             while(stmt.next()){
                  final BigDecimal amount = stmt.getAmount();
                  out.print("<tr");
!                 if (amount.compareTo(ZERO)<0)
                      out.print(" class=\"negative\"");
                  out.print("><td style=\"size:small\">");
--- 84,103 ----
      protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
          response.setContentType("text/html");
!         PrintWriter out = response.getWriter();
!         ServletTools.printHeader(out, request, "Account Browser");
!         String url = ServletTools.getAbsoluteURL(request, request.getServletPath());
          try {
!             Principal user = request.getUserPrincipal();
!             String book = request.getPathInfo();
              if (Utility.isEmpty(book))
!                 book = serviceid;
              else
!                 book = "neu:/" + book;
!             BookBrowser stmt = ledger.browse(book);
              out.println("<table><tr><th>Transaction ID</th><th>Time</th><th>Counterparty</th><th>Comment</th><th>Amount</th></tr>");
!             while (stmt.next()) {
                  final BigDecimal amount = stmt.getAmount();
                  out.print("<tr");
!                 if (amount.compareTo(ZERO) < 0)
                      out.print(" class=\"negative\"");
                  out.print("><td style=\"size:small\">");
***************
*** 109,113 ****
                      out.print(NSTools.name2path(stmt.getCounterparty()));
                  else
!                     out.print("/"+stmt.getCounterparty());
                  out.println("\">");
                  out.print(stmt.getCounterparty());
--- 110,114 ----
                      out.print(NSTools.name2path(stmt.getCounterparty()));
                  else
!                     out.print("/" + stmt.getCounterparty());
                  out.println("\">");
                  out.print(stmt.getCounterparty());
***************
*** 122,136 ****
          } catch (InvalidNamedObjectException e) {
              e.printStackTrace();
-         } catch (UnknownBookException e) {
-             e.printStackTrace();
          } catch (LowlevelLedgerException e) {
              e.printStackTrace();
          }
      }
      private DataSource ds;
      private String datasource;
      private String serviceid;
!     private static final BigDecimal ZERO=new BigDecimal(0);
!     private SQLLedger ledger;
      private StatementFactory fact;
  }
--- 123,136 ----
          } catch (InvalidNamedObjectException e) {
              e.printStackTrace();
          } catch (LowlevelLedgerException e) {
              e.printStackTrace();
          }
      }
+ 
      private DataSource ds;
      private String datasource;
      private String serviceid;
!     private static final BigDecimal ZERO = new BigDecimal(0);
!     private LedgerBrowser ledger;
      private StatementFactory fact;
  }