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

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

Modified Files:
	AssetBuilder.java 
Log Message:
Created new ServiceBuilder class for creating services. A service is an identity that has a seperate service URL and Service Public Key.

Index: AssetBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/contracts/builders/AssetBuilder.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** AssetBuilder.java	2 Apr 2004 16:58:53 -0000	1.10
--- AssetBuilder.java	5 Apr 2004 16:31:40 -0000	1.11
***************
*** 2,11 ****
  
  import org.dom4j.Element;
- import org.neuclear.asset.contracts.Asset;
  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.IdentityBuilder;
  import org.neuclear.xml.xmlsec.KeyInfo;
  
--- 2,11 ----
  
  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;
  
***************
*** 32,35 ****
--- 32,38 ----
  $Id$
  $Log$
+ 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.
+ 
  Revision 1.10  2004/04/02 16:58:53  pelle
  Updated Asset and Asset Builder with semi fully featured functionality.
***************
*** 114,118 ****
   * Time: 3:13:27 PM
   */
! public final class AssetBuilder extends IdentityBuilder {
      /**
       * @param serviceUrl
--- 117,121 ----
   * Time: 3:13:27 PM
   */
! public final class AssetBuilder extends ServiceBuilder {
      /**
       * @param serviceUrl
***************
*** 124,138 ****
       */
      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));
--- 127,135 ----
       */
      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));
***************
*** 152,156 ****
                      2,
                      0.01);
!             final Asset asset = (Asset) assetraw.convert("neu://bob@test", signer);
  
  
--- 149,153 ----
                      2,
                      0.01);
!             final Service asset = (Service) assetraw.convert("neu://bob@test", signer);