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

[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-serv28155/src/java/org/neuclear/asset/contracts/builders

Modified Files:
	AssetBuilder.java 
Log Message:
Updated Asset and Asset Builder with semi fully featured functionality.
It now has Issuer, Service etc.

Index: AssetBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/contracts/builders/AssetBuilder.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** AssetBuilder.java	1 Apr 2004 23:18:31 -0000	1.9
--- AssetBuilder.java	2 Apr 2004 16:58:53 -0000	1.10
***************
*** 8,11 ****
--- 8,14 ----
  import org.neuclear.commons.crypto.signers.TestCaseSigner;
  import org.neuclear.id.builders.IdentityBuilder;
+ import org.neuclear.xml.xmlsec.KeyInfo;
+ 
+ import java.security.PublicKey;
  
  /*
***************
*** 29,32 ****
--- 32,39 ----
  $Id$
  $Log$
+ Revision 1.10  2004/04/02 16:58:53  pelle
+ Updated Asset and Asset Builder with semi fully featured functionality.
+ It now has Issuer, Service etc.
+ 
  Revision 1.9  2004/04/01 23:18:31  pelle
  Split Identity into Signatory and Identity class.
***************
*** 109,127 ****
  public final class AssetBuilder extends IdentityBuilder {
      /**
!      * Used to create new Assets
!      * 
!      * @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
!      * @param controller URL of AssetController This should be a http web url
!      * @param decimal    The amount of decimal points.
!      * @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);
!         AssetGlobals.createAttribute(elem, "decimalpoints", Integer.toString(decimal));
!         AssetGlobals.createAttribute(elem, "minimumxact", Double.toString(minimum));
! 
      }
  
--- 116,144 ----
  public final class AssetBuilder extends IdentityBuilder {
      /**
!      * @param serviceUrl
!      * @param serviceKey
!      * @param issuerKey
!      * @param decimal
!      * @param minimum
!      * @throws NeuClearException
       */
!     public AssetBuilder(final String serviceUrl, final PublicKey serviceKey, final PublicKey issuerKey, final int decimal, final double minimum) throws NeuClearException {
!         super(AssetGlobals.createQName(AssetGlobals.ASSET_TAGNAME), null);
          final Element elem = getElement();
!         final Element issuerElem = AssetGlobals.createElement("Issuer");
!         issuerElem.add(new KeyInfo(issuerKey).getElement());
!         elem.add(issuerElem);
!         final Element serviceElem = AssetGlobals.createElement("Service");
!         serviceElem.add(new KeyInfo(serviceKey).getElement());
!         final Element urlElem = AssetGlobals.createElement("Url");
!         urlElem.setText(serviceUrl);
!         serviceElem.add(urlElem);
!         elem.add(serviceElem);
!         final Element dec = AssetGlobals.createElement(AssetGlobals.DECIMAL_POINT_TAGNAME);
!         dec.setText(Integer.toString(decimal));
!         elem.add(dec);
!         final Element min = AssetGlobals.createElement(AssetGlobals.MINIMUM_TAGNAME);
!         min.setText(Double.toString(minimum));
!         elem.add(min);
      }
  
***************
*** 129,143 ****
          try {
              final JCESigner signer = new TestCaseSigner();
-             String assetname = "neu://test/bux";
-             if (args.length > 0)
-                 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) {
--- 146,157 ----
          try {
              final JCESigner signer = new TestCaseSigner();
  
!             final AssetBuilder assetraw = new AssetBuilder("http://bux.neuclear.org",
!                     signer.getPublicKey("neu://test/bux"),
!                     signer.getPublicKey("neu://alice@test"),
                      2,
                      0.01);
!             final Asset asset = (Asset) assetraw.convert("neu://bob@test", signer);
! 
  
          } catch (Exception e) {