[Neuclear-develop] neuclear-pay/src/java/org/neuclear/asset/receiver/servlet AssetControllerServlet.java,1.5,1.6

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

Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/receiver/servlet
In directory sc8-pr-cvs1:/tmp/cvs-serv26037/src/java/org/neuclear/asset/receiver/servlet

Modified Files:
	AssetControllerServlet.java 
Log Message:
added ServletTools.getInitParam() which first tries the ServletConfig, then the context config.
All the web.xml's have been updated to support this. Also various further generalizations have been done throughout
for getServiceid(), getTitle(), getSigner()

Index: AssetControllerServlet.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/receiver/servlet/AssetControllerServlet.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AssetControllerServlet.java	10 Dec 2003 23:52:39 -0000	1.5
--- AssetControllerServlet.java	15 Dec 2003 23:31:54 -0000	1.6
***************
*** 35,38 ****
--- 35,43 ----
  $Id$
  $Log$
+ Revision 1.6  2003/12/15 23:31:54  pelle
+ added ServletTools.getInitParam() which first tries the ServletConfig, then the context config.
+ All the web.xml's have been updated to support this. Also various further generalizations have been done throughout
+ for getServiceid(), getTitle(), getSigner()
+ 
  Revision 1.5  2003/12/10 23:52:39  pelle
  Did some cleaning up in the builders
***************
*** 76,80 ****
      public final void init(final ServletConfig config) throws ServletException {
          super.init(config);
-         serviceid = config.getInitParameter("serviceid");
          datasource = config.getInitParameter("datasource");
          AssetGlobals.registerReaders();
--- 81,84 ----
***************
*** 82,96 ****
          INSTANCE = this;
          try {
!             asset = (Asset) NSResolver.resolveIdentity(serviceid);
!             signer = new TestCaseSigner();
              final AssetControllerReceiver receiver = new AssetControllerReceiver(
                      new CurrencyController(
                              new SQLLedger(
                                      new JNDIConnectionSource(datasource),
!                                     serviceid
                              ),
!                             serviceid
                      ),
!                     signer
  
              );
--- 86,99 ----
          INSTANCE = this;
          try {
!             asset = (Asset) NSResolver.resolveIdentity(getServiceid());
              final AssetControllerReceiver receiver = new AssetControllerReceiver(
                      new CurrencyController(
                              new SQLLedger(
                                      new JNDIConnectionSource(datasource),
!                                     getServiceid()
                              ),
!                             getServiceid()
                      ),
!                     getSigner()
  
              );
***************
*** 98,119 ****
  
          } catch (Exception e) {
!             e.printStackTrace();
          }
      }
  
      public final Asset getAsset() {
-         final byte test[] = "one two three".getBytes();
-         test[0] = 0;
- 
          return asset;
      }
  
-     public TestCaseSigner getSigner() {
-         return signer;
-     }
- 
-     public final String getServiceid() {
-         return serviceid;
-     }
  
      public final String getDatasource() {
--- 101,113 ----
  
          } catch (Exception e) {
!             ctx.log("AssetControllerServer: "+e.getLocalizedMessage());
!             throw new ServletException(e);
          }
      }
  
      public final Asset getAsset() {
          return asset;
      }
  
  
      public final String getDatasource() {
***************
*** 126,132 ****
  
      private Asset asset;
-     private String serviceid;
      private String datasource;
      private static AssetControllerServlet INSTANCE;
-     private TestCaseSigner signer;
  }
--- 120,124 ----