neuclear-develop — Support requests, cvs etc

[Neuclear-develop] neuclear-commons project.properties,1.17,1.18

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

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

Modified Files:
	project.properties 
Log Message:
implemented the queue and improved the DefaultSigner

Index: project.properties
===================================================================
RCS file: /cvsroot/neuclear/neuclear-commons/project.properties,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** project.properties	23 Mar 2004 19:23:40 -0000	1.17
--- project.properties	12 Apr 2004 23:50:08 -0000	1.18
***************
*** 2,6 ****
  # P R O J E C T  P R O P E R T I E S
  # -------------------------------------------------------------------
! maven.test.skip=true
  
  maven.compile.debug = on
--- 2,6 ----
  # P R O J E C T  P R O P E R T I E S
  # -------------------------------------------------------------------
! #maven.test.skip=true
  
  maven.compile.debug = on

[Neuclear-develop] neuclear-commons/src/java/org/neuclear/commons/crypto/passphraseagents/swing RunnableQueue.java,NONE,1.1 KeyStoreDialog.java,1.1,1.2 SwingAgent.java,1.3,1.4

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

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

Modified Files:
	KeyStoreDialog.java SwingAgent.java 
Added Files:
	RunnableQueue.java 
Log Message:
implemented the queue and improved the DefaultSigner

--- NEW FILE: RunnableQueue.java ---
package org.neuclear.commons.crypto.passphraseagents.swing;

import java.util.LinkedList;

/*
NeuClear Distributed Transaction Clearing Platform
(C) 2003 Pelle Braendgaard

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.

This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

$Id: RunnableQueue.java,v 1.1 2004/04/12 23:50:07 pelle Exp $
$Log: RunnableQueue.java,v $
Revision 1.1  2004/04/12 23:50:07  pelle
implemented the queue and improved the DefaultSigner

*/

/**
 * User: pelleb
 * Date: Apr 12, 2004
 * Time: 10:16:55 PM
 */
public class RunnableQueue implements Runnable {
    public RunnableQueue() {
        queue = new LinkedList();
    }

    public void run() {

        System.out.println("Starting Crypto Agent Event Queue");
        while (true) {
            read().run();

        }
    }

    private Runnable read() {
        synchronized (monitor) {
            if (queue.size() > 0)
                return (Runnable) queue.removeFirst();

            try {
                monitor.wait();
            } catch (InterruptedException e) {
                e.printStackTrace();
            }
            return read();
        }
    }

    public void queue(Runnable run) {
        if (thread == null) {
            thread = new Thread(this);
            thread.start();
        }
        synchronized (monitor) {
            queue.add(run);
            monitor.notifyAll();
        }
    }

    private final LinkedList queue;
    private Thread thread;
    private final Object monitor = new Object();
}

Index: SwingAgent.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-commons/src/java/org/neuclear/commons/crypto/passphraseagents/swing/SwingAgent.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SwingAgent.java	12 Apr 2004 15:00:29 -0000	1.3
--- SwingAgent.java	12 Apr 2004 23:50:07 -0000	1.4
***************
*** 6,21 ****
  import org.neuclear.commons.crypto.passphraseagents.UserCancellationException;
  import org.neuclear.commons.crypto.signers.BrowsableSigner;
  import org.neuclear.commons.crypto.signers.InvalidPassphraseException;
  import org.neuclear.commons.crypto.signers.SetPublicKeyCallBack;
- import org.neuclear.commons.crypto.signers.TestCaseSigner;
  
  import javax.swing.*;
  import java.security.PublicKey;
- import java.util.HashMap;
- import java.util.Map;
  
  /*
  $Id$
  $Log$
  Revision 1.3  2004/04/12 15:00:29  pelle
  Now have a slightly better way of handling the waiting for input using the WaitForInput class.
--- 6,22 ----
  import org.neuclear.commons.crypto.passphraseagents.UserCancellationException;
  import org.neuclear.commons.crypto.signers.BrowsableSigner;
+ import org.neuclear.commons.crypto.signers.DefaultSigner;
  import org.neuclear.commons.crypto.signers.InvalidPassphraseException;
  import org.neuclear.commons.crypto.signers.SetPublicKeyCallBack;
  
  import javax.swing.*;
  import java.security.PublicKey;
  
  /*
  $Id$
  $Log$
+ Revision 1.4  2004/04/12 23:50:07  pelle
+ implemented the queue and improved the DefaultSigner
+ 
  Revision 1.3  2004/04/12 15:00:29  pelle
  Now have a slightly better way of handling the waiting for input using the WaitForInput class.
***************
*** 47,60 ****
          ksd = new KeyStoreDialog();
          simple = new SimpleDialog();
!         nad = new NewAliasDialog(ksd);
!         cache = new HashMap();
      }
  
-     private BrowsableSigner signer;
-     private final NewAliasDialog nad;
      private final SimpleDialog simple;
      private final KeyStoreDialog ksd;
!     private final Map cache;
!     private boolean isCancel;
  
      public static void main(final String[] args) {
--- 48,57 ----
          ksd = new KeyStoreDialog();
          simple = new SimpleDialog();
!         queue = new RunnableQueue();
      }
  
      private final SimpleDialog simple;
      private final KeyStoreDialog ksd;
!     private final RunnableQueue queue;
  
      public static void main(final String[] args) {
***************
*** 62,66 ****
          try {
              try {
!                 final BrowsableSigner signer = new TestCaseSigner(dia);
                  byte sig[] = signer.sign("testdata".getBytes(), new SetPublicKeyCallBack() {
                      public void setPublicKey(PublicKey pub) {
--- 59,64 ----
          try {
              try {
!                 System.out.println(dia.getPassPhrase("test"));
!                 final BrowsableSigner signer = new DefaultSigner(dia);
                  byte sig[] = signer.sign("testdata".getBytes(), new SetPublicKeyCallBack() {
                      public void setPublicKey(PublicKey pub) {
***************
*** 95,99 ****
      public char[] getPassPhrase(String name, boolean incorrect) throws UserCancellationException {
          WaitForInput waiter = simple.createGetPassphraseTask(name, incorrect);
!         new Thread(waiter).start();
          return (char[]) waiter.getResult();
      }
--- 93,97 ----
      public char[] getPassPhrase(String name, boolean incorrect) throws UserCancellationException {
          WaitForInput waiter = simple.createGetPassphraseTask(name, incorrect);
!         queue.queue(waiter);
          return (char[]) waiter.getResult();
      }
***************
*** 109,113 ****
      public byte[] sign(BrowsableSigner signer, byte data[], SetPublicKeyCallBack callback) throws UserCancellationException {
          WaitForInput waiter = ksd.createSigningTask(signer, data, callback);
!         new Thread(waiter).start();
          return (byte[]) waiter.getResult();
      }
--- 107,111 ----
      public byte[] sign(BrowsableSigner signer, byte data[], SetPublicKeyCallBack callback) throws UserCancellationException {
          WaitForInput waiter = ksd.createSigningTask(signer, data, callback);
!         queue.queue(waiter);
          return (byte[]) waiter.getResult();
      }

Index: KeyStoreDialog.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-commons/src/java/org/neuclear/commons/crypto/passphraseagents/swing/KeyStoreDialog.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** KeyStoreDialog.java	12 Apr 2004 15:00:29 -0000	1.1
--- KeyStoreDialog.java	12 Apr 2004 23:50:07 -0000	1.2
***************
*** 28,31 ****
--- 28,34 ----
  $Id$
  $Log$
+ Revision 1.2  2004/04/12 23:50:07  pelle
+ implemented the queue and improved the DefaultSigner
+ 
  Revision 1.1  2004/04/12 15:00:29  pelle
  Now have a slightly better way of handling the waiting for input using the WaitForInput class.
***************
*** 60,64 ****
          cancel = new JButton("Cancel");
          newId = new JButton("New ...");
!         list = new JList(new String[]{"bob", "carol", "alice"});
          list.setBorder(BorderFactory.createLoweredBevelBorder());
          passphrase = new JPasswordField();
--- 63,67 ----
          cancel = new JButton("Cancel");
          newId = new JButton("New ...");
!         list = new JList();
          list.setBorder(BorderFactory.createLoweredBevelBorder());
          passphrase = new JPasswordField();

[Neuclear-develop] neuclear-commons/src/java/org/neuclear/commons/crypto/passphraseagents AlwaysTheSamePassphraseAgent.java,1.3,1.4

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

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

Modified Files:
	AlwaysTheSamePassphraseAgent.java 
Log Message:
implemented the queue and improved the DefaultSigner

Index: AlwaysTheSamePassphraseAgent.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-commons/src/java/org/neuclear/commons/crypto/passphraseagents/AlwaysTheSamePassphraseAgent.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AlwaysTheSamePassphraseAgent.java	19 Dec 2003 18:02:53 -0000	1.3
--- AlwaysTheSamePassphraseAgent.java	12 Apr 2004 23:50:07 -0000	1.4
***************
*** 23,26 ****
--- 23,29 ----
  $Id$
  $Log$
+ Revision 1.4  2004/04/12 23:50:07  pelle
+ implemented the queue and improved the DefaultSigner
+ 
  Revision 1.3  2003/12/19 18:02:53  pelle
  Revamped a lot of exception handling throughout the framework, it has been simplified in most places:
***************
*** 67,70 ****
--- 70,78 ----
      }
  
+     public AlwaysTheSamePassphraseAgent(final char[] passphrase) {
+         this.passphrase = new String(passphrase);
+         System.out.println("AlwaysTheSamePassphraseAgent started.\nDO NOT USE FOR PRODUCTION SERVERS");
+     }
+ 
      public final char[] getPassPhrase(final String name) {
          return passphrase.toCharArray();
***************
*** 72,76 ****
  
      public char[] getPassPhrase(String name, boolean incorrect) throws UserCancellationException {
!         if (incorrect) throw new LowLevelException("passphrase is incorrect for: "+name);
          return getPassPhrase(name);
      }
--- 80,84 ----
  
      public char[] getPassPhrase(String name, boolean incorrect) throws UserCancellationException {
!         if (incorrect) throw new LowLevelException("passphrase is incorrect for: " + name);
          return getPassPhrase(name);
      }

[Neuclear-develop] [JIRA] Closed: (COM-19) Create signing task queue on SwingAgent

[<bug...@ve...>]

Message:

   The following issue has been closed.

---------------------------------------------------------------------
View the issue:
  http://jira.neuclear.org//browse/COM-19

Here is an overview of the issue:
---------------------------------------------------------------------
        Key: COM-19
    Summary: Create signing task queue on SwingAgent
       Type: Improvement

     Status: Closed
   Priority: Major
 Resolution: FIXED

 Original Estimate: Unknown
 Time Spent: Unknown
  Remaining: Unknown

    Project: NeuClear Commons
   Fix Fors:
             r_0_7
   Versions:
             r_0_7

   Assignee: Pelle Braendgaard
   Reporter: Pelle Braendgaard

    Created: Mon, 12 Apr 2004 9:53 AM
    Updated: Mon, 12 Apr 2004 3:31 PM

Description:
The agent needs to queue all tasks to avoid problems with multiple simultaneous signing requests.


---------------------------------------------------------------------
JIRA INFORMATION:
This message is automatically generated by JIRA.

If you think it was sent incorrectly contact one of the administrators:
   http://jira.neuclear.org//secure/Administrators.jspa

If you want more information on JIRA, or have a bug to report see:
   http://www.atlassian.com/software/jira

[Neuclear-develop] neuclear-pay/src/test/org/neuclear/asset/controllers/currency PrevalentCurrencyHibernateAuditorTests.java,NONE,1.1 CurrencyTests.java,1.11,1.12 HibernateCurrencyTests.java,1.1,1.2 PrevalentCurrencyTests.java,1.1,1.2

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

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

Modified Files:
	CurrencyTests.java HibernateCurrencyTests.java 
	PrevalentCurrencyTests.java 
Added Files:
	PrevalentCurrencyHibernateAuditorTests.java 
Log Message:
Hibernate and Pervayler implementations of the Ledger all pass now for both currency and ledger tests.

Index: CurrencyTests.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/asset/controllers/currency/CurrencyTests.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** CurrencyTests.java	12 Apr 2004 15:27:52 -0000	1.11
--- CurrencyTests.java	12 Apr 2004 19:29:53 -0000	1.12
***************
*** 61,65 ****
      }
  
!     protected Ledger createAuditLedger() {
          return new SimpleLedger("audit");
      }
--- 61,65 ----
      }
  
!     protected Ledger createAuditLedger() throws LowlevelLedgerException {
          return new SimpleLedger("audit");
      }
***************
*** 291,295 ****
          AssetBuilder builder = new AssetBuilder("http://bux.neuclear.org",
                  getSigner().getPublicKey("neu://test/bux"),
!                 getAlice().getPublicKey(),
                  2, 0);
          return (Asset) builder.convert("neu://test/bux", getSigner());
--- 291,295 ----
          AssetBuilder builder = new AssetBuilder("http://bux.neuclear.org",
                  getSigner().getPublicKey("neu://test/bux"),
!                 getIssuer().getPublicKey(),
                  2, 0);
          return (Asset) builder.convert("neu://test/bux", getSigner());
***************
*** 300,304 ****
          AssetBuilder builder = new AssetBuilder("http://shoes.neuclear.org",
                  getSigner().getPublicKey("neu://test/bux"),
!                 getAlice().getPublicKey(),
                  2, 0);
          return (Asset) builder.convert("neu://test", getSigner());
--- 300,304 ----
          AssetBuilder builder = new AssetBuilder("http://shoes.neuclear.org",
                  getSigner().getPublicKey("neu://test/bux"),
!                 getIssuer().getPublicKey(),
                  2, 0);
          return (Asset) builder.convert("neu://test", getSigner());

Index: PrevalentCurrencyTests.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/asset/controllers/currency/PrevalentCurrencyTests.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PrevalentCurrencyTests.java	12 Apr 2004 15:27:52 -0000	1.1
--- PrevalentCurrencyTests.java	12 Apr 2004 19:29:53 -0000	1.2
***************
*** 29,32 ****
--- 29,35 ----
  $Id$
  $Log$
+ Revision 1.2  2004/04/12 19:29:53  pelle
+ Hibernate and Pervayler implementations of the Ledger all pass now for both currency and ledger tests.
+ 
  Revision 1.1  2004/04/12 15:27:52  pelle
  Added Hibernate and Prevalent tests for Currency Controllers
***************
*** 49,53 ****
  
      protected Ledger createControllerLedger() throws IOException, ClassNotFoundException {
!         return new PrevalentLedger("asset", "target/test-data/pl");
      }
  
--- 52,56 ----
  
      protected Ledger createControllerLedger() throws IOException, ClassNotFoundException {
!         return new PrevalentLedger("asset");
      }
  

--- NEW FILE: PrevalentCurrencyHibernateAuditorTests.java ---
package org.neuclear.asset.controllers.currency;

import org.neuclear.commons.NeuClearException;
import org.neuclear.ledger.Ledger;
import org.neuclear.ledger.LowlevelLedgerException;
import org.neuclear.ledger.hibernate.HibernateLedger;
import org.neuclear.ledger.prevalent.PrevalentLedger;

import java.io.IOException;
import java.security.GeneralSecurityException;

/*
NeuClear Distributed Transaction Clearing Platform
(C) 2003 Pelle Braendgaard

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.

This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

$Id: PrevalentCurrencyHibernateAuditorTests.java,v 1.1 2004/04/12 19:29:53 pelle Exp $
$Log: PrevalentCurrencyHibernateAuditorTests.java,v $
Revision 1.1  2004/04/12 19:29:53  pelle
Hibernate and Pervayler implementations of the Ledger all pass now for both currency and ledger tests.

Revision 1.1  2004/04/12 15:27:52  pelle
Added Hibernate and Prevalent tests for Currency Controllers

Revision 1.1  2004/04/06 23:01:01  pelle
Create new PrevalentCurrencyTests TestCase for doing integration testing with various persistent ledgers.

*/

/**
 * User: pelleb
 * Date: Apr 6, 2004
 * Time: 8:11:02 PM
 */
public class PrevalentCurrencyHibernateAuditorTests extends CurrencyTests {

    public PrevalentCurrencyHibernateAuditorTests(String s) throws GeneralSecurityException, LowlevelLedgerException, NeuClearException, IOException, ClassNotFoundException {
        super(s);
    }

    protected Ledger createControllerLedger() throws IOException, ClassNotFoundException {
        return new PrevalentLedger("asset");
    }

    protected Ledger createAuditLedger() throws LowlevelLedgerException {
        return new HibernateLedger("audit", true);
    }

}

Index: HibernateCurrencyTests.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/asset/controllers/currency/HibernateCurrencyTests.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** HibernateCurrencyTests.java	12 Apr 2004 15:27:52 -0000	1.1
--- HibernateCurrencyTests.java	12 Apr 2004 19:29:53 -0000	1.2
***************
*** 29,32 ****
--- 29,35 ----
  $Id$
  $Log$
+ Revision 1.2  2004/04/12 19:29:53  pelle
+ Hibernate and Pervayler implementations of the Ledger all pass now for both currency and ledger tests.
+ 
  Revision 1.1  2004/04/12 15:27:52  pelle
  Added Hibernate and Prevalent tests for Currency Controllers
***************
*** 49,53 ****
  
      protected Ledger createControllerLedger() throws IOException, ClassNotFoundException, LowlevelLedgerException {
!         return new HibernateLedger("test");
      }
  
--- 52,56 ----
  
      protected Ledger createControllerLedger() throws IOException, ClassNotFoundException, LowlevelLedgerException {
!         return new HibernateLedger("test", true);
      }
  

[Neuclear-develop] neuclear-pay/src/java/org/neuclear/asset/controllers/currency CurrencyController.java,1.24,1.25

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

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

Modified Files:
	CurrencyController.java 
Log Message:
Hibernate and Pervayler implementations of the Ledger all pass now for both currency and ledger tests.

Index: CurrencyController.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/controllers/currency/CurrencyController.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** CurrencyController.java	6 Apr 2004 16:24:33 -0000	1.24
--- CurrencyController.java	12 Apr 2004 19:29:52 -0000	1.25
***************
*** 47,50 ****
--- 47,52 ----
  
          try {
+             if (req.getSignatory().getName().equals(issuerBook))
+                 throw new InvalidTransferException("Issuer is not allowed to transfer");
  
              final PostedTransaction posted = ledger.verifiedTransfer(req.getDigest(), req.getSignatory().getName(), req.getRecipient(), req.getAmount().getAmount(), req.getComment());
***************
*** 97,100 ****
--- 99,104 ----
      public final ExchangeOrderReceipt process(final ExchangeOrder req) throws InvalidTransferException, LowLevelPaymentException, TransferDeniedException, NeuClearException {
          try {
+             if (req.getSignatory().getName().equals(issuerBook))
+                 throw new InvalidTransferException("Issuer is not allowed to Exchange");
  
              final PostedHeldTransaction posted = ledger.hold(req.getDigest(), req.getSignatory().getName(), req.getAgent().getSignatory().getName(), req.getExpiry(), req.getAmount().getAmount(), req.getComment());

[Neuclear-develop] neuclear-id/src/java/org/neuclear/tests AbstractSigningTest.java,1.7,1.8

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

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

Modified Files:
	AbstractSigningTest.java 
Log Message:
Hibernate and Pervayler implementations of the Ledger all pass now for both currency and ledger tests.

Index: AbstractSigningTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/tests/AbstractSigningTest.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** AbstractSigningTest.java	1 Apr 2004 23:19:50 -0000	1.7
--- AbstractSigningTest.java	12 Apr 2004 19:27:27 -0000	1.8
***************
*** 9,12 ****
--- 9,13 ----
  
  import java.security.GeneralSecurityException;
+ import java.security.KeyPair;
  
  /*
***************
*** 30,33 ****
--- 31,37 ----
  $Id$
  $Log$
+ Revision 1.8  2004/04/12 19:27:27  pelle
+ Hibernate and Pervayler implementations of the Ledger all pass now for both currency and ledger tests.
+ 
  Revision 1.7  2004/04/01 23:19:50  pelle
  Split Identity into Signatory and Identity class.
***************
*** 82,85 ****
--- 86,91 ----
          bob = new Signatory(signer.getPublicKey("neu://bob@test"));
          assertNotNull(bob);
+         issuerkp = CryptoTools.createTinyRSAKeyPair();
+         issuer = new Signatory(issuerkp.getPublic());
      }
  
***************
*** 104,107 ****
--- 110,117 ----
      }
  
+     protected final Signatory getIssuer() {
+         return issuer;
+     }
+ 
      protected final JCESigner getSigner() {
          return signer;
***************
*** 110,113 ****
--- 120,126 ----
      private Signatory bob;
      private Signatory alice;
+     private Signatory issuer;
+     private KeyPair issuerkp;
+ 
      protected final JCESigner signer;
  }

[Neuclear-develop] neuclear-ledger-hibernate/src/java/org/neuclear/ledger/hibernate HHeld.java,1.4,1.5 HTransaction.java,1.6,1.7 HibernateLedger.java,1.13,1.14

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

Update of /cvsroot/neuclear/neuclear-ledger-hibernate/src/java/org/neuclear/ledger/hibernate
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32058/src/java/org/neuclear/ledger/hibernate

Modified Files:
	HHeld.java HTransaction.java HibernateLedger.java 
Log Message:
Hibernate and Pervayler implementations of the Ledger all pass now for both currency and ledger tests.

Index: HHeld.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger-hibernate/src/java/org/neuclear/ledger/hibernate/HHeld.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** HHeld.java	31 Mar 2004 23:11:30 -0000	1.4
--- HHeld.java	12 Apr 2004 19:27:19 -0000	1.5
***************
*** 106,110 ****
              unp.addItem(item.getBook(), item.getAmount());
          }
!         return new PostedHeldTransaction(unp, transactionTime);
      }
  
--- 106,114 ----
              unp.addItem(item.getBook(), item.getAmount());
          }
! 
!         PostedHeldTransaction tran = new PostedHeldTransaction(unp, transactionTime);
!         tran.setReceiptId(receipt);
!         return tran;
! 
      }
  

Index: HibernateLedger.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger-hibernate/src/java/org/neuclear/ledger/hibernate/HibernateLedger.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** HibernateLedger.java	6 Apr 2004 22:52:34 -0000	1.13
--- HibernateLedger.java	12 Apr 2004 19:27:19 -0000	1.14
***************
*** 362,372 ****
          try {
              Session ses = factory.openSession();
!             HHeld held = (HHeld) ses.get(HHeld.class, idstring);
!             if (held == null) {
                  ses.close();
!                 return held.createPosted();
              }
              ses.close();
!             throw new UnknownTransactionException(this, idstring);
          } catch (HibernateException e) {
              throw new LowlevelLedgerException(e);
--- 362,374 ----
          try {
              Session ses = factory.openSession();
!             net.sf.hibernate.Transaction t = ses.beginTransaction();
!             HHeld tran = (HHeld) ses.get(HHeld.class, idstring);
!             if (tran == null) {
                  ses.close();
!                 throw new UnknownTransactionException(this, idstring);
              }
+             PostedHeldTransaction ph = tran.createPosted();
              ses.close();
!             return ph;
          } catch (HibernateException e) {
              throw new LowlevelLedgerException(e);
***************
*** 386,389 ****
--- 388,393 ----
              }
              tran.setReceipt(receipt);
+             ses.flush();
+ //            ses.update(tran);
              t.commit();
              ses.close();
***************
*** 404,407 ****
--- 408,412 ----
              }
              tran.setReceipt(receipt);
+             ses.flush();
              t.commit();
              ses.close();

Index: HTransaction.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger-hibernate/src/java/org/neuclear/ledger/hibernate/HTransaction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** HTransaction.java	31 Mar 2004 23:11:30 -0000	1.6
--- HTransaction.java	12 Apr 2004 19:27:19 -0000	1.7
***************
*** 88,92 ****
              unp.addItem(item.getBook(), item.getAmount());
          }
!         return new PostedTransaction(unp, transactionTime);
      }
  
--- 88,94 ----
              unp.addItem(item.getBook(), item.getAmount());
          }
!         PostedTransaction tran = new PostedTransaction(unp, transactionTime);
!         tran.setReceiptId(receipt);
!         return tran;
      }
  

[Neuclear-develop] neuclear-ledger-hibernate/src/java hibernate.properties,1.9,1.10

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

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

Modified Files:
	hibernate.properties 
Log Message:
Hibernate and Pervayler implementations of the Ledger all pass now for both currency and ledger tests.

Index: hibernate.properties
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger-hibernate/src/java/hibernate.properties,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** hibernate.properties	6 Apr 2004 22:52:34 -0000	1.9
--- hibernate.properties	12 Apr 2004 19:27:19 -0000	1.10
***************
*** 376,380 ****
  ## enable the query cache
  
! #hibernate.cache.use_query_cache true
  
  
--- 376,380 ----
  ## enable the query cache
  
! hibernate.cache.use_query_cache false
  
  

[Neuclear-develop] neuclear-ledger-prevalent/src/java/org/neuclear/ledger/prevalent CompleteHeldTransaction.java,1.2,1.3 PrevalentLedger.java,1.5,1.6

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

Update of /cvsroot/neuclear/neuclear-ledger-prevalent/src/java/org/neuclear/ledger/prevalent
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31962/src/java/org/neuclear/ledger/prevalent

Modified Files:
	CompleteHeldTransaction.java PrevalentLedger.java 
Log Message:
Hibernate and Pervayler implementations of the Ledger all pass now for both currency and ledger tests.

Index: CompleteHeldTransaction.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger-prevalent/src/java/org/neuclear/ledger/prevalent/CompleteHeldTransaction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CompleteHeldTransaction.java	31 Mar 2004 23:11:20 -0000	1.2
--- CompleteHeldTransaction.java	12 Apr 2004 19:27:08 -0000	1.3
***************
*** 46,55 ****
          table.register(tran.getRequestId(), executionTime);
  
!         Iterator iter = tran.getItems();
          while (iter.hasNext()) {
              TransactionItem item = (TransactionItem) iter.next();
              system.getBalanceTable().add(item.getBook(), item.getAmount());
          }
!         return new PostedTransaction(tran, executionTime, amount, comment);
      }
  }
--- 46,56 ----
          table.register(tran.getRequestId(), executionTime);
  
!         final PostedTransaction posted = new PostedTransaction(tran, executionTime, amount, comment);
!         Iterator iter = posted.getItems();
          while (iter.hasNext()) {
              TransactionItem item = (TransactionItem) iter.next();
              system.getBalanceTable().add(item.getBook(), item.getAmount());
          }
!         return posted;
      }
  }

Index: PrevalentLedger.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger-prevalent/src/java/org/neuclear/ledger/prevalent/PrevalentLedger.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** PrevalentLedger.java	6 Apr 2004 22:56:36 -0000	1.5
--- PrevalentLedger.java	12 Apr 2004 19:27:08 -0000	1.6
***************
*** 19,22 ****
--- 19,30 ----
      private final LedgerSystem system;
  
+     /**
+      * Persistent Prevalent Ledger
+      *
+      * @param id
+      * @param basedir
+      * @throws IOException
+      * @throws ClassNotFoundException
+      */
      public PrevalentLedger(final String id, final String basedir) throws IOException, ClassNotFoundException {
          super(id);
***************
*** 26,29 ****
--- 34,50 ----
  
      /**
+      * Transient PrevalentLedger
+      *
+      * @param id
+      * @throws IOException
+      * @throws ClassNotFoundException
+      */
+     public PrevalentLedger(final String id) throws IOException, ClassNotFoundException {
+         super(id);
+         prevayler = PrevaylerFactory.createTransientPrevayler(new LedgerSystem(id));
+         system = (LedgerSystem) prevayler.prevalentSystem();
+     }
+ 
+     /**
       * The basic interface for creating Transactions in the database.
       * The implementing class takes this transacion information and stores it with an automatically generated uniqueid.
***************
*** 248,252 ****
      public void close() {
          try {
!             prevayler.takeSnapshot();
              prevayler.close();
          } catch (IOException e) {
--- 269,273 ----
      public void close() {
          try {
! //            prevayler.takeSnapshot();
              prevayler.close();
          } catch (IOException e) {

[Neuclear-develop] neuclear-ledger/src/java/org/neuclear/ledger/tests AbstractLedgerTest.java,1.8,1.9

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

Update of /cvsroot/neuclear/neuclear-ledger/src/java/org/neuclear/ledger/tests
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31899/src/java/org/neuclear/ledger/tests

Modified Files:
	AbstractLedgerTest.java 
Log Message:
Hibernate and Pervayler implementations of the Ledger all pass now for both currency and ledger tests.

Index: AbstractLedgerTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger/src/java/org/neuclear/ledger/tests/AbstractLedgerTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** AbstractLedgerTest.java	6 Apr 2004 22:50:14 -0000	1.8
--- AbstractLedgerTest.java	12 Apr 2004 19:26:37 -0000	1.9
***************
*** 14,20 ****
   * $Id$
   * $Log$
   * Revision 1.8  2004/04/06 22:50:14  pelle
   * Updated Unit Tests
!  *
   * Revision 1.7  2004/04/05 22:06:46  pelle
   * added setHeldReceiptId() method to ledger
--- 14,23 ----
   * $Id$
   * $Log$
+  * Revision 1.9  2004/04/12 19:26:37  pelle
+  * Hibernate and Pervayler implementations of the Ledger all pass now for both currency and ledger tests.
+  *
   * Revision 1.8  2004/04/06 22:50:14  pelle
   * Updated Unit Tests
!  * <p/>
   * Revision 1.7  2004/04/05 22:06:46  pelle
   * added setHeldReceiptId() method to ledger
***************
*** 452,456 ****
          }
          PostedHeldTransaction t2 = ledger.findHeldTransaction(tran.getRequestId());
!         assertEquals("1234", t2.getReceiptId());
          assertEquals(aliceBalance, ledger.getBalance(ALICE), 0);
          assertEquals(aliceBalance - 100, ledger.getAvailableBalance(ALICE), 0);
--- 455,459 ----
          }
          PostedHeldTransaction t2 = ledger.findHeldTransaction(tran.getRequestId());
!         assertEquals(t2.getRequestId(), "1234", t2.getReceiptId());
          assertEquals(aliceBalance, ledger.getBalance(ALICE), 0);
          assertEquals(aliceBalance - 100, ledger.getAvailableBalance(ALICE), 0);

[Neuclear-develop] [JIRA] Closed: (PAY-44) Issuer should be disallowed all non Issue Transactions

[<bug...@ve...>]

Message:

   The following issue has been closed.

   Resolver: Pelle Braendgaard
       Date: Mon, 12 Apr 2004 12:33 PM

Done.
Added access control banning Issuer for all non issuance transactions.
---------------------------------------------------------------------
View the issue:
  http://jira.neuclear.org//browse/PAY-44

Here is an overview of the issue:
---------------------------------------------------------------------
        Key: PAY-44
    Summary: Issuer should be disallowed all non Issue Transactions
       Type: Improvement

     Status: Closed
   Priority: Major
 Resolution: FIXED

 Original Estimate: Unknown
 Time Spent: Unknown
  Remaining: Unknown

    Project: NeuClear Payments
 Components: 
             Asset Controller
   Fix Fors:
             0.3
   Versions:
             0.3

   Assignee: Pelle Braendgaard
   Reporter: Pelle Braendgaard

    Created: Tue, 6 Apr 2004 11:53 AM
    Updated: Mon, 12 Apr 2004 12:33 PM

Description:
For reasons of security and auditing, the Issuer should only be allowed to perform IssueOrder's.

No TransferOrder's, ExchangeOrder's or any other Order should be allowed.


---------------------------------------------------------------------
JIRA INFORMATION:
This message is automatically generated by JIRA.

If you think it was sent incorrectly contact one of the administrators:
   http://jira.neuclear.org//secure/Administrators.jspa

If you want more information on JIRA, or have a bug to report see:
   http://www.atlassian.com/software/jira

[Neuclear-develop] [JIRA] Closed: (PAY-47) Test Currency Controller combined with Prevayler and Hibernate

[<bug...@ve...>]

Message:

   The following issue has been closed.

   Resolver: Pelle Braendgaard
       Date: Mon, 12 Apr 2004 12:28 PM

Done. All tests pass.
---------------------------------------------------------------------
View the issue:
  http://jira.neuclear.org//browse/PAY-47

Here is an overview of the issue:
---------------------------------------------------------------------
        Key: PAY-47
    Summary: Test Currency Controller combined with Prevayler and Hibernate
       Type: Test Case

     Status: Closed
   Priority: Major
 Resolution: FIXED

 Original Estimate: Unknown
 Time Spent: Unknown
  Remaining: Unknown

    Project: NeuClear Payments
 Components: 
             Asset Controller
             Audit Controller
   Fix Fors:
             0.4
   Versions:
             0.4

   Assignee: Pelle Braendgaard
   Reporter: Pelle Braendgaard

    Created: Mon, 12 Apr 2004 12:25 PM
    Updated: Mon, 12 Apr 2004 12:28 PM

Description:
Test with PrevalentLedger as the Currency Controller and HibernateLedger as the Audit Controller.


---------------------------------------------------------------------
JIRA INFORMATION:
This message is automatically generated by JIRA.

If you think it was sent incorrectly contact one of the administrators:
   http://jira.neuclear.org//secure/Administrators.jspa

If you want more information on JIRA, or have a bug to report see:
   http://www.atlassian.com/software/jira

[Neuclear-develop] [JIRA] Created: (PAY-47) Test Currency Controller combined with Prevayler and Hibernate

[<bug...@ve...>]

Message:

  A new issue has been created in JIRA.

---------------------------------------------------------------------
View the issue:
  http://jira.neuclear.org//browse/PAY-47

Here is an overview of the issue:
---------------------------------------------------------------------
        Key: PAY-47
    Summary: Test Currency Controller combined with Prevayler and Hibernate
       Type: Test Case

     Status: Open
   Priority: Major

 Original Estimate: Unknown
 Time Spent: Unknown
  Remaining: Unknown

    Project: NeuClear Payments
 Components: 
             Asset Controller
             Audit Controller
   Fix Fors:
             0.4
   Versions:
             0.4

   Assignee: Pelle Braendgaard
   Reporter: Pelle Braendgaard

    Created: Mon, 12 Apr 2004 12:25 PM
    Updated: Mon, 12 Apr 2004 12:25 PM

Description:
Test with PrevalentLedger as the Currency Controller and HibernateLedger as the Audit Controller.


---------------------------------------------------------------------
JIRA INFORMATION:
This message is automatically generated by JIRA.

If you think it was sent incorrectly contact one of the administrators:
   http://jira.neuclear.org//secure/Administrators.jspa

If you want more information on JIRA, or have a bug to report see:
   http://www.atlassian.com/software/jira

[Neuclear-develop] [JIRA] Closed: (PAY-46) Test Currency Controller with Prevayler

[<bug...@ve...>]

Message:

   The following issue has been closed.

   Resolver: Pelle Braendgaard
       Date: Mon, 12 Apr 2004 12:24 PM

Created test. Identified issue with Complete Exchange Order. Fixed.
Now all tests pass.
---------------------------------------------------------------------
View the issue:
  http://jira.neuclear.org//browse/PAY-46

Here is an overview of the issue:
---------------------------------------------------------------------
        Key: PAY-46
    Summary: Test Currency Controller with Prevayler
       Type: Test Case

     Status: Closed
   Priority: Major
 Resolution: FIXED

 Original Estimate: Unknown
 Time Spent: Unknown
  Remaining: Unknown

    Project: NeuClear Payments
 Components: 
             Asset Controller
   Fix Fors:
             0.4
   Versions:
             0.4

   Assignee: Pelle Braendgaard
   Reporter: Pelle Braendgaard

    Created: Mon, 12 Apr 2004 12:18 PM
    Updated: Mon, 12 Apr 2004 12:24 PM

Description:
Test with PrevalentLedger as the Currency Controller and SimpleLedger as the Audit Controller.


---------------------------------------------------------------------
JIRA INFORMATION:
This message is automatically generated by JIRA.

If you think it was sent incorrectly contact one of the administrators:
   http://jira.neuclear.org//secure/Administrators.jspa

If you want more information on JIRA, or have a bug to report see:
   http://www.atlassian.com/software/jira

[Neuclear-develop] [JIRA] Created: (PAY-46) Test Currency Controller with Prevayler

[<bug...@ve...>]

Message:

  A new issue has been created in JIRA.

---------------------------------------------------------------------
View the issue:
  http://jira.neuclear.org//browse/PAY-46

Here is an overview of the issue:
---------------------------------------------------------------------
        Key: PAY-46
    Summary: Test Currency Controller with Prevayler
       Type: Test Case

     Status: Open
   Priority: Major

 Original Estimate: Unknown
 Time Spent: Unknown
  Remaining: Unknown

    Project: NeuClear Payments
 Components: 
             Asset Controller
   Fix Fors:
             0.4
   Versions:
             0.4

   Assignee: Pelle Braendgaard
   Reporter: Pelle Braendgaard

    Created: Mon, 12 Apr 2004 12:18 PM
    Updated: Mon, 12 Apr 2004 12:18 PM

Description:
Test with PrevalentLedger as the Currency Controller and SimpleLedger as the Audit Controller.


---------------------------------------------------------------------
JIRA INFORMATION:
This message is automatically generated by JIRA.

If you think it was sent incorrectly contact one of the administrators:
   http://jira.neuclear.org//secure/Administrators.jspa

If you want more information on JIRA, or have a bug to report see:
   http://www.atlassian.com/software/jira

[Neuclear-develop] [JIRA] Closed: (PAY-45) Test Currency Controller with Hibernate

[<bug...@ve...>]

Message:

   The following issue has been closed.

   Resolver: Pelle Braendgaard
       Date: Mon, 12 Apr 2004 12:18 PM

All tests pass
---------------------------------------------------------------------
View the issue:
  http://jira.neuclear.org//browse/PAY-45

Here is an overview of the issue:
---------------------------------------------------------------------
        Key: PAY-45
    Summary: Test Currency Controller with Hibernate
       Type: Test Case

     Status: Closed
   Priority: Major
 Resolution: FIXED

 Original Estimate: Unknown
 Time Spent: Unknown
  Remaining: Unknown

    Project: NeuClear Payments
 Components: 
             Asset Controller
   Fix Fors:
             0.4
   Versions:
             0.4

   Assignee: Pelle Braendgaard
   Reporter: Pelle Braendgaard

    Created: Mon, 12 Apr 2004 12:17 PM
    Updated: Mon, 12 Apr 2004 12:18 PM

Description:
Test with Hibernate as the Currency Controller and SimpleLedger as the Audit Controller.


---------------------------------------------------------------------
JIRA INFORMATION:
This message is automatically generated by JIRA.

If you think it was sent incorrectly contact one of the administrators:
   http://jira.neuclear.org//secure/Administrators.jspa

If you want more information on JIRA, or have a bug to report see:
   http://www.atlassian.com/software/jira

[Neuclear-develop] [JIRA] Created: (PAY-45) Test Currency Controller with Hibernate

[<bug...@ve...>]

Message:

  A new issue has been created in JIRA.

---------------------------------------------------------------------
View the issue:
  http://jira.neuclear.org//browse/PAY-45

Here is an overview of the issue:
---------------------------------------------------------------------
        Key: PAY-45
    Summary: Test Currency Controller with Hibernate
       Type: Test Case

     Status: Open
   Priority: Major

 Original Estimate: Unknown
 Time Spent: Unknown
  Remaining: Unknown

    Project: NeuClear Payments
 Components: 
             Asset Controller
   Fix Fors:
             0.4
   Versions:
             0.4

   Assignee: Pelle Braendgaard
   Reporter: Pelle Braendgaard

    Created: Mon, 12 Apr 2004 12:17 PM
    Updated: Mon, 12 Apr 2004 12:17 PM

Description:
Test with Hibernate as the Currency Controller and SimpleLedger as the Audit Controller.


---------------------------------------------------------------------
JIRA INFORMATION:
This message is automatically generated by JIRA.

If you think it was sent incorrectly contact one of the administrators:
   http://jira.neuclear.org//secure/Administrators.jspa

If you want more information on JIRA, or have a bug to report see:
   http://www.atlassian.com/software/jira

[Neuclear-develop] [JIRA] Closed: (GL-35) Update Prevalent Ledger with latest API changes

[<bug...@ve...>]

Message:

   The following issue has been closed.

---------------------------------------------------------------------
View the issue:
  http://jira.neuclear.org//browse/GL-35

Here is an overview of the issue:
---------------------------------------------------------------------
        Key: GL-35
    Summary: Update Prevalent Ledger with latest API changes
       Type: Improvement

     Status: Closed
   Priority: Major
 Resolution: FIXED

 Original Estimate: Unknown
 Time Spent: Unknown
  Remaining: Unknown

    Project: NeuClear Ledger
 Components: 
             Prevalent Ledger
   Fix Fors:
             r_0_4
   Versions:
             r_0_4

   Assignee: Pelle Braendgaard
   Reporter: Pelle Braendgaard

    Created: Mon, 5 Apr 2004 4:01 PM
    Updated: Mon, 12 Apr 2004 12:15 PM

Description:
Update the Prevalent Ledger with the latest API changes:

- Dont count transactions in balances without receipt id
- Return Cancellation Date when Cancelling a Held transaction
- transactionExists()
- heldTransactionExists()



---------------------------------------------------------------------
JIRA INFORMATION:
This message is automatically generated by JIRA.

If you think it was sent incorrectly contact one of the administrators:
   http://jira.neuclear.org//secure/Administrators.jspa

If you want more information on JIRA, or have a bug to report see:
   http://www.atlassian.com/software/jira

[Neuclear-develop] [JIRA] Updated: (COM-17) Create SQLSigner

[<bug...@ve...>]

The following issue has been updated:

    Updater: Pelle Braendgaard (mailto:pe...@ve...)
       Date: Mon, 12 Apr 2004 9:54 AM
    Changes:
             assignee changed from Pelle Braendgaard to deneb
    ---------------------------------------------------------------------
For a full history of the issue, see:

  http://jira.neuclear.org//browse/COM-17?page=history

---------------------------------------------------------------------
View the issue:
  http://jira.neuclear.org//browse/COM-17

Here is an overview of the issue:
---------------------------------------------------------------------
        Key: COM-17
    Summary: Create SQLSigner
       Type: New Feature

     Status: Open
   Priority: Major

 Original Estimate: Unknown
 Time Spent: Unknown
  Remaining: Unknown

    Project: NeuClear Commons
   Fix Fors:
             r_0_8

   Assignee: deneb
   Reporter: Pelle Braendgaard

    Created: Fri, 9 Apr 2004 1:21 PM
    Updated: Mon, 12 Apr 2004 9:54 AM

Description:
This should be a server based signer implementation that can manage large amounts of keypairs stored on a SQL database.



---------------------------------------------------------------------
JIRA INFORMATION:
This message is automatically generated by JIRA.

If you think it was sent incorrectly contact one of the administrators:
   http://jira.neuclear.org//secure/Administrators.jspa

If you want more information on JIRA, or have a bug to report see:
   http://www.atlassian.com/software/jira

[Neuclear-develop] [JIRA] Created: (COM-19) Create signing task queue on SwingAgent

[<bug...@ve...>]

Message:

  A new issue has been created in JIRA.

---------------------------------------------------------------------
View the issue:
  http://jira.neuclear.org//browse/COM-19

Here is an overview of the issue:
---------------------------------------------------------------------
        Key: COM-19
    Summary: Create signing task queue on SwingAgent
       Type: Improvement

     Status: Open
   Priority: Major

 Original Estimate: Unknown
 Time Spent: Unknown
  Remaining: Unknown

    Project: NeuClear Commons
   Fix Fors:
             r_0_7
   Versions:
             r_0_7

   Assignee: Pelle Braendgaard
   Reporter: Pelle Braendgaard

    Created: Mon, 12 Apr 2004 9:53 AM
    Updated: Mon, 12 Apr 2004 9:53 AM

Description:
The agent needs to queue all tasks to avoid problems with multiple simultaneous signing requests.


---------------------------------------------------------------------
JIRA INFORMATION:
This message is automatically generated by JIRA.

If you think it was sent incorrectly contact one of the administrators:
   http://jira.neuclear.org//secure/Administrators.jspa

If you want more information on JIRA, or have a bug to report see:
   http://www.atlassian.com/software/jira

[Neuclear-develop] [JIRA] Closed: (COM-15) Update project.xml with latest dependencies

[<bug...@ve...>]

Message:

   The following issue has been closed.

---------------------------------------------------------------------
View the issue:
  http://jira.neuclear.org//browse/COM-15

Here is an overview of the issue:
---------------------------------------------------------------------
        Key: COM-15
    Summary: Update project.xml with latest dependencies
       Type: Task

     Status: Closed
   Priority: Major
 Resolution: FIXED

 Original Estimate: Unknown
 Time Spent: Unknown
  Remaining: Unknown

    Project: NeuClear Commons
   Fix Fors:
             r_0_7
   Versions:
             r_0_7

   Assignee: Pelle Braendgaard
   Reporter: Pelle Braendgaard

    Created: Wed, 7 Apr 2004 10:32 AM
    Updated: Mon, 12 Apr 2004 9:51 AM

Description:
We need to add the Jgoodies stuff.


---------------------------------------------------------------------
JIRA INFORMATION:
This message is automatically generated by JIRA.

If you think it was sent incorrectly contact one of the administrators:
   http://jira.neuclear.org//secure/Administrators.jspa

If you want more information on JIRA, or have a bug to report see:
   http://www.atlassian.com/software/jira

[Neuclear-develop] neuclear-commons/src/java/org/neuclear/commons/crypto/signers DefaultSigner.java,1.5,1.6 ServletSignerFactory.java,1.7,1.8

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

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

Modified Files:
	DefaultSigner.java ServletSignerFactory.java 
Log Message:
Refactored DefaultSigner to delegate to a JCESigner and not inherit.

Index: ServletSignerFactory.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-commons/src/java/org/neuclear/commons/crypto/signers/ServletSignerFactory.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ServletSignerFactory.java	2 Mar 2004 18:58:44 -0000	1.7
--- ServletSignerFactory.java	12 Apr 2004 15:37:01 -0000	1.8
***************
*** 27,31 ****
   * <tr><td>keeppassphrase</td><td>This asks for the service passphrase once at startup and remembers it through the lifetime of the signers</td></tr>
   * </table>
!  * <p>
   * To use the factory. Do as follows within your servlets init() method:
   * <code>Signer signer=ServletSignerFactory.getInstance().createSigner(config);</code>
--- 27,31 ----
   * <tr><td>keeppassphrase</td><td>This asks for the service passphrase once at startup and remembers it through the lifetime of the signers</td></tr>
   * </table>
!  * <p/>
   * To use the factory. Do as follows within your servlets init() method:
   * <code>Signer signer=ServletSignerFactory.getInstance().createSigner(config);</code>
***************
*** 37,72 ****
  
      private ServletSignerFactory() {
!         map=Collections.synchronizedMap(new HashMap());
      }
      public synchronized Signer createSigner(ServletConfig config) throws FileNotFoundException, GeneralSecurityException, NeuClearException {
!         final String keystore=ServletTools.getInitParam("keystore",config);
!         final String keeppassphrase=ServletTools.getInitParam("keeppassphrase",config);
!         final String agenttype=ServletTools.getInitParam("passphraseagent",config);
!         final String serviceid = ServletTools.getInitParam("serviceid",config);
!         final String hash = getConfigHash(keystore, keeppassphrase, agenttype,serviceid);
          if (map.containsKey(hash))
!             return (Signer)map.get(hash);
  
!         final PassPhraseAgent coreagent=getAgent(agenttype);
!         final PassPhraseAgent agent=createWrapperAgent(keeppassphrase, coreagent, serviceid);
          // If keystore is "test" setup the TestCaseSigner otherwise use the JCESigner
!         final Signer signer=createSigner(keystore, agent);
!         map.put(hash,signer);
          return signer;
      }
  
      private static final PassPhraseAgent createWrapperAgent(final String keeppassphrase, final PassPhraseAgent coreagent, final String serviceid) throws UserCancellationException {
!         if (!Utility.isEmpty(keeppassphrase)&&keeppassphrase.equals("1")&&coreagent instanceof InteractiveAgent)
!             return new AskAtStartupAgent((InteractiveAgent)coreagent,serviceid);
          return coreagent;
      }
  
!     private static final JCESigner createSigner(final String keystore, final PassPhraseAgent agent) throws GeneralSecurityException, NeuClearException, FileNotFoundException {
!         if (!Utility.isEmpty(keystore)){
              if (keystore.toLowerCase().equals("test"))
                  return new TestCaseSigner(agent);
  
              if (!keystore.toLowerCase().equals("default"))
!                 return new JCESigner(keystore,"jks", "SUN",agent);
          }
          return new DefaultSigner(agent);
--- 37,73 ----
  
      private ServletSignerFactory() {
!         map = Collections.synchronizedMap(new HashMap());
      }
+ 
      public synchronized Signer createSigner(ServletConfig config) throws FileNotFoundException, GeneralSecurityException, NeuClearException {
!         final String keystore = ServletTools.getInitParam("keystore", config);
!         final String keeppassphrase = ServletTools.getInitParam("keeppassphrase", config);
!         final String agenttype = ServletTools.getInitParam("passphraseagent", config);
!         final String serviceid = ServletTools.getInitParam("serviceid", config);
!         final String hash = getConfigHash(keystore, keeppassphrase, agenttype, serviceid);
          if (map.containsKey(hash))
!             return (Signer) map.get(hash);
  
!         final PassPhraseAgent coreagent = getAgent(agenttype);
!         final PassPhraseAgent agent = createWrapperAgent(keeppassphrase, coreagent, serviceid);
          // If keystore is "test" setup the TestCaseSigner otherwise use the JCESigner
!         final Signer signer = createSigner(keystore, agent);
!         map.put(hash, signer);
          return signer;
      }
  
      private static final PassPhraseAgent createWrapperAgent(final String keeppassphrase, final PassPhraseAgent coreagent, final String serviceid) throws UserCancellationException {
!         if (!Utility.isEmpty(keeppassphrase) && keeppassphrase.equals("1") && coreagent instanceof InteractiveAgent)
!             return new AskAtStartupAgent((InteractiveAgent) coreagent, serviceid);
          return coreagent;
      }
  
!     private static final BrowsableSigner createSigner(final String keystore, final PassPhraseAgent agent) throws GeneralSecurityException, NeuClearException, FileNotFoundException {
!         if (!Utility.isEmpty(keystore)) {
              if (keystore.toLowerCase().equals("test"))
                  return new TestCaseSigner(agent);
  
              if (!keystore.toLowerCase().equals("default"))
!                 return new JCESigner(keystore, "jks", "SUN", agent);
          }
          return new DefaultSigner(agent);
***************
*** 74,78 ****
  
      private static final PassPhraseAgent getAgent(final String agenttype) {
!         if (!Utility.isEmpty(agenttype)){
              if (agenttype.toLowerCase().equals("console"))
                  return new ConsoleAgent();
--- 75,79 ----
  
      private static final PassPhraseAgent getAgent(final String agenttype) {
!         if (!Utility.isEmpty(agenttype)) {
              if (agenttype.toLowerCase().equals("console"))
                  return new ConsoleAgent();
***************
*** 85,95 ****
      }
  
!     private static final String getConfigHash(final String keystore, final String keeppassphrase, final String agenttype,final String serviceid) {
!         return new String(CryptoTools.digest((keystore+keeppassphrase+agenttype).getBytes()));
      }
  
!     public synchronized static ServletSignerFactory getInstance(){
!         if (instance==null)
!             instance=new ServletSignerFactory();
          return instance;
      }
--- 86,96 ----
      }
  
!     private static final String getConfigHash(final String keystore, final String keeppassphrase, final String agenttype, final String serviceid) {
!         return new String(CryptoTools.digest((keystore + keeppassphrase + agenttype).getBytes()));
      }
  
!     public synchronized static ServletSignerFactory getInstance() {
!         if (instance == null)
!             instance = new ServletSignerFactory();
          return instance;
      }

Index: DefaultSigner.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-commons/src/java/org/neuclear/commons/crypto/signers/DefaultSigner.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DefaultSigner.java	19 Jan 2004 17:53:14 -0000	1.5
--- DefaultSigner.java	12 Apr 2004 15:37:01 -0000	1.6
***************
*** 1,8 ****
--- 1,13 ----
  package org.neuclear.commons.crypto.signers;
  
+ import org.neuclear.commons.crypto.CryptoException;
  import org.neuclear.commons.crypto.CryptoTools;
  import org.neuclear.commons.crypto.passphraseagents.PassPhraseAgent;
  import org.neuclear.commons.crypto.passphraseagents.UserCancellationException;
  
+ import java.security.KeyStoreException;
+ import java.security.PublicKey;
+ import java.util.Iterator;
+ 
  /*
  NeuClear Distributed Transaction Clearing Platform
***************
*** 25,28 ****
--- 30,36 ----
  $Id$
  $Log$
+ Revision 1.6  2004/04/12 15:37:01  pelle
+ Refactored DefaultSigner to delegate to a JCESigner and not inherit.
+ 
  Revision 1.5  2004/01/19 17:53:14  pelle
  Various clean ups
***************
*** 65,73 ****
   * Time: 3:22:17 PM
   */
! public final class DefaultSigner extends JCESigner {
!     public DefaultSigner(final PassPhraseAgent agent) throws  UserCancellationException,InvalidPassphraseException {
!         super(CryptoTools.DEFAULT_KEYSTORE, "jks", "SUN", agent);
  
      }
  
  }
--- 73,127 ----
   * Time: 3:22:17 PM
   */
! public final class DefaultSigner implements BrowsableSigner {
!     public DefaultSigner(final PassPhraseAgent agent) throws UserCancellationException, InvalidPassphraseException {
!         signer = new JCESigner(CryptoTools.DEFAULT_KEYSTORE, "jks", "SUN", agent);
! 
!     }
! 
!     public final byte[] sign(final String name, final byte[] data) throws NonExistingSignerException, UserCancellationException {
!         return signer.sign(name, data);
!     }
! 
!     public final byte[] sign(final String name, final byte[] data, boolean incorrect) throws UserCancellationException, NonExistingSignerException {
!         return signer.sign(name, data, incorrect);
!     }
! 
!     public final boolean canSignFor(final String name) {
!         return signer.canSignFor(name);
!     }
! 
!     public final int getKeyType(final String name) {
!         return signer.getKeyType(name);
!     }
! 
!     public final PublicKey generateKey(final String alias) throws UserCancellationException {
!         return signer.generateKey(alias);
!     }
! 
!     public final PublicKey getPublicKey(final String name) throws NonExistingSignerException {
!         return signer.getPublicKey(name);
!     }
! 
!     public byte[] sign(byte data[], SetPublicKeyCallBack callback) throws UserCancellationException {
!         return signer.sign(data, callback);
!     }
! 
!     public byte[] sign(String name, char pass[], byte data[], SetPublicKeyCallBack callback) throws InvalidPassphraseException {
!         return signer.sign(name, pass, data, callback);
!     }
  
+     public void createKeyPair(String alias, char passphrase[]) throws CryptoException {
+         signer.createKeyPair(alias, passphrase);
      }
  
+     public void save() {
+         signer.save();
+     }
+ 
+     public Iterator iterator() throws KeyStoreException {
+         return signer.iterator();
+     }
+ 
+     private final JCESigner signer;
+ 
  }

[Neuclear-develop] neuclear-id/src/java/org/neuclear/id/signers SigningServlet.java,1.4,1.5

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

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

Modified Files:
	SigningServlet.java 
Log Message:
Added Hibernate and Prevalent tests for Currency Controllers

Index: SigningServlet.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/signers/SigningServlet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SigningServlet.java	12 Apr 2004 15:00:54 -0000	1.4
--- SigningServlet.java	12 Apr 2004 15:28:08 -0000	1.5
***************
*** 2,5 ****
--- 2,8 ----
   * $Id$
   * $Log$
+  * Revision 1.5  2004/04/12 15:28:08  pelle
+  * Added Hibernate and Prevalent tests for Currency Controllers
+  *
   * Revision 1.4  2004/04/12 15:00:54  pelle
   * Now have a slightly better way of handling the waiting for input using the WaitForInput class.
***************
*** 371,378 ****
          if (isReadyToSign(request)) {
  
!             out.println("<div id=\"log\" style=\"background:#003;color:#EEE\"><tt><ul><li>Signing with " + username + "...</li>");
              out.flush();
              try {
!                 isSigned = sign(named, out);
  
              } catch (InvalidNamedObjectException e) {
--- 374,381 ----
          if (isReadyToSign(request)) {
  
!             out.println("<div id=\"log\" style=\"background:#003;color:#EEE\"><tt><ul><li>Signing ...</li>");
              out.flush();
              try {
!                 isSigned = sign(named, "test", out);
  
              } catch (InvalidNamedObjectException e) {

[Neuclear-develop] neuclear-xmlsig/src/test/org/neuclear/xml/xmlsec InteractiveXMLSignature.java,1.1,1.2

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

Update of /cvsroot/neuclear/neuclear-xmlsig/src/test/org/neuclear/xml/xmlsec
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11881/src/test/org/neuclear/xml/xmlsec

Modified Files:
	InteractiveXMLSignature.java 
Log Message:
Added Hibernate and Prevalent tests for Currency Controllers

Index: InteractiveXMLSignature.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/test/org/neuclear/xml/xmlsec/InteractiveXMLSignature.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** InteractiveXMLSignature.java	7 Apr 2004 17:22:23 -0000	1.1
--- InteractiveXMLSignature.java	12 Apr 2004 15:28:00 -0000	1.2
***************
*** 8,12 ****
  import org.neuclear.commons.crypto.signers.BrowsableSigner;
  import org.neuclear.commons.crypto.signers.InvalidPassphraseException;
- import org.neuclear.commons.crypto.signers.NonExistingSignerException;
  import org.neuclear.commons.crypto.signers.TestCaseSigner;
  
--- 8,11 ----
***************
*** 14,17 ****
--- 13,19 ----
  $Id$
  $Log$
+ Revision 1.2  2004/04/12 15:28:00  pelle
+ Added Hibernate and Prevalent tests for Currency Controllers
+ 
  Revision 1.1  2004/04/07 17:22:23  pelle
  Added support for the new improved interactive signing model. A new Agent is also available with SwingAgent.
***************
*** 40,45 ****
          } catch (DocumentException e) {
              e.printStackTrace();
-         } catch (NonExistingSignerException e) {
-             e.printStackTrace();
          } catch (UserCancellationException e) {
              e.printStackTrace();
--- 42,45 ----