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

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

Modified Files:
	AssetBuilder.java 
Log Message:
Identity is now fully html based as is the ServiceBuilder.
VerifyingReader correctly identifies html files and parses them as such.
Targets and Target now parse html link tags
AssetBuilder and ExchangeAgentBuilder have been updated to support it and provide html formatted contracts.
The Asset.Reader and ExchangeAgent.Reader still need to be updated.

Index: AssetBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/contracts/builders/AssetBuilder.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** AssetBuilder.java	5 Apr 2004 16:31:40 -0000	1.11
--- AssetBuilder.java	17 Apr 2004 19:27:59 -0000	1.12
***************
*** 1,13 ****
  package org.neuclear.asset.contracts.builders;
  
- import org.dom4j.Element;
  import org.neuclear.asset.contracts.AssetGlobals;
  import org.neuclear.commons.NeuClearException;
  import org.neuclear.commons.crypto.signers.JCESigner;
  import org.neuclear.commons.crypto.signers.TestCaseSigner;
- import org.neuclear.id.Service;
  import org.neuclear.id.builders.ServiceBuilder;
! import org.neuclear.xml.xmlsec.KeyInfo;
  
  import java.security.PublicKey;
  
--- 1,12 ----
  package org.neuclear.asset.contracts.builders;
  
  import org.neuclear.asset.contracts.AssetGlobals;
  import org.neuclear.commons.NeuClearException;
  import org.neuclear.commons.crypto.signers.JCESigner;
  import org.neuclear.commons.crypto.signers.TestCaseSigner;
  import org.neuclear.id.builders.ServiceBuilder;
! import org.neuclear.xml.XMLTools;
  
+ import java.io.File;
  import java.security.PublicKey;
  
***************
*** 32,35 ****
--- 31,41 ----
  $Id$
  $Log$
+ Revision 1.12  2004/04/17 19:27:59  pelle
+ Identity is now fully html based as is the ServiceBuilder.
+ VerifyingReader correctly identifies html files and parses them as such.
+ Targets and Target now parse html link tags
+ AssetBuilder and ExchangeAgentBuilder have been updated to support it and provide html formatted contracts.
+ The Asset.Reader and ExchangeAgent.Reader still need to be updated.
+ 
  Revision 1.11  2004/04/05 16:31:40  pelle
  Created new ServiceBuilder class for creating services. A service is an identity that has a seperate service URL and Service Public Key.
***************
*** 126,141 ****
       * @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), serviceUrl, serviceKey);
!         final Element elem = getElement();
!         final Element issuerElem = AssetGlobals.createElement("Issuer");
!         issuerElem.add(new KeyInfo(issuerKey).getElement());
!         elem.add(issuerElem);
!         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);
      }
  
--- 132,141 ----
       * @throws NeuClearException
       */
!     public AssetBuilder(final String title, final String serviceUrl, final PublicKey serviceKey, final PublicKey issuerKey, final int decimal, final double minimum) throws NeuClearException {
!         super(AssetGlobals.ASSET_TAGNAME, title, serviceUrl, serviceKey);
!         addKeyInfo("asset.issuer.publickey", issuerKey, "Issuers Key");
!         addFeature("asset.decimalpoints", "Decimal Points", Integer.toString(decimal), "Decimal Points");
!         addFeature("asset.miminmum", "Minimum Transaction", Double.toString(minimum), "The Minumum Transaction size");
! 
      }
  
***************
*** 144,153 ****
              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 Service asset = (Service) assetraw.convert("neu://bob@test", signer);
  
  
--- 144,160 ----
              final JCESigner signer = new TestCaseSigner();
  
!             final AssetBuilder assetraw = new AssetBuilder("Bux",
!                     "http://bux.neuclear.org",
                      signer.getPublicKey("neu://test/bux"),
                      signer.getPublicKey("neu://alice@test"),
                      2,
                      0.01);
!             assetraw.getDescription().setText("NeuClear Test Currency");
!             assetraw.getRules().setText("You know the rules, there are no rules!!!");
!             assetraw.sign("ivan", signer);
!             File out = new File("target/testdata/assets/bux.html");
!             out.getParentFile().mkdirs();
!             XMLTools.writeFile(out, assetraw.getElement());
! //            final Service asset = (Service) assetraw.convert("neu://bob@test", signer);