neuclear-develop — Support requests, cvs etc

[Neuclear-develop] neuclear-id/src/java/org/neuclear/id/servlet - New directory

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

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

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

[Neuclear-develop] neuclear-id/src/test-cactus/org/neuclear/id/servlet - New directory

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

Update of /cvsroot/neuclear/neuclear-id/src/test-cactus/org/neuclear/id/servlet
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32481/src/test-cactus/org/neuclear/id/servlet

Log Message:
Directory /cvsroot/neuclear/neuclear-id/src/test-cactus/org/neuclear/id/servlet added to the repository

[Neuclear-develop] neuclear-id/src/java/org/neuclear/id/senders - New directory

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

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

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

[Neuclear-develop] neuclear-id/src/java/org/neuclear/id/auth - New directory

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

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

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

[Neuclear-develop] neuclear-id/src/test-cactus/org/neuclear/id/auth - New directory

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

Update of /cvsroot/neuclear/neuclear-id/src/test-cactus/org/neuclear/id/auth
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31377/src/test-cactus/org/neuclear/id/auth

Log Message:
Directory /cvsroot/neuclear/neuclear-id/src/test-cactus/org/neuclear/id/auth added to the repository

[Neuclear-develop] neuclear-id/src/test/org/neuclear/store AbstractStoreTest.java,1.18,NONE EncryptedFileStoreTest.java,1.6,NONE FileStoreTest.java,1.5,NONE

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

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

Removed Files:
	AbstractStoreTest.java EncryptedFileStoreTest.java 
	FileStoreTest.java 
Log Message:
Done some more minor fixes within xmlsig, but mainly I've removed the old Source and Store patterns and sub packages. This is because
they really are no longer necessary with the new non naming naming system.

--- AbstractStoreTest.java DELETED ---

--- EncryptedFileStoreTest.java DELETED ---

--- FileStoreTest.java DELETED ---

[Neuclear-develop] neuclear-id/src/java/org/neuclear/store EncryptedFileStore.java,1.19,NONE FileStore.java,1.19,NONE StorageException.java,1.1,NONE Store.java,1.18,NONE StoreFactory.java,1.4,NONE

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

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

Removed Files:
	EncryptedFileStore.java FileStore.java StorageException.java 
	Store.java StoreFactory.java 
Log Message:
Done some more minor fixes within xmlsig, but mainly I've removed the old Source and Store patterns and sub packages. This is because
they really are no longer necessary with the new non naming naming system.

--- EncryptedFileStore.java DELETED ---

--- FileStore.java DELETED ---

--- StorageException.java DELETED ---

--- Store.java DELETED ---

--- StoreFactory.java DELETED ---

[Neuclear-develop] neuclear-id/src/test/org/neuclear/source AbstractSourceTest.java,1.1,NONE CachedSourceTest.java,1.1,NONE HttpSourceTest.java,1.3,NONE

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

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

Removed Files:
	AbstractSourceTest.java CachedSourceTest.java 
	HttpSourceTest.java 
Log Message:
Done some more minor fixes within xmlsig, but mainly I've removed the old Source and Store patterns and sub packages. This is because
they really are no longer necessary with the new non naming naming system.

--- AbstractSourceTest.java DELETED ---

--- CachedSourceTest.java DELETED ---

--- HttpSourceTest.java DELETED ---

[Neuclear-develop] neuclear-id/src/test/org/neuclear/id/resolver ResolverTests.java,1.5,1.6

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

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

Modified Files:
	ResolverTests.java 
Log Message:
Done some more minor fixes within xmlsig, but mainly I've removed the old Source and Store patterns and sub packages. This is because
they really are no longer necessary with the new non naming naming system.

Index: ResolverTests.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/resolver/ResolverTests.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ResolverTests.java	18 Feb 2004 00:14:35 -0000	1.5
--- ResolverTests.java	2 Mar 2004 18:40:04 -0000	1.6
***************
*** 16,20 ****
  //          URL testid=getClass().getClassLoader().getResource("org/neuclear/id/testid.xml");
  //          assertNotNull(NSResolver.resolveIdentity(testid.toExternalForm()));
!         assertNotNull(NSResolver.resolveIdentity("http://talk.org/pelle.xml"));
  //        assertNotNull(NSResolver.resolveIdentity("neu://bob@test"));
  //        assertNotNull(NSResolver.resolveIdentity("neu://alice@test"));
--- 16,20 ----
  //          URL testid=getClass().getClassLoader().getResource("org/neuclear/id/testid.xml");
  //          assertNotNull(NSResolver.resolveIdentity(testid.toExternalForm()));
! //        assertNotNull(NSResolver.resolveIdentity("http://talk.org/pelle.xml"));
  //        assertNotNull(NSResolver.resolveIdentity("neu://bob@test"));
  //        assertNotNull(NSResolver.resolveIdentity("neu://alice@test"));

[Neuclear-develop] neuclear-id/src/java/org/neuclear/store/servlet StorageServlet.java,1.6,NONE

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

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

Removed Files:
	StorageServlet.java 
Log Message:
Done some more minor fixes within xmlsig, but mainly I've removed the old Source and Store patterns and sub packages. This is because
they really are no longer necessary with the new non naming naming system.

--- StorageServlet.java DELETED ---

[Neuclear-develop] neuclear-id/src/java/org/neuclear/source CachedSource.java,1.17,NONE HttpSource.java,1.13,NONE Source.java,1.9,NONE SourceException.java,1.1,NONE

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

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

Removed Files:
	CachedSource.java HttpSource.java Source.java 
	SourceException.java 
Log Message:
Done some more minor fixes within xmlsig, but mainly I've removed the old Source and Store patterns and sub packages. This is because
they really are no longer necessary with the new non naming naming system.

--- CachedSource.java DELETED ---

--- HttpSource.java DELETED ---

--- Source.java DELETED ---

--- SourceException.java DELETED ---

[Neuclear-develop] neuclear-id/src/java/org/neuclear/id/tools/commandline BuildAllTopLevel.java,1.7,NONE

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

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

Removed Files:
	BuildAllTopLevel.java 
Log Message:
Done some more minor fixes within xmlsig, but mainly I've removed the old Source and Store patterns and sub packages. This is because
they really are no longer necessary with the new non naming naming system.

--- BuildAllTopLevel.java DELETED ---

[Neuclear-develop] neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec Reference.java,1.10,1.11 XMLSignature.java,1.12,1.13

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

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

Modified Files:
	Reference.java XMLSignature.java 
Log Message:
Done some more minor fixes within xmlsig, but mainly I've removed the old Source and Store patterns and sub packages. This is because
they really are no longer necessary with the new non naming naming system.

Index: Reference.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/Reference.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Reference.java	19 Feb 2004 00:27:59 -0000	1.10
--- Reference.java	2 Mar 2004 18:39:57 -0000	1.11
***************
*** 1,4 ****
--- 1,8 ----
  /* $Id$
   * $Log$
+  * Revision 1.11  2004/03/02 18:39:57  pelle
+  * Done some more minor fixes within xmlsig, but mainly I've removed the old Source and Store patterns and sub packages. This is because
+  * they really are no longer necessary with the new non naming naming system.
+  *
   * Revision 1.10  2004/02/19 00:27:59  pelle
   * Discovered several incompatabilities with the xmlsig implementation. Have been working on getting it working.
***************
*** 165,168 ****
--- 169,173 ----
          super(Reference.TAG_NAME);
          final Canonicalizer canon;
+         Object ref=null;
          Element transformsElement = addElement("Transforms");
  //        final Element object;
***************
*** 171,176 ****
--- 176,183 ----
              canon=new CanonicalizerWithoutSignature();
              transformsElement.addElement(XMLSecTools.createQName("Transform")).addAttribute("Algorithm","http://www.w3.org/2000/09/xmldsig#enveloped-signature");
+             ref=root;
          } else if (sigtype == XMLSIGTYPE_ENVELOPING){
              canon= new Canonicalizer();
+             ref=root;
          } else {
              throw new XMLSecurityException("Unsupported Signature Method");
***************
*** 183,187 ****
              createAttribute("URI","#"+id);
  
!         addDigest(canon,root);
      }
  
--- 190,194 ----
              createAttribute("URI","#"+id);
  
!         addDigest(canon,ref);
      }
  
***************
*** 247,251 ****
              if (id.startsWith("#")){
  //                System.out.println("Ref: "+id.substring(1));
!                 return XMLTools.getByID(elem,id.substring(1));
              }
              // Non Local URI, we need to load it
--- 254,258 ----
              if (id.startsWith("#")){
  //                System.out.println("Ref: "+id.substring(1));
!                 return XMLTools.getByID(elem,id.substring(1));//.createCopy();
              }
              // Non Local URI, we need to load it

Index: XMLSignature.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/XMLSignature.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** XMLSignature.java	19 Feb 2004 00:27:59 -0000	1.12
--- XMLSignature.java	2 Mar 2004 18:39:57 -0000	1.13
***************
*** 1,4 ****
--- 1,8 ----
  /* $Id$
   * $Log$
+  * Revision 1.13  2004/03/02 18:39:57  pelle
+  * Done some more minor fixes within xmlsig, but mainly I've removed the old Source and Store patterns and sub packages. This is because
+  * they really are no longer necessary with the new non naming naming system.
+  *
   * Revision 1.12  2004/02/19 00:27:59  pelle
   * Discovered several incompatabilities with the xmlsig implementation. Have been working on getting it working.
***************
*** 311,317 ****
          final byte[] sig = getSignature();
          final byte[] cansi = si.canonicalize();
!         System.out.println("Canonicalized:");
!         System.out.println(new String(cansi));
!         System.out.println("------");
  
          try {
--- 315,321 ----
          final byte[] sig = getSignature();
          final byte[] cansi = si.canonicalize();
! //        System.out.println("Canonicalized:");
! //        System.out.println(new String(cansi));
! //        System.out.println("------");
  
          try {

[Neuclear-develop] neuclear-xmlsig/src/test/org/neuclear/xml/xmlsec RefTest.java,1.5,1.6 SimpleXMLSigTest.java,1.8,1.9

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

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

Modified Files:
	RefTest.java SimpleXMLSigTest.java 
Log Message:
Done some more minor fixes within xmlsig, but mainly I've removed the old Source and Store patterns and sub packages. This is because
they really are no longer necessary with the new non naming naming system.

Index: RefTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/test/org/neuclear/xml/xmlsec/RefTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** RefTest.java	19 Feb 2004 00:28:00 -0000	1.5
--- RefTest.java	2 Mar 2004 18:39:57 -0000	1.6
***************
*** 32,35 ****
--- 32,39 ----
  $Id$
  $Log$
+ Revision 1.6  2004/03/02 18:39:57  pelle
+ Done some more minor fixes within xmlsig, but mainly I've removed the old Source and Store patterns and sub packages. This is because
+ they really are no longer necessary with the new non naming naming system.
+ 
  Revision 1.5  2004/02/19 00:28:00  pelle
  Discovered several incompatabilities with the xmlsig implementation. Have been working on getting it working.
***************
*** 62,66 ****
  
      public void testExternalReference() throws XMLException, CryptoException, MalformedURLException {
!         File rfile=new File("src/testdata/homegrown/signature-enveloped-rsa.xml");
          final String uri = rfile.toURL().toExternalForm();
          Reference ref=new Reference(uri);
--- 66,70 ----
  
      public void testExternalReference() throws XMLException, CryptoException, MalformedURLException {
!         File rfile=new File("project.xml");
          final String uri = rfile.toURL().toExternalForm();
          Reference ref=new Reference(uri);

Index: SimpleXMLSigTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/test/org/neuclear/xml/xmlsec/SimpleXMLSigTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** SimpleXMLSigTest.java	19 Feb 2004 00:28:00 -0000	1.8
--- SimpleXMLSigTest.java	2 Mar 2004 18:39:57 -0000	1.9
***************
*** 22,25 ****
--- 22,29 ----
   * $Id$
   * $Log$
+  * Revision 1.9  2004/03/02 18:39:57  pelle
+  * Done some more minor fixes within xmlsig, but mainly I've removed the old Source and Store patterns and sub packages. This is because
+  * they really are no longer necessary with the new non naming naming system.
+  *
   * Revision 1.8  2004/02/19 00:28:00  pelle
   * Discovered several incompatabilities with the xmlsig implementation. Have been working on getting it working.

[Neuclear-develop] neuclear-commons project.properties,1.14,1.15

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

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

Modified Files:
	project.properties 
Log Message:
Done some more minor fixes within xmlsig, but mainly I've removed the old Source and Store patterns and sub packages. This is because
they really are no longer necessary with the new non naming naming system.

Index: project.properties
===================================================================
RCS file: /cvsroot/neuclear/neuclear-commons/project.properties,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** project.properties	19 Feb 2004 15:29:13 -0000	1.14
--- project.properties	2 Mar 2004 18:39:37 -0000	1.15
***************
*** 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-pay/src/java/org/neuclear/asset/contracts/builders AssetBuilder.java,1.7,1.8

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

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

Modified Files:
	AssetBuilder.java 
Log Message:
Done some more minor fixes within xmlsig, but mainly I've removed the old Source and Store patterns and sub packages. This is because
they really are no longer necessary with the new non naming naming system.

Index: AssetBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/contracts/builders/AssetBuilder.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** AssetBuilder.java	18 Feb 2004 00:13:29 -0000	1.7
--- AssetBuilder.java	2 Mar 2004 18:39:29 -0000	1.8
***************
*** 8,13 ****
  import org.neuclear.commons.crypto.signers.TestCaseSigner;
  import org.neuclear.id.builders.IdentityBuilder;
- import org.neuclear.store.FileStore;
- import org.neuclear.store.Store;
  
  import java.security.PublicKey;
--- 8,11 ----
***************
*** 33,36 ****
--- 31,38 ----
  $Id$
  $Log$
+ Revision 1.8  2004/03/02 18:39:29  pelle
+ Done some more minor fixes within xmlsig, but mainly I've removed the old Source and Store patterns and sub packages. This is because
+ they really are no longer necessary with the new non naming naming system.
+ 
  Revision 1.7  2004/02/18 00:13:29  pelle
  Many, many clean ups. I've readded Targets in a new method.
***************
*** 140,145 ****
              );
              final Asset asset= (Asset) assetraw.convert(assetname,signer);
!             final Store store = new FileStore("target/testdata/repository");
!             store.receive(asset);
          } catch (Exception e) {
              e.printStackTrace();
--- 142,146 ----
              );
              final Asset asset= (Asset) assetraw.convert(assetname,signer);
! 
          } catch (Exception e) {
              e.printStackTrace();

[Neuclear-develop] neuclear-id/src/java/org/neuclear/id/tools/commandline CommandLineSigner.java,1.10,1.11

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

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

Modified Files:
	CommandLineSigner.java 
Log Message:
At times IntelliJ IDEA can cause some real hassle. On my last checkin it optimized away all of the dom4j and command line imports.
We'll now, Ive added them all back.

Index: CommandLineSigner.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/tools/commandline/CommandLineSigner.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** CommandLineSigner.java	19 Feb 2004 15:30:21 -0000	1.10
--- CommandLineSigner.java	19 Feb 2004 19:38:13 -0000	1.11
***************
*** 1,4 ****
--- 1,8 ----
  /* $Id$
   * $Log$
+  * Revision 1.11  2004/02/19 19:38:13  pelle
+  * At times IntelliJ IDEA can cause some real hassle. On my last checkin it optimized away all of the dom4j and command line imports.
+  * We'll now, Ive added them all back.
+  *
   * Revision 1.10  2004/02/19 15:30:21  pelle
   * Various cleanups and corrections
***************
*** 237,240 ****
--- 241,245 ----
  import org.neuclear.xml.XMLException;
  import org.neuclear.xml.XMLTools;
+ import org.apache.commons.cli.*;
  
  import java.io.*;

[Neuclear-develop] neuclear-xmlsig/src/java/org/neuclear/xml/c14 Canonicalizer.java,1.8,1.9

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

Update of /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml/c14
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3992/src/java/org/neuclear/xml/c14

Modified Files:
	Canonicalizer.java 
Log Message:
At times IntelliJ IDEA can cause some real hassle. On my last checkin it optimized away all of the dom4j and command line imports.
We'll now, Ive added them all back.

Index: Canonicalizer.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml/c14/Canonicalizer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Canonicalizer.java	19 Feb 2004 15:30:08 -0000	1.8
--- Canonicalizer.java	19 Feb 2004 19:37:33 -0000	1.9
***************
*** 8,11 ****
--- 8,15 ----
   * $Id$
   * $Log$
+  * Revision 1.9  2004/02/19 19:37:33  pelle
+  * At times IntelliJ IDEA can cause some real hassle. On my last checkin it optimized away all of the dom4j and command line imports.
+  * We'll now, Ive added them all back.
+  *
   * Revision 1.8  2004/02/19 15:30:08  pelle
   * Various cleanups and corrections
***************
*** 123,126 ****
--- 127,131 ----
  
  import org.dom4j.tree.NamespaceStack;
+ import org.dom4j.*;
  import org.neuclear.xml.ElementProxy;
  import org.neuclear.xml.XMLTools;

[Neuclear-develop] neuclear-xmlsig/src/java/org/neuclear/xml/transforms DropSignatureTransform.java,1.3,1.4 XPathTransform.java,1.3,1.4

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

Update of /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml/transforms
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3992/src/java/org/neuclear/xml/transforms

Modified Files:
	DropSignatureTransform.java XPathTransform.java 
Log Message:
At times IntelliJ IDEA can cause some real hassle. On my last checkin it optimized away all of the dom4j and command line imports.
We'll now, Ive added them all back.

Index: DropSignatureTransform.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml/transforms/DropSignatureTransform.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DropSignatureTransform.java	19 Feb 2004 15:30:08 -0000	1.3
--- DropSignatureTransform.java	19 Feb 2004 19:37:34 -0000	1.4
***************
*** 8,11 ****
--- 8,15 ----
   * $Id$
   * $Log$
+  * Revision 1.4  2004/02/19 19:37:34  pelle
+  * At times IntelliJ IDEA can cause some real hassle. On my last checkin it optimized away all of the dom4j and command line imports.
+  * We'll now, Ive added them all back.
+  *
   * Revision 1.3  2004/02/19 15:30:08  pelle
   * Various cleanups and corrections
***************
*** 41,44 ****
--- 45,49 ----
  import org.neuclear.xml.xmlsec.XMLSecTools;
  import org.neuclear.xml.xmlsec.XMLSecurityException;
+ import org.dom4j.*;
  
  import java.util.ListIterator;

Index: XPathTransform.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml/transforms/XPathTransform.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** XPathTransform.java	19 Feb 2004 15:30:08 -0000	1.3
--- XPathTransform.java	19 Feb 2004 19:37:34 -0000	1.4
***************
*** 3,7 ****
  import org.neuclear.xml.xmlsec.XMLSecTools;
  import org.neuclear.xml.xmlsec.XMLSecurityException;
! 
  import java.util.HashMap;
  import java.util.List;
--- 3,7 ----
  import org.neuclear.xml.xmlsec.XMLSecTools;
  import org.neuclear.xml.xmlsec.XMLSecurityException;
! import org.dom4j.*;
  import java.util.HashMap;
  import java.util.List;

[Neuclear-develop] neuclear-xmlsig/src/java/org/neuclear/xml/soap SOAPTools.java,1.7,1.8

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

Update of /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml/soap
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3992/src/java/org/neuclear/xml/soap

Modified Files:
	SOAPTools.java 
Log Message:
At times IntelliJ IDEA can cause some real hassle. On my last checkin it optimized away all of the dom4j and command line imports.
We'll now, Ive added them all back.

Index: SOAPTools.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml/soap/SOAPTools.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** SOAPTools.java	19 Feb 2004 15:30:08 -0000	1.7
--- SOAPTools.java	19 Feb 2004 19:37:33 -0000	1.8
***************
*** 1,4 ****
--- 1,8 ----
  /* $Id$
   * $Log$
+  * Revision 1.8  2004/02/19 19:37:33  pelle
+  * At times IntelliJ IDEA can cause some real hassle. On my last checkin it optimized away all of the dom4j and command line imports.
+  * We'll now, Ive added them all back.
+  *
   * Revision 1.7  2004/02/19 15:30:08  pelle
   * Various cleanups and corrections
***************
*** 123,126 ****
--- 127,131 ----
  import org.dom4j.io.SAXReader;
  import org.neuclear.commons.NeuClearException;
+ import org.dom4j.*;
  
  import java.io.*;

[Neuclear-develop] neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec XMLSecTools.java,1.10,1.11

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

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

Modified Files:
	XMLSecTools.java 
Log Message:
At times IntelliJ IDEA can cause some real hassle. On my last checkin it optimized away all of the dom4j and command line imports.
We'll now, Ive added them all back.

Index: XMLSecTools.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml/xmlsec/XMLSecTools.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** XMLSecTools.java	19 Feb 2004 15:30:09 -0000	1.10
--- XMLSecTools.java	19 Feb 2004 19:37:34 -0000	1.11
***************
*** 1,4 ****
--- 1,8 ----
  /* $Id$
   * $Log$
+  * Revision 1.11  2004/02/19 19:37:34  pelle
+  * At times IntelliJ IDEA can cause some real hassle. On my last checkin it optimized away all of the dom4j and command line imports.
+  * We'll now, Ive added them all back.
+  *
   * Revision 1.10  2004/02/19 15:30:09  pelle
   * Various cleanups and corrections
***************
*** 164,167 ****
--- 168,173 ----
  
  import org.dom4j.io.XMLWriter;
+ import org.dom4j.*;
+ 
  import org.neuclear.commons.crypto.Base64;
  import org.neuclear.commons.crypto.CryptoException;

[Neuclear-develop] neuclear-id/src/java/org/neuclear/senders Sender.java,1.14,1.15

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

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

Modified Files:
	Sender.java 
Log Message:
Various cleanups and corrections

Index: Sender.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/senders/Sender.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Sender.java	16 Dec 2003 15:05:00 -0000	1.14
--- Sender.java	19 Feb 2004 15:30:21 -0000	1.15
***************
*** 8,11 ****
--- 8,14 ----
   * $Id$
   * $Log$
+  * Revision 1.15  2004/02/19 15:30:21  pelle
+  * Various cleanups and corrections
+  *
   * Revision 1.14  2003/12/16 15:05:00  pelle
   * Added SignedMessage contract for signing simple textual contracts.
***************
*** 109,115 ****
          final int protloc = endpoint.indexOf(":");
          final int atloc = endpoint.indexOf("@");
!         if (protloc < 0&&atloc<0)
              throw new NeuClearException(endpoint + "Is not in URL format");
!         if (protloc>=0)
              return endpoint.substring(0, protloc);
          return "mailto";
--- 112,118 ----
          final int protloc = endpoint.indexOf(":");
          final int atloc = endpoint.indexOf("@");
!         if (protloc < 0 && atloc < 0)
              throw new NeuClearException(endpoint + "Is not in URL format");
!         if (protloc >= 0)
              return endpoint.substring(0, protloc);
          return "mailto";
***************
*** 117,145 ****
  
      public static Sender getSender(final String protocol) {
!         if (SENDERS == null) {
!             SENDERS = new HashMap();
!             SENDERS.put("soap", new SoapSender());
!             SENDERS.put("http", new SoapSender());
!             SENDERS.put("mailto", new SmtpSender());
!             SENDERS.put("neu", new NeuSender());
!         }
  
          return (Sender) SENDERS.get(protocol);
      }
  
!     private static Map SENDERS;
  
!     public static void main(final String[] args) {
! /*
!         try {
!             NameSpace pelle=(NameSpace)NamedObjectFactory.fetchNamedObject("neu://free/pelle");
!             NamedObject free=NamedObjectFactory.fetchNamedObject("neu://free");
!             pelle.receive(free);
!         } catch (NeuClearException e) {
!             e.printStackTrace();  //To change body of catch statement use Options | File Templates.
!         }
! */
  
-     }
  }
  
--- 120,139 ----
  
      public static Sender getSender(final String protocol) {
!         makeSenders();
  
          return (Sender) SENDERS.get(protocol);
      }
  
!     private static HashMap makeSenders() {
!         HashMap map = new HashMap();
!         map.put("soap", new SoapSender());
!         map.put("http", new SoapSender());
!         map.put("mailto", new SmtpSender());
!         map.put("neu", new NeuSender());
!         return map;
!     }
  
!     private static final Map SENDERS = makeSenders();
  
  }
  

[Neuclear-develop] neuclear-id/src/java/org/neuclear/id/tools/commandline BuildAllTopLevel.java,1.6,1.7 CommandLineSigner.java,1.9,1.10

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

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

Modified Files:
	BuildAllTopLevel.java CommandLineSigner.java 
Log Message:
Various cleanups and corrections

Index: BuildAllTopLevel.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/tools/commandline/BuildAllTopLevel.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** BuildAllTopLevel.java	18 Feb 2004 00:14:31 -0000	1.6
--- BuildAllTopLevel.java	19 Feb 2004 15:30:21 -0000	1.7
***************
*** 32,35 ****
--- 32,38 ----
  $Id$
  $Log$
+ Revision 1.7  2004/02/19 15:30:21  pelle
+ Various cleanups and corrections
+ 
  Revision 1.6  2004/02/18 00:14:31  pelle
  Many, many clean ups. I've readded Targets in a new method.
***************
*** 85,92 ****
   */
  public final class BuildAllTopLevel {
      public static SignedNamedObject createIdentities(final String name, final Signer signer, final PublicKeySource pubsource) throws NeuClearException, XMLException {
          final IdentityBuilder id = new IdentityBuilder(pubsource.getPublicKey(name));
          System.out.println("Signing: " + name);
!         return id.convert(name,signer);
      }
  
--- 88,98 ----
   */
  public final class BuildAllTopLevel {
+     private BuildAllTopLevel() { //Dont Instantiate
+     }
+ 
      public static SignedNamedObject createIdentities(final String name, final Signer signer, final PublicKeySource pubsource) throws NeuClearException, XMLException {
          final IdentityBuilder id = new IdentityBuilder(pubsource.getPublicKey(name));
          System.out.println("Signing: " + name);
!         return id.convert(name, signer);
      }
  

Index: CommandLineSigner.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/tools/commandline/CommandLineSigner.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** CommandLineSigner.java	18 Feb 2004 00:14:31 -0000	1.9
--- CommandLineSigner.java	19 Feb 2004 15:30:21 -0000	1.10
***************
*** 1,4 ****
--- 1,7 ----
  /* $Id$
   * $Log$
+  * Revision 1.10  2004/02/19 15:30:21  pelle
+  * Various cleanups and corrections
+  *
   * Revision 1.9  2004/02/18 00:14:31  pelle
   * Many, many clean ups. I've readded Targets in a new method.
***************
*** 215,219 ****
  package org.neuclear.id.tools.commandline;
  
- import org.apache.commons.cli.*;
  import org.dom4j.Document;
  import org.neuclear.commons.LowLevelException;
--- 218,221 ----
***************
*** 243,253 ****
   */
  public class CommandLineSigner {
!     private final String EXECUTABLE ;
  
      public CommandLineSigner(final String[] args) throws UserCancellationException {
          CryptoTools.ensureProvider();
!         EXECUTABLE=Utility.getExecutable(getClass());
          options = createOptions();
!         cmd=parseOptions(args);
          checkArguments();
          if (cmd.hasOption('v')) {
--- 245,255 ----
   */
  public class CommandLineSigner {
!     private final String executable;
  
      public CommandLineSigner(final String[] args) throws UserCancellationException {
          CryptoTools.ensureProvider();
!         executable = Utility.getExecutable(getClass());
          options = createOptions();
!         cmd = parseOptions(args);
          checkArguments();
          if (cmd.hasOption('v')) {
***************
*** 271,275 ****
          }
  //        agent=(PassPhraseAgent)Configuration.getComponent(PassPhraseAgent.class,"neuclear-id");
!         final InteractiveAgent agent = cmd.hasOption('g')?(InteractiveAgent)new GuiDialogAgent():new ConsoleAgent();
          sig = createSigner(agent);
          alias = cmd.getOptionValue("a");
--- 273,277 ----
          }
  //        agent=(PassPhraseAgent)Configuration.getComponent(PassPhraseAgent.class,"neuclear-id");
!         final InteractiveAgent agent = cmd.hasOption('g') ? (InteractiveAgent) new GuiDialogAgent() : new ConsoleAgent();
          sig = createSigner(agent);
          alias = cmd.getOptionValue("a");
***************
*** 305,309 ****
              final CommandLineSigner signer = new CommandLineSigner(args);
              signer.execute();
!         } catch (UserCancellationException e){
              System.out.println("Bye");
          } catch (Exception e) {
--- 307,311 ----
              final CommandLineSigner signer = new CommandLineSigner(args);
              signer.execute();
!         } catch (UserCancellationException e) {
              System.out.println("Bye");
          } catch (Exception e) {
***************
*** 313,317 ****
  
      public final void checkArguments() {
!         if (!hasArguments()||cmd.hasOption('h')) {
              printHelp();
              System.exit(1);
--- 315,319 ----
  
      public final void checkArguments() {
!         if (!hasArguments() || cmd.hasOption('h')) {
              printHelp();
              System.exit(1);
***************
*** 322,329 ****
          final HelpFormatter help = new HelpFormatter();
          help.setDescPadding(10);
!         help.printHelp("\n"+EXECUTABLE +getExtraHelp()+
                  "  [--outputfile signed/test.id] \n" +
!                 EXECUTABLE+" --verify neu://neuclear.org\n" +
!                 EXECUTABLE+" --inputfile jo...@yo... \n" , options);
      }
  
--- 324,331 ----
          final HelpFormatter help = new HelpFormatter();
          help.setDescPadding(10);
!         help.printHelp("\n" + executable + getExtraHelp() +
                  "  [--outputfile signed/test.id] \n" +
!                 executable + " --verify neu://neuclear.org\n" +
!                 executable + " --inputfile jo...@yo... \n", options);
      }
  
***************
*** 337,348 ****
  
      public final void execute() throws UserCancellationException {
!             final Builder subject = build();
  
          try {
              if (!sig.canSignFor(alias)) {
                  if (!Utility.isEmpty(of))
!                     of =  "signthis.xml";
                  System.out.println("Key with alias: " + alias + " doesnt exist in our keystore. \nSaving unsigned Identity as: " + of);
!             } else if(!subject.isSigned()) {
                  System.out.println("Signing by " + alias + " ...");
                  subject.sign(alias, sig);
--- 339,350 ----
  
      public final void execute() throws UserCancellationException {
!         final Builder subject = build();
  
          try {
              if (!sig.canSignFor(alias)) {
                  if (!Utility.isEmpty(of))
!                     of = "signthis.xml";
                  System.out.println("Key with alias: " + alias + " doesnt exist in our keystore. \nSaving unsigned Identity as: " + of);
!             } else if (!subject.isSigned()) {
                  System.out.println("Signing by " + alias + " ...");
                  subject.sign(alias, sig);
***************
*** 359,366 ****
              XMLTools.writeFile(dest, subject.getElement());
              System.out.println();
!             System.out.println("You now need to copy the file: "+of+ " to your webserver so it is visible at a given location");
  
  //            System.out.println("\nOnce this is done you will be able to verify your new Identity like this:");
! //            System.out.println(EXECUTABLE+" -v "+subject.getName());
  /*  We need to be able to send an unsigned object before I can enable this
              if (!sig.canSignFor(alias)) {
--- 361,368 ----
              XMLTools.writeFile(dest, subject.getElement());
              System.out.println();
!             System.out.println("You now need to copy the file: " + of + " to your webserver so it is visible at a given location");
  
  //            System.out.println("\nOnce this is done you will be able to verify your new Identity like this:");
! //            System.out.println(executable+" -v "+subject.getName());
  /*  We need to be able to send an unsigned object before I can enable this
              if (!sig.canSignFor(alias)) {
***************
*** 392,396 ****
      protected Builder build() throws UserCancellationException {
          final String sf = cmd.getOptionValue("i");
!         Builder subject=null;
          try {
              InputStream source = System.in;
--- 394,398 ----
      protected Builder build() throws UserCancellationException {
          final String sf = cmd.getOptionValue("i");
!         Builder subject = null;
          try {
              InputStream source = System.in;
***************
*** 438,443 ****
          options.addOption(new Option("i", "inputfile", true, "specify Input File \n[ --inputfile bob.xml ]"));
          options.addOption(new Option("v", "verify", true, "Specify NEU ID to verify \n[ --verify neu://bob@yourdomain.com ]"));
!         options.addOption(new Option("h","help",false,"Help"));
!         options.addOption(new Option("g","gui",false,"Use GUI Passphrase Dialog"));
          getLocalOptions(options);
  
--- 440,445 ----
          options.addOption(new Option("i", "inputfile", true, "specify Input File \n[ --inputfile bob.xml ]"));
          options.addOption(new Option("v", "verify", true, "Specify NEU ID to verify \n[ --verify neu://bob@yourdomain.com ]"));
!         options.addOption(new Option("h", "help", false, "Help"));
!         options.addOption(new Option("g", "gui", false, "Use GUI Passphrase Dialog"));
          getLocalOptions(options);
  

[Neuclear-develop] neuclear-id project.properties,1.31,1.32

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

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

Modified Files:
	project.properties 
Log Message:
Various cleanups and corrections

Index: project.properties
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/project.properties,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** project.properties	19 Feb 2004 00:28:08 -0000	1.31
--- project.properties	19 Feb 2004 15:30:22 -0000	1.32
***************
*** 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
  maven.compile.optimize = 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
  maven.compile.optimize = on

[Neuclear-develop] neuclear-id/src/test/org/neuclear/store AbstractStoreTest.java,1.17,1.18

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

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

Modified Files:
	AbstractStoreTest.java 
Log Message:
Various cleanups and corrections

Index: AbstractStoreTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/store/AbstractStoreTest.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** AbstractStoreTest.java	18 Feb 2004 00:14:36 -0000	1.17
--- AbstractStoreTest.java	19 Feb 2004 15:30:22 -0000	1.18
***************
*** 2,5 ****
--- 2,8 ----
    $Id$
    $Log$
+   Revision 1.18  2004/02/19 15:30:22  pelle
+   Various cleanups and corrections
+ 
    Revision 1.17  2004/02/18 00:14:36  pelle
    Many, many clean ups. I've readded Targets in a new method.
***************
*** 198,221 ****
      public final void testStore() throws NeuClearException, InvalidNamedObjectException, XMLException {
          System.out.println("\nTesting " + this.getClass().getName());
!         System.out.println("Storing " + bobName);
!         final IdentityBuilder bob = new IdentityBuilder(signer.getPublicKey(bobName));
!         store.receive(bob.convert(bobName, signer));
!         System.out.println("Storing " + aliceName);
!         final IdentityBuilder alice = new IdentityBuilder(signer.getPublicKey(aliceName));
!         store.receive(alice.convert(aliceName, signer));
  
!         System.out.println("Fetching " + bobName);
!         final SignedNamedObject nobj2 = store.fetch(bobName);
          assertNotNull(nobj2);
!         assertEquals(bobName, nobj2.getName());
  
!         System.out.println("Fetching " + aliceName);
!         final SignedNamedObject nobj4 = store.fetch(aliceName);
!         assertEquals(aliceName, nobj4.getName());
      }
  
      private Store store;
!     protected static final String bobName = "neu://bob@test";
!     protected static final String aliceName = "neu://alice@test";
  
  }
\ No newline at end of file
--- 201,224 ----
      public final void testStore() throws NeuClearException, InvalidNamedObjectException, XMLException {
          System.out.println("\nTesting " + this.getClass().getName());
!         System.out.println("Storing " + BOB);
!         final IdentityBuilder bob = new IdentityBuilder(signer.getPublicKey(BOB));
!         store.receive(bob.convert(BOB, signer));
!         System.out.println("Storing " + ALICE);
!         final IdentityBuilder alice = new IdentityBuilder(signer.getPublicKey(ALICE));
!         store.receive(alice.convert(ALICE, signer));
  
!         System.out.println("Fetching " + BOB);
!         final SignedNamedObject nobj2 = store.fetch(BOB);
          assertNotNull(nobj2);
!         assertEquals(BOB, nobj2.getName());
  
!         System.out.println("Fetching " + ALICE);
!         final SignedNamedObject nobj4 = store.fetch(ALICE);
!         assertEquals(ALICE, nobj4.getName());
      }
  
      private Store store;
!     protected static final String BOB = "neu://bob@test";
!     protected static final String ALICE = "neu://alice@test";
  
  }
\ No newline at end of file