neuclear-cvs Mailing List for NeuClear

neuclear-cvs — NeuClear CVS changes

You can subscribe to this list here.

2004	_Jan	_Feb	_Mar	_Apr (276)	_May (291)	_Jun (130)	_Jul (46)	_Aug (26)	_Sep (75)	_Oct	_Nov (1)	_Dec

Flat | Threaded

1 2 3 .. 34 > >> (Page 1 of 34)

[Neuclear-cvs] neuclear-id/src/java/org/neuclear/id/web - New directory

From: Pelle B. <pe...@us...> - 2004-11-11 15:34:05

Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/web
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3424/src/java/org/neuclear/id/web

Log Message:
Directory /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/web added to the repository

[Neuclear-cvs] neuclear-pay/src/java/org/neuclear/asset/controllers/serviceunits - New directory

From: Pelle B. <pe...@us...> - 2004-09-13 16:05:56

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

Log Message:
Directory /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/controllers/serviceunits added to the repository

[Neuclear-cvs] neuclear-pay/src/test/org/neuclear/exchange/controllers/receivers AbstractExchangeReceiverTest.java,NONE,1.1 CancelExchangeOrderReceiverTest.java,NONE,1.1 CancelExchangeOrderReceiverWithFeesTest.java,NONE,1.1 CancelExchangeReceiptReceiverTest.java,NONE,1.1 CancelExchangeReceiptReceiverWithFeesTest.java,NONE,1.1 ExchangeCompletedReceiptReceiverTest.java,NONE,1.1 ExchangeCompletedReceiptReceiverWithFeesTest.java,NONE,1.1 ExchangeCompletionOrderReceiverTest.java,NONE,1.1 ExchangeCompletionOrderReceiverWithFeesTest.java,NONE,1.1 ExchangeOrderReceiptReceiverTest.java,NONE,1.1 ExchangeOrderReceiptReceiverWithFeesTest.java,NONE,1.1 ExchangeOrderReceiverTest.java,NONE,1.1 ExchangeOrderReceiverWithFeesTest.java,NONE,1.1

From: Pelle B. <pe...@us...> - 2004-09-11 04:43:19

Update of /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/exchange/controllers/receivers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20812/src/test/org/neuclear/exchange/controllers/receivers

Added Files:
	AbstractExchangeReceiverTest.java 
	CancelExchangeOrderReceiverTest.java 
	CancelExchangeOrderReceiverWithFeesTest.java 
	CancelExchangeReceiptReceiverTest.java 
	CancelExchangeReceiptReceiverWithFeesTest.java 
	ExchangeCompletedReceiptReceiverTest.java 
	ExchangeCompletedReceiptReceiverWithFeesTest.java 
	ExchangeCompletionOrderReceiverTest.java 
	ExchangeCompletionOrderReceiverWithFeesTest.java 
	ExchangeOrderReceiptReceiverTest.java 
	ExchangeOrderReceiptReceiverWithFeesTest.java 
	ExchangeOrderReceiverTest.java 
	ExchangeOrderReceiverWithFeesTest.java 
Log Message:
Refactored all the Exchange related receivers into a new package under org.neuclear.exchange.
Refactored the way the Receivers handle embedded objects. Now they pass them on to the parent receiver for processing before they do their own thing.

--- NEW FILE: ExchangeOrderReceiptReceiverTest.java ---
package org.neuclear.exchange.controllers.receivers;

import org.neuclear.asset.InvalidTransferException;
import org.neuclear.asset.contracts.AssetGlobals;
import org.neuclear.asset.orders.Amount;
import org.neuclear.commons.NeuClearException;
import org.neuclear.exchange.contracts.ExchangeAgentGlobals;
import org.neuclear.exchange.orders.BidItem;
import org.neuclear.exchange.orders.ExchangeOrderGlobals;
import org.neuclear.exchange.orders.ExchangeOrderReceipt;
import org.neuclear.exchange.orders.builders.ExchangeOrderBuilder;
import org.neuclear.id.Signatory;
import org.neuclear.ledger.InvalidTransactionException;
import org.neuclear.ledger.LedgerController;
import org.neuclear.ledger.LowlevelLedgerException;
import org.neuclear.ledger.UnknownBookException;
import org.neuclear.ledger.simple.SimpleLedgerController;

import java.security.GeneralSecurityException;
import java.util.Date;

/*
$Id: ExchangeOrderReceiptReceiverTest.java,v 1.1 2004/09/10 19:48:02 pelle Exp $
$Log: ExchangeOrderReceiptReceiverTest.java,v $
Revision 1.1  2004/09/10 19:48:02  pelle
Refactored all the Exchange related receivers into a new package under org.neuclear.exchange.
Refactored the way the Receivers handle embedded objects. Now they pass them on to the parent receiver for processing before they do their own thing.

Revision 1.1  2004/08/18 09:42:56  pelle
Many fixes to the various Signing and SigningRequest Servlets etc.

Revision 1.1  2004/07/22 21:48:46  pelle
Further receivers and unit tests for for Exchanges etc.
I've also changed the internal asset to ledger id from being the pk of the contract signer, to being the pk of the service key.

Revision 1.1  2004/07/21 23:11:22  pelle
Added single function Receivers and a DelegatingAssetController. These will eventually replace the CurrencyController and Auditor.

*/

/**
 * User: pelleb
 * Date: Jul 21, 2004
 * Time: 1:38:45 PM
 */
public class ExchangeOrderReceiptReceiverTest extends AbstractExchangeReceiverTest {

    public ExchangeOrderReceiptReceiverTest(String string) throws NeuClearException, GeneralSecurityException {
        super(string);
        ExchangeOrderGlobals.registerReaders();
        ExchangeAgentGlobals.registerReaders();
        AssetGlobals.registerReaders();
    }

    protected void setUp() throws Exception {
        generatePrimaryTestAsset();
        ledger = new SimpleLedgerController("test");
        receiver = createReceiver();
        agent = createTestExchangeAgent();
        shoes = createShoeAsset();
    }


    public void testExchangeOrderReceipt() throws NeuClearException, InvalidTransferException, LowlevelLedgerException, UnknownBookException, InvalidTransactionException {
        Signatory recipient = new Signatory(signer.getPublicKey("alice"));
        Signatory sender = new Signatory(signer.getPublicKey("bob"));
        final double senderstart = ledger.getBalance(asset.getServiceId(), sender.getName());
        ledger.transfer(asset.getServiceId(), "bluesky", sender.getName(), 10 - senderstart, "bla");
        assertEquals(10, ledger.getBalance(asset.getServiceId(), sender.getName()), 0);

        ExchangeOrderReceipt receipt = (ExchangeOrderReceipt) receiver.receive(new ExchangeOrderBuilder(asset, agent, new Amount(10), new Date(System.currentTimeMillis() + 10000), new BidItem[]{new BidItem(shoes, new Amount(10))}, "test").convert("bob", signer));
        receiver.receive(receipt);
        assertEquals(10, ledger.getBalance(asset.getServiceId(), sender.getName()), 0);
        assertEquals(0, ledger.getAvailableBalance(asset.getServiceId(), sender.getName()), 0);
    }

    public void testExchangeOrderReceiptAudit() throws NeuClearException, InvalidTransferException, LowlevelLedgerException, UnknownBookException, InvalidTransactionException {
        LedgerController ac = new SimpleLedgerController("asset");
        Signatory recipient = new Signatory(signer.getPublicKey("alice"));
        Signatory sender = new Signatory(signer.getPublicKey("bob"));
        final double senderstart = ledger.getBalance(asset.getServiceId(), sender.getName());
        ledger.transfer(asset.getServiceId(), "bluesky", sender.getName(), 10 - senderstart, "bla");
        assertEquals(10, ledger.getBalance(asset.getServiceId(), sender.getName()), 0);
        ac.transfer(asset.getServiceId(), "bluesky", sender.getName(), 10 - senderstart, "bla");
        assertEquals(10, ac.getBalance(asset.getServiceId(), sender.getName()), 0);

        ExchangeOrderReceipt receipt = (ExchangeOrderReceipt) new ExchangeOrderReceiver(receiver, signer, ac).receive(new ExchangeOrderBuilder(asset, agent, new Amount(10), new Date(System.currentTimeMillis() + 10000), new BidItem[]{new BidItem(shoes, new Amount(10))}, "test").convert("bob", signer));
        receiver.receive(receipt);
        assertEquals(10, ledger.getBalance(asset.getServiceId(), sender.getName()), 0);
        assertEquals(0, ledger.getAvailableBalance(asset.getServiceId(), sender.getName()), 0);
    }

}

--- NEW FILE: ExchangeCompletedReceiptReceiverWithFeesTest.java ---
package org.neuclear.exchange.controllers.receivers;

/*
 *  The NeuClear Project and it's libraries are
 *  (c) 2002-2004 Antilles Software Ventures SA
 *  For more information see: http://neuclear.org
 *
 *  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
 */

import org.neuclear.asset.InvalidTransferException;
import org.neuclear.asset.contracts.AssetGlobals;
import org.neuclear.asset.orders.Amount;
import org.neuclear.commons.NeuClearException;
import org.neuclear.exchange.contracts.ExchangeAgentGlobals;
import org.neuclear.exchange.orders.BidItem;
import org.neuclear.exchange.orders.ExchangeCompletedReceipt;
import org.neuclear.exchange.orders.ExchangeOrderGlobals;
import org.neuclear.exchange.orders.ExchangeOrderReceipt;
import org.neuclear.exchange.orders.builders.ExchangeCompletionOrderBuilder;
import org.neuclear.exchange.orders.builders.ExchangeOrderBuilder;
import org.neuclear.id.Signatory;
import org.neuclear.id.SignedNamedObject;
import org.neuclear.ledger.InvalidTransactionException;
import org.neuclear.ledger.LedgerController;
import org.neuclear.ledger.LowlevelLedgerException;
import org.neuclear.ledger.UnknownBookException;
import org.neuclear.ledger.simple.SimpleLedgerController;

import java.security.GeneralSecurityException;
import java.util.Date;

/**
 * User: pelleb
 * Date: Jul 21, 2004
 * Time: 1:38:45 PM
 */
public class ExchangeCompletedReceiptReceiverWithFeesTest extends AbstractExchangeReceiverTest {

    public ExchangeCompletedReceiptReceiverWithFeesTest(String string) throws NeuClearException, GeneralSecurityException {
        super(string);
        ExchangeOrderGlobals.registerReaders();
        ExchangeAgentGlobals.registerReaders();
        AssetGlobals.registerReaders();
    }

    protected void setUp() throws Exception {
        generatePrimaryTestAssetWithFees();
        ledger = new SimpleLedgerController("test");
        receiver = createReceiver();
        agent = createTestExchangeAgent();
        shoes = createShoeAsset();
    }

    public void testExchangeCompletionOrder() throws NeuClearException, InvalidTransferException, LowlevelLedgerException, UnknownBookException, InvalidTransactionException {
        LedgerController ac = new SimpleLedgerController("asset");
        Signatory sender = new Signatory(signer.getPublicKey("bob"));
        Signatory recipient = new Signatory(signer.getPublicKey("alice"));
        final double amount = 10;
        final double fee = asset.getFeeStructure().calculateFee(amount);
        final double senderstart = ledger.getBalance(asset.getServiceId(), sender.getName());
        ledger.transfer(asset.getServiceId(), "bluesky", sender.getName(), amount - senderstart, "bla");
        assertEquals(amount, ledger.getBalance(asset.getServiceId(), sender.getName()), 0);
        assertEquals(amount, ledger.getAvailableBalance(asset.getServiceId(), sender.getName()), 0);
        ac.transfer(asset.getServiceId(), "bluesky", sender.getName(), amount - senderstart, "bla");
        assertEquals(amount, ac.getBalance(asset.getServiceId(), sender.getName()), 0);
        assertEquals(amount, ac.getAvailableBalance(asset.getServiceId(), sender.getName()), 0);

        SignedNamedObject order = new ExchangeOrderBuilder(asset, agent, new Amount(amount), new Date(System.currentTimeMillis() + 50000), new BidItem[]{new BidItem(shoes, new Amount(amount))}, "test").convert("bob", signer);
        ExchangeOrderReceipt receipt = (ExchangeOrderReceipt) receiver.receive(order);
        assertEquals(amount - fee, ac.getBalance(asset.getServiceId(), sender.getName()), 0);
        assertEquals(0, ac.getAvailableBalance(asset.getServiceId(), sender.getName()), 0);

        assertEquals(0, ac.getBalance(asset.getServiceId(), recipient.getName()), 0);
        assertEquals(0, ac.getAvailableBalance(asset.getServiceId(), recipient.getName()), 0);

        ExchangeCompletedReceipt completed = (ExchangeCompletedReceipt) receiver.receive(new ExchangeCompletionOrderBuilder(receipt, new Date(), recipient.getName(), new Amount(amount), "did it").convert("exchange", signer));
        assertNotNull(completed);
        receiver.receive(completed);
        assertEquals(0, ledger.getBalance(asset.getServiceId(), sender.getName()), 0);
        assertEquals(0, ledger.getAvailableBalance(asset.getServiceId(), sender.getName()), 0);
        assertEquals(amount - fee, ledger.getBalance(asset.getServiceId(), recipient.getName()), 0);
        assertEquals(amount - fee, ledger.getAvailableBalance(asset.getServiceId(), recipient.getName()), 0);
        assertEquals(0, ac.getBalance(asset.getServiceId(), sender.getName()), 0);
        assertEquals(0, ac.getAvailableBalance(asset.getServiceId(), sender.getName()), 0);
        assertEquals(amount - fee, ac.getBalance(asset.getServiceId(), recipient.getName()), 0);
        assertEquals(amount - fee, ac.getAvailableBalance(asset.getServiceId(), recipient.getName()), 0);

    }

}

--- NEW FILE: CancelExchangeOrderReceiverWithFeesTest.java ---
package org.neuclear.exchange.controllers.receivers;

/*
 *  The NeuClear Project and it's libraries are
 *  (c) 2002-2004 Antilles Software Ventures SA
 *  For more information see: http://neuclear.org
 *
 *  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
 */

import org.neuclear.asset.InvalidTransferException;
import org.neuclear.asset.contracts.AssetGlobals;
import org.neuclear.asset.orders.Amount;
import org.neuclear.commons.NeuClearException;
import org.neuclear.exchange.contracts.ExchangeAgentGlobals;
import org.neuclear.exchange.orders.BidItem;
import org.neuclear.exchange.orders.CancelExchangeReceipt;
import org.neuclear.exchange.orders.ExchangeOrderGlobals;
import org.neuclear.exchange.orders.ExchangeOrderReceipt;
import org.neuclear.exchange.orders.builders.CancelExchangeOrderBuilder;
import org.neuclear.exchange.orders.builders.ExchangeOrderBuilder;
import org.neuclear.id.Signatory;
import org.neuclear.id.SignedNamedObject;
import org.neuclear.ledger.InvalidTransactionException;
import org.neuclear.ledger.LowlevelLedgerException;
import org.neuclear.ledger.UnknownBookException;
import org.neuclear.ledger.simple.SimpleLedgerController;

import java.security.GeneralSecurityException;
import java.util.Date;

/**
 * User: pelleb
 * Date: Jul 21, 2004
 * Time: 1:38:45 PM
 */
public class CancelExchangeOrderReceiverWithFeesTest extends AbstractExchangeReceiverTest {

    public CancelExchangeOrderReceiverWithFeesTest(String string) throws NeuClearException, GeneralSecurityException {
        super(string);
        ExchangeOrderGlobals.registerReaders();
        ExchangeAgentGlobals.registerReaders();
        AssetGlobals.registerReaders();
    }

    protected void setUp() throws Exception {
        generatePrimaryTestAssetWithFees();
        ledger = new SimpleLedgerController("test");
        receiver = createReceiver();
        agent = createTestExchangeAgent();
        shoes = createShoeAsset();
    }


    public void testCancelExchangeOrder() throws NeuClearException, InvalidTransferException, LowlevelLedgerException, UnknownBookException, InvalidTransactionException {
        Signatory sender = new Signatory(signer.getPublicKey("bob"));
        Signatory recipient = new Signatory(signer.getPublicKey("alice"));
        final double amount = 10;
        final double fee = asset.getFeeStructure().calculateFee(amount);
        final double senderstart = ledger.getBalance(asset.getServiceId(), sender.getName());
        ledger.transfer(asset.getServiceId(), "bluesky", sender.getName(), amount - senderstart, "bla");
        assertEquals(amount, ledger.getBalance(asset.getServiceId(), sender.getName()), 0);
        assertEquals(amount, ledger.getAvailableBalance(asset.getServiceId(), sender.getName()), 0);

        SignedNamedObject order = new ExchangeOrderBuilder(asset, agent, new Amount(amount), new Date(System.currentTimeMillis() + 50000), new BidItem[]{new BidItem(shoes, new Amount(amount))}, "test").convert("bob", signer);
        ExchangeOrderReceipt receipt = (ExchangeOrderReceipt) receiver.receive(order);
        assertEquals(amount - fee, ledger.getBalance(asset.getServiceId(), sender.getName()), 0);
        assertEquals(0, ledger.getAvailableBalance(asset.getServiceId(), sender.getName()), 0);

        assertEquals(0, ledger.getBalance(asset.getServiceId(), recipient.getName()), 0);
        assertEquals(0, ledger.getAvailableBalance(asset.getServiceId(), recipient.getName()), 0);

        CancelExchangeReceipt cancelled = (CancelExchangeReceipt) receiver.receive(new CancelExchangeOrderBuilder(receipt).convert("exchange", signer));
        assertNotNull(cancelled);
        assertEquals(amount - fee, ledger.getBalance(asset.getServiceId(), sender.getName()), 0);
        assertEquals(amount - fee, ledger.getAvailableBalance(asset.getServiceId(), sender.getName()), 0);
        assertEquals(0, ledger.getBalance(asset.getServiceId(), recipient.getName()), 0);
        assertEquals(0, ledger.getAvailableBalance(asset.getServiceId(), recipient.getName()), 0);

    }

}

--- NEW FILE: CancelExchangeReceiptReceiverTest.java ---
package org.neuclear.exchange.controllers.receivers;

import org.neuclear.asset.InvalidTransferException;
import org.neuclear.asset.contracts.AssetGlobals;
import org.neuclear.asset.orders.Amount;
import org.neuclear.commons.NeuClearException;
import org.neuclear.exchange.contracts.ExchangeAgentGlobals;
import org.neuclear.exchange.orders.BidItem;
import org.neuclear.exchange.orders.CancelExchangeOrder;
import org.neuclear.exchange.orders.ExchangeOrderGlobals;
import org.neuclear.exchange.orders.ExchangeOrderReceipt;
import org.neuclear.exchange.orders.builders.CancelExchangeOrderBuilder;
import org.neuclear.exchange.orders.builders.CancelExchangeReceiptBuilder;
import org.neuclear.exchange.orders.builders.ExchangeOrderBuilder;
import org.neuclear.id.Signatory;
import org.neuclear.id.SignedNamedObject;
import org.neuclear.ledger.InvalidTransactionException;
import org.neuclear.ledger.LowlevelLedgerException;
import org.neuclear.ledger.UnknownBookException;
import org.neuclear.ledger.simple.SimpleLedgerController;

import java.security.GeneralSecurityException;
import java.util.Date;

/*
$Id: CancelExchangeReceiptReceiverTest.java,v 1.1 2004/09/10 19:48:02 pelle Exp $
$Log: CancelExchangeReceiptReceiverTest.java,v $
Revision 1.1  2004/09/10 19:48:02  pelle
Refactored all the Exchange related receivers into a new package under org.neuclear.exchange.
Refactored the way the Receivers handle embedded objects. Now they pass them on to the parent receiver for processing before they do their own thing.

Revision 1.2  2004/09/08 16:50:49  pelle
All unit tests now pass

Revision 1.1  2004/08/18 09:42:56  pelle
Many fixes to the various Signing and SigningRequest Servlets etc.

Revision 1.1  2004/07/22 21:48:46  pelle
Further receivers and unit tests for for Exchanges etc.
I've also changed the internal asset to ledger id from being the pk of the contract signer, to being the pk of the service key.

Revision 1.1  2004/07/21 23:11:22  pelle
Added single function Receivers and a DelegatingAssetController. These will eventually replace the CurrencyController and Auditor.

*/

/**
 * User: pelleb
 * Date: Jul 21, 2004
 * Time: 1:38:45 PM
 */
public class CancelExchangeReceiptReceiverTest extends AbstractExchangeReceiverTest {

    public CancelExchangeReceiptReceiverTest(String string) throws NeuClearException, GeneralSecurityException {
        super(string);
        ExchangeOrderGlobals.registerReaders();
        ExchangeAgentGlobals.registerReaders();
        AssetGlobals.registerReaders();
    }

    protected void setUp() throws Exception {
        generatePrimaryTestAsset();
        ledger = new SimpleLedgerController("test");
        receiver = createReceiver();
        agent = createTestExchangeAgent();
        shoes = createShoeAsset();
    }


    public void testCancelExchangeReceipt() throws NeuClearException, InvalidTransferException, LowlevelLedgerException, UnknownBookException, InvalidTransactionException {
        Signatory sender = new Signatory(signer.getPublicKey("bob"));
        Signatory recipient = new Signatory(signer.getPublicKey("alice"));

        final double senderstart = ledger.getBalance(asset.getServiceId(), sender.getName());
        ledger.transfer(asset.getServiceId(), "bluesky", sender.getName(), 10 - senderstart, "bla");
        assertEquals(10, ledger.getBalance(asset.getServiceId(), sender.getName()), 0);
        assertEquals(10, ledger.getAvailableBalance(asset.getServiceId(), sender.getName()), 0);

        SignedNamedObject order = new ExchangeOrderBuilder(asset, agent, new Amount(10), new Date(System.currentTimeMillis() + 50000), new BidItem[]{new BidItem(shoes, new Amount(10))}, "test").convert("bob", signer);
        ExchangeOrderReceipt receipt = (ExchangeOrderReceipt) receiver.receive(order);
        assertEquals(10, ledger.getBalance(asset.getServiceId(), sender.getName()), 0);
        assertEquals(0, ledger.getAvailableBalance(asset.getServiceId(), sender.getName()), 0);

        assertEquals(0, ledger.getBalance(asset.getServiceId(), recipient.getName()), 0);
        assertEquals(0, ledger.getAvailableBalance(asset.getServiceId(), recipient.getName()), 0);

        CancelExchangeOrder cancelOrder = (CancelExchangeOrder) new CancelExchangeOrderBuilder(receipt).convert("exchange", signer);
        receiver.receive(new CancelExchangeReceiptBuilder(cancelOrder, new Date()).convert(assetalias, signer));
        assertEquals(10, ledger.getBalance(asset.getServiceId(), sender.getName()), 0);
        assertEquals(10, ledger.getAvailableBalance(asset.getServiceId(), sender.getName()), 0);
        assertEquals(0, ledger.getBalance(asset.getServiceId(), recipient.getName()), 0);
        assertEquals(0, ledger.getAvailableBalance(asset.getServiceId(), recipient.getName()), 0);

    }

}

--- NEW FILE: CancelExchangeOrderReceiverTest.java ---
package org.neuclear.exchange.controllers.receivers;

import org.neuclear.asset.InvalidTransferException;
import org.neuclear.asset.contracts.AssetGlobals;
import org.neuclear.asset.orders.Amount;
import org.neuclear.commons.NeuClearException;
import org.neuclear.exchange.contracts.ExchangeAgentGlobals;
import org.neuclear.exchange.orders.BidItem;
import org.neuclear.exchange.orders.CancelExchangeReceipt;
import org.neuclear.exchange.orders.ExchangeOrderGlobals;
import org.neuclear.exchange.orders.ExchangeOrderReceipt;
import org.neuclear.exchange.orders.builders.CancelExchangeOrderBuilder;
import org.neuclear.exchange.orders.builders.ExchangeOrderBuilder;
import org.neuclear.id.Signatory;
import org.neuclear.id.SignedNamedObject;
import org.neuclear.ledger.InvalidTransactionException;
import org.neuclear.ledger.LowlevelLedgerException;
import org.neuclear.ledger.UnknownBookException;
import org.neuclear.ledger.simple.SimpleLedgerController;

import java.security.GeneralSecurityException;
import java.util.Date;

/*
$Id: CancelExchangeOrderReceiverTest.java,v 1.1 2004/09/10 19:48:02 pelle Exp $
$Log: CancelExchangeOrderReceiverTest.java,v $
Revision 1.1  2004/09/10 19:48:02  pelle
Refactored all the Exchange related receivers into a new package under org.neuclear.exchange.
Refactored the way the Receivers handle embedded objects. Now they pass them on to the parent receiver for processing before they do their own thing.

Revision 1.3  2004/09/08 16:50:49  pelle
All unit tests now pass

Revision 1.2  2004/08/18 09:42:56  pelle
Many fixes to the various Signing and SigningRequest Servlets etc.

Revision 1.1  2004/07/22 21:48:46  pelle
Further receivers and unit tests for for Exchanges etc.
I've also changed the internal asset to ledger id from being the pk of the contract signer, to being the pk of the service key.

Revision 1.1  2004/07/21 23:11:22  pelle
Added single function Receivers and a DelegatingAssetController. These will eventually replace the CurrencyController and Auditor.

*/

/**
 * User: pelleb
 * Date: Jul 21, 2004
 * Time: 1:38:45 PM
 */
public class CancelExchangeOrderReceiverTest extends AbstractExchangeReceiverTest {

    public CancelExchangeOrderReceiverTest(String string) throws NeuClearException, GeneralSecurityException {
        super(string);
        ExchangeOrderGlobals.registerReaders();
        ExchangeAgentGlobals.registerReaders();
        AssetGlobals.registerReaders();
    }

    protected void setUp() throws Exception {
        generatePrimaryTestAsset();
        ledger = new SimpleLedgerController("test");
        receiver = createReceiver();
        agent = createTestExchangeAgent();
        shoes = createShoeAsset();
    }


    public void testCancelExchangeOrder() throws NeuClearException, InvalidTransferException, LowlevelLedgerException, UnknownBookException, InvalidTransactionException {
        Signatory sender = new Signatory(signer.getPublicKey("bob"));
        Signatory recipient = new Signatory(signer.getPublicKey("alice"));

        final double senderstart = ledger.getBalance(asset.getServiceId(), sender.getName());
        ledger.transfer(asset.getServiceId(), "bluesky", sender.getName(), 10 - senderstart, "bla");
        assertEquals(10, ledger.getBalance(asset.getServiceId(), sender.getName()), 0);
        assertEquals(10, ledger.getAvailableBalance(asset.getServiceId(), sender.getName()), 0);

        SignedNamedObject order = new ExchangeOrderBuilder(asset, agent, new Amount(10), new Date(System.currentTimeMillis() + 50000), new BidItem[]{new BidItem(shoes, new Amount(10))}, "test").convert("bob", signer);
        ExchangeOrderReceipt receipt = (ExchangeOrderReceipt) receiver.receive(order);
        assertEquals(10, ledger.getBalance(asset.getServiceId(), sender.getName()), 0);
        assertEquals(0, ledger.getAvailableBalance(asset.getServiceId(), sender.getName()), 0);

        assertEquals(0, ledger.getBalance(asset.getServiceId(), recipient.getName()), 0);
        assertEquals(0, ledger.getAvailableBalance(asset.getServiceId(), recipient.getName()), 0);

        CancelExchangeReceipt cancelled = (CancelExchangeReceipt) receiver.receive(new CancelExchangeOrderBuilder(receipt).convert("exchange", signer));
        assertNotNull(cancelled);
        assertEquals(10, ledger.getBalance(asset.getServiceId(), sender.getName()), 0);
        assertEquals(10, ledger.getAvailableBalance(asset.getServiceId(), sender.getName()), 0);
        assertEquals(0, ledger.getBalance(asset.getServiceId(), recipient.getName()), 0);
        assertEquals(0, ledger.getAvailableBalance(asset.getServiceId(), recipient.getName()), 0);

    }

}

--- NEW FILE: CancelExchangeReceiptReceiverWithFeesTest.java ---
package org.neuclear.exchange.controllers.receivers;

/*
 *  The NeuClear Project and it's libraries are
 *  (c) 2002-2004 Antilles Software Ventures SA
 *  For more information see: http://neuclear.org
 *
 *  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
 */

import org.neuclear.asset.InvalidTransferException;
import org.neuclear.asset.contracts.AssetGlobals;
import org.neuclear.asset.orders.Amount;
import org.neuclear.commons.NeuClearException;
import org.neuclear.exchange.contracts.ExchangeAgentGlobals;
import org.neuclear.exchange.orders.BidItem;
import org.neuclear.exchange.orders.CancelExchangeOrder;
import org.neuclear.exchange.orders.ExchangeOrderGlobals;
import org.neuclear.exchange.orders.ExchangeOrderReceipt;
import org.neuclear.exchange.orders.builders.CancelExchangeOrderBuilder;
import org.neuclear.exchange.orders.builders.CancelExchangeReceiptBuilder;
import org.neuclear.exchange.orders.builders.ExchangeOrderBuilder;
import org.neuclear.id.Signatory;
import org.neuclear.id.SignedNamedObject;
import org.neuclear.ledger.InvalidTransactionException;
import org.neuclear.ledger.LowlevelLedgerException;
import org.neuclear.ledger.UnknownBookException;
import org.neuclear.ledger.simple.SimpleLedgerController;

import java.security.GeneralSecurityException;
import java.util.Date;

/**
 * User: pelleb
 * Date: Jul 21, 2004
 * Time: 1:38:45 PM
 */
public class CancelExchangeReceiptReceiverWithFeesTest extends AbstractExchangeReceiverTest {

    public CancelExchangeReceiptReceiverWithFeesTest(String string) throws NeuClearException, GeneralSecurityException {
        super(string);
        ExchangeOrderGlobals.registerReaders();
        ExchangeAgentGlobals.registerReaders();
        AssetGlobals.registerReaders();
    }

    protected void setUp() throws Exception {
        generatePrimaryTestAssetWithFees();
        ledger = new SimpleLedgerController("test");
        receiver = createReceiver();
        agent = createTestExchangeAgent();
        shoes = createShoeAsset();
    }


    public void testCancelExchangeReceipt() throws NeuClearException, InvalidTransferException, LowlevelLedgerException, UnknownBookException, InvalidTransactionException {
        Signatory sender = new Signatory(signer.getPublicKey("bob"));
        Signatory recipient = new Signatory(signer.getPublicKey("alice"));
        final double amount = 10;
        final double fee = asset.getFeeStructure().calculateFee(amount);
        final double senderstart = ledger.getBalance(asset.getServiceId(), sender.getName());
        ledger.transfer(asset.getServiceId(), "bluesky", sender.getName(), amount - senderstart, "bla");
        assertEquals(amount, ledger.getBalance(asset.getServiceId(), sender.getName()), 0);
        assertEquals(amount, ledger.getAvailableBalance(asset.getServiceId(), sender.getName()), 0);

        SignedNamedObject order = new ExchangeOrderBuilder(asset, agent, new Amount(amount), new Date(System.currentTimeMillis() + 50000), new BidItem[]{new BidItem(shoes, new Amount(amount))}, "test").convert("bob", signer);
        ExchangeOrderReceipt receipt = (ExchangeOrderReceipt) receiver.receive(order);
        assertEquals(amount - fee, ledger.getBalance(asset.getServiceId(), sender.getName()), 0);
        assertEquals(0, ledger.getAvailableBalance(asset.getServiceId(), sender.getName()), 0);

        assertEquals(0, ledger.getBalance(asset.getServiceId(), recipient.getName()), 0);
        assertEquals(0, ledger.getAvailableBalance(asset.getServiceId(), recipient.getName()), 0);

        CancelExchangeOrder cancelOrder = (CancelExchangeOrder) new CancelExchangeOrderBuilder(receipt).convert("exchange", signer);
        receiver.receive(new CancelExchangeReceiptBuilder(cancelOrder, new Date()).convert(assetalias, signer));
        assertEquals(amount - fee, ledger.getBalance(asset.getServiceId(), sender.getName()), 0);
        assertEquals(amount - fee, ledger.getAvailableBalance(asset.getServiceId(), sender.getName()), 0);
        assertEquals(0, ledger.getBalance(asset.getServiceId(), recipient.getName()), 0);
        assertEquals(0, ledger.getAvailableBalance(asset.getServiceId(), recipient.getName()), 0);

    }

}

--- NEW FILE: ExchangeCompletionOrderReceiverWithFeesTest.java ---
package org.neuclear.exchange.controllers.receivers;

/*
 *  The NeuClear Project and it's libraries are
 *  (c) 2002-2004 Antilles Software Ventures SA
 *  For more information see: http://neuclear.org
 *
 *  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
 */

import org.neuclear.asset.InvalidTransferException;
import org.neuclear.asset.contracts.AssetGlobals;
import org.neuclear.asset.orders.Amount;
import org.neuclear.commons.NeuClearException;
import org.neuclear.exchange.contracts.ExchangeAgentGlobals;
import org.neuclear.exchange.orders.BidItem;
import org.neuclear.exchange.orders.ExchangeCompletedReceipt;
import org.neuclear.exchange.orders.ExchangeOrderGlobals;
import org.neuclear.exchange.orders.ExchangeOrderReceipt;
import org.neuclear.exchange.orders.builders.ExchangeCompletionOrderBuilder;
import org.neuclear.exchange.orders.builders.ExchangeOrderBuilder;
import org.neuclear.id.Signatory;
import org.neuclear.id.SignedNamedObject;
import org.neuclear.ledger.InvalidTransactionException;
import org.neuclear.ledger.LowlevelLedgerException;
import org.neuclear.ledger.UnknownBookException;
import org.neuclear.ledger.simple.SimpleLedgerController;

import java.security.GeneralSecurityException;
import java.util.Date;

/**
 * User: pelleb
 * Date: Jul 21, 2004
 * Time: 1:38:45 PM
 */
public class ExchangeCompletionOrderReceiverWithFeesTest extends AbstractExchangeReceiverTest {

    public ExchangeCompletionOrderReceiverWithFeesTest(String string) throws NeuClearException, GeneralSecurityException {
        super(string);
        ExchangeOrderGlobals.registerReaders();
        ExchangeAgentGlobals.registerReaders();
        AssetGlobals.registerReaders();
    }

    protected void setUp() throws Exception {
        generatePrimaryTestAssetWithFees();
        ledger = new SimpleLedgerController("test");
        receiver = createReceiver();
        agent = createTestExchangeAgent();
        shoes = createShoeAsset();
    }

    public void testExchangeCompletionOrder() throws NeuClearException, InvalidTransferException, LowlevelLedgerException, UnknownBookException, InvalidTransactionException {
        Signatory sender = new Signatory(signer.getPublicKey("bob"));
        Signatory recipient = new Signatory(signer.getPublicKey("alice"));
        final double amount = 10;
        final double fee = asset.getFeeStructure().calculateFee(amount);
        final double senderstart = ledger.getBalance(asset.getServiceId(), sender.getName());
        ledger.transfer(asset.getServiceId(), "bluesky", sender.getName(), amount - senderstart, "bla");
        assertEquals(amount, ledger.getBalance(asset.getServiceId(), sender.getName()), 0);
        assertEquals(amount, ledger.getAvailableBalance(asset.getServiceId(), sender.getName()), 0);

        SignedNamedObject order = new ExchangeOrderBuilder(asset, agent, new Amount(amount), new Date(System.currentTimeMillis() + 50000), new BidItem[]{new BidItem(shoes, new Amount(amount))}, "test").convert("bob", signer);
        ExchangeOrderReceipt receipt = (ExchangeOrderReceipt) receiver.receive(order);
        assertEquals(amount - fee, ledger.getBalance(asset.getServiceId(), sender.getName()), 0);
        assertEquals(0, ledger.getAvailableBalance(asset.getServiceId(), sender.getName()), 0);

        assertEquals(0, ledger.getBalance(asset.getServiceId(), recipient.getName()), 0);
        assertEquals(0, ledger.getAvailableBalance(asset.getServiceId(), recipient.getName()), 0);

        ExchangeCompletedReceipt completed = (ExchangeCompletedReceipt) receiver.receive(new ExchangeCompletionOrderBuilder(receipt, new Date(), recipient.getName(), new Amount(amount), "did it").convert("exchange", signer));
        assertNotNull(completed);
        assertEquals(0, ledger.getBalance(asset.getServiceId(), sender.getName()), 0);
        assertEquals(0, ledger.getAvailableBalance(asset.getServiceId(), sender.getName()), 0);
        assertEquals(amount - fee, ledger.getBalance(asset.getServiceId(), recipient.getName()), 0);
        assertEquals(amount - fee, ledger.getAvailableBalance(asset.getServiceId(), recipient.getName()), 0);

    }

}

--- NEW FILE: ExchangeCompletionOrderReceiverTest.java ---
package org.neuclear.exchange.controllers.receivers;

import org.neuclear.asset.InvalidTransferException;
import org.neuclear.asset.contracts.AssetGlobals;
import org.neuclear.asset.orders.Amount;
import org.neuclear.commons.NeuClearException;
import org.neuclear.exchange.contracts.ExchangeAgentGlobals;
import org.neuclear.exchange.orders.BidItem;
import org.neuclear.exchange.orders.ExchangeCompletedReceipt;
import org.neuclear.exchange.orders.ExchangeOrderGlobals;
import org.neuclear.exchange.orders.ExchangeOrderReceipt;
import org.neuclear.exchange.orders.builders.ExchangeCompletionOrderBuilder;
import org.neuclear.exchange.orders.builders.ExchangeOrderBuilder;
import org.neuclear.id.Signatory;
import org.neuclear.id.SignedNamedObject;
import org.neuclear.ledger.InvalidTransactionException;
import org.neuclear.ledger.LowlevelLedgerException;
import org.neuclear.ledger.UnknownBookException;
import org.neuclear.ledger.simple.SimpleLedgerController;

import java.security.GeneralSecurityException;
import java.util.Date;

/*
$Id: ExchangeCompletionOrderReceiverTest.java,v 1.1 2004/09/10 19:48:02 pelle Exp $
$Log: ExchangeCompletionOrderReceiverTest.java,v $
Revision 1.1  2004/09/10 19:48:02  pelle
Refactored all the Exchange related receivers into a new package under org.neuclear.exchange.
Refactored the way the Receivers handle embedded objects. Now they pass them on to the parent receiver for processing before they do their own thing.

Revision 1.1  2004/07/22 21:48:46  pelle
Further receivers and unit tests for for Exchanges etc.
I've also changed the internal asset to ledger id from being the pk of the contract signer, to being the pk of the service key.

Revision 1.1  2004/07/21 23:11:22  pelle
Added single function Receivers and a DelegatingAssetController. These will eventually replace the CurrencyController and Auditor.

*/

/**
 * User: pelleb
 * Date: Jul 21, 2004
 * Time: 1:38:45 PM
 */
public class ExchangeCompletionOrderReceiverTest extends AbstractExchangeReceiverTest {

    public ExchangeCompletionOrderReceiverTest(String string) throws NeuClearException, GeneralSecurityException {
        super(string);
        ExchangeOrderGlobals.registerReaders();
        ExchangeAgentGlobals.registerReaders();
        AssetGlobals.registerReaders();
    }

    protected void setUp() throws Exception {
        generatePrimaryTestAsset();
        ledger = new SimpleLedgerController("test");
        receiver = createReceiver();
        agent = createTestExchangeAgent();
        shoes = createShoeAsset();
    }


    public void testExchangeCompletionOrder() throws NeuClearException, InvalidTransferException, LowlevelLedgerException, UnknownBookException, InvalidTransactionException {
        Signatory sender = new Signatory(signer.getPublicKey("bob"));
        Signatory recipient = new Signatory(signer.getPublicKey("alice"));

        final double senderstart = ledger.getBalance(asset.getServiceId(), sender.getName());
        ledger.transfer(asset.getServiceId(), "bluesky", sender.getName(), 10 - senderstart, "bla");
        assertEquals(10, ledger.getBalance(asset.getServiceId(), sender.getName()), 0);
        assertEquals(10, ledger.getAvailableBalance(asset.getServiceId(), sender.getName()), 0);

        SignedNamedObject order = new ExchangeOrderBuilder(asset, agent, new Amount(10), new Date(System.currentTimeMillis() + 50000), new BidItem[]{new BidItem(shoes, new Amount(10))}, "test").convert("bob", signer);
        ExchangeOrderReceipt receipt = (ExchangeOrderReceipt) receiver.receive(order);
        assertEquals(10, ledger.getBalance(asset.getServiceId(), sender.getName()), 0);
        assertEquals(0, ledger.getAvailableBalance(asset.getServiceId(), sender.getName()), 0);

        assertEquals(0, ledger.getBalance(asset.getServiceId(), recipient.getName()), 0);
        assertEquals(0, ledger.getAvailableBalance(asset.getServiceId(), recipient.getName()), 0);

        ExchangeCompletedReceipt completed = (ExchangeCompletedReceipt) receiver.receive(new ExchangeCompletionOrderBuilder(receipt, new Date(), recipient.getName(), new Amount(10), "did it").convert("exchange", signer));
        assertNotNull(completed);
        assertEquals(0, ledger.getBalance(asset.getServiceId(), sender.getName()), 0);
        assertEquals(0, ledger.getAvailableBalance(asset.getServiceId(), sender.getName()), 0);
        assertEquals(10, ledger.getBalance(asset.getServiceId(), recipient.getName()), 0);
        assertEquals(10, ledger.getAvailableBalance(asset.getServiceId(), recipient.getName()), 0);

    }

}

--- NEW FILE: ExchangeOrderReceiverWithFeesTest.java ---
package org.neuclear.exchange.controllers.receivers;

/*
 *  The NeuClear Project and it's libraries are
 *  (c) 2002-2004 Antilles Software Ventures SA
 *  For more information see: http://neuclear.org
 *
 *  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
 */

import org.neuclear.asset.InvalidTransferException;
import org.neuclear.asset.contracts.AssetGlobals;
import org.neuclear.asset.orders.Amount;
import org.neuclear.commons.NeuClearException;
import org.neuclear.exchange.contracts.ExchangeAgentGlobals;
import org.neuclear.exchange.orders.BidItem;
import org.neuclear.exchange.orders.ExchangeOrderGlobals;
import org.neuclear.exchange.orders.builders.ExchangeOrderBuilder;
import org.neuclear.id.Signatory;
import org.neuclear.ledger.InvalidTransactionException;
import org.neuclear.ledger.LowlevelLedgerException;
import org.neuclear.ledger.UnknownBookException;
import org.neuclear.ledger.simple.SimpleLedgerController;

import java.security.GeneralSecurityException;
import java.util.Date;

/**
 * User: pelleb
 * Date: Jul 21, 2004
 * Time: 1:38:45 PM
 */
public class ExchangeOrderReceiverWithFeesTest extends AbstractExchangeReceiverTest {

    public ExchangeOrderReceiverWithFeesTest(String string) throws NeuClearException, GeneralSecurityException {
        super(string);
        ExchangeOrderGlobals.registerReaders();
        ExchangeAgentGlobals.registerReaders();
        AssetGlobals.registerReaders();
    }

    protected void setUp() throws Exception {
        generatePrimaryTestAssetWithFees();
        ledger = new SimpleLedgerController("test");
        receiver = createReceiver();
        agent = createTestExchangeAgent();
        shoes = createShoeAsset();
    }

    public void testExchangeOrder() throws NeuClearException, InvalidTransferException, LowlevelLedgerException, UnknownBookException, InvalidTransactionException {
        Signatory recipient = new Signatory(signer.getPublicKey("alice"));
        Signatory sender = new Signatory(signer.getPublicKey("bob"));
        final double senderstart = ledger.getBalance(asset.getServiceId(), sender.getName());
        double feeBalance = ledger.getBalance(asset.getServiceId(), asset.getFeeAccount().getName());
        final double amount = 10;
        ledger.transfer(asset.getServiceId(), "bluesky", sender.getName(), amount - senderstart, "bla");
        assertEquals(10, ledger.getBalance(asset.getServiceId(), sender.getName()), 0);

        receiver.receive(new ExchangeOrderBuilder(asset, agent, new Amount(10), new Date(System.currentTimeMillis() + 100000), new BidItem[]{new BidItem(shoes, new Amount(10))}, "test").convert("bob", signer));
        double fee = asset.getFeeStructure().calculateFee(amount);
        assertEquals(feeBalance + fee, ledger.getBalance(asset.getServiceId(), asset.getFeeAccount().getName()), 0);
        assertEquals(senderstart, ledger.getAvailableBalance(asset.getServiceId(), sender.getName()), 0);
        assertEquals(10 - fee, ledger.getBalance(asset.getServiceId(), sender.getName()), 0);

    }

}

--- NEW FILE: ExchangeOrderReceiverTest.java ---
package org.neuclear.exchange.controllers.receivers;

import org.neuclear.asset.InvalidTransferException;
import org.neuclear.asset.contracts.AssetGlobals;
import org.neuclear.asset.orders.Amount;
import org.neuclear.commons.NeuClearException;
import org.neuclear.exchange.contracts.ExchangeAgentGlobals;
import org.neuclear.exchange.orders.BidItem;
import org.neuclear.exchange.orders.ExchangeOrderGlobals;
import org.neuclear.exchange.orders.builders.ExchangeOrderBuilder;
import org.neuclear.id.Signatory;
import org.neuclear.ledger.InvalidTransactionException;
import org.neuclear.ledger.LowlevelLedgerException;
import org.neuclear.ledger.UnknownBookException;
import org.neuclear.ledger.simple.SimpleLedgerController;

import java.security.GeneralSecurityException;
import java.util.Date;

/*
$Id: ExchangeOrderReceiverTest.java,v 1.1 2004/09/10 19:48:02 pelle Exp $
$Log: ExchangeOrderReceiverTest.java,v $
Revision 1.1  2004/09/10 19:48:02  pelle
Refactored all the Exchange related receivers into a new package under org.neuclear.exchange.
Refactored the way the Receivers handle embedded objects. Now they pass them on to the parent receiver for processing before they do their own thing.

Revision 1.2  2004/08/18 09:42:56  pelle
Many fixes to the various Signing and SigningRequest Servlets etc.

Revision 1.1  2004/07/22 21:48:46  pelle
Further receivers and unit tests for for Exchanges etc.
I've also changed the internal asset to ledger id from being the pk of the contract signer, to being the pk of the service key.

Revision 1.1  2004/07/21 23:11:22  pelle
Added single function Receivers and a DelegatingAssetController. These will eventually replace the CurrencyController and Auditor.

*/

/**
 * User: pelleb
 * Date: Jul 21, 2004
 * Time: 1:38:45 PM
 */
public class ExchangeOrderReceiverTest extends AbstractExchangeReceiverTest {

    public ExchangeOrderReceiverTest(String string) throws NeuClearException, GeneralSecurityException {
        super(string);
        ExchangeOrderGlobals.registerReaders();
        ExchangeAgentGlobals.registerReaders();
        AssetGlobals.registerReaders();
    }

    protected void setUp() throws Exception {
        generatePrimaryTestAsset();
        ledger = new SimpleLedgerController("test");
        receiver = createReceiver();
        agent = createTestExchangeAgent();
        shoes = createShoeAsset();
    }

    public void testExchangeOrder() throws NeuClearException, InvalidTransferException, LowlevelLedgerException, UnknownBookException, InvalidTransactionException {
        Signatory recipient = new Signatory(signer.getPublicKey("alice"));
        Signatory sender = new Signatory(signer.getPublicKey("bob"));
        final double senderstart = ledger.getBalance(asset.getServiceId(), sender.getName());
        ledger.transfer(asset.getServiceId(), "bluesky", sender.getName(), 10 - senderstart, "bla");
        assertEquals(10, ledger.getBalance(asset.getServiceId(), sender.getName()), 0);

        receiver.receive(new ExchangeOrderBuilder(asset, agent, new Amount(10), new Date(System.currentTimeMillis() + 100000), new BidItem[]{new BidItem(shoes, new Amount(10))}, "test").convert("bob", signer));
        assertEquals(10, ledger.getBalance(asset.getServiceId(), sender.getName()), 0);
        assertEquals(senderstart, ledger.getAvailableBalance(asset.getServiceId(), sender.getName()), 0);
    }

}

--- NEW FILE: ExchangeCompletedReceiptReceiverTest.java ---
package org.neuclear.exchange.controllers.receivers;

import org.neuclear.asset.InvalidTransferException;
import org.neuclear.asset.contracts.AssetGlobals;
import org.neuclear.asset.orders.Amount;
import org.neuclear.commons.NeuClearException;
import org.neuclear.exchange.contracts.ExchangeAgentGlobals;
import org.neuclear.exchange.orders.BidItem;
import org.neuclear.exchange.orders.ExchangeCompletedReceipt;
import org.neuclear.exchange.orders.ExchangeOrderGlobals;
import org.neuclear.exchange.orders.ExchangeOrderReceipt;
import org.neuclear.exchange.orders.builders.ExchangeCompletionOrderBuilder;
import org.neuclear.exchange.orders.builders.ExchangeOrderBuilder;
import org.neuclear.id.Signatory;
import org.neuclear.id.SignedNamedObject;
import org.neuclear.ledger.InvalidTransactionException;
import org.neuclear.ledger.LedgerController;
import org.neuclear.ledger.LowlevelLedgerException;
import org.neuclear.ledger.UnknownBookException;
import org.neuclear.ledger.simple.SimpleLedgerController;

import java.security.GeneralSecurityException;
import java.util.Date;

/*
$Id: ExchangeCompletedReceiptReceiverTest.java,v 1.1 2004/09/10 19:48:02 pelle Exp $
$Log: ExchangeCompletedReceiptReceiverTest.java,v $
Revision 1.1  2004/09/10 19:48:02  pelle
Refactored all the Exchange related receivers into a new package under org.neuclear.exchange.
Refactored the way the Receivers handle embedded objects. Now they pass them on to the parent receiver for processing before they do their own thing.

Revision 1.1  2004/08/18 09:42:56  pelle
Many fixes to the various Signing and SigningRequest Servlets etc.

Revision 1.1  2004/07/22 21:48:46  pelle
Further receivers and unit tests for for Exchanges etc.
I've also changed the internal asset to ledger id from being the pk of the contract signer, to being the pk of the service key.

Revision 1.1  2004/07/21 23:11:22  pelle
Added single function Receivers and a DelegatingAssetController. These will eventually replace the CurrencyController and Auditor.

*/

/**
 * User: pelleb
 * Date: Jul 21, 2004
 * Time: 1:38:45 PM
 */
public class ExchangeCompletedReceiptReceiverTest extends AbstractExchangeReceiverTest {

    public ExchangeCompletedReceiptReceiverTest(String string) throws NeuClearException, GeneralSecurityException {
        super(string);
        ExchangeOrderGlobals.registerReaders();
        ExchangeAgentGlobals.registerReaders();
        AssetGlobals.registerReaders();
    }

    protected void setUp() throws Exception {
        generatePrimaryTestAsset();
        ledger = new SimpleLedgerController("test");
        receiver = createReceiver();
        agent = createTestExchangeAgent();
        shoes = createShoeAsset();
    }


    public void testExchangeCompletionOrder() throws NeuClearException, InvalidTransferException, LowlevelLedgerException, UnknownBookException, InvalidTransactionException {
        LedgerController ac = new SimpleLedgerController("asset");
        Signatory sender = new Signatory(signer.getPublicKey("bob"));
        Signatory recipient = new Signatory(signer.getPublicKey("alice"));

        final double senderstart = ledger.getBalance(asset.getServiceId(), sender.getName());
        ledger.transfer(asset.getServiceId(), "bluesky", sender.getName(), 10 - senderstart, "bla");
        assertEquals(10, ledger.getBalance(asset.getServiceId(), sender.getName()), 0);
        assertEquals(10, ledger.getAvailableBalance(asset.getServiceId(), sender.getName()), 0);
        ac.transfer(asset.getServiceId(), "bluesky", sender.getName(), 10 - senderstart, "bla");
        assertEquals(10, ac.getBalance(asset.getServiceId(), sender.getName()), 0);
        assertEquals(10, ac.getAvailableBalance(asset.getServiceId(), sender.getName()), 0);

        SignedNamedObject order = new ExchangeOrderBuilder(asset, agent, new Amount(10), new Date(System.currentTimeMillis() + 50000), new BidItem[]{new BidItem(shoes, new Amount(10))}, "test").convert("bob", signer);
        ExchangeOrderReceipt receipt = (ExchangeOrderReceipt) receiver.receive(order);
        assertEquals(10, ac.getBalance(asset.getServiceId(), sender.getName()), 0);
        assertEquals(0, ac.getAvailableBalance(asset.getServiceId(), sender.getName()), 0);

        assertEquals(0, ac.getBalance(asset.getServiceId(), recipient.getName()), 0);
        assertEquals(0, ac.getAvailableBalance(asset.getServiceId(), recipient.getName()), 0);

        ExchangeCompletedReceipt completed = (ExchangeCompletedReceipt) receiver.receive(new ExchangeCompletionOrderBuilder(receipt, new Date(), recipient.getName(), new Amount(10), "did it").convert("exchange", signer));
        assertNotNull(completed);
        receiver.receive(completed);
        assertEquals(0, ledger.getBalance(asset.getServiceId(), sender.getName()), 0);
        assertEquals(0, ledger.getAvailableBalance(asset.getServiceId(), sender.getName()), 0);
        assertEquals(10, ledger.getBalance(asset.getServiceId(), recipient.getName()), 0);
        assertEquals(10, ledger.getAvailableBalance(asset.getServiceId(), recipient.getName()), 0);
        assertEquals(0, ac.getBalance(asset.getServiceId(), sender.getName()), 0);
        assertEquals(0, ac.getAvailableBalance(asset.getServiceId(), sender.getName()), 0);
        assertEquals(10, ac.getBalance(asset.getServiceId(), recipient.getName()), 0);
        assertEquals(10, ac.getAvailableBalance(asset.getServiceId(), recipient.getName()), 0);

    }

}

--- NEW FILE: AbstractExchangeReceiverTest.java ---
package org.neuclear.exchange.controllers.receivers;

import org.neuclear.asset.contracts.Asset;
import org.neuclear.asset.contracts.builders.AssetBuilder;
import org.neuclear.asset.fees.FeeStructureBuilder;
import org.neuclear.commons.NeuClearException;
import org.neuclear.exchange.contracts.ExchangeAgent;
import org.neuclear.exchange.contracts.builders.ExchangeAgentBuilder;
import org.neuclear.exchange.controllers.DelegatingExchangeAssetController;
import org.neuclear.id.Signatory;
import org.neuclear.id.receiver.Receiver;
import org.neuclear.ledger.LedgerController;
import org.neuclear.tests.AbstractSigningTest;

import java.security.GeneralSecurityException;
import java.security.PublicKey;

/*
$Id: AbstractExchangeReceiverTest.java,v 1.1 2004/09/10 19:48:02 pelle Exp $
$Log: AbstractExchangeReceiverTest.java,v $
Revision 1.1  2004/09/10 19:48:02  pelle
Refactored all the Exchange related receivers into a new package under org.neuclear.exchange.
Refactored the way the Receivers handle embedded objects. Now they pass them on to the parent receiver for processing before they do their own thing.

Revision 1.3  2004/09/08 23:17:39  pelle
Fees now work for everything but Exchange Completion.

Revision 1.2  2004/08/18 09:42:56  pelle
Many fixes to the various Signing and SigningRequest Servlets etc.

Revision 1.1  2004/07/22 21:48:46  pelle
Further receivers and unit tests for for Exchanges etc.
I've also changed the internal asset to ledger id from being the pk of the contract signer, to being the pk of the service key.

*/

/**
 * User: pelleb
 * Date: Jul 22, 2004
 * Time: 10:39:40 AM
 */
public abstract class AbstractExchangeReceiverTest extends AbstractSigningTest {
    protected Receiver receiver;
    protected Asset asset;
    protected Asset shoes;
    protected LedgerController ledger;
    protected ExchangeAgent agent;
    public static String PROMOTER = "ivan";
    protected String assetalias;


    public AbstractExchangeReceiverTest(final String string) throws NeuClearException, GeneralSecurityException {
        super(string);
    }

    public ExchangeAgent createTestExchangeAgent() throws NeuClearException {
        ExchangeAgentBuilder builder = new ExchangeAgentBuilder("tradex", "http://tradex.neuclear.org", "http://tradex.neuclear.org",
                getSigner().getPublicKey("exchange"));
        return (ExchangeAgent) builder.convert("carol", getSigner());

    }

    public Asset createShoeAsset() throws NeuClearException {
        AssetBuilder builder = new AssetBuilder("shoes", "http://shoes.neuclear.org", "http://shoes.neuclear.org",
                getSigner().getPublicKey("shoes"),
                getSigner().getPublicKey("shoesissuer"),
                2, 0, "pairs of shoes");
        return (Asset) builder.convert(PROMOTER, getSigner());

    }

    protected void generatePrimaryTestAsset() throws NeuClearException {
        PublicKey pub = signer.generateKey();
        asset = (Asset) new AssetBuilder("test", "http://localhost:8080/rules.html", "http://localhost:8080/Asset", pub, signer.getPublicKey("carol"), 2, 0, "t").convert("bux", signer);
        assetalias = new Signatory(pub).getName();
    }

    protected void generatePrimaryTestAssetWithFees() throws NeuClearException {
        PublicKey pub = signer.generateKey();
        AssetBuilder assetBuilder = new AssetBuilder("test", "http://localhost:8080/rules.html", "http://localhost:8080/Asset", pub, signer.getPublicKey("carol"), 2, 0, "t");
        assetBuilder.addFeeStructure(new FeeStructureBuilder(0.01));
        assetBuilder.addFeeAccount(signer.getPublicKey("eve"));
        asset = (Asset) assetBuilder.convert("bux", signer);
        assetalias = new Signatory(pub).getName();
    }

    public Receiver createReceiver() {
        return new DelegatingExchangeAssetController(signer, ledger);
    }
}

--- NEW FILE: ExchangeOrderReceiptReceiverWithFeesTest.java ---
package org.neuclear.exchange.controllers.receivers;

/*
 *  The NeuClear Project and it's libraries are
 *  (c) 2002-2004 Antilles Software Ventures SA
 *  For more information see: http://neuclear.org
 *
 *  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
 */

import org.neuclear.asset.InvalidTransferException;
import org.neuclear.asset.contracts.AssetGlobals;
import org.neuclear.asset.orders.Amount;
import org.neuclear.commons.NeuClearException;
import org.neuclear.exchange.contracts.ExchangeAgentGlobals;
import org.neuclear.exchange.orders.BidItem;
import org.neuclear.exchange.orders.ExchangeOrderGlobals;
import org.neuclear.exchange.orders.ExchangeOrderReceipt;
import org.neuclear.exchange.orders.builders.ExchangeOrderBuilder;
import org.neuclear.id.Signatory;
import org.neuclear.ledger.InvalidTransactionException;
import org.neuclear.ledger.LedgerController;
import org.neuclear.ledger.LowlevelLedgerException;
import org.neuclear.ledger.UnknownBookException;
import org.neuclear.ledger.simple.SimpleLedgerController;

import java.security.GeneralSecurityException;
import java.util.Date;

/**
 * User: pelleb
 * Date: Jul 21, 2004
 * Time: 1:38:45 PM
 */
public class ExchangeOrderReceiptReceiverWithFeesTest extends AbstractExchangeReceiverTest {

    public ExchangeOrderReceiptReceiverWithFeesTest(String string) throws NeuClearException, GeneralSecurityException {
        super(string);
        ExchangeOrderGlobals.registerReaders();
        ExchangeAgentGlobals.registerReaders();
        AssetGlobals.registerReaders();
    }

    protected void setUp() throws Exception {
        generatePrimaryTestAssetWithFees();
        ledger = new SimpleLedgerController("test");
        receiver = createReceiver();
        agent = createTestExchangeAgent();
        shoes = createShoeAsset();
    }


    public void testExchangeOrderReceipt() throws NeuClearException, InvalidTransferException, LowlevelLedgerException, UnknownBookException, InvalidTransactionException {
        Signatory recipient = new Signatory(signer.getPublicKey("alice"));
        Signatory sender = new Signatory(signer.getPublicKey("bob"));
        final double amount = 10;
        final double fee = asset.getFeeStructure().calculateFee(amount);
        final double senderstart = ledger.getBalance(asset.getServiceId(), sender.getName());
        ledger.transfer(asset.getServiceId(), "bluesky", sender.getName(), amount - senderstart, "bla");
        assertEquals(amount, ledger.getBalance(asset.getServiceId(), sender.getName()), 0);

        ExchangeOrderReceipt receipt = (ExchangeOrderReceipt) receiver.receive(new Exc...
 
[truncated message content]

[Neuclear-cvs] neuclear-commons/src/java/org/neuclear/commons/crypto/signers DummySigner.java,NONE,1.1

From: Pelle B. <pe...@us...> - 2004-09-11 02:47:36

Update of /cvsroot/neuclear/neuclear-commons/src/java/org/neuclear/commons/crypto/signers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20792/src/java/org/neuclear/commons/crypto/signers

Added Files:
	DummySigner.java 
Log Message:
Refactored all the Exchange related receivers into a new package under org.neuclear.exchange.
Refactored the way the Receivers handle embedded objects. Now they pass them on to the parent receiver for processing before they do their own thing.

--- NEW FILE: DummySigner.java ---
package org.neuclear.commons.crypto.signers;

import org.neuclear.commons.crypto.passphraseagents.UserCancellationException;

import java.security.PublicKey;

/*
 *  The NeuClear Project and it's libraries are
 *  (c) 2002-2004 Antilles Software Ventures SA
 *  For more information see: http://neuclear.org
 *
 *  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
 */

/**
 * A Signer which doesn't actually do anything. It is just intended as a placeholder when an App doesn't need to sign.
 */
public class DummySigner implements Signer {
    public byte[] sign(String name, byte data[]) throws UserCancellationException, NonExistingSignerException {
        throw new NonExistingSignerException(name);
    }

    public boolean canSignFor(String name) {
        return false;
    }

    public int getKeyType(String name) {
        return 0;
    }

    public PublicKey generateKey(String alias) throws UserCancellationException {
        throw new UserCancellationException(alias);
    }

    public PublicKey generateKey() throws UserCancellationException {
        throw new UserCancellationException("");
    }

    public void save() throws UserCancellationException {
        ;
    }
}

[Neuclear-cvs] neuclear-pay/src/java/org/neuclear/exchange/receivers - New directory

From: Pelle B. <pe...@us...> - 2004-09-10 21:59:12

Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/receivers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21345/src/java/org/neuclear/exchange/receivers

Log Message:
Directory /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/receivers added to the repository

[Neuclear-cvs] neuclear-pay/src/test/org/neuclear/asset/controllers/receivers IssueOrderReceiverTest.java,1.2,1.3 IssueOrderReceiverWithFeesTest.java,1.1,1.2 TransferOrderReceiverTest.java,1.4,1.5 TransferOrderReceiverWithFeesTest.java,1.1,1.2 TransferReceiptReceiverTest.java,1.2,1.3 TransferReceiptReceiverWithFeesTest.java,1.1,1.2 AbstractExchangeReceiverTest.java,1.3,NONE CancelExchangeOrderReceiverTest.java,1.3,NONE CancelExchangeOrderReceiverWithFeesTest.java,1.1,NONE CancelExchangeReceiptReceiverTest.java,1.2,NONE CancelExchangeReceiptReceiverWithFeesTest.java,1.1,NONE ExchangeCompletedReceiptReceiverTest.java,1.1,NONE ExchangeCompletedReceiptReceiverWithFeesTest.java,1.1,NONE ExchangeCompletionOrderReceiverTest.java,1.1,NONE ExchangeCompletionOrderReceiverWithFeesTest.java,1.1,NONE ExchangeOrderReceiptReceiverTest.java,1.1,NONE ExchangeOrderReceiptReceiverWithFeesTest.java,1.1,NONE ExchangeOrderReceiverTest.java,1.2,NONE ExchangeOrderReceiverWithFeesTest.java,1.1,NONE

From: Pelle B. <pe...@us...> - 2004-09-10 19:48:42

Update of /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/asset/controllers/receivers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20812/src/test/org/neuclear/asset/controllers/receivers

Modified Files:
	IssueOrderReceiverTest.java 
	IssueOrderReceiverWithFeesTest.java 
	TransferOrderReceiverTest.java 
	TransferOrderReceiverWithFeesTest.java 
	TransferReceiptReceiverTest.java 
	TransferReceiptReceiverWithFeesTest.java 
Removed Files:
	AbstractExchangeReceiverTest.java 
	CancelExchangeOrderReceiverTest.java 
	CancelExchangeOrderReceiverWithFeesTest.java 
	CancelExchangeReceiptReceiverTest.java 
	CancelExchangeReceiptReceiverWithFeesTest.java 
	ExchangeCompletedReceiptReceiverTest.java 
	ExchangeCompletedReceiptReceiverWithFeesTest.java 
	ExchangeCompletionOrderReceiverTest.java 
	ExchangeCompletionOrderReceiverWithFeesTest.java 
	ExchangeOrderReceiptReceiverTest.java 
	ExchangeOrderReceiptReceiverWithFeesTest.java 
	ExchangeOrderReceiverTest.java 
	ExchangeOrderReceiverWithFeesTest.java 
Log Message:
Refactored all the Exchange related receivers into a new package under org.neuclear.exchange.
Refactored the way the Receivers handle embedded objects. Now they pass them on to the parent receiver for processing before they do their own thing.

Index: IssueOrderReceiverTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/asset/controllers/receivers/IssueOrderReceiverTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** IssueOrderReceiverTest.java	22 Jul 2004 21:48:46 -0000	1.2
--- IssueOrderReceiverTest.java	10 Sep 2004 19:48:02 -0000	1.3
***************
*** 5,8 ****
--- 5,9 ----
  import org.neuclear.asset.contracts.AssetGlobals;
  import org.neuclear.asset.contracts.builders.AssetBuilder;
+ import org.neuclear.asset.controllers.DelegatingAssetController;
  import org.neuclear.asset.orders.Amount;
  import org.neuclear.asset.orders.TransferGlobals;
***************
*** 24,27 ****
--- 25,32 ----
  $Id$
  $Log$
+ Revision 1.3  2004/09/10 19:48:02  pelle
+ Refactored all the Exchange related receivers into a new package under org.neuclear.exchange.
+ Refactored the way the Receivers handle embedded objects. Now they pass them on to the parent receiver for processing before they do their own thing.
+ 
  Revision 1.2  2004/07/22 21:48:46  pelle
  Further receivers and unit tests for for Exchanges etc.
***************
*** 53,57 ****
          asset = (Asset) new AssetBuilder("test", "http://localhost:8080/rules.html", "http://localhost:8080/Asset", pub, signer.getPublicKey("carol"), 2, 0, "t").convert("bux", signer);
          ledger = new SimpleLedgerController("test");
!         receiver = new IssueOrderReceiver(signer, ledger);
      }
  
--- 58,62 ----
          asset = (Asset) new AssetBuilder("test", "http://localhost:8080/rules.html", "http://localhost:8080/Asset", pub, signer.getPublicKey("carol"), 2, 0, "t").convert("bux", signer);
          ledger = new SimpleLedgerController("test");
!         receiver = new DelegatingAssetController(signer, ledger);
      }
  

Index: TransferReceiptReceiverTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/asset/controllers/receivers/TransferReceiptReceiverTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TransferReceiptReceiverTest.java	8 Sep 2004 17:41:11 -0000	1.2
--- TransferReceiptReceiverTest.java	10 Sep 2004 19:48:02 -0000	1.3
***************
*** 5,8 ****
--- 5,9 ----
  import org.neuclear.asset.contracts.AssetGlobals;
  import org.neuclear.asset.contracts.builders.AssetBuilder;
+ import org.neuclear.asset.controllers.DelegatingAssetController;
  import org.neuclear.asset.orders.Amount;
  import org.neuclear.asset.orders.TransferGlobals;
***************
*** 27,30 ****
--- 28,35 ----
  $Id$
  $Log$
+ Revision 1.3  2004/09/10 19:48:02  pelle
+ Refactored all the Exchange related receivers into a new package under org.neuclear.exchange.
+ Refactored the way the Receivers handle embedded objects. Now they pass them on to the parent receiver for processing before they do their own thing.
+ 
  Revision 1.2  2004/09/08 17:41:11  pelle
  Changed these tests to use the SimpleLedgerController from the HibernateLedgerController.
***************
*** 60,64 ****
          asset = (Asset) new AssetBuilder("test", "http://localhost:8080/rules.html", "http://localhost:8080/Asset", pub, signer.getPublicKey("carol"), 2, 0, "t").convert("bux", signer);
          ledger = new SimpleLedgerController("test");
!         receiver = new TransferReceiptReceiver(ledger);
      }
  
--- 65,69 ----
          asset = (Asset) new AssetBuilder("test", "http://localhost:8080/rules.html", "http://localhost:8080/Asset", pub, signer.getPublicKey("carol"), 2, 0, "t").convert("bux", signer);
          ledger = new SimpleLedgerController("test");
!         receiver = new DelegatingAssetController(signer, ledger);
      }
  

--- ExchangeOrderReceiptReceiverTest.java DELETED ---

--- ExchangeCompletedReceiptReceiverWithFeesTest.java DELETED ---

--- CancelExchangeOrderReceiverWithFeesTest.java DELETED ---

--- CancelExchangeReceiptReceiverWithFeesTest.java DELETED ---

--- ExchangeCompletionOrderReceiverTest.java DELETED ---

--- ExchangeCompletedReceiptReceiverTest.java DELETED ---

Index: IssueOrderReceiverWithFeesTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/asset/controllers/receivers/IssueOrderReceiverWithFeesTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** IssueOrderReceiverWithFeesTest.java	8 Sep 2004 23:17:40 -0000	1.1
--- IssueOrderReceiverWithFeesTest.java	10 Sep 2004 19:48:02 -0000	1.2
***************
*** 25,28 ****
--- 25,29 ----
  import org.neuclear.asset.contracts.AssetGlobals;
  import org.neuclear.asset.contracts.builders.AssetBuilder;
+ import org.neuclear.asset.controllers.DelegatingAssetController;
  import org.neuclear.asset.fees.FeeStructureBuilder;
  import org.neuclear.asset.orders.Amount;
***************
*** 62,66 ****
          asset = (Asset) assetBuilder.convert("bux", signer);
          ledger = new SimpleLedgerController("test");
!         receiver = new IssueOrderReceiver(signer, ledger);
      }
  
--- 63,67 ----
          asset = (Asset) assetBuilder.convert("bux", signer);
          ledger = new SimpleLedgerController("test");
!         receiver = new DelegatingAssetController(signer, ledger);
      }
  

--- CancelExchangeOrderReceiverTest.java DELETED ---

Index: TransferOrderReceiverWithFeesTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/asset/controllers/receivers/TransferOrderReceiverWithFeesTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TransferOrderReceiverWithFeesTest.java	8 Sep 2004 20:08:00 -0000	1.1
--- TransferOrderReceiverWithFeesTest.java	10 Sep 2004 19:48:02 -0000	1.2
***************
*** 25,28 ****
--- 25,29 ----
  import org.neuclear.asset.contracts.AssetGlobals;
  import org.neuclear.asset.contracts.builders.AssetBuilder;
+ import org.neuclear.asset.controllers.DelegatingAssetController;
  import org.neuclear.asset.fees.FeeStructureBuilder;
  import org.neuclear.asset.orders.Amount;
***************
*** 62,66 ****
          asset = (Asset) assetBuilder.convert("bux", signer);
          ledger = new SimpleLedgerController("test");
!         receiver = new TransferOrderReceiver(signer, ledger);
      }
  
--- 63,67 ----
          asset = (Asset) assetBuilder.convert("bux", signer);
          ledger = new SimpleLedgerController("test");
!         receiver = new DelegatingAssetController(signer, ledger);
      }
  

--- ExchangeOrderReceiverWithFeesTest.java DELETED ---

--- ExchangeCompletionOrderReceiverWithFeesTest.java DELETED ---

--- CancelExchangeReceiptReceiverTest.java DELETED ---

--- ExchangeOrderReceiverTest.java DELETED ---

Index: TransferOrderReceiverTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/asset/controllers/receivers/TransferOrderReceiverTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TransferOrderReceiverTest.java	8 Sep 2004 20:08:00 -0000	1.4
--- TransferOrderReceiverTest.java	10 Sep 2004 19:48:02 -0000	1.5
***************
*** 5,8 ****
--- 5,9 ----
  import org.neuclear.asset.contracts.AssetGlobals;
  import org.neuclear.asset.contracts.builders.AssetBuilder;
+ import org.neuclear.asset.controllers.DelegatingAssetController;
  import org.neuclear.asset.orders.Amount;
  import org.neuclear.asset.orders.TransferGlobals;
***************
*** 24,27 ****
--- 25,32 ----
  $Id$
  $Log$
+ Revision 1.5  2004/09/10 19:48:02  pelle
+ Refactored all the Exchange related receivers into a new package under org.neuclear.exchange.
+ Refactored the way the Receivers handle embedded objects. Now they pass them on to the parent receiver for processing before they do their own thing.
+ 
  Revision 1.4  2004/09/08 20:08:00  pelle
  Added support for fees to TransferOrderReceiver
***************
*** 56,60 ****
          asset = (Asset) new AssetBuilder("test", "http://localhost:8080/rules.html", "http://localhost:8080/Asset", pub, signer.getPublicKey("carol"), 2, 0, "t").convert("bux", signer);
          ledger = new SimpleLedgerController("test");
!         receiver = new TransferOrderReceiver(signer, ledger);
      }
  
--- 61,65 ----
          asset = (Asset) new AssetBuilder("test", "http://localhost:8080/rules.html", "http://localhost:8080/Asset", pub, signer.getPublicKey("carol"), 2, 0, "t").convert("bux", signer);
          ledger = new SimpleLedgerController("test");
!         receiver = new DelegatingAssetController(signer, ledger);
      }
  

--- AbstractExchangeReceiverTest.java DELETED ---

--- ExchangeOrderReceiptReceiverWithFeesTest.java DELETED ---

Index: TransferReceiptReceiverWithFeesTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/asset/controllers/receivers/TransferReceiptReceiverWithFeesTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TransferReceiptReceiverWithFeesTest.java	8 Sep 2004 23:17:40 -0000	1.1
--- TransferReceiptReceiverWithFeesTest.java	10 Sep 2004 19:48:02 -0000	1.2
***************
*** 25,28 ****
--- 25,29 ----
  import org.neuclear.asset.contracts.AssetGlobals;
  import org.neuclear.asset.contracts.builders.AssetBuilder;
+ import org.neuclear.asset.controllers.DelegatingAssetController;
  import org.neuclear.asset.fees.FeeStructureBuilder;
  import org.neuclear.asset.orders.Amount;
***************
*** 66,70 ****
          asset = (Asset) assetBuilder.convert("bux", signer);
          ledger = new SimpleLedgerController("test");
!         receiver = new TransferReceiptReceiver(ledger);
      }
  
--- 67,71 ----
          asset = (Asset) assetBuilder.convert("bux", signer);
          ledger = new SimpleLedgerController("test");
!         receiver = new DelegatingAssetController(signer, ledger);
      }

[Neuclear-cvs] neuclear-pay/src/java/org/neuclear/asset AssetLedgerHelper.java,1.1,NONE

From: Pelle B. <pe...@us...> - 2004-09-10 19:48:38

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

Removed Files:
	AssetLedgerHelper.java 
Log Message:
Refactored all the Exchange related receivers into a new package under org.neuclear.exchange.
Refactored the way the Receivers handle embedded objects. Now they pass them on to the parent receiver for processing before they do their own thing.

--- AssetLedgerHelper.java DELETED ---

[Neuclear-cvs] neuclear-pay/src/java/org/neuclear/exchange/controllers/receivers CancelExchangeOrderReceiver.java,NONE,1.1 CancelExchangeReceiptReceiver.java,NONE,1.1 ExchangeCompletedReceiptReceiver.java,NONE,1.1 ExchangeCompletionOrderReceiver.java,NONE,1.1 ExchangeOrderReceiptReceiver.java,NONE,1.1 ExchangeOrderReceiver.java,NONE,1.1

From: Pelle B. <pe...@us...> - 2004-09-10 19:48:37

Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/controllers/receivers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20812/src/java/org/neuclear/exchange/controllers/receivers

Added Files:
	CancelExchangeOrderReceiver.java 
	CancelExchangeReceiptReceiver.java 
	ExchangeCompletedReceiptReceiver.java 
	ExchangeCompletionOrderReceiver.java 
	ExchangeOrderReceiptReceiver.java ExchangeOrderReceiver.java 
Log Message:
Refactored all the Exchange related receivers into a new package under org.neuclear.exchange.
Refactored the way the Receivers handle embedded objects. Now they pass them on to the parent receiver for processing before they do their own thing.

--- NEW FILE: CancelExchangeReceiptReceiver.java ---
package org.neuclear.exchange.controllers.receivers;

import org.neuclear.asset.InvalidTransferException;
import org.neuclear.asset.NegativeTransferException;
import org.neuclear.asset.controllers.receivers.LedgerReceiver;
import org.neuclear.commons.NeuClearException;
import org.neuclear.exchange.orders.CancelExchangeOrder;
import org.neuclear.exchange.orders.CancelExchangeReceipt;
import org.neuclear.exchange.orders.ExchangeOrderGlobals;
import org.neuclear.id.SignedNamedObject;
import org.neuclear.id.receiver.HandlingReceiver;
import org.neuclear.id.receiver.Receiver;
import org.neuclear.id.receiver.UnsupportedTransaction;
import org.neuclear.ledger.LedgerController;
import org.neuclear.ledger.LowlevelLedgerException;
import org.neuclear.ledger.UnknownTransactionException;

/*
$Id: CancelExchangeReceiptReceiver.java,v 1.1 2004/09/10 19:48:02 pelle Exp $
$Log: CancelExchangeReceiptReceiver.java,v $
Revision 1.1  2004/09/10 19:48:02  pelle
Refactored all the Exchange related receivers into a new package under org.neuclear.exchange.
Refactored the way the Receivers handle embedded objects. Now they pass them on to the parent receiver for processing before they do their own thing.

Revision 1.1  2004/08/18 09:42:55  pelle
Many fixes to the various Signing and SigningRequest Servlets etc.

Revision 1.1  2004/07/22 21:48:42  pelle
Further receivers and unit tests for for Exchanges etc.
I've also changed the internal asset to ledger id from being the pk of the contract signer, to being the pk of the service key.

Revision 1.1  2004/07/21 23:11:22  pelle
Added single function Receivers and a DelegatingAssetController. These will eventually replace the CurrencyController and Auditor.

*/

/**
 * User: pelleb
 * Date: Jul 21, 2004
 * Time: 12:45:42 PM
 */
public class CancelExchangeReceiptReceiver extends LedgerReceiver implements HandlingReceiver {
    public CancelExchangeReceiptReceiver(Receiver parent, LedgerController ledger) {
        super(parent, ledger);
    }

    public SignedNamedObject receive(SignedNamedObject obj) throws UnsupportedTransaction, NeuClearException {
        try {
            CancelExchangeReceipt receipt = (CancelExchangeReceipt) obj;
            CancelExchangeOrder cancel = receipt.getOrder();
            String name = cancel.getAsset().getServiceId();
            if (!(cancel.getSignatory().getName().equals(cancel.getReceipt().getOrder().getSignatory().getName())
                    || cancel.getSignatory().getName().equals(cancel.getReceipt().getOrder().getAgent().getServiceId())))
                throw new InvalidTransferException("Only Agent is allowed to Sign Completion Order");
            final String orderId = cancel.getReceipt().getOrder().getDigest();
            if (ledger.heldTransactionExists(orderId))
                ledger.cancel(orderId);
        } catch (ClassCastException e) {
            throw new UnsupportedTransaction(obj);
        } catch (UnknownTransactionException e) {
            throw new NeuClearException(e);
        } catch (NegativeTransferException e) {
            throw new NeuClearException(e);
        } catch (InvalidTransferException e) {
            throw new NeuClearException(e);
        } catch (LowlevelLedgerException e) {
            throw new NeuClearException(e);
        }
        return null;
    }

    public String handlesTagName() {
        return ExchangeOrderGlobals.CANCEL_RCPT_TAGNAME;
    }
}

--- NEW FILE: ExchangeOrderReceiver.java ---
package org.neuclear.exchange.controllers.receivers;

import org.neuclear.asset.InvalidTransferException;
import org.neuclear.asset.NegativeTransferException;
import org.neuclear.asset.contracts.Asset;
import org.neuclear.asset.controllers.receivers.SigningLedgerReceiver;
import org.neuclear.commons.NeuClearException;
import org.neuclear.commons.crypto.signers.Signer;
import org.neuclear.exchange.orders.ExchangeOrder;
import org.neuclear.exchange.orders.ExchangeOrderGlobals;
import org.neuclear.exchange.orders.ExchangeOrderReceipt;
import org.neuclear.exchange.orders.builders.ExchangeOrderReceiptBuilder;
import org.neuclear.id.SignedNamedObject;
import org.neuclear.id.receiver.HandlingReceiver;
import org.neuclear.id.receiver.Receiver;
import org.neuclear.id.receiver.UnsupportedTransaction;
import org.neuclear.ledger.*;

/*
$Id: ExchangeOrderReceiver.java,v 1.1 2004/09/10 19:48:02 pelle Exp $
$Log: ExchangeOrderReceiver.java,v $
Revision 1.1  2004/09/10 19:48:02  pelle
Refactored all the Exchange related receivers into a new package under org.neuclear.exchange.
Refactored the way the Receivers handle embedded objects. Now they pass them on to the parent receiver for processing before they do their own thing.

Revision 1.3  2004/09/08 23:17:23  pelle
Fees now work for everything but Exchange Completion.

Revision 1.2  2004/07/23 18:58:39  pelle
Updated to use the new complete method in ledger.

Revision 1.1  2004/07/22 21:48:42  pelle
Further receivers and unit tests for for Exchanges etc.
I've also changed the internal asset to ledger id from being the pk of the contract signer, to being the pk of the service key.

Revision 1.1  2004/07/21 23:11:22  pelle
Added single function Receivers and a DelegatingAssetController. These will eventually replace the CurrencyController and Auditor.

*/

/**
 * User: pelleb
 * Date: Jul 21, 2004
 * Time: 12:45:42 PM
 */
public class ExchangeOrderReceiver extends SigningLedgerReceiver implements HandlingReceiver {
    public ExchangeOrderReceiver(Receiver parent, Signer signer, LedgerController ledger) {
        super(parent, signer, ledger);
    }

    public SignedNamedObject receive(SignedNamedObject obj) throws UnsupportedTransaction, NeuClearException {
        try {
            ExchangeOrder order = (ExchangeOrder) obj;
            Asset asset = order.getAsset();
            String name = asset.getServiceId();
            double amount = order.getAmount().getAmount();
            double fee = asset.getFeeStructure().calculateFee(amount);
            final PostedTransaction posted = ledger.hold(name, order.getDigest(), order.getSignatory().getName(), order.getAgent().getServiceId(), order.getExpiry(), asset.round(amount - fee), order.getComment());
            if (fee > 0) {
                String req = "-" + order.getDigest().substring(1);
                PostedTransaction postedFee = ledger.transfer(name, req, order.getSignatory().getName(), asset.getFeeAccount().getName(), fee, "Exchange " + order.getDigest());
                ledger.setReceiptId(req, order.getDigest());
            }
            if (!signer.canSignFor(name))
                return null;
            final ExchangeOrderReceipt receipt = (ExchangeOrderReceipt) new ExchangeOrderReceiptBuilder(order, posted.getTransactionTime()).convert(name, signer);
            ledger.setHeldReceiptId(order.getDigest(), receipt.getDigest());
            return receipt;

        } catch (ClassCastException e) {
            throw new UnsupportedTransaction(obj);
        } catch (UnknownTransactionException e) {
            throw new NeuClearException(e);
        } catch (UnknownBookException e) {
            throw new NeuClearException(e);
        } catch (InsufficientFundsException e) {
            throw new NeuClearException(e);
        } catch (NegativeTransferException e) {
            throw new NeuClearException(e);
        } catch (InvalidTransferException e) {
            throw new NeuClearException(e);
        } catch (UnBalancedTransactionException e) {
            throw new NeuClearException(e);
        } catch (LowlevelLedgerException e) {
            throw new NeuClearException(e);
        } catch (InvalidTransactionException e) {
            throw new NeuClearException(e);
        }
    }

    public String handlesTagName() {
        return ExchangeOrderGlobals.EXCHANGE_TAGNAME;
    }
}

--- NEW FILE: CancelExchangeOrderReceiver.java ---
package org.neuclear.exchange.controllers.receivers;

import org.neuclear.asset.InvalidTransferException;
import org.neuclear.asset.NegativeTransferException;
import org.neuclear.asset.controllers.receivers.SigningLedgerReceiver;
import org.neuclear.commons.NeuClearException;
import org.neuclear.commons.crypto.signers.Signer;
import org.neuclear.exchange.orders.CancelExchangeOrder;
import org.neuclear.exchange.orders.CancelExchangeReceipt;
import org.neuclear.exchange.orders.ExchangeOrderGlobals;
import org.neuclear.exchange.orders.builders.CancelExchangeReceiptBuilder;
import org.neuclear.id.SignedNamedObject;
import org.neuclear.id.receiver.HandlingReceiver;
import org.neuclear.id.receiver.Receiver;
import org.neuclear.id.receiver.UnsupportedTransaction;
import org.neuclear.ledger.LedgerController;
import org.neuclear.ledger.LowlevelLedgerException;
import org.neuclear.ledger.UnknownTransactionException;

import java.util.Date;

/*
$Id: CancelExchangeOrderReceiver.java,v 1.1 2004/09/10 19:48:02 pelle Exp $
$Log: CancelExchangeOrderReceiver.java,v $
Revision 1.1  2004/09/10 19:48:02  pelle
Refactored all the Exchange related receivers into a new package under org.neuclear.exchange.
Refactored the way the Receivers handle embedded objects. Now they pass them on to the parent receiver for processing before they do their own thing.

Revision 1.1  2004/07/22 21:48:42  pelle
Further receivers and unit tests for for Exchanges etc.
I've also changed the internal asset to ledger id from being the pk of the contract signer, to being the pk of the service key.

Revision 1.1  2004/07/21 23:11:22  pelle
Added single function Receivers and a DelegatingAssetController. These will eventually replace the CurrencyController and Auditor.

*/

/**
 * User: pelleb
 * Date: Jul 21, 2004
 * Time: 12:45:42 PM
 */
public class CancelExchangeOrderReceiver extends SigningLedgerReceiver implements HandlingReceiver {
    public CancelExchangeOrderReceiver(Receiver parent, Signer signer, LedgerController ledger) {
        super(parent, signer, ledger);
    }

    public SignedNamedObject receive(SignedNamedObject obj) throws UnsupportedTransaction, NeuClearException {
        try {
            CancelExchangeOrder cancel = (CancelExchangeOrder) obj;
            String name = cancel.getAsset().getServiceId();
            if (!(cancel.getSignatory().getName().equals(cancel.getReceipt().getOrder().getSignatory().getName())
                    || cancel.getSignatory().getName().equals(cancel.getReceipt().getOrder().getAgent().getServiceId())))
                throw new InvalidTransferException("Only Agent is allowed to Sign Completion Order");
            if (!signer.canSignFor(name))
                return null;
            final Date time = ledger.cancel(cancel.getReceipt().getOrder().getDigest());
            return (CancelExchangeReceipt) new CancelExchangeReceiptBuilder(cancel, time).convert(name, signer);

        } catch (ClassCastException e) {
            throw new UnsupportedTransaction(obj);
        } catch (UnknownTransactionException e) {
            throw new NeuClearException(e);
        } catch (NegativeTransferException e) {
            throw new NeuClearException(e);
        } catch (InvalidTransferException e) {
            throw new NeuClearException(e);
        } catch (LowlevelLedgerException e) {
            throw new NeuClearException(e);
        }
    }

    public String handlesTagName() {
        return ExchangeOrderGlobals.CANCEL_TAGNAME;
    }
}

--- NEW FILE: ExchangeOrderReceiptReceiver.java ---
package org.neuclear.exchange.controllers.receivers;

import org.neuclear.asset.controllers.receivers.LedgerReceiver;
import org.neuclear.commons.NeuClearException;
import org.neuclear.exchange.orders.ExchangeOrder;
import org.neuclear.exchange.orders.ExchangeOrderGlobals;
import org.neuclear.exchange.orders.ExchangeOrderReceipt;
import org.neuclear.id.SignedNamedObject;
import org.neuclear.id.receiver.HandlingReceiver;
import org.neuclear.id.receiver.Receiver;
import org.neuclear.id.receiver.UnsupportedTransaction;
import org.neuclear.ledger.LedgerController;
import org.neuclear.ledger.LowlevelLedgerException;
import org.neuclear.ledger.UnknownTransactionException;

/*
$Id: ExchangeOrderReceiptReceiver.java,v 1.1 2004/09/10 19:48:02 pelle Exp $
$Log: ExchangeOrderReceiptReceiver.java,v $
Revision 1.1  2004/09/10 19:48:02  pelle
Refactored all the Exchange related receivers into a new package under org.neuclear.exchange.
Refactored the way the Receivers handle embedded objects. Now they pass them on to the parent receiver for processing before they do their own thing.

Revision 1.1  2004/08/18 09:42:55  pelle
Many fixes to the various Signing and SigningRequest Servlets etc.

Revision 1.2  2004/07/23 18:58:39  pelle
Updated to use the new complete method in ledger.

Revision 1.1  2004/07/22 21:48:42  pelle
Further receivers and unit tests for for Exchanges etc.
I've also changed the internal asset to ledger id from being the pk of the contract signer, to being the pk of the service key.

Revision 1.1  2004/07/21 23:11:22  pelle
Added single function Receivers and a DelegatingAssetController. These will eventually replace the CurrencyController and Auditor.

*/

/**
 * User: pelleb
 * Date: Jul 21, 2004
 * Time: 12:45:42 PM
 */
public class ExchangeOrderReceiptReceiver extends LedgerReceiver implements HandlingReceiver {
    public ExchangeOrderReceiptReceiver(Receiver parent, LedgerController ledger) {
        super(parent, ledger);
    }

    public SignedNamedObject receive(SignedNamedObject obj) throws UnsupportedTransaction, NeuClearException {
        try {
            ExchangeOrderReceipt receipt = (ExchangeOrderReceipt) obj;
            ExchangeOrder order = receipt.getOrder();
            String name = order.getAsset().getServiceId();
            if (!ledger.heldTransactionExists(order.getDigest()))
                parent.receive(order);
            ledger.setHeldReceiptId(order.getDigest(), receipt.getDigest());
        } catch (ClassCastException e) {
            throw new UnsupportedTransaction(obj);
        } catch (UnknownTransactionException e) {
            throw new NeuClearException(e);
        } catch (LowlevelLedgerException e) {
            throw new NeuClearException(e);
        }
        return null;
    }

    public String handlesTagName() {
        return ExchangeOrderGlobals.EXCHANGE_RCPT_TAGNAME;
    }
}

--- NEW FILE: ExchangeCompletedReceiptReceiver.java ---
package org.neuclear.exchange.controllers.receivers;

import org.neuclear.asset.InvalidTransferException;
import org.neuclear.asset.NegativeTransferException;
import org.neuclear.asset.contracts.Asset;
import org.neuclear.asset.controllers.receivers.LedgerReceiver;
import org.neuclear.commons.NeuClearException;
import org.neuclear.exchange.orders.ExchangeCompletedReceipt;
import org.neuclear.exchange.orders.ExchangeCompletionOrder;
import org.neuclear.exchange.orders.ExchangeOrderGlobals;
import org.neuclear.id.SignedNamedObject;
import org.neuclear.id.receiver.HandlingReceiver;
import org.neuclear.id.receiver.Receiver;
import org.neuclear.id.receiver.UnsupportedTransaction;
import org.neuclear.ledger.LedgerController;
import org.neuclear.ledger.LowlevelLedgerException;
import org.neuclear.ledger.UnknownTransactionException;

/*
$Id: ExchangeCompletedReceiptReceiver.java,v 1.1 2004/09/10 19:48:02 pelle Exp $
$Log: ExchangeCompletedReceiptReceiver.java,v $
Revision 1.1  2004/09/10 19:48:02  pelle
Refactored all the Exchange related receivers into a new package under org.neuclear.exchange.
Refactored the way the Receivers handle embedded objects. Now they pass them on to the parent receiver for processing before they do their own thing.

Revision 1.1  2004/08/18 09:42:55  pelle
Many fixes to the various Signing and SigningRequest Servlets etc.

Revision 1.2  2004/07/23 18:58:39  pelle
Updated to use the new complete method in ledger.

Revision 1.1  2004/07/22 21:48:42  pelle
Further receivers and unit tests for for Exchanges etc.
I've also changed the internal asset to ledger id from being the pk of the contract signer, to being the pk of the service key.

Revision 1.1  2004/07/21 23:11:22  pelle
Added single function Receivers and a DelegatingAssetController. These will eventually replace the CurrencyController and Auditor.

*/

/**
 * User: pelleb
 * Date: Jul 21, 2004
 * Time: 12:45:42 PM
 */
public class ExchangeCompletedReceiptReceiver extends LedgerReceiver implements HandlingReceiver {
    public ExchangeCompletedReceiptReceiver(Receiver parent, LedgerController ledger) {
        super(parent, ledger);
    }

    public SignedNamedObject receive(SignedNamedObject obj) throws UnsupportedTransaction, NeuClearException {
        try {
            ExchangeCompletedReceipt receipt = (ExchangeCompletedReceipt) obj;
            ExchangeCompletionOrder complete = receipt.getOrder();
            final Asset asset = complete.getAsset();
            String name = asset.getServiceId();

            if (!complete.getSignatory().getName().equals(complete.getReceipt().getOrder().getAgent().getServiceId()))
                throw new InvalidTransferException("Only Agent is allowed to Sign Completion Order");
            final double amount = complete.getAmount().getAmount();
            if (amount > complete.getReceipt().getOrder().getAmount().getAmount())
                throw new InvalidTransferException("Attempting to complete larger than authorized amount");

            if (!ledger.transactionExists(complete.getDigest())) {
                parent.receive(complete);
            }
            ledger.setReceiptId(complete.getReceipt().getOrder().getDigest(), receipt.getDigest());


        } catch (ClassCastException e) {
            throw new UnsupportedTransaction(obj);
        } catch (UnknownTransactionException e) {
            throw new NeuClearException(e);
        } catch (NegativeTransferException e) {
            throw new NeuClearException(e);
        } catch (InvalidTransferException e) {
            throw new NeuClearException(e);
        } catch (LowlevelLedgerException e) {
            throw new NeuClearException(e);
        }
        return null;
    }

    public String handlesTagName() {
        return ExchangeOrderGlobals.COMPLETE_RCPT_TAGNAME;
    }
}

--- NEW FILE: ExchangeCompletionOrderReceiver.java ---
package org.neuclear.exchange.controllers.receivers;

import org.neuclear.asset.InvalidTransferException;
import org.neuclear.asset.NegativeTransferException;
import org.neuclear.asset.contracts.Asset;
import org.neuclear.asset.controllers.receivers.SigningLedgerReceiver;
import org.neuclear.commons.NeuClearException;
import org.neuclear.commons.crypto.signers.Signer;
import org.neuclear.exchange.orders.ExchangeCompletedReceipt;
import org.neuclear.exchange.orders.ExchangeCompletionOrder;
import org.neuclear.exchange.orders.ExchangeOrderGlobals;
import org.neuclear.exchange.orders.builders.ExchangeCompletedReceiptBuilder;
import org.neuclear.id.SignedNamedObject;
import org.neuclear.id.receiver.HandlingReceiver;
import org.neuclear.id.receiver.Receiver;
import org.neuclear.id.receiver.UnsupportedTransaction;
import org.neuclear.ledger.*;

/*
$Id: ExchangeCompletionOrderReceiver.java,v 1.1 2004/09/10 19:48:02 pelle Exp $
$Log: ExchangeCompletionOrderReceiver.java,v $
Revision 1.1  2004/09/10 19:48:02  pelle
Refactored all the Exchange related receivers into a new package under org.neuclear.exchange.
Refactored the way the Receivers handle embedded objects. Now they pass them on to the parent receiver for processing before they do their own thing.

Revision 1.3  2004/09/08 23:17:23  pelle
Fees now work for everything but Exchange Completion.

Revision 1.2  2004/07/23 18:58:39  pelle
Updated to use the new complete method in ledger.

Revision 1.1  2004/07/22 21:48:42  pelle
Further receivers and unit tests for for Exchanges etc.
I've also changed the internal asset to ledger id from being the pk of the contract signer, to being the pk of the service key.

Revision 1.1  2004/07/21 23:11:22  pelle
Added single function Receivers and a DelegatingAssetController. These will eventually replace the CurrencyController and Auditor.

*/

/**
 * User: pelleb
 * Date: Jul 21, 2004
 * Time: 12:45:42 PM
 */
public class ExchangeCompletionOrderReceiver extends SigningLedgerReceiver implements HandlingReceiver {
    public ExchangeCompletionOrderReceiver(Receiver parent, Signer signer, LedgerController ledger) {
        super(parent, signer, ledger);
    }

    public SignedNamedObject receive(SignedNamedObject obj) throws UnsupportedTransaction, NeuClearException {
        try {
            ExchangeCompletionOrder complete = (ExchangeCompletionOrder) obj;
            final Asset asset = complete.getAsset();
            String name = asset.getServiceId();
            if (!complete.getSignatory().getName().equals(complete.getReceipt().getOrder().getAgent().getServiceId()))
                throw new InvalidTransferException("Only Agent is allowed to Sign Completion Order");
            final double amount = complete.getAmount().getAmount();
            if (amount > complete.getReceipt().getOrder().getAmount().getAmount())
                throw new InvalidTransferException("Attempting to complete larger than authorized amount");
            if (ledger.findHeldTransaction(complete.getReceipt().getOrder().getDigest()) == null)
                parent.receive(complete.getReceipt());
            PostedTransaction tran = ledger.complete(complete.getReceipt().getOrder().getDigest(), complete.getSignatory().getName(), complete.getCounterparty(), asset.round(amount - asset.getFeeStructure().calculateFee(amount)), complete.getComment());
            if (!signer.canSignFor(name))
                return null;
            ExchangeCompletedReceipt receipt = (ExchangeCompletedReceipt) new ExchangeCompletedReceiptBuilder(complete, tran.getTransactionTime()).convert(name, signer);
            ledger.setReceiptId(complete.getReceipt().getOrder().getDigest(), receipt.getDigest());
            return receipt;

        } catch (ClassCastException e) {
            throw new UnsupportedTransaction(obj);
        } catch (UnknownTransactionException e) {
            throw new NeuClearException(e);
        } catch (InsufficientFundsException e) {
            throw new NeuClearException(e);
        } catch (NegativeTransferException e) {
            throw new NeuClearException(e);
        } catch (InvalidTransferException e) {
            throw new NeuClearException(e);
        } catch (UnBalancedTransactionException e) {
            throw new NeuClearException(e);
        } catch (LowlevelLedgerException e) {
            throw new NeuClearException(e);
        } catch (InvalidTransactionException e) {
            throw new NeuClearException(e);
        } catch (TransactionExpiredException e) {
            throw new NeuClearException(e);
        } catch (UnknownBookException e) {
            throw new NeuClearException(e);
        }
    }

    public String handlesTagName() {
        return ExchangeOrderGlobals.COMPLETE_TAGNAME;
    }
}

[Neuclear-cvs] neuclear-pay/src/java/org/neuclear/asset/controllers/receivers IssueOrderReceiver.java,1.2,1.3 IssueReceiptReceiver.java,1.2,1.3 LedgerReceiver.java,1.1,1.2 SigningLedgerReceiver.java,1.1,1.2 TransferOrderReceiver.java,1.3,1.4 TransferReceiptReceiver.java,1.4,1.5 CancelExchangeOrderReceiver.java,1.1,NONE CancelExchangeReceiptReceiver.java,1.1,NONE ExchangeCompletedReceiptReceiver.java,1.1,NONE ExchangeCompletionOrderReceiver.java,1.3,NONE ExchangeOrderReceiptReceiver.java,1.1,NONE ExchangeOrderReceiver.java,1.3,NONE

From: Pelle B. <pe...@us...> - 2004-09-10 19:48:35

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

Modified Files:
	IssueOrderReceiver.java IssueReceiptReceiver.java 
	LedgerReceiver.java SigningLedgerReceiver.java 
	TransferOrderReceiver.java TransferReceiptReceiver.java 
Removed Files:
	CancelExchangeOrderReceiver.java 
	CancelExchangeReceiptReceiver.java 
	ExchangeCompletedReceiptReceiver.java 
	ExchangeCompletionOrderReceiver.java 
	ExchangeOrderReceiptReceiver.java ExchangeOrderReceiver.java 
Log Message:
Refactored all the Exchange related receivers into a new package under org.neuclear.exchange.
Refactored the way the Receivers handle embedded objects. Now they pass them on to the parent receiver for processing before they do their own thing.

Index: SigningLedgerReceiver.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/controllers/receivers/SigningLedgerReceiver.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SigningLedgerReceiver.java	21 Jul 2004 23:11:22 -0000	1.1
--- SigningLedgerReceiver.java	10 Sep 2004 19:48:01 -0000	1.2
***************
*** 2,5 ****
--- 2,6 ----
  
  import org.neuclear.commons.crypto.signers.Signer;
+ import org.neuclear.id.receiver.Receiver;
  import org.neuclear.id.receiver.SigningReceiver;
  import org.neuclear.ledger.LedgerController;
***************
*** 8,11 ****
--- 9,16 ----
  $Id$
  $Log$
+ Revision 1.2  2004/09/10 19:48:01  pelle
+ Refactored all the Exchange related receivers into a new package under org.neuclear.exchange.
+ Refactored the way the Receivers handle embedded objects. Now they pass them on to the parent receiver for processing before they do their own thing.
+ 
  Revision 1.1  2004/07/21 23:11:22  pelle
  Added single function Receivers and a DelegatingAssetController. These will eventually replace the CurrencyController and Auditor.
***************
*** 19,27 ****
   */
  public abstract class SigningLedgerReceiver extends SigningReceiver {
!     protected SigningLedgerReceiver(Signer signer, LedgerController ledger) {
          super(signer);
          this.ledger = ledger;
      }
  
      protected final LedgerController ledger;
  }
--- 24,34 ----
   */
  public abstract class SigningLedgerReceiver extends SigningReceiver {
!     protected SigningLedgerReceiver(Receiver parent, Signer signer, LedgerController ledger) {
          super(signer);
          this.ledger = ledger;
+         this.parent = parent;
      }
  
      protected final LedgerController ledger;
+     protected final Receiver parent;
  }

Index: LedgerReceiver.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/controllers/receivers/LedgerReceiver.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LedgerReceiver.java	21 Jul 2004 23:11:22 -0000	1.1
--- LedgerReceiver.java	10 Sep 2004 19:48:01 -0000	1.2
***************
*** 7,10 ****
--- 7,14 ----
  $Id$
  $Log$
+ Revision 1.2  2004/09/10 19:48:01  pelle
+ Refactored all the Exchange related receivers into a new package under org.neuclear.exchange.
+ Refactored the way the Receivers handle embedded objects. Now they pass them on to the parent receiver for processing before they do their own thing.
+ 
  Revision 1.1  2004/07/21 23:11:22  pelle
  Added single function Receivers and a DelegatingAssetController. These will eventually replace the CurrencyController and Auditor.
***************
*** 18,25 ****
   */
  public abstract class LedgerReceiver implements Receiver {
!     protected LedgerReceiver(LedgerController ledger) {
          this.ledger = ledger;
      }
  
      protected final LedgerController ledger;
  }
--- 22,32 ----
   */
  public abstract class LedgerReceiver implements Receiver {
! 
!     protected LedgerReceiver(Receiver parent, LedgerController ledger) {
          this.ledger = ledger;
+         this.parent = parent;
      }
  
      protected final LedgerController ledger;
+     protected final Receiver parent;
  }

--- ExchangeCompletedReceiptReceiver.java DELETED ---

--- ExchangeCompletionOrderReceiver.java DELETED ---

Index: IssueOrderReceiver.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/controllers/receivers/IssueOrderReceiver.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** IssueOrderReceiver.java	22 Jul 2004 21:48:42 -0000	1.2
--- IssueOrderReceiver.java	10 Sep 2004 19:48:01 -0000	1.3
***************
*** 10,13 ****
--- 10,14 ----
  import org.neuclear.id.SignedNamedObject;
  import org.neuclear.id.receiver.HandlingReceiver;
+ import org.neuclear.id.receiver.Receiver;
  import org.neuclear.id.receiver.UnsupportedTransaction;
  import org.neuclear.ledger.*;
***************
*** 16,19 ****
--- 17,24 ----
  $Id$
  $Log$
+ Revision 1.3  2004/09/10 19:48:01  pelle
+ Refactored all the Exchange related receivers into a new package under org.neuclear.exchange.
+ Refactored the way the Receivers handle embedded objects. Now they pass them on to the parent receiver for processing before they do their own thing.
+ 
  Revision 1.2  2004/07/22 21:48:42  pelle
  Further receivers and unit tests for for Exchanges etc.
***************
*** 31,36 ****
   */
  public class IssueOrderReceiver extends SigningLedgerReceiver implements HandlingReceiver {
!     public IssueOrderReceiver(Signer signer, LedgerController ledger) {
!         super(signer, ledger);
      }
  
--- 36,41 ----
   */
  public class IssueOrderReceiver extends SigningLedgerReceiver implements HandlingReceiver {
!     public IssueOrderReceiver(Receiver parent, Signer signer, LedgerController ledger) {
!         super(parent, signer, ledger);
      }
  

Index: TransferReceiptReceiver.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/controllers/receivers/TransferReceiptReceiver.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TransferReceiptReceiver.java	8 Sep 2004 23:17:23 -0000	1.4
--- TransferReceiptReceiver.java	10 Sep 2004 19:48:01 -0000	1.5
***************
*** 8,17 ****
  import org.neuclear.id.SignedNamedObject;
  import org.neuclear.id.receiver.HandlingReceiver;
  import org.neuclear.id.receiver.UnsupportedTransaction;
! import org.neuclear.ledger.*;
  
  /*
  $Id$
  $Log$
  Revision 1.4  2004/09/08 23:17:23  pelle
  Fees now work for everything but Exchange Completion.
--- 8,24 ----
  import org.neuclear.id.SignedNamedObject;
  import org.neuclear.id.receiver.HandlingReceiver;
+ import org.neuclear.id.receiver.Receiver;
  import org.neuclear.id.receiver.UnsupportedTransaction;
! import org.neuclear.ledger.LedgerController;
! import org.neuclear.ledger.LowlevelLedgerException;
! import org.neuclear.ledger.UnknownTransactionException;
  
  /*
  $Id$
  $Log$
+ Revision 1.5  2004/09/10 19:48:01  pelle
+ Refactored all the Exchange related receivers into a new package under org.neuclear.exchange.
+ Refactored the way the Receivers handle embedded objects. Now they pass them on to the parent receiver for processing before they do their own thing.
+ 
  Revision 1.4  2004/09/08 23:17:23  pelle
  Fees now work for everything but Exchange Completion.
***************
*** 35,40 ****
   */
  public class TransferReceiptReceiver extends LedgerReceiver implements HandlingReceiver {
!     public TransferReceiptReceiver(LedgerController ledger) {
!         super(ledger);
      }
  
--- 42,47 ----
   */
  public class TransferReceiptReceiver extends LedgerReceiver implements HandlingReceiver {
!     public TransferReceiptReceiver(Receiver parent, LedgerController ledger) {
!         super(parent, ledger);
      }
  
***************
*** 47,60 ****
  
              if (!ledger.transactionExists(order.getDigest())) {
!                 double amount = order.getAmount().getAmount();
!                 UnPostedTransaction transaction = new UnPostedTransaction(name, order.getDigest(), order.getComment());
!                 double fee = asset.getFeeStructure().calculateFee(amount);
!                 transaction.addItem(ledger.getBook(order.getSignatory().getName()), -amount);
!                 if (fee > 0) {
!                     amount = -transaction.addItem(ledger.getBook(asset.getFeeAccount().getName()), fee);
!                 }
!                 transaction.addItem(ledger.getBook(order.getRecipient()), amount);
! 
!                 ledger.performTransaction(transaction);
              }
              ledger.setReceiptId(order.getDigest(), receipt.getDigest());
--- 54,58 ----
  
              if (!ledger.transactionExists(order.getDigest())) {
!                 parent.receive(order);
              }
              ledger.setReceiptId(order.getDigest(), receipt.getDigest());
***************
*** 63,76 ****
          } catch (UnknownTransactionException e) {
              throw new NeuClearException(e);
-         } catch (UnknownBookException e) {
-             throw new NeuClearException(e);
-         } catch (InsufficientFundsException e) {
-             throw new NeuClearException(e);
-         } catch (UnBalancedTransactionException e) {
-             throw new NeuClearException(e);
          } catch (LowlevelLedgerException e) {
              throw new NeuClearException(e);
-         } catch (InvalidTransactionException e) {
-             throw new NeuClearException(e);
          }
          return null;
--- 61,66 ----

Index: TransferOrderReceiver.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/controllers/receivers/TransferOrderReceiver.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TransferOrderReceiver.java	8 Sep 2004 20:07:43 -0000	1.3
--- TransferOrderReceiver.java	10 Sep 2004 19:48:01 -0000	1.4
***************
*** 11,14 ****
--- 11,15 ----
  import org.neuclear.id.SignedNamedObject;
  import org.neuclear.id.receiver.HandlingReceiver;
+ import org.neuclear.id.receiver.Receiver;
  import org.neuclear.id.receiver.UnsupportedTransaction;
  import org.neuclear.ledger.*;
***************
*** 17,20 ****
--- 18,25 ----
  $Id$
  $Log$
+ Revision 1.4  2004/09/10 19:48:01  pelle
+ Refactored all the Exchange related receivers into a new package under org.neuclear.exchange.
+ Refactored the way the Receivers handle embedded objects. Now they pass them on to the parent receiver for processing before they do their own thing.
+ 
  Revision 1.3  2004/09/08 20:07:43  pelle
  Added support for fees to TransferOrderReceiver
***************
*** 35,40 ****
   */
  public class TransferOrderReceiver extends SigningLedgerReceiver implements HandlingReceiver {
!     public TransferOrderReceiver(Signer signer, LedgerController ledger) {
!         super(signer, ledger);
      }
  
--- 40,45 ----
   */
  public class TransferOrderReceiver extends SigningLedgerReceiver implements HandlingReceiver {
!     public TransferOrderReceiver(Receiver parent, Signer signer, LedgerController ledger) {
!         super(parent, signer, ledger);
      }
  

--- ExchangeOrderReceiver.java DELETED ---

--- CancelExchangeOrderReceiver.java DELETED ---

--- CancelExchangeReceiptReceiver.java DELETED ---

--- ExchangeOrderReceiptReceiver.java DELETED ---

Index: IssueReceiptReceiver.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/controllers/receivers/IssueReceiptReceiver.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** IssueReceiptReceiver.java	22 Jul 2004 21:48:42 -0000	1.2
--- IssueReceiptReceiver.java	10 Sep 2004 19:48:01 -0000	1.3
***************
*** 6,15 ****
  import org.neuclear.id.SignedNamedObject;
  import org.neuclear.id.receiver.HandlingReceiver;
  import org.neuclear.id.receiver.UnsupportedTransaction;
! import org.neuclear.ledger.*;
  
  /*
  $Id$
  $Log$
  Revision 1.2  2004/07/22 21:48:42  pelle
  Further receivers and unit tests for for Exchanges etc.
--- 6,22 ----
  import org.neuclear.id.SignedNamedObject;
  import org.neuclear.id.receiver.HandlingReceiver;
+ import org.neuclear.id.receiver.Receiver;
  import org.neuclear.id.receiver.UnsupportedTransaction;
! import org.neuclear.ledger.LedgerController;
! import org.neuclear.ledger.LowlevelLedgerException;
! import org.neuclear.ledger.UnknownTransactionException;
  
  /*
  $Id$
  $Log$
+ Revision 1.3  2004/09/10 19:48:01  pelle
+ Refactored all the Exchange related receivers into a new package under org.neuclear.exchange.
+ Refactored the way the Receivers handle embedded objects. Now they pass them on to the parent receiver for processing before they do their own thing.
+ 
  Revision 1.2  2004/07/22 21:48:42  pelle
  Further receivers and unit tests for for Exchanges etc.
***************
*** 27,32 ****
   */
  public class IssueReceiptReceiver extends LedgerReceiver implements HandlingReceiver {
!     public IssueReceiptReceiver(LedgerController ledger) {
!         super(ledger);
      }
  
--- 34,39 ----
   */
  public class IssueReceiptReceiver extends LedgerReceiver implements HandlingReceiver {
!     public IssueReceiptReceiver(Receiver parent, LedgerController ledger) {
!         super(parent, ledger);
      }
  
***************
*** 37,41 ****
              final IssueOrder order = receipt.getOrder();
              if (!ledger.transactionExists(order.getDigest()))
!                 ledger.transfer(name, order.getDigest(), order.getSignatory().getName(), order.getRecipient(), order.getAmount().getAmount(), order.getComment());
              ledger.setReceiptId(order.getDigest(), receipt.getDigest());
          } catch (ClassCastException e) {
--- 44,48 ----
              final IssueOrder order = receipt.getOrder();
              if (!ledger.transactionExists(order.getDigest()))
!                 parent.receive(order);
              ledger.setReceiptId(order.getDigest(), receipt.getDigest());
          } catch (ClassCastException e) {
***************
*** 43,56 ****
          } catch (UnknownTransactionException e) {
              throw new NeuClearException(e);
-         } catch (UnknownBookException e) {
-             throw new NeuClearException(e);
-         } catch (InsufficientFundsException e) {
-             throw new NeuClearException(e);
-         } catch (UnBalancedTransactionException e) {
-             throw new NeuClearException(e);
          } catch (LowlevelLedgerException e) {
              throw new NeuClearException(e);
-         } catch (InvalidTransactionException e) {
-             throw new NeuClearException(e);
          }
          return null;
--- 50,55 ----

[Neuclear-cvs] neuclear-pay/src/java/org/neuclear/asset/controllers DelegatingAssetController.java,1.1,1.2

From: Pelle B. <pe...@us...> - 2004-09-10 19:48:34

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

Modified Files:
	DelegatingAssetController.java 
Log Message:
Refactored all the Exchange related receivers into a new package under org.neuclear.exchange.
Refactored the way the Receivers handle embedded objects. Now they pass them on to the parent receiver for processing before they do their own thing.

Index: DelegatingAssetController.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/controllers/DelegatingAssetController.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DelegatingAssetController.java	21 Jul 2004 23:11:22 -0000	1.1
--- DelegatingAssetController.java	10 Sep 2004 19:48:01 -0000	1.2
***************
*** 12,15 ****
--- 12,19 ----
  $Id$
  $Log$
+ Revision 1.2  2004/09/10 19:48:01  pelle
+ Refactored all the Exchange related receivers into a new package under org.neuclear.exchange.
+ Refactored the way the Receivers handle embedded objects. Now they pass them on to the parent receiver for processing before they do their own thing.
+ 
  Revision 1.1  2004/07/21 23:11:22  pelle
  Added single function Receivers and a DelegatingAssetController. These will eventually replace the CurrencyController and Auditor.
***************
*** 24,31 ****
  public class DelegatingAssetController extends DelegatingReceiver {
      public DelegatingAssetController(final Signer signer, final LedgerController ledger) {
!         register(new TransferOrderReceiver(signer, ledger));
!         register(new TransferReceiptReceiver(ledger));
!         register(new IssueOrderReceiver(signer, ledger));
!         register(new IssueReceiptReceiver(ledger));
      }
  }
--- 28,35 ----
  public class DelegatingAssetController extends DelegatingReceiver {
      public DelegatingAssetController(final Signer signer, final LedgerController ledger) {
!         register(new TransferOrderReceiver(this, signer, ledger));
!         register(new TransferReceiptReceiver(this, ledger));
!         register(new IssueOrderReceiver(this, signer, ledger));
!         register(new IssueReceiptReceiver(this, ledger));
      }
  }

[Neuclear-cvs] neuclear-pay/src/java/org/neuclear/exchange/controllers DelegatingExchangeAssetController.java,NONE,1.1

From: Pelle B. <pe...@us...> - 2004-09-10 19:48:30

Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/controllers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20812/src/java/org/neuclear/exchange/controllers

Added Files:
	DelegatingExchangeAssetController.java 
Log Message:
Refactored all the Exchange related receivers into a new package under org.neuclear.exchange.
Refactored the way the Receivers handle embedded objects. Now they pass them on to the parent receiver for processing before they do their own thing.

--- NEW FILE: DelegatingExchangeAssetController.java ---
package org.neuclear.exchange.controllers;

import org.neuclear.asset.controllers.DelegatingAssetController;
import org.neuclear.commons.crypto.signers.Signer;
import org.neuclear.exchange.controllers.receivers.*;
import org.neuclear.ledger.LedgerController;

/*
 *  The NeuClear Project and it's libraries are
 *  (c) 2002-2004 Antilles Software Ventures SA
 *  For more information see: http://neuclear.org
 *
 *  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
 */

/**
 * An asset controller with support for exchange transactions.
 */
public class DelegatingExchangeAssetController extends DelegatingAssetController {
    public DelegatingExchangeAssetController(Signer signer, LedgerController ledger) {
        super(signer, ledger);
        register(new ExchangeOrderReceiver(this, signer, ledger));
        register(new ExchangeOrderReceiptReceiver(this, ledger));
        register(new ExchangeCompletionOrderReceiver(this, signer, ledger));
        register(new ExchangeCompletedReceiptReceiver(this, ledger));
        register(new CancelExchangeOrderReceiver(this, signer, ledger));
        register(new CancelExchangeReceiptReceiver(this, ledger));
    }
}

[Neuclear-cvs] neuclear-pay/src/test/org/neuclear/exchange/controllers/receivers - New directory

From: Pelle B. <pe...@us...> - 2004-09-10 17:27:56

Update of /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/exchange/controllers/receivers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24070/src/test/org/neuclear/exchange/controllers/receivers

Log Message:
Directory /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/exchange/controllers/receivers added to the repository

[Neuclear-cvs] neuclear-pay/src/test/org/neuclear/exchange/controllers - New directory

From: Pelle B. <pe...@us...> - 2004-09-10 17:27:24

Update of /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/exchange/controllers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24042/src/test/org/neuclear/exchange/controllers

Log Message:
Directory /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/exchange/controllers added to the repository

[Neuclear-cvs] neuclear-pay/src/java/org/neuclear/exchange/controllers/receivers - New directory

From: Pelle B. <pe...@us...> - 2004-09-10 17:26:48

Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/controllers/receivers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23888/src/java/org/neuclear/exchange/controllers/receivers

Log Message:
Directory /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/controllers/receivers added to the repository

[Neuclear-cvs] neuclear-pay/src/java/org/neuclear/exchange/controllers - New directory

From: Pelle B. <pe...@us...> - 2004-09-10 17:26:06

Update of /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/controllers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23704/src/java/org/neuclear/exchange/controllers

Log Message:
Directory /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/controllers added to the repository

[Neuclear-cvs] neuclear-xmlsig/xdocs bdg.xml,1.2,1.3 index.xml,1.7,1.8 installation.xml,1.4,1.5

From: Pelle B. <pe...@us...> - 2004-09-09 17:54:31

Update of /cvsroot/neuclear/neuclear-xmlsig/xdocs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv499/xdocs

Modified Files:
	bdg.xml index.xml installation.xml 
Log Message:
Updated docs with release information.

Index: index.xml
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/xdocs/index.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** index.xml	28 Apr 2004 17:36:58 -0000	1.7
--- index.xml	9 Sep 2004 17:54:18 -0000	1.8
***************
*** 8,11 ****
--- 8,38 ----
  
      <body>
+         <section name="[9th of September 2004] Release 0.14">
+             <p>
+                         Panama City, 9th of September 2004. We are happy to announce
+                         the 0.14 release of NeuClear XMLSIG.
+             </p>
+             <h2>New Feature</h2>
+             <ul>
+                 <li>[
+                     <a href='http://jira.neuclear.org//browse/XMLSIG-18'>XMLSIG-18</a>] - Use XPP3 as dom4j xml reader
+                 </li>
+             </ul>
+             <h2>Task</h2>
+             <ul>
+                 <li>[
+                     <a href='http://jira.neuclear.org//browse/XMLSIG-17'>XMLSIG-17</a>] - Bump dom4j version to 1.5
+                 </li>
+                 <li>[
+                     <a href='http://jira.neuclear.org//browse/XMLSIG-21'>XMLSIG-21</a>] - Verify compatibility with JDK5
+                 </li>
+             </ul>
+             <p>
+                 <a href="http://jira.neuclear.org/secure/ReleaseNote.jspa?projectId=10020&amp;styleName=Html&amp;version=10053">See full list.</a>
+             </p>
+             <p>
+                 <a href="http://sourceforge.net/project/showfiles.php?group_id=90470">Download it today and join in the NeuClear revolution</a>.
+             </p>
+         </section>
          <section name="[28th of April 2004] Release 0.13">
              <p>

Index: bdg.xml
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/xdocs/bdg.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** bdg.xml	28 Apr 2004 17:36:58 -0000	1.2
--- bdg.xml	9 Sep 2004 17:54:18 -0000	1.3
***************
*** 22,26 ****
                          <a href="http://www.dom4j.org/apidocs/org/dom4j/Element.html">Element</a>
                      </li>
!                     <li>An RSA Private Key</li>
                  </ul>
                  Look at the following code snippet for an example:
--- 22,26 ----
                          <a href="http://www.dom4j.org/apidocs/org/dom4j/Element.html">Element</a>
                      </li>
!                     <li>An RSA or DSA Private Key</li>
                  </ul>
                  Look at the following code snippet for an example:

Index: installation.xml
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/xdocs/installation.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** installation.xml	28 Apr 2004 17:36:58 -0000	1.4
--- installation.xml	9 Sep 2004 17:54:18 -0000	1.5
***************
*** 24,27 ****
--- 24,30 ----
                          <a href="http://jtidy.sourceforge.net/">JTidy</a>
                      </li>
+                     <li>
+                         <a href="http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/">MXP1 XPP3 Parser (Recommended)</a>
+                     </li>
                  </ul>
                  With Dom4J make sure you include the full jar in your classpath.

[Neuclear-cvs] neuclear-signer project.xml,1.37,1.38

From: Pelle B. <pe...@us...> - 2004-09-09 17:19:48

Update of /cvsroot/neuclear/neuclear-signer
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26329

Modified Files:
	project.xml 
Log Message:
Fixed sourceforge cvs repository info in Maven project descriptor

Index: project.xml
===================================================================
RCS file: /cvsroot/neuclear/neuclear-signer/project.xml,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** project.xml	27 Aug 2004 17:51:43 -0000	1.37
--- project.xml	9 Sep 2004 17:19:39 -0000	1.38
***************
*** 20,27 ****
      <repository>
          <connection>
!          scm:cvs:pserver:ano...@cv...:/cvsroot/neuclear:neuclear-signer
          </connection>
          <url>
!       http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/neuclear/neuclear-signer/
          </url>
      </repository>
--- 20,27 ----
      <repository>
          <connection>
!          scm:cvs:pserver:ano...@cv...:/cvsroot/neuclear:neuclear-signer
          </connection>
          <url>
!       http://cvs.sourceforge.net/viewcvs.py/neuclear/neuclear-signer/
          </url>
      </repository>

[Neuclear-cvs] neuclear-xmlsig project.xml,1.26,1.27

From: Pelle B. <pe...@us...> - 2004-09-09 17:19:40

Update of /cvsroot/neuclear/neuclear-xmlsig
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26302

Modified Files:
	project.xml 
Log Message:
Fixed sourceforge cvs repository info in Maven project descriptor

Index: project.xml
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/project.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** project.xml	7 Sep 2004 21:26:01 -0000	1.26
--- project.xml	9 Sep 2004 17:19:32 -0000	1.27
***************
*** 22,29 ****
      <repository>
          <connection>
!          scm:cvs:pserver:ano...@cv...:/cvsroot/neuclear:neuclear-xmlsig
          </connection>
          <url>
!       http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/neuclear/neuclear-xmlsig/
          </url>
      </repository>
--- 22,29 ----
      <repository>
          <connection>
!          scm:cvs:pserver:ano...@cv...:/cvsroot/neuclear:neuclear-xmlsig
          </connection>
          <url>
!       http://cvs.sourceforge.net/viewcvs.py/neuclear/neuclear-xmlsig/
          </url>
      </repository>

[Neuclear-cvs] neuclear-ledger-prevalent project.xml,1.13,1.14

From: Pelle B. <pe...@us...> - 2004-09-09 17:19:35

Update of /cvsroot/neuclear/neuclear-ledger-prevalent
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26242

Modified Files:
	project.xml 
Log Message:
Fixed sourceforge cvs repository info in Maven project descriptor

Index: project.xml
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger-prevalent/project.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** project.xml	23 Jul 2004 18:56:29 -0000	1.13
--- project.xml	9 Sep 2004 17:19:26 -0000	1.14
***************
*** 21,28 ****
      <repository>
          <connection>
!          scm:cvs:pserver:ano...@cv...:/cvsroot/neuclear:neuclear-ledger-prevalent
          </connection>
          <url>
!       http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/neuclear/neuclear-ledger-prevalent/
          </url>
      </repository>
--- 21,28 ----
      <repository>
          <connection>
!          scm:cvs:pserver:ano...@cv...:/cvsroot/neuclear:neuclear-ledger-prevalent
          </connection>
          <url>
!       http://cvs.sourceforge.net/viewcvs.py/neuclear/neuclear-ledger-prevalent/
          </url>
      </repository>

[Neuclear-cvs] neuclear-ledger project.xml,1.30,1.31

From: Pelle B. <pe...@us...> - 2004-09-09 17:19:20

Update of /cvsroot/neuclear/neuclear-ledger
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26197

Modified Files:
	project.xml 
Log Message:
Fixed sourceforge cvs repository info in Maven project descriptor

Index: project.xml
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger/project.xml,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** project.xml	23 Jul 2004 18:55:27 -0000	1.30
--- project.xml	9 Sep 2004 17:19:03 -0000	1.31
***************
*** 22,29 ****
      <repository>
          <connection>
!          scm:cvs:pserver:ano...@cv...:/cvsroot/neuclear:neuclear-ledger
          </connection>
          <url>
!       http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/neuclear/neuclear-ledger/
          </url>
      </repository>
--- 22,29 ----
      <repository>
          <connection>
!          scm:cvs:pserver:ano...@cv...:/cvsroot/neuclear:neuclear-ledger
          </connection>
          <url>
!       http://cvs.sourceforge.net/viewcvs.py/neuclear/neuclear-ledger/
          </url>
      </repository>

[Neuclear-cvs] neuclear-commons project.xml,1.50,1.51

From: Pelle B. <pe...@us...> - 2004-09-09 17:19:06

Update of /cvsroot/neuclear/neuclear-commons
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26086

Modified Files:
	project.xml 
Log Message:
Fixed sourceforge cvs repository info in Maven project descriptor

Index: project.xml
===================================================================
RCS file: /cvsroot/neuclear/neuclear-commons/project.xml,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** project.xml	7 Sep 2004 21:16:47 -0000	1.50
--- project.xml	9 Sep 2004 17:18:56 -0000	1.51
***************
*** 23,33 ****
      <repository>
          <connection>
!          scm:cvs:pserver:ano...@cv...:/cvsroot/neuclear:neuclear-commons
          </connection>
          <url>
!       http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/neuclear/neuclear-commons/
          </url>
      </repository>
  
      <siteAddress>dev.neuclear.org</siteAddress>
      <siteDirectory>/home/sites/neuclear.org/public_html/commons/</siteDirectory>
--- 23,34 ----
      <repository>
          <connection>
!          scm:cvs:pserver:ano...@cv...:/cvsroot/neuclear:neuclear-commons
          </connection>
          <url>
!       http://cvs.sourceforge.net/viewcvs.py/neuclear/neuclear-commons/
          </url>
      </repository>
  
+ 
      <siteAddress>dev.neuclear.org</siteAddress>
      <siteDirectory>/home/sites/neuclear.org/public_html/commons/</siteDirectory>

[Neuclear-cvs] pkyp project.xml,1.2,1.3

From: Pelle B. <pe...@us...> - 2004-09-09 17:19:03

Update of /cvsroot/neuclear/pkyp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26016

Modified Files:
	project.xml 
Log Message:
Fixed sourceforge cvs repository info in Maven project descriptor

Index: project.xml
===================================================================
RCS file: /cvsroot/neuclear/pkyp/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** project.xml	23 Jun 2004 19:27:54 -0000	1.2
--- project.xml	9 Sep 2004 17:18:42 -0000	1.3
***************
*** 20,27 ****
      <repository>
          <connection>
!          scm:cvs:pserver:ano...@cv...:/cvsroot/neuclear:pkyp
          </connection>
          <url>
!       http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/neuclear/neuclear-signer/
          </url>
      </repository>
--- 20,27 ----
      <repository>
          <connection>
!          scm:cvs:pserver:ano...@cv...:/cvsroot/neuclear:pkyp
          </connection>
          <url>
!       http://cvs.sourceforge.net/viewcvs.py/neuclear/neuclear-signer/
          </url>
      </repository>

[Neuclear-cvs] neuclear-pay project.xml,1.51,1.52

From: Pelle B. <pe...@us...> - 2004-09-09 17:18:44

Update of /cvsroot/neuclear/neuclear-pay
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25983

Modified Files:
	project.xml 
Log Message:
Fixed sourceforge cvs repository info in Maven project descriptor

Index: project.xml
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/project.xml,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** project.xml	8 Sep 2004 16:50:50 -0000	1.51
--- project.xml	9 Sep 2004 17:18:35 -0000	1.52
***************
*** 22,29 ****
      <repository>
          <connection>
!          scm:cvs:pserver:ano...@cv...:/cvsroot/neuclear:neuclear-pay
          </connection>
          <url>
!       http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/neuclear/neuclear-pay/
          </url>
      </repository>
--- 22,29 ----
      <repository>
          <connection>
!          scm:cvs:pserver:ano...@cv...:/cvsroot/neuclear:neuclear-pay
          </connection>
          <url>
!       http://cvs.sourceforge.net/viewcvs.py/neuclear/neuclear-pay/
          </url>
      </repository>

[Neuclear-cvs] neuclear-ledger-hibernate project.xml,1.18,1.19

From: Pelle B. <pe...@us...> - 2004-09-09 17:18:37

Update of /cvsroot/neuclear/neuclear-ledger-hibernate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25863

Modified Files:
	project.xml 
Log Message:
Fixed sourceforge cvs repository info in Maven project descriptor

Index: project.xml
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger-hibernate/project.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** project.xml	23 Jul 2004 18:56:08 -0000	1.18
--- project.xml	9 Sep 2004 17:18:28 -0000	1.19
***************
*** 21,28 ****
      <repository>
          <connection>
!          scm:cvs:pserver:ano...@cv...:/cvsroot/neuclear:neuclear-ledger
          </connection>
          <url>
!       http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/neuclear/neuclear-ledger/
          </url>
      </repository>
--- 21,28 ----
      <repository>
          <connection>
!          scm:cvs:pserver:ano...@cv...:/cvsroot/neuclear:neuclear-ledger
          </connection>
          <url>
!       http://cvs.sourceforge.net/viewcvs.py/neuclear/neuclear-ledger/
          </url>
      </repository>

[Neuclear-cvs] neuclear-id project.xml,1.59,1.60

From: Pelle B. <pe...@us...> - 2004-09-09 17:18:33

Update of /cvsroot/neuclear/neuclear-id
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25799

Modified Files:
	project.xml 
Log Message:
Fixed sourceforge cvs repository info in Maven project descriptor

Index: project.xml
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/project.xml,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** project.xml	7 Sep 2004 21:25:22 -0000	1.59
--- project.xml	9 Sep 2004 17:18:21 -0000	1.60
***************
*** 22,32 ****
      <repository>
          <connection>
!          scm:cvs:pserver:ano...@cv...:/cvsroot/neuclear:neuclear-id
          </connection>
          <url>
!       http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/neuclear/neuclear-id/
          </url>
      </repository>
  
      <siteAddress>dev.neuclear.org</siteAddress>
      <siteDirectory>/home/sites/neuclear.org/public_html/id/</siteDirectory>
--- 22,33 ----
      <repository>
          <connection>
!          scm:cvs:pserver:ano...@cv...:/cvsroot/neuclear:neuclear-id
          </connection>
          <url>
!       http://cvs.sourceforge.net/viewcvs.py/neuclear/neuclear-id/
          </url>
      </repository>
  
+ 
      <siteAddress>dev.neuclear.org</siteAddress>
      <siteDirectory>/home/sites/neuclear.org/public_html/id/</siteDirectory>

Flat | Threaded

1 2 3 .. 34 > >> (Page 1 of 34)