[Neuclear-develop] neuclear-pay/src/java/org/neuclear/asset/contracts Asset.java,1.16,1.17

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

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

Modified Files:
	Asset.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: Asset.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/contracts/Asset.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Asset.java	2 Apr 2004 16:58:53 -0000	1.16
--- Asset.java	5 Apr 2004 16:31:40 -0000	1.17
***************
*** 5,9 ****
  import org.neuclear.id.*;
  import org.neuclear.id.targets.Targets;
- import org.neuclear.xml.xmlsec.KeyInfo;
  import org.neuclear.xml.xmlsec.XMLSecTools;
  import org.neuclear.xml.xmlsec.XMLSecurityException;
--- 5,8 ----
***************
*** 31,34 ****
--- 30,36 ----
  $Id$
  $Log$
+ Revision 1.17  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.16  2004/04/02 16:58:53  pelle
  Updated Asset and Asset Builder with semi fully featured functionality.
***************
*** 131,140 ****
   * @see org.neuclear.asset.contracts.builders.AssetBuilder
   */
! public final class Asset extends Identity {
      protected Asset(final SignedNamedCore core, final String serviceUrl, final PublicKey servicekey, final PublicKey issuerKey, final Targets targets, final int decimal, final double minimumTransaction) {
!         super(core, null, targets);
!         this.serviceUrl = serviceUrl;
          this.issuerKey = issuerKey;
-         this.serviceKey = servicekey;
          this.decimal = decimal;
          this.multiplier = (int) Math.round(Math.pow(10, -decimal));
--- 133,140 ----
   * @see org.neuclear.asset.contracts.builders.AssetBuilder
   */
! public final class Asset extends Service {
      protected Asset(final SignedNamedCore core, final String serviceUrl, final PublicKey servicekey, final PublicKey issuerKey, final Targets targets, final int decimal, final double minimumTransaction) {
!         super(core, serviceUrl, servicekey, targets);
          this.issuerKey = issuerKey;
          this.decimal = decimal;
          this.multiplier = (int) Math.round(Math.pow(10, -decimal));
***************
*** 181,192 ****
      }
  
-     public final PublicKey getServiceKey() {
-         return serviceKey;
-     }
- 
-     public final String getServiceUrl() {
-         return serviceUrl;
-     }
- 
      public int getDecimal() {
          return decimal;
--- 181,184 ----
***************
*** 212,218 ****
                  throw new InvalidNamedObjectException(core.getName(), "Not in XML NameSpace: " + AssetGlobals.NS_ASSET.getURI());
              final Element issuerElement = InvalidNamedObjectException.assertContainsElementQName(core, elem, AssetGlobals.createQName("Issuer"));
!             final Element serviceElement = InvalidNamedObjectException.assertContainsElementQName(core, elem, AssetGlobals.createQName("Service"));
              final Element serviceKeyElement = InvalidNamedObjectException.assertContainsElementQName(core, serviceElement, XMLSecTools.createQName("KeyInfo"));
!             final Element serviceUrlElement = InvalidNamedObjectException.assertContainsElementQName(core, serviceElement, AssetGlobals.createQName("Url"));
              try {
                  final PublicKey sPub = extractPublicKey(serviceKeyElement);
--- 204,210 ----
                  throw new InvalidNamedObjectException(core.getName(), "Not in XML NameSpace: " + AssetGlobals.NS_ASSET.getURI());
              final Element issuerElement = InvalidNamedObjectException.assertContainsElementQName(core, elem, AssetGlobals.createQName("Issuer"));
!             final Element serviceElement = InvalidNamedObjectException.assertContainsElementQName(core, elem, SignedNamedObject.createNEUIDQName("Service"));
              final Element serviceKeyElement = InvalidNamedObjectException.assertContainsElementQName(core, serviceElement, XMLSecTools.createQName("KeyInfo"));
!             final Element serviceUrlElement = InvalidNamedObjectException.assertContainsElementQName(core, serviceElement, SignedNamedObject.createNEUIDQName("Url"));
              try {
                  final PublicKey sPub = extractPublicKey(serviceKeyElement);
***************
*** 231,239 ****
      }
  
-     private static PublicKey extractPublicKey(Element kiElem) throws XMLSecurityException {
-         final KeyInfo sKi = new KeyInfo(kiElem);
-         return sKi.getPublicKey();
-     }
- 
      private static double extractMinimumTransactionAmount(Element elem) {
          Element melem = elem.element(AssetGlobals.createQName(AssetGlobals.MINIMUM_TAGNAME));
--- 223,226 ----
***************
*** 253,258 ****
  
      private final PublicKey issuerKey;
-     private final String serviceUrl;
-     private final PublicKey serviceKey;
      private final int decimal;
      private final int multiplier;
--- 240,243 ----