neuclear-develop — Support requests, cvs etc

[Neuclear-develop] neuclear-signer/src/java/org/neuclear/signers/standalone StandaloneSigner.java,1.7,1.8

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

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

Modified Files:
	StandaloneSigner.java 
Log Message:
Added help menu with links to web site.
Added About menu item.
Now uses JTidy to tidy up html before signing it.

Index: StandaloneSigner.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-signer/src/java/org/neuclear/signers/standalone/StandaloneSigner.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** StandaloneSigner.java	15 Apr 2004 20:03:26 -0000	1.7
--- StandaloneSigner.java	15 Apr 2004 23:58:54 -0000	1.8
***************
*** 3,6 ****
--- 3,7 ----
  import com.jgoodies.plaf.Options;
  import org.dom4j.Document;
+ import org.dom4j.io.DOMReader;
  import org.mortbay.http.HttpContext;
  import org.mortbay.jetty.Server;
***************
*** 10,22 ****
  import org.neuclear.commons.crypto.CryptoTools;
  import org.neuclear.commons.crypto.passphraseagents.PassPhraseAgent;
- import org.neuclear.commons.crypto.passphraseagents.UserCancellationException;
  import org.neuclear.commons.crypto.passphraseagents.swing.MessageLabel;
  import org.neuclear.commons.crypto.signers.BrowsableSigner;
  import org.neuclear.commons.crypto.signers.DefaultSigner;
- import org.neuclear.xml.XMLException;
  import org.neuclear.xml.XMLTools;
  import org.neuclear.xml.xmlsec.EnvelopedSignature;
  import org.neuclear.xml.xmlsec.XMLSignature;
  
  import javax.swing.*;
  import javax.swing.filechooser.FileFilter;
--- 11,24 ----
  import org.neuclear.commons.crypto.CryptoTools;
  import org.neuclear.commons.crypto.passphraseagents.PassPhraseAgent;
  import org.neuclear.commons.crypto.passphraseagents.swing.MessageLabel;
  import org.neuclear.commons.crypto.signers.BrowsableSigner;
  import org.neuclear.commons.crypto.signers.DefaultSigner;
  import org.neuclear.xml.XMLTools;
  import org.neuclear.xml.xmlsec.EnvelopedSignature;
  import org.neuclear.xml.xmlsec.XMLSignature;
+ import org.w3c.tidy.Tidy;
  
+ import javax.jnlp.BasicService;
+ import javax.jnlp.ServiceManager;
  import javax.swing.*;
  import javax.swing.filechooser.FileFilter;
***************
*** 25,29 ****
--- 27,34 ----
  import java.awt.event.ActionListener;
  import java.awt.event.KeyEvent;
+ import java.io.BufferedInputStream;
  import java.io.File;
+ import java.io.FileInputStream;
+ import java.io.InputStream;
  import java.net.URL;
  
***************
*** 146,149 ****
--- 151,177 ----
  
          });
+ 
+         JMenu help = new JMenu("Help");
+         help.setMnemonic(KeyEvent.VK_H);
+         menubar.add(help);
+ 
+         help.add(createWebMenuItem("NeuClear Site", "http://neuclear.org", message));
+         help.add(createWebMenuItem("The Two-Minute NeuClear Tour", "http://neuclear.org/display/neu/The+Two-Minute+NeuClear+Tour", message));
+         help.addSeparator();
+         help.add(createWebMenuItem("Road Map", "http://jira.neuclear.org/secure/BrowseProject.jspa?id=10030&report=roadmap", message));
+         help.add(createWebMenuItem("Report Bug or Suggest Feature", "http://jira.neuclear.org/secure/CreateIssue!default.jspa", message));
+         help.addSeparator();
+         JMenuItem about = new JMenuItem("About");
+         about.setMnemonic(KeyEvent.VK_A);
+         help.add(about);
+         about.addActionListener(new ActionListener() {
+             /**
+              * Invoked when an action occurs.
+              */
+             public void actionPerformed(ActionEvent e) {
+                 new SplashWindow(frame, Toolkit.getDefaultToolkit().createImage(QuickStart.class.getClassLoader().getResource("neuclearsplash.png"))).show();
+             }
+ 
+         });
          frame.pack();
          frame.show();
***************
*** 153,156 ****
--- 181,204 ----
      }
  
+     private static JMenuItem createWebMenuItem(final String title, final String url, final MessageLabel message) {
+         final JMenuItem item = new JMenuItem(title);
+         item.addActionListener(new ActionListener() {
+             /**
+              * Invoked when an action occurs.
+              */
+             public void actionPerformed(ActionEvent e) {
+                 try {
+                     BasicService bs = (BasicService) ServiceManager.lookup("javax.jnlp.BasicService");
+                     // Invoke the showDocument method
+                     bs.showDocument(new URL(url));
+                 } catch (Exception e1) {
+                     message.error(e1);
+                 }
+             }
+ 
+         });
+         return item;
+     }
+ 
      public static class SignDocument implements Runnable {
          public SignDocument(BrowsableSigner signer, JFileChooser chooser, JFrame frame, MessageLabel message) {
***************
*** 172,176 ****
              try {
                  message.info("Parsing " + chooser.getSelectedFile().getName());
!                 Document doc = XMLTools.loadDocument(chooser.getSelectedFile());
                  message.info("Signing " + chooser.getSelectedFile().getName());
                  XMLSignature sig = new EnvelopedSignature(signer, doc.getRootElement());
--- 220,234 ----
              try {
                  message.info("Parsing " + chooser.getSelectedFile().getName());
!                 final File file = chooser.getSelectedFile();
!                 Document doc;
!                 if (file.getName().endsWith(".html") || file.getName().endsWith(".html")) {
!                     Tidy tidy = new Tidy();
!                     tidy.setXmlOut(true);
!                     InputStream is = new BufferedInputStream(new FileInputStream(file));
!                     org.w3c.dom.Document dom = tidy.parseDOM(is, null);
!                     DOMReader reader = new DOMReader();
!                     doc = reader.read(dom);
!                 } else
!                     doc = XMLTools.loadDocument(file);
                  message.info("Signing " + chooser.getSelectedFile().getName());
                  XMLSignature sig = new EnvelopedSignature(signer, doc.getRootElement());
***************
*** 187,194 ****
                  frame.setEnabled(true);
  
!             } catch (XMLException e) {
!                 frame.setEnabled(true);
!                 message.error(e);
!             } catch (UserCancellationException e) {
                  frame.setEnabled(true);
                  message.error(e);
--- 245,249 ----
                  frame.setEnabled(true);
  
!             } catch (Exception e) {
                  frame.setEnabled(true);
                  message.error(e);
***************
*** 201,204 ****
--- 256,260 ----
          private final JFrame frame;
          private final MessageLabel message;
+         private final static String CVSID = "$Id$";
  
      }

[Neuclear-develop] [JIRA] Created: (COM-29) Create Default Content Generator Plugin

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

Message:

  A new issue has been created in JIRA.

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

Here is an overview of the issue:
---------------------------------------------------------------------
        Key: COM-29
    Summary: Create Default Content Generator Plugin
       Type: New Feature

     Status: Open
   Priority: Major

 Original Estimate: Unknown
 Time Spent: Unknown
  Remaining: Unknown

    Project: NeuClear Commons

   Assignee: Pelle Braendgaard
   Reporter: Pelle Braendgaard

    Created: Thu, 15 Apr 2004 3:30 PM
    Updated: Thu, 15 Apr 2004 3:30 PM

Description:
This plugin should take a byte array and present it to the user


---------------------------------------------------------------------
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-28) Create Content Generator plugin interface for SwingAgent

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

Message:

  A new issue has been created in JIRA.

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

Here is an overview of the issue:
---------------------------------------------------------------------
        Key: COM-28
    Summary: Create Content Generator plugin interface for SwingAgent
       Type: New Feature

     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: Thu, 15 Apr 2004 3:27 PM
    Updated: Thu, 15 Apr 2004 3:27 PM

Description:
This is a component that allows the user to specify the data to be signed.

There should be an Abstract class with the following main functionality:

- getBuilderPanel()
- getHelpPanel()
- getAboutPanel()
- isValid()
- getData() returns the data to be signed



---------------------------------------------------------------------
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: (USER-12) Convert html to xml

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

Message:

   The following issue has been closed.

---------------------------------------------------------------------
View the issue:
  http://jira.neuclear.org//browse/USER-12

Here is an overview of the issue:
---------------------------------------------------------------------
        Key: USER-12
    Summary: Convert html to xml
       Type: New Feature

     Status: Closed
   Priority: Major
 Resolution: FIXED

 Original Estimate: Unknown
 Time Spent: Unknown
  Remaining: Unknown

    Project: NeuClear Signer
   Fix Fors:
             r_0_9
   Versions:
             r_0_9

   Assignee: Pelle Braendgaard
   Reporter: Pelle Braendgaard

    Created: Thu, 15 Apr 2004 2:57 PM
    Updated: Thu, 15 Apr 2004 3:11 PM

Description:
HTML files should be cleaned first with jtidy to provide valid xhtml.


---------------------------------------------------------------------
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: (USER-12) Convert html to xml

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

Message:

  A new issue has been created in JIRA.

---------------------------------------------------------------------
View the issue:
  http://jira.neuclear.org//browse/USER-12

Here is an overview of the issue:
---------------------------------------------------------------------
        Key: USER-12
    Summary: Convert html to xml
       Type: New Feature

     Status: Open
   Priority: Major

 Original Estimate: Unknown
 Time Spent: Unknown
  Remaining: Unknown

    Project: NeuClear Signer
   Fix Fors:
             r_0_9
   Versions:
             r_0_9

   Assignee: Pelle Braendgaard
   Reporter: Pelle Braendgaard

    Created: Thu, 15 Apr 2004 2:57 PM
    Updated: Thu, 15 Apr 2004 2:57 PM

Description:
HTML files should be cleaned first with jtidy to provide valid xhtml.


---------------------------------------------------------------------
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: (USER-11) Signing Dialog takes a long time to popup

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

Message:

  A new issue has been created in JIRA.

---------------------------------------------------------------------
View the issue:
  http://jira.neuclear.org//browse/USER-11

Here is an overview of the issue:
---------------------------------------------------------------------
        Key: USER-11
    Summary: Signing Dialog takes a long time to popup
       Type: Bug

     Status: Open
   Priority: Major

 Original Estimate: Unknown
 Time Spent: Unknown
  Remaining: Unknown

    Project: NeuClear Signer
   Fix Fors:
             r_0_9
   Versions:
             r_0_9

   Assignee: Pelle Braendgaard
   Reporter: Pelle Braendgaard

    Created: Thu, 15 Apr 2004 2:56 PM
    Updated: Thu, 15 Apr 2004 2:56 PM

Description:
I am not sure why, but it sometimes takes a while for it to open up.


---------------------------------------------------------------------
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-id/src/java/org/neuclear/id/signers SigningServlet.java,1.7,1.8

[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-serv8045/src/java/org/neuclear/id/signers

Modified Files:
	SigningServlet.java 
Log Message:
Added license screen to Personal Signer.
Added Sign document menu to  Personal Signer.

Index: SigningServlet.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/signers/SigningServlet.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** SigningServlet.java	14 Apr 2004 23:44:44 -0000	1.7
--- SigningServlet.java	15 Apr 2004 20:04:05 -0000	1.8
***************
*** 2,5 ****
--- 2,9 ----
   * $Id$
   * $Log$
+  * Revision 1.8  2004/04/15 20:04:05  pelle
+  * Added license screen to Personal Signer.
+  * Added Sign document menu to  Personal Signer.
+  *
   * Revision 1.7  2004/04/14 23:44:44  pelle
   * Got the cactus tests working and the sample web app
***************
*** 334,338 ****
      }
  
!     protected final BrowsableSigner getSigner() {
          return signer;
      }
--- 338,342 ----
      }
  
!     protected BrowsableSigner getSigner() {
          return signer;
      }

[Neuclear-develop] neuclear-commons/src/java/org/neuclear/commons/crypto/passphraseagents/swing KeyStoreDialog.java,1.6,1.7 SwingAgent.java,1.8,1.9 WaitForInput.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-serv7954/src/java/org/neuclear/commons/crypto/passphraseagents/swing

Modified Files:
	KeyStoreDialog.java SwingAgent.java WaitForInput.java 
Log Message:
Added license screen to Personal Signer.
Added Sign document menu to  Personal Signer.

Index: SwingAgent.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-commons/src/java/org/neuclear/commons/crypto/passphraseagents/swing/SwingAgent.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** SwingAgent.java	15 Apr 2004 15:34:41 -0000	1.8
--- SwingAgent.java	15 Apr 2004 20:03:52 -0000	1.9
***************
*** 17,20 ****
--- 17,24 ----
  $Id$
  $Log$
+ Revision 1.9  2004/04/15 20:03:52  pelle
+ Added license screen to Personal Signer.
+ Added Sign document menu to  Personal Signer.
+ 
  Revision 1.8  2004/04/15 15:34:41  pelle
  Got rid of the looping InvalidPassphraseException in DefaultSigner.
***************
*** 165,169 ****
          public boolean accept(File file) {
              String filename = file.getName();
!             return filename.endsWith(".jks");
          }
  
--- 169,173 ----
          public boolean accept(File file) {
              String filename = file.getName();
!             return file.isDirectory() || filename.endsWith(".jks");
          }
  

Index: KeyStoreDialog.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-commons/src/java/org/neuclear/commons/crypto/passphraseagents/swing/KeyStoreDialog.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** KeyStoreDialog.java	15 Apr 2004 15:34:41 -0000	1.6
--- KeyStoreDialog.java	15 Apr 2004 20:03:51 -0000	1.7
***************
*** 33,36 ****
--- 33,40 ----
  $Id$
  $Log$
+ Revision 1.7  2004/04/15 20:03:51  pelle
+ Added license screen to Personal Signer.
+ Added Sign document menu to  Personal Signer.
+ 
  Revision 1.6  2004/04/15 15:34:41  pelle
  Got rid of the looping InvalidPassphraseException in DefaultSigner.
***************
*** 87,91 ****
          newId = new JButton("New ID ...");
          message = new MessageLabel();
!         save = new JButton("Save ...");
          remember = new JCheckBox("remember passphrase in current session", prefs.getBoolean(REMEMBER_PASSPHRASE, false));
          list = new JList();
--- 91,95 ----
          newId = new JButton("New ID ...");
          message = new MessageLabel();
!         save = new JButton("Save keys ...");
          remember = new JCheckBox("remember passphrase in current session", prefs.getBoolean(REMEMBER_PASSPHRASE, false));
          list = new JList();

Index: WaitForInput.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-commons/src/java/org/neuclear/commons/crypto/passphraseagents/swing/WaitForInput.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** WaitForInput.java	14 Apr 2004 00:10:52 -0000	1.3
--- WaitForInput.java	15 Apr 2004 20:03:52 -0000	1.4
***************
*** 6,9 ****
--- 6,13 ----
  $Id$
  $Log$
+ Revision 1.4  2004/04/15 20:03:52  pelle
+ Added license screen to Personal Signer.
+ Added Sign document menu to  Personal Signer.
+ 
  Revision 1.3  2004/04/14 00:10:52  pelle
  Added a MessageLabel for handling errors, validation and info
***************
*** 57,61 ****
      }
  
!     abstract void execute();
  
      private Object result;
--- 61,65 ----
      }
  
!     public abstract void execute();
  
      private Object result;

[Neuclear-develop] neuclear-commons/src/java/org/neuclear/commons/crypto/signers DefaultSigner.java,1.10,1.11

[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-serv7954/src/java/org/neuclear/commons/crypto/signers

Modified Files:
	DefaultSigner.java 
Log Message:
Added license screen to Personal Signer.
Added Sign document menu to  Personal Signer.

Index: DefaultSigner.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-commons/src/java/org/neuclear/commons/crypto/signers/DefaultSigner.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** DefaultSigner.java	15 Apr 2004 15:34:41 -0000	1.10
--- DefaultSigner.java	15 Apr 2004 20:03:52 -0000	1.11
***************
*** 34,37 ****
--- 34,41 ----
  $Id$
  $Log$
+ Revision 1.11  2004/04/15 20:03:52  pelle
+ Added license screen to Personal Signer.
+ Added Sign document menu to  Personal Signer.
+ 
  Revision 1.10  2004/04/15 15:34:41  pelle
  Got rid of the looping InvalidPassphraseException in DefaultSigner.
***************
*** 166,169 ****
--- 170,177 ----
      }
  
+     public InteractiveAgent getAgent() {
+         return agent;
+     }
+ 
      public void save() {
          try {

[Neuclear-develop] neuclear-signer/src/java/org/neuclear/signers/standalone LicenseScreen.java,NONE,1.1 QuickStart.java,1.1,1.2 StandaloneSigner.java,1.6,1.7 StandaloneSigningServlet.java,1.9,1.10

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

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

Modified Files:
	QuickStart.java StandaloneSigner.java 
	StandaloneSigningServlet.java 
Added Files:
	LicenseScreen.java 
Log Message:
Added license screen to Personal Signer.
Added Sign document menu to  Personal Signer.

Index: QuickStart.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-signer/src/java/org/neuclear/signers/standalone/QuickStart.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** QuickStart.java	14 Apr 2004 15:30:02 -0000	1.1
--- QuickStart.java	15 Apr 2004 20:03:26 -0000	1.2
***************
*** 25,29 ****
          }
          try {
!             Thread.sleep(4000);
          } catch (InterruptedException e) {
              e.printStackTrace();
--- 25,29 ----
          }
          try {
!             Thread.sleep(2000);
          } catch (InterruptedException e) {
              e.printStackTrace();

--- NEW FILE: LicenseScreen.java ---
package org.neuclear.signers.standalone;

import com.jgoodies.forms.builder.ButtonBarBuilder;
import com.jgoodies.plaf.Options;
import org.neuclear.commons.crypto.passphraseagents.PassPhraseAgent;

import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.URL;
import java.util.prefs.Preferences;

/*
$Id: LicenseScreen.java,v 1.1 2004/04/15 20:03:26 pelle Exp $
$Log: LicenseScreen.java,v $
Revision 1.1  2004/04/15 20:03:26  pelle
Added license screen to Personal Signer.
Added Sign document menu to  Personal Signer.

*/

/**
 * User: pelleb
 * Date: Apr 15, 2004
 * Time: 1:13:16 PM
 */
public class LicenseScreen {

    public static boolean accept() {
        final Preferences prefs = Preferences.userNodeForPackage(StandaloneSigner.class);
        if (prefs.getBoolean(ACCEPTED, false)) {// User accepted the license
            return true;
        }

        try {
            UIManager.setLookAndFeel("com.jgoodies.plaf.plastic.PlasticXPLookAndFeel");
            UIManager.put(Options.USE_SYSTEM_FONTS_APP_KEY, Boolean.TRUE);
        } catch (Exception e) {
            // Likely PlasticXP is not in the class path; ignore.
        }

        final JFrame frame = new JFrame("License");
        frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);

        Container content = frame.getContentPane();
        content.setLayout(new BorderLayout());
        final URL imageurl = PassPhraseAgent.class.getClassLoader().getResource("org/neuclear/commons/crypto/passphraseagents/neuclear.png");
        JLabel label = new JLabel("NeuClear Personal Signer License Agreement");
        ;
        if (imageurl != null) {
            final ImageIcon icon = new ImageIcon(imageurl);
            frame.setIconImage(icon.getImage());
            label.setIcon(icon);
        }

        label.setForeground(Color.WHITE);
        label.setFont(new Font("Arial", Font.BOLD, 12));
        content.add(label, BorderLayout.NORTH);
//        final MessageLabel message=new MessageLabel();
//        message.info("Ready");
//        content.add(message, BorderLayout.SOUTH);
//        content.add(quit, BorderLayout.SOUTH);
        content.setBackground(Color.BLUE);
        JTextArea license = new JTextArea(loadLicense());

        license.setEditable(false);
        content.add(new JScrollPane(license), BorderLayout.CENTER);
        ButtonBarBuilder bb = new ButtonBarBuilder();
        final JCheckBox check = new JCheckBox("I accept the above license", false);
        bb.addGridded(check);
        bb.addGlue();
        bb.addRelatedGap();
        final JButton ok = new JButton("Accept License");
        ok.setEnabled(false);
        JButton cancel = new JButton("Cancel");
        bb.addGridded(ok);
        bb.addGridded(cancel);
        content.add(bb.getPanel(), BorderLayout.SOUTH);

        cancel.addActionListener(new ActionListener() {
            public void actionPerformed(ActionEvent event) {
                System.exit(0);
            }

        });

        ok.addActionListener(new ActionListener() {
            public void actionPerformed(ActionEvent event) {
                synchronized (ok) {
                    ok.notifyAll();
                }
            }

        });
        check.addActionListener(new ActionListener() {
            public void actionPerformed(ActionEvent event) {
                ok.setEnabled(check.isSelected());
            }

        });

        frame.pack();
        frame.show();
        frame.toFront();
        try {
            synchronized (ok) {
                while (true) {
                    ok.wait();
                    if (check.isSelected()) {
                        frame.dispose();
                        prefs.putBoolean(ACCEPTED, true);
                        return true;
                    }
                }
            }
        } catch (InterruptedException e) {
            return false;
        }

    }

    private static String loadLicense() {
        InputStream is = LicenseScreen.class.getClassLoader().getResourceAsStream("LICENSE.txt");
        BufferedReader reader = new BufferedReader(new InputStreamReader(is));
        StringBuffer buf = new StringBuffer();
        try {
            String line = reader.readLine();
            while (line != null) {
                buf.append(line);
                buf.append("\n");
                line = reader.readLine();
            }
        } catch (IOException e) {
            e.printStackTrace();
        }
        return buf.toString();
    }

    private static final String ACCEPTED = "LICENSE_ACCEPTED";
}

Index: StandaloneSigningServlet.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-signer/src/java/org/neuclear/signers/standalone/StandaloneSigningServlet.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** StandaloneSigningServlet.java	15 Apr 2004 16:09:42 -0000	1.9
--- StandaloneSigningServlet.java	15 Apr 2004 20:03:26 -0000	1.10
***************
*** 42,45 ****
--- 42,48 ----
      }
  */
+     public BrowsableSigner getSigner() {
+         return super.getSigner();
+     }
  
      protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
***************
*** 50,53 ****
--- 53,57 ----
      }
  
+ 
      private final InteractiveAgent agent;
  

Index: StandaloneSigner.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-signer/src/java/org/neuclear/signers/standalone/StandaloneSigner.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** StandaloneSigner.java	14 Apr 2004 15:30:02 -0000	1.6
--- StandaloneSigner.java	15 Apr 2004 20:03:26 -0000	1.7
***************
*** 2,16 ****
--- 2,29 ----
  
  import com.jgoodies.plaf.Options;
+ import org.dom4j.Document;
  import org.mortbay.http.HttpContext;
  import org.mortbay.jetty.Server;
  import org.mortbay.jetty.servlet.ServletHandler;
+ import org.mortbay.jetty.servlet.ServletHolder;
  import org.mortbay.util.InetAddrPort;
  import org.neuclear.commons.crypto.CryptoTools;
  import org.neuclear.commons.crypto.passphraseagents.PassPhraseAgent;
+ import org.neuclear.commons.crypto.passphraseagents.UserCancellationException;
+ import org.neuclear.commons.crypto.passphraseagents.swing.MessageLabel;
+ import org.neuclear.commons.crypto.signers.BrowsableSigner;
+ import org.neuclear.commons.crypto.signers.DefaultSigner;
+ import org.neuclear.xml.XMLException;
+ import org.neuclear.xml.XMLTools;
+ import org.neuclear.xml.xmlsec.EnvelopedSignature;
+ import org.neuclear.xml.xmlsec.XMLSignature;
  
  import javax.swing.*;
+ import javax.swing.filechooser.FileFilter;
  import java.awt.*;
  import java.awt.event.ActionEvent;
  import java.awt.event.ActionListener;
+ import java.awt.event.KeyEvent;
+ import java.io.File;
  import java.net.URL;
  
***************
*** 23,27 ****
      public static void main(String args[]) {
  //        Frame splash=SplashWindow.splash(Toolkit.getDefaultToolkit().createImage(StandaloneSigner.class.getClassLoader().getResource("neuclearsplash.png")));
! 
          try {
              CryptoTools.ensureProvider();
--- 36,41 ----
      public static void main(String args[]) {
  //        Frame splash=SplashWindow.splash(Toolkit.getDefaultToolkit().createImage(StandaloneSigner.class.getClassLoader().getResource("neuclearsplash.png")));
!         if (!LicenseScreen.accept())
!             System.exit(0);
          try {
              CryptoTools.ensureProvider();
***************
*** 36,41 ****
              handler.start();
              handler.initializeServlets();
  
!             JFrame frame = createFrame();
  
              Thread.sleep(2000);
--- 50,64 ----
              handler.start();
              handler.initializeServlets();
+             ServletHolder[] holders = handler.getServlets();
+             for (int i = 0; i < holders.length; i++) {
+                 ServletHolder holder = holders[i];
+                 if (holder.getServlet() instanceof StandaloneSigningServlet) {
+ //                    System.out.println("Found servlet: "+holder.getName());
+                     if (!holder.isStarted())
+                         holder.start();
  
!                     JFrame frame = createFrame((DefaultSigner) ((StandaloneSigningServlet) holder.getServlet()).getSigner());
!                 }
!             }
  
              Thread.sleep(2000);
***************
*** 43,50 ****
          } catch (Exception e) {
              e.printStackTrace();
          }
      }
  
!     public static JFrame createFrame() {
          try {
              UIManager.setLookAndFeel("com.jgoodies.plaf.plastic.PlasticXPLookAndFeel");
--- 66,74 ----
          } catch (Exception e) {
              e.printStackTrace();
+             System.exit(1);
          }
      }
  
!     public static JFrame createFrame(final DefaultSigner signer) {
          try {
              UIManager.setLookAndFeel("com.jgoodies.plaf.plastic.PlasticXPLookAndFeel");
***************
*** 53,61 ****
              // Likely PlasticXP is not in the class path; ignore.
          }
!         JFrame frame = new JFrame("NeuClear Signing Agent");
          frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
!         JButton quit = new JButton("Shut down");
  
!         quit.addActionListener(new ActionListener() {
              /**
               * Invoked when an action occurs.
--- 77,85 ----
              // Likely PlasticXP is not in the class path; ignore.
          }
!         final JFrame frame = new JFrame("NeuClear Signing Agent");
          frame.setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
! //        JButton quit = new JButton("Shut down");
  
!         final ActionListener quitlistener = new ActionListener() {
              /**
               * Invoked when an action occurs.
***************
*** 66,70 ****
              }
  
!         });
          Container content = frame.getContentPane();
          content.setLayout(new BorderLayout());
--- 90,95 ----
              }
  
!         };
! //        quit.addActionListener(quitlistener);
          Container content = frame.getContentPane();
          content.setLayout(new BorderLayout());
***************
*** 81,86 ****
          label.setFont(new Font("Arial", Font.BOLD, 14));
          content.add(label, BorderLayout.NORTH);
!         content.add(quit, BorderLayout.SOUTH);
          content.setBackground(Color.BLUE);
          frame.pack();
          frame.show();
--- 106,149 ----
          label.setFont(new Font("Arial", Font.BOLD, 14));
          content.add(label, BorderLayout.NORTH);
!         final MessageLabel message = new MessageLabel();
!         message.info("Ready");
!         content.add(message, BorderLayout.SOUTH);
! //        content.add(quit, BorderLayout.SOUTH);
          content.setBackground(Color.BLUE);
+ 
+         JMenuBar menubar = new JMenuBar();
+         frame.setJMenuBar(menubar);
+ 
+         JMenu menu = new JMenu("File");
+         menu.setMnemonic(KeyEvent.VK_F);
+         menubar.add(menu);
+ 
+         JMenuItem signItem = new JMenuItem("Sign file...",
+                 KeyEvent.VK_S);
+         menu.add(signItem);
+         menu.addSeparator();
+         JMenuItem quitItem = new JMenuItem("Exit",
+                 KeyEvent.VK_X);
+         menu.add(quitItem);
+         quitItem.addActionListener(quitlistener);
+ 
+         final JFileChooser chooser = new JFileChooser();
+         chooser.setFileFilter(new FileFilter() {
+             public boolean accept(File file) {
+                 String filename = file.getName();
+                 return file.isDirectory() || filename.endsWith(".xml") || filename.endsWith(".html") || filename.endsWith(".htm");
+             }
+ 
+             public String getDescription() {
+                 return "XML Files";
+             }
+         });
+         signItem.addActionListener(new ActionListener() {
+             public void actionPerformed(ActionEvent event) {
+                 SignDocument sign = new SignDocument(signer, chooser, frame, message);
+                 new Thread(sign).start();
+             }
+ 
+         });
          frame.pack();
          frame.show();
***************
*** 89,91 ****
--- 152,205 ----
  
      }
+ 
+     public static class SignDocument implements Runnable {
+         public SignDocument(BrowsableSigner signer, JFileChooser chooser, JFrame frame, MessageLabel message) {
+             this.signer = signer;
+             this.frame = frame;
+             this.chooser = chooser;
+             this.message = message;
+         }
+ 
+         public void run() {
+             frame.setEnabled(false);
+             chooser.setDialogTitle("Select XML file to sign...");
+             int result = chooser.showOpenDialog(frame);
+             if (result == JFileChooser.CANCEL_OPTION) {
+                 frame.setEnabled(true);
+                 message.info("Cancelled");
+                 return;
+             }
+             try {
+                 message.info("Parsing " + chooser.getSelectedFile().getName());
+                 Document doc = XMLTools.loadDocument(chooser.getSelectedFile());
+                 message.info("Signing " + chooser.getSelectedFile().getName());
+                 XMLSignature sig = new EnvelopedSignature(signer, doc.getRootElement());
+                 chooser.setDialogTitle("Save signed XML Document");
+                 result = chooser.showSaveDialog(frame);
+                 if (result == JFileChooser.CANCEL_OPTION) {
+                     frame.setEnabled(true);
+                     message.info("Cancelled");
+                     return;
+                 }
+                 message.info("Saving " + chooser.getSelectedFile().getName());
+                 XMLTools.writeFile(chooser.getSelectedFile(), doc);
+                 message.info("Saved signed XML document " + chooser.getSelectedFile().getName());
+                 frame.setEnabled(true);
+ 
+             } catch (XMLException e) {
+                 frame.setEnabled(true);
+                 message.error(e);
+             } catch (UserCancellationException e) {
+                 frame.setEnabled(true);
+                 message.error(e);
+             }
+ 
+         }
+ 
+         private final BrowsableSigner signer;
+         private final JFileChooser chooser;
+         private final JFrame frame;
+         private final MessageLabel message;
+ 
+     }
  }

[Neuclear-develop] neuclear-signer project.xml,1.12,1.13

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

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

Modified Files:
	project.xml 
Log Message:
Added license screen to Personal Signer.
Added Sign document menu to  Personal Signer.

Index: project.xml
===================================================================
RCS file: /cvsroot/neuclear/neuclear-signer/project.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** project.xml	15 Apr 2004 16:09:42 -0000	1.12
--- project.xml	15 Apr 2004 20:03:26 -0000	1.13
***************
*** 203,206 ****
--- 203,207 ----
                  <includes>*.properties</includes>
                  <excludes>*.java</excludes>
+                 <includes>LICENSE.txt</includes>
              </resource>
          </resources>

[Neuclear-develop] neuclear-pay/src/java/org/neuclear/asset/servlet AssetControllerServlet.java,1.6,1.7

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

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

Modified Files:
	AssetControllerServlet.java 
Log Message:
Added license screen to Personal Signer.
Added Sign document menu to  Personal Signer.

Index: AssetControllerServlet.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/servlet/AssetControllerServlet.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** AssetControllerServlet.java	5 Apr 2004 22:08:23 -0000	1.6
--- AssetControllerServlet.java	15 Apr 2004 20:03:18 -0000	1.7
***************
*** 5,12 ****
  import org.neuclear.asset.controllers.currency.CurrencyController;
  import org.neuclear.asset.orders.TransferGlobals;
- import org.neuclear.commons.servlets.ServletTools;
  import org.neuclear.id.Service;
  import org.neuclear.id.receiver.ReceiverServlet;
  import org.neuclear.id.resolver.Resolver;
  
  import javax.servlet.ServletConfig;
--- 5,12 ----
  import org.neuclear.asset.controllers.currency.CurrencyController;
  import org.neuclear.asset.orders.TransferGlobals;
  import org.neuclear.id.Service;
  import org.neuclear.id.receiver.ReceiverServlet;
  import org.neuclear.id.resolver.Resolver;
+ import org.neuclear.ledger.simple.SimpleLedger;
  
  import javax.servlet.ServletConfig;
***************
*** 33,36 ****
--- 33,40 ----
  $Id$
  $Log$
+ Revision 1.7  2004/04/15 20:03:18  pelle
+ Added license screen to Personal Signer.
+ Added Sign document menu to  Personal Signer.
+ 
  Revision 1.6  2004/04/05 22:08:23  pelle
  CurrencyController and AuditController now now pass all unit tests in CurrencyTests.
***************
*** 118,127 ****
      public final void init(final ServletConfig config) throws ServletException {
          super.init(config);
-         datasource = ServletTools.getInitParam("datasource", config);
          AssetGlobals.registerReaders();
          TransferGlobals.registerReaders();
          try {
              asset = (Service) Resolver.resolveIdentity(getServiceid());
!             final AssetController receiver = new CurrencyController(null, null,
                      getSigner(),
                      getServiceid());
--- 122,130 ----
      public final void init(final ServletConfig config) throws ServletException {
          super.init(config);
          AssetGlobals.registerReaders();
          TransferGlobals.registerReaders();
          try {
              asset = (Service) Resolver.resolveIdentity(getServiceid());
!             final AssetController receiver = new CurrencyController(new SimpleLedger(getServiceid()), null,
                      getSigner(),
                      getServiceid());
***************
*** 139,147 ****
  
  
-     public final String getDatasource() {
-         return datasource;
-     }
- 
      private Service asset;
-     private String datasource;
  }
--- 142,145 ----

[Neuclear-develop] [JIRA] Closed: (USER-9) Create license acceptance screen

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

Message:

   The following issue has been closed.

   Resolver: Pelle Braendgaard
       Date: Thu, 15 Apr 2004 12:56 PM

This has now been implemented in the LicenseScreen class
---------------------------------------------------------------------
View the issue:
  http://jira.neuclear.org//browse/USER-9

Here is an overview of the issue:
---------------------------------------------------------------------
        Key: USER-9
    Summary: Create license acceptance screen
       Type: New Feature

     Status: Closed
   Priority: Major
 Resolution: FIXED

 Original Estimate: Unknown
 Time Spent: Unknown
  Remaining: Unknown

    Project: NeuClear Signer
   Fix Fors:
             r_0_9
   Versions:
             r_0_9

   Assignee: Pelle Braendgaard
   Reporter: Pelle Braendgaard

    Created: Wed, 14 Apr 2004 11:29 AM
    Updated: Thu, 15 Apr 2004 12:56 PM

Description:
After the popup there should be a license acceptance screen that shows the GPL license to the user and allows them to hit ok or cancel.
Once ok has been hit a preference entry should be stored and the license should no longer be displayed.



---------------------------------------------------------------------
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: (USER-10) Add option to Sign a local file

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

Message:

   The following issue has been closed.

---------------------------------------------------------------------
View the issue:
  http://jira.neuclear.org//browse/USER-10

Here is an overview of the issue:
---------------------------------------------------------------------
        Key: USER-10
    Summary: Add option to Sign a local file
       Type: New Feature

     Status: Closed
   Priority: Major
 Resolution: FIXED

 Original Estimate: Unknown
 Time Spent: Unknown
  Remaining: Unknown

    Project: NeuClear Signer
   Fix Fors:
             r_0_9
   Versions:
             r_0_9

   Assignee: Pelle Braendgaard
   Reporter: Pelle Braendgaard

    Created: Thu, 15 Apr 2004 11:15 AM
    Updated: Thu, 15 Apr 2004 12:56 PM

Description:
User should be able to open an xml document, sign it and save the resulting signature.


---------------------------------------------------------------------
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: (USER-10) Add option to Sign a local file

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

Message:

  A new issue has been created in JIRA.

---------------------------------------------------------------------
View the issue:
  http://jira.neuclear.org//browse/USER-10

Here is an overview of the issue:
---------------------------------------------------------------------
        Key: USER-10
    Summary: Add option to Sign a local file
       Type: New Feature

     Status: Open
   Priority: Major

 Original Estimate: Unknown
 Time Spent: Unknown
  Remaining: Unknown

    Project: NeuClear Signer
   Fix Fors:
             r_0_9
   Versions:
             r_0_9

   Assignee: Pelle Braendgaard
   Reporter: Pelle Braendgaard

    Created: Thu, 15 Apr 2004 11:15 AM
    Updated: Thu, 15 Apr 2004 11:15 AM

Description:
User should be able to open an xml document, sign it and save the resulting signature.


---------------------------------------------------------------------
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-id/src/java/org/neuclear/id/tools/commandline CommandLineSigner.java,1.13,1.14

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

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

Modified Files:
	CommandLineSigner.java 
Log Message:
Got rid of unnecessary catch clause for InvalidPassphrase

Index: CommandLineSigner.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/tools/commandline/CommandLineSigner.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** CommandLineSigner.java	1 Apr 2004 23:19:49 -0000	1.13
--- CommandLineSigner.java	15 Apr 2004 16:10:24 -0000	1.14
***************
*** 1,4 ****
--- 1,7 ----
  /* $Id$
   * $Log$
+  * Revision 1.14  2004/04/15 16:10:24  pelle
+  * Got rid of unnecessary catch clause for InvalidPassphrase
+  *
   * Revision 1.13  2004/04/01 23:19:49  pelle
   * Split Identity into Signatory and Identity class.
***************
*** 241,245 ****
  import org.neuclear.commons.crypto.passphraseagents.UserCancellationException;
  import org.neuclear.commons.crypto.signers.DefaultSigner;
- import org.neuclear.commons.crypto.signers.InvalidPassphraseException;
  import org.neuclear.commons.crypto.signers.NonExistingSignerException;
  import org.neuclear.commons.crypto.signers.Signer;
--- 244,247 ----
***************
*** 308,316 ****
  
      private DefaultSigner createSigner(final InteractiveAgent agent) throws UserCancellationException {
!         try {
!             return new DefaultSigner(agent);
!         } catch (InvalidPassphraseException e) {
!             return createSigner(agent);
!         }
      }
  
--- 310,314 ----
  
      private DefaultSigner createSigner(final InteractiveAgent agent) throws UserCancellationException {
!         return new DefaultSigner(agent);
      }
  

[Neuclear-develop] neuclear-signer project.xml,1.11,1.12

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

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

Modified Files:
	project.xml 
Log Message:
Updated splash screen image
Added image resources to project.xml
Got rid of unnecessary catch clause for InvalidPassphrase

Index: project.xml
===================================================================
RCS file: /cvsroot/neuclear/neuclear-signer/project.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** project.xml	14 Apr 2004 15:30:03 -0000	1.11
--- project.xml	15 Apr 2004 16:09:42 -0000	1.12
***************
*** 191,195 ****
              </excludes>
          </unitTest>
! 
      </build>
  </project>
--- 191,208 ----
              </excludes>
          </unitTest>
!         <resources>
!             <resource>
!                 <directory>
!                 src/java
!                 </directory>
!                 <includes>*.png</includes>
!                 <includes>*.gif</includes>
!                 <includes>*.jpg</includes>
!                 <includes>*.jks</includes>
!                 <includes>*.xml</includes>
!                 <includes>*.properties</includes>
!                 <excludes>*.java</excludes>
!             </resource>
!         </resources>
      </build>
  </project>

[Neuclear-develop] neuclear-signer/src/java neuclearsplash.png,1.1,1.2

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

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

Modified Files:
	neuclearsplash.png 
Log Message:
Updated splash screen image
Added image resources to project.xml
Got rid of unnecessary catch clause for InvalidPassphrase

Index: neuclearsplash.png
===================================================================
RCS file: /cvsroot/neuclear/neuclear-signer/src/java/neuclearsplash.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsLggGE4 and /tmp/cvsS2tnC0 differ

[Neuclear-develop] neuclear-signer/src/java/org/neuclear/signers/standalone StandaloneSigningServlet.java,1.8,1.9

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

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

Modified Files:
	StandaloneSigningServlet.java 
Log Message:
Updated splash screen image
Added image resources to project.xml
Got rid of unnecessary catch clause for InvalidPassphrase

Index: StandaloneSigningServlet.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-signer/src/java/org/neuclear/signers/standalone/StandaloneSigningServlet.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** StandaloneSigningServlet.java	14 Apr 2004 15:30:02 -0000	1.8
--- StandaloneSigningServlet.java	15 Apr 2004 16:09:42 -0000	1.9
***************
*** 6,10 ****
  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.servlets.ServletTools;
  import org.neuclear.id.signers.SigningServlet;
--- 6,9 ----
***************
*** 30,38 ****
  
      protected BrowsableSigner createSigner(ServletConfig config) throws UserCancellationException {
!         try {
!             return new DefaultSigner(agent);
!         } catch (InvalidPassphraseException e) {
!             return createSigner(config);
!         }
      }
  
--- 29,33 ----
  
      protected BrowsableSigner createSigner(ServletConfig config) throws UserCancellationException {
!         return new DefaultSigner(agent);
      }
  

[Neuclear-develop] neuclear-commons project.xml,1.27,1.28

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

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

Modified Files:
	project.xml 
Log Message:
Added image resources to project.xml

Index: project.xml
===================================================================
RCS file: /cvsroot/neuclear/neuclear-commons/project.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** project.xml	9 Apr 2004 22:56:45 -0000	1.27
--- project.xml	15 Apr 2004 16:08:21 -0000	1.28
***************
*** 199,202 ****
--- 199,205 ----
                  src/java
                  </directory>
+                 <includes>*.png</includes>
+                 <includes>*.gif</includes>
+                 <includes>*.jpg</includes>
                  <includes>*.jks</includes>
                  <includes>*.xml</includes>

[Neuclear-develop] [JIRA] Updated: (COM-24) Create abstract Dialog class for all SwingAgent dialogs

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

The following issue has been updated:

    Updater: Pelle Braendgaard (mailto:pe...@ve...)
       Date: Thu, 15 Apr 2004 9:05 AM
    Changes:
             priority changed from Major to Minor
             Version changed to r_0_7
             Fix Version changed to r_0_7
    ---------------------------------------------------------------------
For a full history of the issue, see:

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

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

Here is an overview of the issue:
---------------------------------------------------------------------
        Key: COM-24
    Summary: Create abstract Dialog class for all SwingAgent dialogs
       Type: Improvement

     Status: Open
   Priority: Minor

 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: Tue, 13 Apr 2004 10:08 AM
    Updated: Thu, 15 Apr 2004 9:05 AM

Description:
We need an abstract super class to handle most of the house keeping with respect to the dialogs.

This should have the following features:

- main pane (entry screen)
- process pane (Shows Process bar)
- help pane (Shows help information)
- control pane (Buttons)


---------------------------------------------------------------------
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-27) Loop when JCESigner is loaded with incorrect passphrase

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

Message:

   The following issue has been closed.

   Resolver: Pelle Braendgaard
       Date: Thu, 15 Apr 2004 9:04 AM

Fixed. It now correctly displays a message to the user as well.
---------------------------------------------------------------------
View the issue:
  http://jira.neuclear.org//browse/COM-27

Here is an overview of the issue:
---------------------------------------------------------------------
        Key: COM-27
    Summary: Loop when JCESigner is loaded with incorrect passphrase
       Type: Bug

     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, 14 Apr 2004 1:21 PM
    Updated: Thu, 15 Apr 2004 9:04 AM

Description:



---------------------------------------------------------------------
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/passphraseagents/swing KeyStoreDialog.java,1.5,1.6 NewAliasDialog.java,1.5,1.6 NewPassphraseDialog.java,1.1,1.2 SimpleDialog.java,1.4,1.5 SwingAgent.java,1.7,1.8

[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-serv10493/src/java/org/neuclear/commons/crypto/passphraseagents/swing

Modified Files:
	KeyStoreDialog.java NewAliasDialog.java 
	NewPassphraseDialog.java SimpleDialog.java SwingAgent.java 
Log Message:
Got rid of the looping InvalidPassphraseException in DefaultSigner.
Added initial focus for all dialogs.

Index: KeyStoreDialog.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-commons/src/java/org/neuclear/commons/crypto/passphraseagents/swing/KeyStoreDialog.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** KeyStoreDialog.java	14 Apr 2004 23:39:57 -0000	1.5
--- KeyStoreDialog.java	15 Apr 2004 15:34:41 -0000	1.6
***************
*** 33,36 ****
--- 33,40 ----
  $Id$
  $Log$
+ Revision 1.6  2004/04/15 15:34:41  pelle
+ Got rid of the looping InvalidPassphraseException in DefaultSigner.
+ Added initial focus for all dialogs.
+ 
  Revision 1.5  2004/04/14 23:39:57  pelle
  Fixed a few things in the ServletSignerFactory
***************
*** 311,317 ****
              else
                  message.clear();
-             passphrase.requestFocus();
              frame.pack();
              frame.show();
              sign.setEnabled(false);
          }
--- 315,322 ----
              else
                  message.clear();
              frame.pack();
              frame.show();
+             frame.toFront();
+             passphrase.requestFocus();
              sign.setEnabled(false);
          }

Index: SwingAgent.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-commons/src/java/org/neuclear/commons/crypto/passphraseagents/swing/SwingAgent.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** SwingAgent.java	14 Apr 2004 00:10:52 -0000	1.7
--- SwingAgent.java	15 Apr 2004 15:34:41 -0000	1.8
***************
*** 3,11 ****
  import com.jgoodies.plaf.Options;
  import org.neuclear.commons.crypto.Base64;
  import org.neuclear.commons.crypto.passphraseagents.InteractiveAgent;
  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;
  
--- 3,11 ----
  import com.jgoodies.plaf.Options;
  import org.neuclear.commons.crypto.Base64;
+ import org.neuclear.commons.crypto.CryptoTools;
  import org.neuclear.commons.crypto.passphraseagents.InteractiveAgent;
  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.SetPublicKeyCallBack;
  
***************
*** 17,20 ****
--- 17,24 ----
  $Id$
  $Log$
+ Revision 1.8  2004/04/15 15:34:41  pelle
+ Got rid of the looping InvalidPassphraseException in DefaultSigner.
+ Added initial focus for all dialogs.
+ 
  Revision 1.7  2004/04/14 00:10:52  pelle
  Added a MessageLabel for handling errors, validation and info
***************
*** 77,102 ****
          final InteractiveAgent dia = new SwingAgent();
          try {
!             try {
  //                System.out.println(dia.getPassPhrase("test"));
!                 final BrowsableSigner signer = new DefaultSigner(dia);
!                 while (true) {
!                     byte sig[] = signer.sign("testdata".getBytes(), new SetPublicKeyCallBack() {
!                         public void setPublicKey(PublicKey pub) {
!                             System.out.println("PublicKey:");
!                             System.out.println(pub);
!                         }
!                     });
!                     System.out.println(Base64.encode(sig));
!                 }
  //                System.out.println("Getting passphrase... " + new String(dia.getPassPhrase((BrowsableSigner) signer)));
  //                System.out.println("Getting passphrase... " + new String(dia.getPassPhrase("neu://pelle@test", true)));
!             } catch (UserCancellationException e) {
!                 System.out.print("User Cancellation by: " + e.getName());
!             }
! 
!         } catch (InvalidPassphraseException e) {
!             e.printStackTrace();
          }
  
          System.exit(0);
      }
--- 81,103 ----
          final InteractiveAgent dia = new SwingAgent();
          try {
!             CryptoTools.ensureProvider();
  //                System.out.println(dia.getPassPhrase("test"));
!             final BrowsableSigner signer = new DefaultSigner(dia);
!             while (true) {
!                 byte sig[] = signer.sign("testdata".getBytes(), new SetPublicKeyCallBack() {
!                     public void setPublicKey(PublicKey pub) {
!                         System.out.println("PublicKey:");
!                         System.out.println(pub);
!                     }
!                 });
!                 System.out.println(Base64.encode(sig));
!             }
  //                System.out.println("Getting passphrase... " + new String(dia.getPassPhrase((BrowsableSigner) signer)));
  //                System.out.println("Getting passphrase... " + new String(dia.getPassPhrase("neu://pelle@test", true)));
!         } catch (UserCancellationException e) {
!             System.out.print("User Cancellation by: " + e.getName());
          }
  
+ 
          System.exit(0);
      }

Index: NewPassphraseDialog.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-commons/src/java/org/neuclear/commons/crypto/passphraseagents/swing/NewPassphraseDialog.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** NewPassphraseDialog.java	14 Apr 2004 00:10:51 -0000	1.1
--- NewPassphraseDialog.java	15 Apr 2004 15:34:41 -0000	1.2
***************
*** 18,21 ****
--- 18,25 ----
  $Id$
  $Log$
+ Revision 1.2  2004/04/15 15:34:41  pelle
+ Got rid of the looping InvalidPassphraseException in DefaultSigner.
+ Added initial focus for all dialogs.
+ 
  Revision 1.1  2004/04/14 00:10:51  pelle
  Added a MessageLabel for handling errors, validation and info
***************
*** 181,184 ****
--- 185,189 ----
              runner = this;
              ok.setEnabled(false);
+             passphrase.requestFocus();
              alias.setText(req);
              dialog.pack();

Index: SimpleDialog.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-commons/src/java/org/neuclear/commons/crypto/passphraseagents/swing/SimpleDialog.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SimpleDialog.java	14 Apr 2004 00:10:52 -0000	1.4
--- SimpleDialog.java	15 Apr 2004 15:34:41 -0000	1.5
***************
*** 18,21 ****
--- 18,25 ----
  $Id$
  $Log$
+ Revision 1.5  2004/04/15 15:34:41  pelle
+ Got rid of the looping InvalidPassphraseException in DefaultSigner.
+ Added initial focus for all dialogs.
+ 
  Revision 1.4  2004/04/14 00:10:52  pelle
  Added a MessageLabel for handling errors, validation and info
***************
*** 171,174 ****
--- 175,179 ----
              dialog.pack();
              dialog.show();
+             passphrase.requestFocus();
              System.out.println(Thread.currentThread());
  

Index: NewAliasDialog.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-commons/src/java/org/neuclear/commons/crypto/passphraseagents/swing/NewAliasDialog.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** NewAliasDialog.java	14 Apr 2004 00:10:51 -0000	1.5
--- NewAliasDialog.java	15 Apr 2004 15:34:41 -0000	1.6
***************
*** 17,20 ****
--- 17,24 ----
  $Id$
  $Log$
+ Revision 1.6  2004/04/15 15:34:41  pelle
+ Got rid of the looping InvalidPassphraseException in DefaultSigner.
+ Added initial focus for all dialogs.
+ 
  Revision 1.5  2004/04/14 00:10:51  pelle
  Added a MessageLabel for handling errors, validation and info
***************
*** 228,231 ****
--- 232,236 ----
          passphrase2.setEnabled(true);
          setMainPanel();
+         alias.requestFocus();
      }
  

[Neuclear-develop] neuclear-commons/src/java/org/neuclear/commons/crypto/signers DefaultSigner.java,1.9,1.10

[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-serv10493/src/java/org/neuclear/commons/crypto/signers

Modified Files:
	DefaultSigner.java 
Log Message:
Got rid of the looping InvalidPassphraseException in DefaultSigner.
Added initial focus for all dialogs.

Index: DefaultSigner.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-commons/src/java/org/neuclear/commons/crypto/signers/DefaultSigner.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** DefaultSigner.java	14 Apr 2004 00:10:52 -0000	1.9
--- DefaultSigner.java	15 Apr 2004 15:34:41 -0000	1.10
***************
*** 34,37 ****
--- 34,41 ----
  $Id$
  $Log$
+ Revision 1.10  2004/04/15 15:34:41  pelle
+ Got rid of the looping InvalidPassphraseException in DefaultSigner.
+ Added initial focus for all dialogs.
+ 
  Revision 1.9  2004/04/14 00:10:52  pelle
  Added a MessageLabel for handling errors, validation and info
***************
*** 90,94 ****
   */
  public final class DefaultSigner implements BrowsableSigner {
!     public DefaultSigner(final InteractiveAgent agent) throws UserCancellationException, InvalidPassphraseException {
          prefs = Preferences.userNodeForPackage(DefaultSigner.class);
          this.agent = agent;
--- 94,98 ----
   */
  public final class DefaultSigner implements BrowsableSigner {
!     public DefaultSigner(final InteractiveAgent agent) throws UserCancellationException {
          prefs = Preferences.userNodeForPackage(DefaultSigner.class);
          this.agent = agent;
***************
*** 97,109 ****
          if (file.exists() && file.length() == 0)
              file.delete(); // Delete empty file
-         InputStream is = null;
-         if (file.exists()) {
-             passphrase = agent.getPassPhrase(filename);
-             try {
-                 is = new FileInputStream(file);
-             } catch (FileNotFoundException e) {
-                 throw new LowLevelException(e);
-             }
-         }
          try {
              prefs.flush();
--- 101,104 ----
***************
*** 111,127 ****
              e.printStackTrace();
          }
!         if (passphrase != null)
!             signer = loadSigner(is, agent);
!         else
!             signer = new JCESigner(filename, is, "jks", "SUN", agent);
! 
! 
      }
  
!     private JCESigner loadSigner(InputStream is, final InteractiveAgent agent) throws InvalidPassphraseException {
          try {
!             return new JCESigner(filename, is, "jks", "SUN", agent, passphrase);
          } catch (InvalidPassphraseException e) {
!             return loadSigner(is, agent);
          }
      }
--- 106,130 ----
              e.printStackTrace();
          }
!         signer = loadSigner(file, agent, false);
      }
  
!     private JCESigner loadSigner(final File file, final InteractiveAgent agent, final boolean wrong) throws UserCancellationException {
          try {
!             if (file.exists() && file.length() > 0) {
!                 passphrase = agent.getPassPhrase(filename, wrong);
!                 try {
!                     InputStream is = new FileInputStream(file);
!                     return new JCESigner(filename, is, "jks", "SUN", agent, passphrase);
!                 } catch (FileNotFoundException e) {  // Lets just return an empty signer then
! //                    throw new LowLevelException(e);
!                 }
!             }
          } catch (InvalidPassphraseException e) {
!             return loadSigner(file, agent, true);
!         }
!         try {
!             return new JCESigner(filename, null, "jks", "SUN", agent);
!         } catch (InvalidPassphraseException e) {
!             throw new LowLevelException(e);
          }
      }

[Neuclear-develop] neuclear-id/src/java/org/neuclear/id SignedNamedCore.java,1.23,1.24 SignedNamedObject.java,1.20,1.21

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

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

Modified Files:
	SignedNamedCore.java SignedNamedObject.java 
Log Message:
Made the SignedNamedCore and SignedNamedObject unserializable for security reasons.

Index: SignedNamedObject.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/SignedNamedObject.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** SignedNamedObject.java	1 Apr 2004 23:19:49 -0000	1.20
--- SignedNamedObject.java	15 Apr 2004 15:33:40 -0000	1.21
***************
*** 2,5 ****
--- 2,8 ----
   * $Id$
   * $Log$
+  * Revision 1.21  2004/04/15 15:33:40  pelle
+  * Made the SignedNamedCore and SignedNamedObject unserializable for security reasons.
+  *
   * Revision 1.20  2004/04/01 23:19:49  pelle
   * Split Identity into Signatory and Identity class.
***************
*** 252,255 ****
--- 255,260 ----
  import org.dom4j.QName;
  
+ import java.io.IOException;
+ import java.io.ObjectInputStream;
  import java.sql.Timestamp;
  
***************
*** 345,347 ****
--- 350,357 ----
      private final SignedNamedCore core;
  
+     // Disable Serialization
+     private final void writeObject(ObjectInputStream in) throws IOException {
+         throw new IOException("object can not be serialized");
+     }
+ 
  }

Index: SignedNamedCore.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/SignedNamedCore.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** SignedNamedCore.java	1 Apr 2004 23:19:49 -0000	1.23
--- SignedNamedCore.java	15 Apr 2004 15:33:40 -0000	1.24
***************
*** 2,5 ****
--- 2,8 ----
   * $Id$
   * $Log$
+  * Revision 1.24  2004/04/15 15:33:40  pelle
+  * Made the SignedNamedCore and SignedNamedObject unserializable for security reasons.
+  *
   * Revision 1.23  2004/04/01 23:19:49  pelle
   * Split Identity into Signatory and Identity class.
***************
*** 297,300 ****
--- 300,305 ----
  import org.neuclear.xml.xmlsec.*;
  
+ import java.io.IOException;
+ import java.io.ObjectInputStream;
  import java.security.PublicKey;
  import java.sql.Timestamp;
***************
*** 450,453 ****
--- 455,462 ----
      }
  
+     // Disable Serialization
+     private final void writeObject(ObjectInputStream in) throws IOException {
+         throw new IOException("object can not be serialized");
+     }
  
      private final String name;