Menu
▾
▴
neuclear-develop — Support requests, cvs etc
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(119) |
Oct
(111) |
Nov
(238) |
Dec
(395) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(239) |
Feb
(59) |
Mar
(354) |
Apr
(489) |
May
(23) |
Jun
(2) |
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
(4) |
May
(5) |
Jun
(2) |
Jul
|
Aug
|
Sep
(3) |
Oct
(14) |
Nov
(17) |
Dec
(9) |
| 2007 |
Jan
(4) |
Feb
(3) |
Mar
|
Apr
(1) |
May
(1) |
Jun
(2) |
Jul
|
Aug
|
Sep
(1) |
Oct
(2) |
Nov
(1) |
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
(1) |
Apr
(7) |
May
(3) |
Jun
(6) |
Jul
(4) |
Aug
(3) |
Sep
(15) |
Oct
(13) |
Nov
(35) |
Dec
(40) |
| 2009 |
Jan
(19) |
Feb
(21) |
Mar
(16) |
Apr
(18) |
May
(36) |
Jun
(20) |
Jul
(32) |
Aug
(11) |
Sep
(3) |
Oct
(2) |
Nov
(2) |
Dec
(13) |
| 2010 |
Jan
(5) |
Feb
(5) |
Mar
(7) |
Apr
(1) |
May
(1) |
Jun
(3) |
Jul
(1) |
Aug
(1) |
Sep
(1) |
Oct
(1) |
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(2) |
Jul
(1) |
Aug
(1) |
Sep
(1) |
Oct
(4) |
Nov
|
Dec
(3) |
| 2012 |
Jan
(3) |
Feb
(3) |
Mar
(1) |
Apr
(4) |
May
(8) |
Jun
(4) |
Jul
(9) |
Aug
(2) |
Sep
(8) |
Oct
(3) |
Nov
(8) |
Dec
(4) |
| 2013 |
Jan
(2) |
Feb
(1) |
Mar
(5) |
Apr
(6) |
May
(10) |
Jun
(5) |
Jul
(6) |
Aug
(7) |
Sep
(5) |
Oct
(2) |
Nov
(4) |
Dec
(4) |
| 2014 |
Jan
(13) |
Feb
(4) |
Mar
(7) |
Apr
(9) |
May
(20) |
Jun
(13) |
Jul
(10) |
Aug
(3) |
Sep
(5) |
Oct
(2) |
Nov
(2) |
Dec
(2) |
| 2015 |
Jan
(3) |
Feb
(3) |
Mar
(5) |
Apr
(4) |
May
(3) |
Jun
(2) |
Jul
(4) |
Aug
(3) |
Sep
(1) |
Oct
|
Nov
(1) |
Dec
(3) |
| 2016 |
Jan
|
Feb
(1) |
Mar
(1) |
Apr
(1) |
May
(1) |
Jun
(2) |
Jul
(1) |
Aug
(4) |
Sep
(3) |
Oct
(3) |
Nov
(4) |
Dec
(2) |
| 2017 |
Jan
|
Feb
(2) |
Mar
|
Apr
(2) |
May
(1) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <bug...@ve...> - 2004-04-05 21:07:34
|
Message:
The following issue has been deleted from JIRA.
---------------------------------------------------------------------
Here is an overview of the issue:
---------------------------------------------------------------------
Key: PAY-29
Summary: Implement CompleteExchangeOrder in Audit Controller
Type: Improvement
Status: Open
Priority: Major
Original Estimate: Unknown
Time Spent: Unknown
Remaining: Unknown
Project: NeuClear Payments
Assignee: Pelle Braendgaard
Reporter: Pelle Braendgaard
Created: Mon, 5 Apr 2004 1:18 PM
Updated: Mon, 5 Apr 2004 1:18 PM
Description:
With new Order Receipt types
---------------------------------------------------------------------
JIRA INFORMATION:
This message is automatically generated by JIRA.
If you think it was sent incorrectly contact one of the administrators:
http://jira.neuclear.org//secure/Administrators.jspa
If you want more information on JIRA, or have a bug to report see:
http://www.atlassian.com/software/jira
|
|
From: <bug...@ve...> - 2004-04-05 21:05:39
|
Message: The following issue has been closed. --------------------------------------------------------------------- View the issue: http://jira.neuclear.org//browse/PAY-26 Here is an overview of the issue: --------------------------------------------------------------------- Key: PAY-26 Summary: Implement ExchangeOrder in Currency Controller Type: Improvement Status: Closed Priority: Major Resolution: FIXED Original Estimate: Unknown Time Spent: Unknown Remaining: Unknown Project: NeuClear Payments Components: Asset Controller Fix Fors: 0.3 Versions: 0.3 Assignee: Pelle Braendgaard Reporter: Pelle Braendgaard Created: Mon, 5 Apr 2004 1:17 PM Updated: Mon, 5 Apr 2004 2:03 PM Description: With new Order Receipt types --------------------------------------------------------------------- JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://jira.neuclear.org//secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira |
|
From: <bug...@ve...> - 2004-04-05 21:05:39
|
Message:
The following issue has been deleted from JIRA.
---------------------------------------------------------------------
Here is an overview of the issue:
---------------------------------------------------------------------
Key: PAY-27
Summary: Implement CancelExchangeOrder in Currency Controller
Type: Improvement
Status: Open
Priority: Major
Original Estimate: Unknown
Time Spent: Unknown
Remaining: Unknown
Project: NeuClear Payments
Assignee: Pelle Braendgaard
Reporter: Pelle Braendgaard
Created: Mon, 5 Apr 2004 1:18 PM
Updated: Mon, 5 Apr 2004 1:18 PM
Description:
With new Order Receipt types
---------------------------------------------------------------------
JIRA INFORMATION:
This message is automatically generated by JIRA.
If you think it was sent incorrectly contact one of the administrators:
http://jira.neuclear.org//secure/Administrators.jspa
If you want more information on JIRA, or have a bug to report see:
http://www.atlassian.com/software/jira
|
|
From: <bug...@ve...> - 2004-04-05 21:03:34
|
Message: The following issue has been closed. --------------------------------------------------------------------- View the issue: http://jira.neuclear.org//browse/GL-29 Here is an overview of the issue: --------------------------------------------------------------------- Key: GL-29 Summary: add setHeldReceiptId() to Ledger and implementations Type: New Feature Status: Closed Priority: Major Resolution: FIXED Original Estimate: Unknown Time Spent: Unknown Remaining: Unknown Project: NeuClear Ledger Fix Fors: r_0_4 Versions: r_0_4 Assignee: Pelle Braendgaard Reporter: Pelle Braendgaard Created: Mon, 5 Apr 2004 1:23 PM Updated: Mon, 5 Apr 2004 2:02 PM Description: Forgot to add this for HeldTransactions, so the Asset Controllers can add the details. --------------------------------------------------------------------- JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://jira.neuclear.org//secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira |
|
From: <bug...@ve...> - 2004-04-05 20:26:19
|
Message: A new issue has been created in JIRA. --------------------------------------------------------------------- View the issue: http://jira.neuclear.org//browse/PAY-28 Here is an overview of the issue: --------------------------------------------------------------------- Key: PAY-28 Summary: Implement CompleteExchangeOrder in Currency Controller Type: Improvement Status: Open Priority: Major Original Estimate: Unknown Time Spent: Unknown Remaining: Unknown Project: NeuClear Payments Components: Asset Controller Fix Fors: 0.3 Versions: 0.3 Assignee: Pelle Braendgaard Reporter: Pelle Braendgaard Created: Mon, 5 Apr 2004 1:18 PM Updated: Mon, 5 Apr 2004 1:18 PM Description: With new Order Receipt types --------------------------------------------------------------------- JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://jira.neuclear.org//secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira |
|
From: <bug...@ve...> - 2004-04-05 20:21:34
|
Message: A new issue has been created in JIRA. --------------------------------------------------------------------- View the issue: http://jira.neuclear.org//browse/PAY-33 Here is an overview of the issue: --------------------------------------------------------------------- Key: PAY-33 Summary: Implement ExchangeOrder in Audit Controller Type: Improvement Status: Open Priority: Major Original Estimate: Unknown Time Spent: Unknown Remaining: Unknown Project: NeuClear Payments Components: Audit Controller Fix Fors: 0.3 Versions: 0.3 Assignee: Pelle Braendgaard Reporter: Pelle Braendgaard Created: Mon, 5 Apr 2004 1:21 PM Updated: Mon, 5 Apr 2004 1:21 PM Description: With new Order Receipt types --------------------------------------------------------------------- JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://jira.neuclear.org//secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira |
|
From: <bug...@ve...> - 2004-04-05 20:21:33
|
Message: A new issue has been created in JIRA. --------------------------------------------------------------------- View the issue: http://jira.neuclear.org//browse/PAY-32 Here is an overview of the issue: --------------------------------------------------------------------- Key: PAY-32 Summary: Implement TransferOrder in Audit Controller Type: Improvement Status: Open Priority: Major Original Estimate: Unknown Time Spent: Unknown Remaining: Unknown Project: NeuClear Payments Components: Audit Controller Fix Fors: 0.3 Versions: 0.3 Assignee: Pelle Braendgaard Reporter: Pelle Braendgaard Created: Mon, 5 Apr 2004 1:20 PM Updated: Mon, 5 Apr 2004 1:20 PM Description: With new Order Receipt types --------------------------------------------------------------------- JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://jira.neuclear.org//secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira |
|
From: <bug...@ve...> - 2004-04-05 20:19:42
|
Message: A new issue has been created in JIRA. --------------------------------------------------------------------- View the issue: http://jira.neuclear.org//browse/PAY-31 Here is an overview of the issue: --------------------------------------------------------------------- Key: PAY-31 Summary: Implement CompleteExchangeOrder in Audit Controller Type: Improvement Status: Open Priority: Major Original Estimate: Unknown Time Spent: Unknown Remaining: Unknown Project: NeuClear Payments Components: Audit Controller Fix Fors: 0.3 Versions: 0.3 Assignee: Pelle Braendgaard Reporter: Pelle Braendgaard Created: Mon, 5 Apr 2004 1:19 PM Updated: Mon, 5 Apr 2004 1:19 PM Description: With new Order Receipt types --------------------------------------------------------------------- JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://jira.neuclear.org//secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira |
|
From: <bug...@ve...> - 2004-04-05 20:19:40
|
Message: A new issue has been created in JIRA. --------------------------------------------------------------------- View the issue: http://jira.neuclear.org//browse/PAY-30 Here is an overview of the issue: --------------------------------------------------------------------- Key: PAY-30 Summary: Implement CancelExchangeOrder in Audit Controller Type: Improvement Status: Open Priority: Major Original Estimate: Unknown Time Spent: Unknown Remaining: Unknown Project: NeuClear Payments Components: Audit Controller Fix Fors: 0.3 Versions: 0.3 Assignee: Pelle Braendgaard Reporter: Pelle Braendgaard Created: Mon, 5 Apr 2004 1:19 PM Updated: Mon, 5 Apr 2004 1:19 PM Description: With new Order Receipt types --------------------------------------------------------------------- JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://jira.neuclear.org//secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira |
|
From: <bug...@ve...> - 2004-04-05 20:19:39
|
Message: A new issue has been created in JIRA. --------------------------------------------------------------------- View the issue: http://jira.neuclear.org//browse/PAY-29 Here is an overview of the issue: --------------------------------------------------------------------- Key: PAY-29 Summary: Implement CompleteExchangeOrder in Audit Controller Type: Improvement Status: Open Priority: Major Original Estimate: Unknown Time Spent: Unknown Remaining: Unknown Project: NeuClear Payments Components: Audit Controller Fix Fors: 0.3 Versions: 0.3 Assignee: Pelle Braendgaard Reporter: Pelle Braendgaard Created: Mon, 5 Apr 2004 1:18 PM Updated: Mon, 5 Apr 2004 1:18 PM Description: With new Order Receipt types --------------------------------------------------------------------- JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://jira.neuclear.org//secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira |
|
From: <bug...@ve...> - 2004-04-05 20:19:39
|
Message: A new issue has been created in JIRA. --------------------------------------------------------------------- View the issue: http://jira.neuclear.org//browse/PAY-27 Here is an overview of the issue: --------------------------------------------------------------------- Key: PAY-27 Summary: Implement CancelExchangeOrder in Currency Controller Type: Improvement Status: Open Priority: Major Original Estimate: Unknown Time Spent: Unknown Remaining: Unknown Project: NeuClear Payments Components: Asset Controller Fix Fors: 0.3 Versions: 0.3 Assignee: Pelle Braendgaard Reporter: Pelle Braendgaard Created: Mon, 5 Apr 2004 1:18 PM Updated: Mon, 5 Apr 2004 1:18 PM Description: With new Order Receipt types --------------------------------------------------------------------- JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://jira.neuclear.org//secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira |
|
From: <bug...@ve...> - 2004-04-05 20:19:37
|
Message: A new issue has been created in JIRA. --------------------------------------------------------------------- View the issue: http://jira.neuclear.org//browse/PAY-26 Here is an overview of the issue: --------------------------------------------------------------------- Key: PAY-26 Summary: Implement ExchangeOrder in Currency Controller Type: Improvement Status: Open Priority: Major Original Estimate: Unknown Time Spent: Unknown Remaining: Unknown Project: NeuClear Payments Components: Asset Controller Fix Fors: 0.3 Versions: 0.3 Assignee: Pelle Braendgaard Reporter: Pelle Braendgaard Created: Mon, 5 Apr 2004 1:17 PM Updated: Mon, 5 Apr 2004 1:17 PM Description: With new Order Receipt types --------------------------------------------------------------------- JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://jira.neuclear.org//secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira |
|
From: <bug...@ve...> - 2004-04-05 20:19:34
|
Message: The following issue has been closed. --------------------------------------------------------------------- View the issue: http://jira.neuclear.org//browse/PAY-25 Here is an overview of the issue: --------------------------------------------------------------------- Key: PAY-25 Summary: Implement TransferOrder Type: Improvement Status: Closed Priority: Major Resolution: FIXED Original Estimate: Unknown Time Spent: Unknown Remaining: Unknown Project: NeuClear Payments Components: Asset Controller Fix Fors: 0.3 Versions: 0.3 Assignee: Pelle Braendgaard Reporter: Pelle Braendgaard Created: Mon, 5 Apr 2004 1:17 PM Updated: Mon, 5 Apr 2004 1:17 PM Description: With new Order Receipt types --------------------------------------------------------------------- JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://jira.neuclear.org//secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira |
|
From: <bug...@ve...> - 2004-04-05 20:17:34
|
Message: A new issue has been created in JIRA. --------------------------------------------------------------------- View the issue: http://jira.neuclear.org//browse/PAY-25 Here is an overview of the issue: --------------------------------------------------------------------- Key: PAY-25 Summary: Implement TransferOrder Type: Improvement Status: Open Priority: Major Original Estimate: Unknown Time Spent: Unknown Remaining: Unknown Project: NeuClear Payments Components: Asset Controller Fix Fors: 0.3 Versions: 0.3 Assignee: Pelle Braendgaard Reporter: Pelle Braendgaard Created: Mon, 5 Apr 2004 1:17 PM Updated: Mon, 5 Apr 2004 1:17 PM Description: With new Order Receipt types --------------------------------------------------------------------- JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://jira.neuclear.org//secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira |
|
From: Pelle B. <pe...@us...> - 2004-04-05 17:20:39
|
Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/controllers/currency In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32493/src/java/org/neuclear/asset/controllers/currency Modified Files: CurrencyController.java Log Message: Transfer now correctly updates the id of the entry afterwards. Index: CurrencyController.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/controllers/currency/CurrencyController.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** CurrencyController.java 5 Apr 2004 16:31:41 -0000 1.20 --- CurrencyController.java 5 Apr 2004 17:07:59 -0000 1.21 *************** *** 41,46 **** try { ! final PostedTransaction posted = ledger.verifiedTransfer("id", req.getSignatory().getName(), req.getRecipient(), req.getAmount().getAmount(), req.getComment()); ! return (TransferReceipt) new TransferReceiptBuilder(req, posted.getTransactionTime()).convert(asset.getName(), signer); } catch (LowlevelLedgerException e) { throw new LowLevelPaymentException(e); --- 41,48 ---- try { ! final PostedTransaction posted = ledger.verifiedTransfer(req.getDigest(), req.getSignatory().getName(), req.getRecipient(), req.getAmount().getAmount(), req.getComment()); ! final TransferReceipt receipt = (TransferReceipt) new TransferReceiptBuilder(req, posted.getTransactionTime()).convert(asset.getName(), signer); ! ledger.setReceiptId(req.getDigest(), receipt.getDigest()); ! return receipt; } catch (LowlevelLedgerException e) { throw new LowLevelPaymentException(e); *************** *** 49,58 **** } catch (NegativeTransferException e) { throw new InvalidTransferException("postive amount"); } } - private String createTransactionId(final TransferOrder req, final PostedTransaction posted) { - return req.getDigest(); - } /** --- 51,59 ---- } catch (NegativeTransferException e) { throw new InvalidTransferException("postive amount"); + } catch (UnknownTransactionException e) { + throw new LowLevelPaymentException(e); } } /** |
|
From: Pelle B. <pe...@us...> - 2004-04-05 16:45:32
|
Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/builders In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26287/src/java/org/neuclear/id/builders Added Files: ServiceBuilder.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. --- NEW FILE: ServiceBuilder.java --- package org.neuclear.id.builders; import org.dom4j.DocumentHelper; import org.dom4j.Element; import org.dom4j.QName; import org.neuclear.id.InvalidNamedObjectException; import org.neuclear.xml.xmlsec.KeyInfo; import java.security.PublicKey; /* $Id: ServiceBuilder.java,v 1.1 2004/04/05 16:32:52 pelle Exp $ $Log: ServiceBuilder.java,v $ Revision 1.1 2004/04/05 16:32:52 pelle Created new ServiceBuilder class for creating services. A service is an identity that has a seperate service URL and Service Public Key. */ /** * User: pelleb * Date: Apr 5, 2004 * Time: 9:28:55 AM */ public class ServiceBuilder extends IdentityBuilder { public ServiceBuilder(final QName tag, final String serviceUrl, PublicKey serviceKey) throws InvalidNamedObjectException { super(tag, null); final Element serviceElem = DocumentHelper.createElement(createNEUIDQName("Service")); serviceElem.add(new KeyInfo(serviceKey).getElement()); final Element urlElem = DocumentHelper.createElement(createNEUIDQName("Url")); urlElem.setText(serviceUrl); serviceElem.add(urlElem); getElement().add(serviceElem); } } |
|
From: Pelle B. <pe...@us...> - 2004-04-05 16:45:32
|
Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26287/src/java/org/neuclear/id Added Files: Service.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. --- NEW FILE: Service.java --- package org.neuclear.id; import org.dom4j.Element; import org.neuclear.id.targets.Targets; import org.neuclear.xml.xmlsec.KeyInfo; import org.neuclear.xml.xmlsec.XMLSecurityException; import java.security.PublicKey; /* $Id: Service.java,v 1.1 2004/04/05 16:32:52 pelle Exp $ $Log: Service.java,v $ Revision 1.1 2004/04/05 16:32:52 pelle Created new ServiceBuilder class for creating services. A service is an identity that has a seperate service URL and Service Public Key. */ /** * User: pelleb * Date: Apr 5, 2004 * Time: 9:24:06 AM */ public class Service extends Identity { public Service(final SignedNamedCore core, String serviceUrl, PublicKey serviceKey, Targets targets) { super(core, null, targets); this.serviceKey = serviceKey; this.serviceUrl = serviceUrl; } public final PublicKey getServiceKey() { return serviceKey; } public final String getServiceUrl() { return serviceUrl; } protected static PublicKey extractPublicKey(Element kiElem) throws XMLSecurityException { final KeyInfo sKi = new KeyInfo(kiElem); return sKi.getPublicKey(); } protected final String serviceUrl; protected final PublicKey serviceKey; } |
|
From: Pelle B. <pe...@us...> - 2004-04-05 16:45:06
|
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 ---- |
|
From: Pelle B. <pe...@us...> - 2004-04-05 16:45:06
|
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); |
|
From: Pelle B. <pe...@us...> - 2004-04-05 16:45:05
|
Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/controllers/currency In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25941/src/java/org/neuclear/asset/controllers/currency Modified Files: CurrencyController.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: CurrencyController.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/controllers/currency/CurrencyController.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** CurrencyController.java 2 Apr 2004 23:04:35 -0000 1.19 --- CurrencyController.java 5 Apr 2004 16:31:41 -0000 1.20 *************** *** 2,6 **** import org.neuclear.asset.*; - import org.neuclear.asset.contracts.Asset; import org.neuclear.asset.orders.TransferOrder; import org.neuclear.asset.orders.TransferReceipt; --- 2,5 ---- *************** *** 10,13 **** --- 9,13 ---- import org.neuclear.exchange.orders.*; import org.neuclear.id.Identity; + import org.neuclear.id.Service; import org.neuclear.id.resolver.Resolver; import org.neuclear.ledger.*; *************** *** 29,37 **** this.ledger = ledger; this.signer = signer; ! asset = (Asset) Resolver.resolveIdentity(assetname); issuerBook = asset.getName(); } ! public boolean canProcess(final Asset asset) { return this.asset.getName().equals(asset.getName()); } --- 29,37 ---- this.ledger = ledger; this.signer = signer; ! asset = (Service) Resolver.resolveIdentity(assetname); issuerBook = asset.getName(); } ! public boolean canProcess(final Service asset) { return this.asset.getName().equals(asset.getName()); } *************** *** 176,180 **** private final Ledger ledger; ! private final Asset asset; private final String issuerBook; private final Signer signer; --- 176,180 ---- private final Ledger ledger; ! private final Service asset; private final String issuerBook; private final Signer signer; |
|
From: Pelle B. <pe...@us...> - 2004-04-05 16:45:05
|
Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/orders/builders In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25941/src/java/org/neuclear/exchange/orders/builders Modified Files: CancelExchangeOrderBuilder.java CancelExchangeReceiptBuilder.java ExchangeCompletedReceiptBuilder.java ExchangeCompletionOrderBuilder.java ExchangeOrderBuilder.java ExchangeOrderReceiptBuilder.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: ExchangeOrderBuilder.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/orders/builders/ExchangeOrderBuilder.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ExchangeOrderBuilder.java 12 Jan 2004 22:39:15 -0000 1.2 --- ExchangeOrderBuilder.java 5 Apr 2004 16:31:43 -0000 1.3 *************** *** 4,18 **** import org.neuclear.asset.InvalidTransferException; import org.neuclear.asset.NegativeTransferException; - import org.neuclear.asset.contracts.Asset; import org.neuclear.asset.orders.TransferGlobals; import org.neuclear.asset.orders.Value; import org.neuclear.commons.NeuClearException; import org.neuclear.commons.Utility; import org.neuclear.exchange.contracts.ExchangeAgent; - import org.neuclear.exchange.orders.ExchangeGlobals; import org.neuclear.exchange.orders.BidItem; ! import org.neuclear.xml.xmlsec.SignedElement; import org.neuclear.id.builders.Builder; /* NeuClear Distributed Transaction Clearing Platform --- 4,20 ---- import org.neuclear.asset.InvalidTransferException; import org.neuclear.asset.NegativeTransferException; import org.neuclear.asset.orders.TransferGlobals; import org.neuclear.asset.orders.Value; import org.neuclear.commons.NeuClearException; import org.neuclear.commons.Utility; + import org.neuclear.commons.time.TimeTools; import org.neuclear.exchange.contracts.ExchangeAgent; import org.neuclear.exchange.orders.BidItem; ! import org.neuclear.exchange.orders.ExchangeOrderGlobals; ! import org.neuclear.id.Service; import org.neuclear.id.builders.Builder; + import java.util.Date; + /* NeuClear Distributed Transaction Clearing Platform *************** *** 35,38 **** --- 37,43 ---- $Id$ $Log$ + Revision 1.3 2004/04/05 16:31:43 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.2 2004/01/12 22:39:15 pelle Completed all the builders and contracts. *************** *** 128,136 **** */ public class ExchangeOrderBuilder extends Builder { ! protected ExchangeOrderBuilder(final Asset asset, final ExchangeAgent agent, final Value amount, final BidItem items[], final String comment) throws InvalidTransferException, NegativeTransferException, NeuClearException { ! super(ExchangeGlobals.createQName(ExchangeGlobals.EXCHANGE_TAGNAME)); if (amount.getAmount() < 0) throw new NegativeTransferException(amount); ! if (asset==null) throw new InvalidTransferException("assetName"); if (agent == null) --- 133,141 ---- */ public class ExchangeOrderBuilder extends Builder { ! protected ExchangeOrderBuilder(final Service asset, final ExchangeAgent agent, final Value amount, final Date expiry, final BidItem items[], final String comment) throws InvalidTransferException, NegativeTransferException, NeuClearException { ! super(ExchangeOrderGlobals.createQName(ExchangeOrderGlobals.EXCHANGE_TAGNAME)); if (amount.getAmount() < 0) throw new NegativeTransferException(amount); ! if (asset == null) throw new InvalidTransferException("assetName"); if (agent == null) *************** *** 138,148 **** final Element element = getElement(); ! element.add(ExchangeGlobals.createElement(ExchangeGlobals.AGENT_TAG, agent.getName())); element.add(TransferGlobals.createElement(TransferGlobals.ASSET_TAG, asset.getName())); element.add(TransferGlobals.createValueTag(amount)); for (int i = 0; i < items.length; i++) { BidItem item = items[i]; ! Element bidelem=element.addElement(ExchangeGlobals.BID_ITEM_TAG); bidelem.addElement(TransferGlobals.createQName(TransferGlobals.ASSET_TAG)).setText(item.getAsset().getName()); bidelem.add(TransferGlobals.createValueTag(item.getAmount())); --- 143,154 ---- final Element element = getElement(); ! element.add(ExchangeOrderGlobals.createElement(ExchangeOrderGlobals.AGENT_TAG, agent.getName())); element.add(TransferGlobals.createElement(TransferGlobals.ASSET_TAG, asset.getName())); element.add(TransferGlobals.createValueTag(amount)); + element.add(ExchangeOrderGlobals.createElement(ExchangeOrderGlobals.EXPIRY_TAG, TimeTools.formatTimeStamp(expiry))); for (int i = 0; i < items.length; i++) { BidItem item = items[i]; ! Element bidelem = element.addElement(ExchangeOrderGlobals.BID_ITEM_TAG); bidelem.addElement(TransferGlobals.createQName(TransferGlobals.ASSET_TAG)).setText(item.getAsset().getName()); bidelem.add(TransferGlobals.createValueTag(item.getAmount())); Index: ExchangeOrderReceiptBuilder.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/orders/builders/ExchangeOrderReceiptBuilder.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ExchangeOrderReceiptBuilder.java 12 Jan 2004 22:39:15 -0000 1.1 --- ExchangeOrderReceiptBuilder.java 5 Apr 2004 16:31:43 -0000 1.2 *************** *** 5,10 **** import org.neuclear.asset.orders.builders.ReceiptBuilder; import org.neuclear.commons.NeuClearException; - import org.neuclear.exchange.orders.ExchangeGlobals; import org.neuclear.exchange.orders.ExchangeOrder; import java.util.Date; --- 5,10 ---- import org.neuclear.asset.orders.builders.ReceiptBuilder; import org.neuclear.commons.NeuClearException; import org.neuclear.exchange.orders.ExchangeOrder; + import org.neuclear.exchange.orders.ExchangeOrderGlobals; import java.util.Date; *************** *** 30,33 **** --- 30,36 ---- $Id$ $Log$ + Revision 1.2 2004/04/05 16:31:43 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.1 2004/01/12 22:39:15 pelle Completed all the builders and contracts. *************** *** 94,99 **** */ public final class ExchangeOrderReceiptBuilder extends ReceiptBuilder { ! public ExchangeOrderReceiptBuilder(final ExchangeOrder order,Date valuetime) throws InvalidTransferException, NegativeTransferException, NeuClearException { ! super(ExchangeGlobals.createQName(ExchangeGlobals.EXCHANGE_RCPT_TAGNAME), order,valuetime); } } --- 97,102 ---- */ public final class ExchangeOrderReceiptBuilder extends ReceiptBuilder { ! public ExchangeOrderReceiptBuilder(final ExchangeOrder order, Date valuetime) throws InvalidTransferException, NegativeTransferException, NeuClearException { ! super(ExchangeOrderGlobals.createQName(ExchangeOrderGlobals.EXCHANGE_RCPT_TAGNAME), order, valuetime); } } Index: CancelExchangeReceiptBuilder.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/orders/builders/CancelExchangeReceiptBuilder.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** CancelExchangeReceiptBuilder.java 13 Jan 2004 15:11:17 -0000 1.4 --- CancelExchangeReceiptBuilder.java 5 Apr 2004 16:31:43 -0000 1.5 *************** *** 3,12 **** import org.neuclear.asset.InvalidTransferException; import org.neuclear.asset.NegativeTransferException; - import org.neuclear.asset.orders.TransferGlobals; import org.neuclear.asset.orders.builders.ReceiptBuilder; import org.neuclear.commons.NeuClearException; import org.neuclear.exchange.orders.CancelExchangeOrder; ! import org.neuclear.exchange.orders.ExchangeGlobals; ! import org.neuclear.id.NSTools; import java.util.Date; --- 3,10 ---- import org.neuclear.asset.InvalidTransferException; import org.neuclear.asset.NegativeTransferException; import org.neuclear.asset.orders.builders.ReceiptBuilder; import org.neuclear.commons.NeuClearException; import org.neuclear.exchange.orders.CancelExchangeOrder; ! import org.neuclear.exchange.orders.ExchangeOrderGlobals; import java.util.Date; *************** *** 19,31 **** * $Id$ * $Log$ * Revision 1.4 2004/01/13 15:11:17 pelle * Now builds. * Now need to do unit tests ! * * Revision 1.3 2004/01/12 22:39:14 pelle * Completed all the builders and contracts. * Added a new abstract Value class to contain either an amount or a list of serial numbers. * Now ready to finish off the AssetControllers. ! * * Revision 1.2 2004/01/10 00:00:46 pelle * Implemented new Schema for Transfer* --- 17,32 ---- * $Id$ * $Log$ + * Revision 1.5 2004/04/05 16:31:43 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.4 2004/01/13 15:11:17 pelle * Now builds. * Now need to do unit tests ! * <p/> * Revision 1.3 2004/01/12 22:39:14 pelle * Completed all the builders and contracts. * Added a new abstract Value class to contain either an amount or a list of serial numbers. * Now ready to finish off the AssetControllers. ! * <p/> * Revision 1.2 2004/01/10 00:00:46 pelle * Implemented new Schema for Transfer* *************** *** 34,48 **** * Changed SignedNamedObject.getDigest() from byte array to String. * The whole malarchy in neuclear-pay does not build yet. The refactoring is a big job, but getting there. ! * * Revision 1.1 2004/01/05 23:47:10 pelle * Create new Document classification "order", which is really just inherint in the new * package layout. * Got rid of much of the inheritance that was lying around and thought a bit further about the format of the exchange orders. ! * * Revision 1.1 2004/01/03 20:36:25 pelle * Renamed HeldTransfer to Exchange * Dropped valuetime from the request objects. * Doesnt yet compile. New commit to follow soon. ! * * Revision 1.3 2003/12/06 00:16:10 pelle * Updated various areas in NSTools. --- 35,49 ---- * Changed SignedNamedObject.getDigest() from byte array to String. * The whole malarchy in neuclear-pay does not build yet. The refactoring is a big job, but getting there. ! * <p/> * Revision 1.1 2004/01/05 23:47:10 pelle * Create new Document classification "order", which is really just inherint in the new * package layout. * Got rid of much of the inheritance that was lying around and thought a bit further about the format of the exchange orders. ! * <p/> * Revision 1.1 2004/01/03 20:36:25 pelle * Renamed HeldTransfer to Exchange * Dropped valuetime from the request objects. * Doesnt yet compile. New commit to follow soon. ! * <p/> * Revision 1.3 2003/12/06 00:16:10 pelle * Updated various areas in NSTools. *************** *** 51,55 **** * In CryptoTools updated getRandom() to finally use a SecureRandom. * Changed CryptoTools.getFormatURLSafe to getBase36 because that is what it really is. ! * * Revision 1.2 2003/11/21 04:43:03 pelle * EncryptedFileStore now works. It uses the PBECipher with DES3 afair. --- 52,56 ---- * In CryptoTools updated getRandom() to finally use a SecureRandom. * Changed CryptoTools.getFormatURLSafe to getBase36 because that is what it really is. ! * <p/> * Revision 1.2 2003/11/21 04:43:03 pelle * EncryptedFileStore now works. It uses the PBECipher with DES3 afair. *************** *** 64,69 **** */ public final class CancelExchangeReceiptBuilder extends ReceiptBuilder { ! public CancelExchangeReceiptBuilder(final CancelExchangeOrder req,Date time) throws InvalidTransferException, NegativeTransferException, NeuClearException { ! super(ExchangeGlobals.createQName(ExchangeGlobals.CANCEL_RCPT_TAGNAME), req,time); } --- 65,70 ---- */ public final class CancelExchangeReceiptBuilder extends ReceiptBuilder { ! public CancelExchangeReceiptBuilder(final CancelExchangeOrder req, Date time) throws InvalidTransferException, NegativeTransferException, NeuClearException { ! super(ExchangeOrderGlobals.createQName(ExchangeOrderGlobals.CANCEL_RCPT_TAGNAME), req, time); } Index: CancelExchangeOrderBuilder.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/orders/builders/CancelExchangeOrderBuilder.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CancelExchangeOrderBuilder.java 12 Jan 2004 22:39:14 -0000 1.1 --- CancelExchangeOrderBuilder.java 5 Apr 2004 16:31:43 -0000 1.2 *************** *** 1,9 **** package org.neuclear.exchange.orders.builders; import org.neuclear.id.builders.EmbeddedSignedObjectBuilder; - import org.neuclear.id.SignedNamedObject; - import org.neuclear.exchange.orders.ExchangeOrder; - import org.neuclear.exchange.orders.ExchangeGlobals; - import org.dom4j.QName; /** --- 1,7 ---- package org.neuclear.exchange.orders.builders; + import org.neuclear.exchange.orders.ExchangeOrderGlobals; + import org.neuclear.exchange.orders.ExchangeOrderReceipt; import org.neuclear.id.builders.EmbeddedSignedObjectBuilder; /** *************** *** 15,20 **** */ public class CancelExchangeOrderBuilder extends EmbeddedSignedObjectBuilder { ! public CancelExchangeOrderBuilder(final ExchangeOrder embedded) { ! super(ExchangeGlobals.createQName(ExchangeGlobals.CANCEL_TAGNAME), embedded); } } --- 13,18 ---- */ public class CancelExchangeOrderBuilder extends EmbeddedSignedObjectBuilder { ! public CancelExchangeOrderBuilder(final ExchangeOrderReceipt embedded) { ! super(ExchangeOrderGlobals.createQName(ExchangeOrderGlobals.CANCEL_TAGNAME), embedded); } } Index: ExchangeCompletionOrderBuilder.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/orders/builders/ExchangeCompletionOrderBuilder.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ExchangeCompletionOrderBuilder.java 12 Jan 2004 22:39:15 -0000 1.1 --- ExchangeCompletionOrderBuilder.java 5 Apr 2004 16:31:43 -0000 1.2 *************** *** 1,15 **** package org.neuclear.exchange.orders.builders; ! import org.neuclear.id.builders.EmbeddedSignedObjectBuilder; ! import org.neuclear.id.SignedNamedObject; ! import org.neuclear.exchange.orders.ExchangeOrder; ! import org.neuclear.exchange.orders.ExchangeGlobals; import org.neuclear.asset.orders.TransferGlobals; import org.neuclear.asset.orders.Value; - import org.neuclear.asset.InvalidTransferException; import org.neuclear.commons.Utility; import org.neuclear.commons.time.TimeTools; ! import org.dom4j.QName; ! import org.dom4j.Element; import java.util.Date; --- 1,13 ---- package org.neuclear.exchange.orders.builders; ! import org.dom4j.Element; ! import org.neuclear.asset.InvalidTransferException; import org.neuclear.asset.orders.TransferGlobals; import org.neuclear.asset.orders.Value; import org.neuclear.commons.Utility; import org.neuclear.commons.time.TimeTools; ! import org.neuclear.exchange.orders.ExchangeOrderGlobals; ! import org.neuclear.exchange.orders.ExchangeOrderReceipt; ! import org.neuclear.id.builders.EmbeddedSignedObjectBuilder; import java.util.Date; *************** *** 22,30 **** * To change this template use Options | File Templates. */ ! public class ExchangeCompletionOrderBuilder extends EmbeddedSignedObjectBuilder{ ! public ExchangeCompletionOrderBuilder(final ExchangeOrder embedded, final Date exchangedate,final Value amount, final String comment) throws InvalidTransferException { ! super(ExchangeGlobals.createQName(ExchangeGlobals.COMPLETE_TAGNAME), embedded); final Element element = getElement(); ! getElement().addElement(ExchangeGlobals.EXCHANGE_TIME_TAGNAME).setText(TimeTools.formatTimeStamp(exchangedate)); element.add(TransferGlobals.createValueTag(amount)); --- 20,30 ---- * To change this template use Options | File Templates. */ ! public class ExchangeCompletionOrderBuilder extends EmbeddedSignedObjectBuilder { ! public ExchangeCompletionOrderBuilder(final ExchangeOrderReceipt embedded, final Date exchangedate, final String recipient, final Value amount, final String comment) throws InvalidTransferException { ! super(ExchangeOrderGlobals.createQName(ExchangeOrderGlobals.COMPLETE_TAGNAME), embedded); final Element element = getElement(); ! element.add(TransferGlobals.createElement(TransferGlobals.RECIPIENT_TAG, recipient)); ! ! getElement().addElement(ExchangeOrderGlobals.createQName(ExchangeOrderGlobals.EXCHANGE_TIME_TAGNAME)).setText(TimeTools.formatTimeStamp(exchangedate)); element.add(TransferGlobals.createValueTag(amount)); Index: ExchangeCompletedReceiptBuilder.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/orders/builders/ExchangeCompletedReceiptBuilder.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** ExchangeCompletedReceiptBuilder.java 12 Jan 2004 22:39:14 -0000 1.1 --- ExchangeCompletedReceiptBuilder.java 5 Apr 2004 16:31:43 -0000 1.2 *************** *** 5,11 **** import org.neuclear.asset.orders.builders.ReceiptBuilder; import org.neuclear.commons.NeuClearException; - import org.neuclear.exchange.orders.ExchangeGlobals; - import org.neuclear.exchange.orders.ExchangeOrder; import org.neuclear.exchange.orders.ExchangeCompletionOrder; import java.util.Date; --- 5,10 ---- import org.neuclear.asset.orders.builders.ReceiptBuilder; import org.neuclear.commons.NeuClearException; import org.neuclear.exchange.orders.ExchangeCompletionOrder; + import org.neuclear.exchange.orders.ExchangeOrderGlobals; import java.util.Date; *************** *** 31,34 **** --- 30,36 ---- $Id$ $Log$ + Revision 1.2 2004/04/05 16:31:43 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.1 2004/01/12 22:39:14 pelle Completed all the builders and contracts. *************** *** 95,100 **** */ public final class ExchangeCompletedReceiptBuilder extends ReceiptBuilder { ! public ExchangeCompletedReceiptBuilder(final ExchangeCompletionOrder order,Date valuetime) throws InvalidTransferException, NegativeTransferException, NeuClearException { ! super(ExchangeGlobals.createQName(ExchangeGlobals.COMPLETE_RCPT_TAGNAME), order,valuetime); } } --- 97,102 ---- */ public final class ExchangeCompletedReceiptBuilder extends ReceiptBuilder { ! public ExchangeCompletedReceiptBuilder(final ExchangeCompletionOrder order, Date valuetime) throws InvalidTransferException, NegativeTransferException, NeuClearException { ! super(ExchangeOrderGlobals.createQName(ExchangeOrderGlobals.COMPLETE_RCPT_TAGNAME), order, valuetime); } } |
|
From: Pelle B. <pe...@us...> - 2004-04-05 16:44:55
|
Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/contracts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25941/src/java/org/neuclear/exchange/contracts Modified Files: ExchangeAgent.java Added Files: ExchangeAgentGlobals.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. --- NEW FILE: ExchangeAgentGlobals.java --- package org.neuclear.exchange.contracts; import org.dom4j.DocumentHelper; import org.dom4j.Element; import org.dom4j.Namespace; import org.dom4j.QName; import org.neuclear.id.verifier.VerifyingReader; /* NeuClear Distributed Transaction Clearing Platform (C) 2003 Pelle Braendgaard This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA $Id: ExchangeAgentGlobals.java,v 1.1 2004/04/05 16:31:42 pelle Exp $ $Log: ExchangeAgentGlobals.java,v $ Revision 1.1 2004/04/05 16:31:42 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:54 pelle Updated Asset and Asset Builder with semi fully featured functionality. It now has Issuer, Service etc. Revision 1.9 2004/01/05 23:47:09 pelle Create new Document classification "order", which is really just inherint in the new package layout. Got rid of much of the inheritance that was lying around and thought a bit further about the format of the exchange orders. Revision 1.8 2004/01/03 20:36:25 pelle Renamed HeldTransfer to Exchange Dropped valuetime from the request objects. Doesnt yet compile. New commit to follow soon. Revision 1.7 2003/12/19 18:02:35 pelle Revamped a lot of exception handling throughout the framework, it has been simplified in most places: - For most cases the main exception to worry about now is InvalidNamedObjectException. - Most lowerlevel exception that cant be handled meaningful are now wrapped in the LowLevelException, a runtime exception. - Source and Store patterns each now have their own exceptions that generalizes the various physical exceptions that can happen in that area. Revision 1.6 2003/11/22 00:22:28 pelle All unit tests in commons, id and xmlsec now work. AssetController now successfully processes payments in the unit test. Payment Web App has working form that creates a TransferOrder presents it to the signer and forwards it to AssetControlServlet. (Which throws an XML Parser Exception) I think the XMLReaderServlet is bust. Revision 1.5 2003/11/21 04:43:04 pelle EncryptedFileStore now works. It uses the PBECipher with DES3 afair. Otherwise You will Finaliate. Anything that can be final has been made final throughout everyting. We've used IDEA's Inspector tool to find all instance of variables that could be final. This should hopefully make everything more stable (and secure). Revision 1.4 2003/11/12 23:47:04 pelle Much work done in creating good test environment. PaymentReceiverTest works, but needs a abit more work in its environment to succeed testing. Revision 1.3 2003/11/10 17:42:07 pelle The AssetController interface has been more or less finalized. CurrencyController fully implemented AssetControlClient implementes a remote client for communicating with AssetControllers Revision 1.2 2003/11/09 03:26:47 pelle More house keeping and shuffling about mainly pay Revision 1.1 2003/11/08 01:39:58 pelle WARNING this rev is majorly unstable and will almost certainly not compile. More major refactoring in neuclear-pay. Got rid of neuclear-ledger like features of pay such as Account and Issuer. Accounts have been replaced by Identity from neuclear-id Issuer is now Asset which is a subclass of Identity AssetController supports more than one Asset. Which is important for most non ecurrency implementations. TransferOrder/Receipt and its Exchange companions are now SignedNamedObjects. Thus to create them you must use their matching TransferOrder/ReceiptBuilder classes. PaymentProcessor has been renamed CurrencyController. I will extract a superclass later to be named AbstractLedgerController which will handle all neuclear-ledger based AssetControllers. Revision 1.3 2003/11/06 23:47:43 pelle Major Refactoring of CurrencyController. Factored out AssetController to be new abstract parent class together with most of its support classes. Created (Half way) AssetControlClient, which can perform transactions on external AssetControllers via NeuClear. Created the first attempt at the ExchangeAgent. This will need use of the AssetControlClient. SOAPTools was changed to return a stream. This is required by the VerifyingReader in NeuClear. Revision 1.2 2003/10/25 00:38:43 pelle Fixed SmtpSender it now sends the messages. Refactored CommandLineSigner. Now it simply signs files read from command line. However new class IdentityCreator is subclassed and creates new Identities. You can subclass CommandLineSigner to create your own variants. Several problems with configuration. Trying to solve at the moment. Updated PicoContainer to beta-2 Revision 1.1 2003/10/03 23:48:29 pelle Did various security related updates in the pay package with regards to immutability of fields etc. AssetControllerReceiver should now be operational. Real testing needs to be done including in particular setting the private key of the Receiver. A new class TransferGlobals contains usefull settings for making life easier in the other contract based classes. TransferContract the signed contract is functional and has a matching TransferRequestBuilder class for programmatically creating TransferRequests for signing. TransferReceiptBuilder has been created for use by Transfer processors. It is used in the AssetControllerReceiver. */ /** * User: pelleb * Date: Oct 3, 2003 * Time: 3:55:06 PM */ public final class ExchangeAgentGlobals { private ExchangeAgentGlobals() { // Instantiation is not allowed } private static Namespace createNameSpace() { return DocumentHelper.createNamespace(EXA_NSPREFIX, EXAGENT_URI); } public static QName createQName(final String name) { return DocumentHelper.createQName(name, NS_EXAGENT); } public static void addAttribute(final Element elem, final String name, final String value) { elem.addAttribute(createQName(name), value); } public static Element createElement(final String name) { return DocumentHelper.createElement(createQName(name)); } public static final String EXCHANGEAGENT_TAGNAME = "ExchangeAgent"; public static final String EXAGENT_URI = "http://neuclear.org/neu/exchangeagent.xsd"; public static final String EXA_NSPREFIX = "exa"; public static final Namespace NS_EXAGENT = createNameSpace(); public static void registerReaders() { VerifyingReader.getInstance().registerReader(ExchangeAgentGlobals.EXCHANGEAGENT_TAGNAME, new ExchangeAgent.Reader()); } static { registerReaders(); } } Index: ExchangeAgent.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/contracts/ExchangeAgent.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ExchangeAgent.java 1 Apr 2004 23:18:33 -0000 1.4 --- ExchangeAgent.java 5 Apr 2004 16:31:42 -0000 1.5 *************** *** 1,7 **** package org.neuclear.exchange.contracts; ! import org.neuclear.id.Identity; ! import org.neuclear.id.SignedNamedCore; import org.neuclear.id.targets.Targets; /* --- 1,11 ---- package org.neuclear.exchange.contracts; ! import org.dom4j.Element; ! import org.neuclear.id.*; import org.neuclear.id.targets.Targets; + import org.neuclear.xml.xmlsec.XMLSecTools; + import org.neuclear.xml.xmlsec.XMLSecurityException; + + import java.security.PublicKey; /* *************** *** 25,28 **** --- 29,35 ---- $Id$ $Log$ + Revision 1.5 2004/04/05 16:31:42 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.4 2004/04/01 23:18:33 pelle Split Identity into Signatory and Identity class. *************** *** 51,57 **** * Time: 11:04:32 PM */ ! public class ExchangeAgent extends Identity { ! public ExchangeAgent(SignedNamedCore core, String signer, Targets targets) { ! super(core, signer, targets); } --- 58,90 ---- * Time: 11:04:32 PM */ ! public class ExchangeAgent extends Service { ! public ExchangeAgent(SignedNamedCore core, String serviceUrl, PublicKey serviceKey, Targets targets) { ! super(core, serviceUrl, serviceKey, targets); ! } ! ! public static final class Reader implements NamedObjectReader { ! /** ! * Read object from Element and fill in its details ! * ! * @param elem ! * @return ! */ ! public final SignedNamedObject read(final SignedNamedCore core, final Element elem) throws InvalidNamedObjectException { ! if (!elem.getNamespace().equals(ExchangeAgentGlobals.NS_EXAGENT)) ! throw new InvalidNamedObjectException(core.getName(), "Not in XML NameSpace: " + ExchangeAgentGlobals.NS_EXAGENT.getURI()); ! 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); ! final String serviceurl = serviceUrlElement.getTextTrim(); ! final Targets targets = Targets.parseList(elem); ! return new ExchangeAgent(core, serviceurl, sPub, targets); ! } catch (XMLSecurityException e) { ! throw new InvalidNamedObjectException("invalid exchange agent xml"); ! } ! } ! ! } |
|
From: Pelle B. <pe...@us...> - 2004-04-05 16:44:55
|
Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/orders In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25941/src/java/org/neuclear/asset/orders Modified Files: AssetTransactionContract.java TransferGlobals.java TransferOrder.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: TransferOrder.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/orders/TransferOrder.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** TransferOrder.java 2 Apr 2004 23:04:36 -0000 1.7 --- TransferOrder.java 5 Apr 2004 16:31:41 -0000 1.8 *************** *** 2,11 **** import org.dom4j.Element; - import org.neuclear.asset.contracts.Asset; import org.neuclear.asset.contracts.AssetGlobals; ! import org.neuclear.id.InvalidNamedObjectException; ! import org.neuclear.id.NamedObjectReader; ! import org.neuclear.id.SignedNamedCore; ! import org.neuclear.id.SignedNamedObject; /** --- 2,7 ---- import org.dom4j.Element; import org.neuclear.asset.contracts.AssetGlobals; ! import org.neuclear.id.*; /** *************** *** 16,20 **** public final class TransferOrder extends AssetTransactionContract { ! private TransferOrder(final SignedNamedCore core, final Asset asset, final String recipient, final Value amount, final String comment) { super(core, asset); this.amount = amount; --- 12,16 ---- public final class TransferOrder extends AssetTransactionContract { ! private TransferOrder(final SignedNamedCore core, final Service asset, final String recipient, final Value amount, final String comment) { super(core, asset); this.amount = amount; Index: TransferGlobals.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/orders/TransferGlobals.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** TransferGlobals.java 2 Apr 2004 23:04:36 -0000 1.9 --- TransferGlobals.java 5 Apr 2004 16:31:41 -0000 1.10 *************** *** 35,38 **** --- 35,41 ---- $Id$ $Log$ + Revision 1.10 2004/04/05 16:31:41 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.9 2004/04/02 23:04:36 pelle Got TransferOrder and Builder working with their test cases. *************** *** 274,278 **** public static final SignedNamedObject parseEmbedded(Element elem, QName name) throws InvalidNamedObjectException { ! Element embedded = elem.element(name); if (embedded == null) throw new InvalidNamedObjectException("Element: " + elem.getName() + " doesnt contain a " + name.getQualifiedName()); --- 277,282 ---- public static final SignedNamedObject parseEmbedded(Element elem, QName name) throws InvalidNamedObjectException { ! final Element embedded = elem.element(name).createCopy(); ! DocumentHelper.createDocument(embedded); if (embedded == null) throw new InvalidNamedObjectException("Element: " + elem.getName() + " doesnt contain a " + name.getQualifiedName()); Index: AssetTransactionContract.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/orders/AssetTransactionContract.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AssetTransactionContract.java 10 Jan 2004 00:00:45 -0000 1.2 --- AssetTransactionContract.java 5 Apr 2004 16:31:41 -0000 1.3 *************** *** 1,5 **** package org.neuclear.asset.orders; ! import org.neuclear.asset.contracts.Asset; import org.neuclear.id.SignedNamedCore; import org.neuclear.id.SignedNamedObject; --- 1,5 ---- package org.neuclear.asset.orders; ! import org.neuclear.id.Service; import org.neuclear.id.SignedNamedCore; import org.neuclear.id.SignedNamedObject; *************** *** 12,15 **** --- 12,18 ---- * $Id$ * $Log$ + * Revision 1.3 2004/04/05 16:31:41 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.2 2004/01/10 00:00:45 pelle * Implemented new Schema for Transfer* *************** *** 18,40 **** * Changed SignedNamedObject.getDigest() from byte array to String. * The whole malarchy in neuclear-pay does not build yet. The refactoring is a big job, but getting there. ! * * Revision 1.1 2004/01/05 23:47:09 pelle * Create new Document classification "order", which is really just inherint in the new * package layout. * Got rid of much of the inheritance that was lying around and thought a bit further about the format of the exchange orders. ! * * Revision 1.11 2004/01/03 20:36:25 pelle * Renamed HeldTransfer to Exchange * Dropped valuetime from the request objects. * Doesnt yet compile. New commit to follow soon. ! * * Revision 1.10 2003/12/19 18:02:35 pelle * Revamped a lot of exception handling throughout the framework, it has been simplified in most places: * - For most cases the main exception to worry about now is InvalidNamedObjectException. * - Most lowerlevel exception that cant be handled meaningful are now wrapped in the LowLevelException, a ! * runtime exception. * - Source and Store patterns each now have their own exceptions that generalizes the various physical ! * exceptions that can happen in that area. ! * * Revision 1.9 2003/12/10 23:52:39 pelle * Did some cleaning up in the builders --- 21,43 ---- * Changed SignedNamedObject.getDigest() from byte array to String. * The whole malarchy in neuclear-pay does not build yet. The refactoring is a big job, but getting there. ! * <p/> * Revision 1.1 2004/01/05 23:47:09 pelle * Create new Document classification "order", which is really just inherint in the new * package layout. * Got rid of much of the inheritance that was lying around and thought a bit further about the format of the exchange orders. ! * <p/> * Revision 1.11 2004/01/03 20:36:25 pelle * Renamed HeldTransfer to Exchange * Dropped valuetime from the request objects. * Doesnt yet compile. New commit to follow soon. ! * <p/> * Revision 1.10 2003/12/19 18:02:35 pelle * Revamped a lot of exception handling throughout the framework, it has been simplified in most places: * - For most cases the main exception to worry about now is InvalidNamedObjectException. * - Most lowerlevel exception that cant be handled meaningful are now wrapped in the LowLevelException, a ! * runtime exception. * - Source and Store patterns each now have their own exceptions that generalizes the various physical ! * exceptions that can happen in that area. ! * <p/> * Revision 1.9 2003/12/10 23:52:39 pelle * Did some cleaning up in the builders *************** *** 43,47 **** * We are close to 0.8 final of ID, 0.11 final of XMLSIG and 0.5 of commons. * Will release shortly. ! * * Revision 1.8 2003/11/28 00:11:50 pelle * Getting the NeuClear web transactions working. --- 46,50 ---- * We are close to 0.8 final of ID, 0.11 final of XMLSIG and 0.5 of commons. * Will release shortly. ! * <p/> * Revision 1.8 2003/11/28 00:11:50 pelle * Getting the NeuClear web transactions working. *************** *** 87,93 **** */ public abstract class AssetTransactionContract extends SignedNamedObject { ! private final Asset asset; ! protected AssetTransactionContract(final SignedNamedCore core, final Asset asset) { super(core); this.asset = asset; --- 90,96 ---- */ public abstract class AssetTransactionContract extends SignedNamedObject { ! private final Service asset; ! protected AssetTransactionContract(final SignedNamedCore core, final Service asset) { super(core); this.asset = asset; *************** *** 95,99 **** ! public final Asset getAsset() { return asset; } --- 98,102 ---- ! public final Service getAsset() { return asset; } |
|
From: Pelle B. <pe...@us...> - 2004-04-05 16:44:55
|
Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25941/src/java/org/neuclear/asset Modified Files: AssetController.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: AssetController.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/AssetController.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** AssetController.java 2 Mar 2004 18:58:35 -0000 1.14 --- AssetController.java 5 Apr 2004 16:31:42 -0000 1.15 *************** *** 1,10 **** package org.neuclear.asset; - import org.neuclear.asset.contracts.Asset; - import org.neuclear.asset.orders.AssetTransactionContract; import org.neuclear.asset.orders.TransferOrder; import org.neuclear.asset.orders.TransferReceipt; import org.neuclear.commons.NeuClearException; import org.neuclear.exchange.orders.*; import org.neuclear.id.SignedNamedObject; import org.neuclear.id.receiver.Receiver; --- 1,9 ---- package org.neuclear.asset; import org.neuclear.asset.orders.TransferOrder; import org.neuclear.asset.orders.TransferReceipt; import org.neuclear.commons.NeuClearException; import org.neuclear.exchange.orders.*; + import org.neuclear.id.Service; import org.neuclear.id.SignedNamedObject; import org.neuclear.id.receiver.Receiver; *************** *** 31,34 **** --- 30,36 ---- $Id$ $Log$ + Revision 1.15 2004/04/05 16:31:42 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.14 2004/03/02 18:58:35 pelle Further cleanups in neuclear-id. Moved everything under id. *************** *** 124,128 **** * @return */ ! public final SignedNamedObject receive(final SignedNamedObject contract) throws UnsupportedTransaction , NeuClearException { try { if (contract instanceof TransferOrder) --- 126,130 ---- * @return */ ! public final SignedNamedObject receive(final SignedNamedObject contract) throws UnsupportedTransaction, NeuClearException { try { if (contract instanceof TransferOrder) *************** *** 151,155 **** * @return true if able to process */ ! public abstract boolean canProcess(Asset asset); --- 153,157 ---- * @return true if able to process */ ! public abstract boolean canProcess(Service asset); |
|
From: Pelle B. <pe...@us...> - 2004-04-05 16:44:55
|
Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/servlet In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25941/src/java/org/neuclear/asset/servlet Modified Files: AssetControllerServlet.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: AssetControllerServlet.java =================================================================== RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/servlet/AssetControllerServlet.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** AssetControllerServlet.java 1 Apr 2004 23:18:33 -0000 1.4 --- AssetControllerServlet.java 5 Apr 2004 16:31:42 -0000 1.5 *************** *** 2,10 **** import org.neuclear.asset.AssetController; - import org.neuclear.asset.contracts.Asset; import org.neuclear.asset.contracts.AssetGlobals; import org.neuclear.asset.controllers.currency.CurrencyController; import org.neuclear.asset.orders.TransferGlobals; import org.neuclear.commons.servlets.ServletTools; import org.neuclear.id.receiver.ReceiverServlet; import org.neuclear.id.resolver.Resolver; --- 2,10 ---- import org.neuclear.asset.AssetController; import org.neuclear.asset.contracts.AssetGlobals; import org.neuclear.asset.controllers.currency.CurrencyController; import org.neuclear.asset.orders.TransferGlobals; import org.neuclear.commons.servlets.ServletTools; + import org.neuclear.id.Service; import org.neuclear.id.receiver.ReceiverServlet; import org.neuclear.id.resolver.Resolver; *************** *** 33,36 **** --- 33,39 ---- $Id$ $Log$ + Revision 1.5 2004/04/05 16:31:42 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.4 2004/04/01 23:18:33 pelle Split Identity into Signatory and Identity class. *************** *** 116,120 **** TransferGlobals.registerReaders(); try { ! asset = (Asset) Resolver.resolveIdentity(getServiceid()); final AssetController receiver = new CurrencyController(null, getSigner(), --- 119,123 ---- TransferGlobals.registerReaders(); try { ! asset = (Service) Resolver.resolveIdentity(getServiceid()); final AssetController receiver = new CurrencyController(null, getSigner(), *************** *** 128,132 **** } ! public final Asset getAsset() { return asset; } --- 131,135 ---- } ! public final Service getAsset() { return asset; } *************** *** 137,141 **** } ! private Asset asset; private String datasource; } --- 140,144 ---- } ! private Service asset; private String datasource; } |
570 messages has been excluded from this view by a project administrator.
