[Neuclear-develop] neuclear-pay/src/java/org/neuclear/asset/contracts/builders AssetBuilder.java,1.8,1.9

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

Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/contracts/builders
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4049/src/java/org/neuclear/asset/contracts/builders

Modified Files:
	AssetBuilder.java 
Log Message:
Split Identity into Signatory and Identity class.
Identity remains a signed named object and will in the future just be used for self declared information.
Signatory now contains the PublicKey etc and is NOT a signed object.

Index: AssetBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/contracts/builders/AssetBuilder.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** AssetBuilder.java	2 Mar 2004 18:39:29 -0000	1.8
--- AssetBuilder.java	1 Apr 2004 23:18:31 -0000	1.9
***************
*** 9,14 ****
  import org.neuclear.id.builders.IdentityBuilder;
  
- import java.security.PublicKey;
- 
  /*
  NeuClear Distributed Transaction Clearing Platform
--- 9,12 ----
***************
*** 31,34 ****
--- 29,37 ----
  $Id$
  $Log$
+ Revision 1.9  2004/04/01 23:18:31  pelle
+ Split Identity into Signatory and Identity class.
+ Identity remains a signed named object and will in the future just be used for self declared information.
+ Signatory now contains the PublicKey etc and is NOT a signed object.
+ 
  Revision 1.8  2004/03/02 18:39:29  pelle
  Done some more minor fixes within xmlsig, but mainly I've removed the old Source and Store patterns and sub packages. This is because
***************
*** 108,113 ****
       * Used to create new Assets
       * 
-      * @param allow      PublicKey allowed to sign in here
-      * @param repository URL of Default Store for NameSpace. (Note. A NameSpace object is stored in the default repository of it's parent namespace)
       * @param signer     URL of default interactive signing service for namespace. If null it doesnt allow interactive signing
       * @param receiver   URL of default receiver for namespace
--- 111,114 ----
***************
*** 116,121 ****
       * @param minimum    Minimum transaction size
       */
!     public AssetBuilder(final PublicKey allow, final String signer, final String logger, final String receiver, final String controller, final int decimal, final double minimum) throws NeuClearException {
!         super(AssetGlobals.createQName(AssetGlobals.ASSET_TAGNAME),  allow,  signer, logger, receiver);
          final Element elem = getElement();
          AssetGlobals.createAttribute(elem, "controller", controller);
--- 117,122 ----
       * @param minimum    Minimum transaction size
       */
!     public AssetBuilder(final String signer, final String logger, final String receiver, final String controller, final int decimal, final double minimum) throws NeuClearException {
!         super(AssetGlobals.createQName(AssetGlobals.ASSET_TAGNAME), signer, logger, receiver);
          final Element elem = getElement();
          AssetGlobals.createAttribute(elem, "controller", controller);
***************
*** 132,145 ****
                  assetname = args[0];
  
!             final AssetBuilder assetraw = new AssetBuilder(
!                     signer.getPublicKey(assetname),
!                     "http://bux.neuclear.org:8080",
                      "http://logger.neuclear.org",
                      "http://bux.neuclear.org:8080",
                      "http://bux.neuclear.org:8080",
                      2,
!                     0.01
!             );
!             final Asset asset= (Asset) assetraw.convert(assetname,signer);
  
          } catch (Exception e) {
--- 133,143 ----
                  assetname = args[0];
  
!             final AssetBuilder assetraw = new AssetBuilder("http://bux.neuclear.org:8080",
                      "http://logger.neuclear.org",
                      "http://bux.neuclear.org:8080",
                      "http://bux.neuclear.org:8080",
                      2,
!                     0.01);
!             final Asset asset = (Asset) assetraw.convert(assetname, signer);
  
          } catch (Exception e) {