neuclear-develop — Support requests, cvs etc

[Neuclear-develop] neuclear-id neuclear.iws,1.10,NONE

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

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

Removed Files:
	neuclear.iws 
Log Message:
got rid of IDEA project



--- neuclear.iws DELETED ---

[Neuclear-develop] neuclear-id/src/java/org/neuclear/receiver SimpleReceipt.java,1.2,1.3

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

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

Modified Files:
	SimpleReceipt.java 
Log Message:
Many, many clean ups. I've readded Targets in a new method.
Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers

Index: SimpleReceipt.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/receiver/SimpleReceipt.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SimpleReceipt.java	13 Jan 2004 15:11:35 -0000	1.2
--- SimpleReceipt.java	18 Feb 2004 00:14:33 -0000	1.3
***************
*** 1,10 ****
  package org.neuclear.receiver;
  
- import org.neuclear.xml.AbstractElementProxy;
- import org.neuclear.id.builders.NamedObjectBuilder;
- import org.neuclear.id.builders.Builder;
- import org.neuclear.id.SignedNamedObject;
  import org.neuclear.id.NSTools;
! import org.dom4j.Namespace;
  
  /**
--- 1,6 ----
  package org.neuclear.receiver;
  
  import org.neuclear.id.NSTools;
! import org.neuclear.id.builders.Builder;
  
  /**

[Neuclear-develop] neuclear-id/src/java/org/neuclear/id Identity.java,1.29,1.30 NSTools.java,1.28,1.29 SignatureRequest.java,1.13,1.14 SignedNamedCore.java,1.18,1.19 SignedNamedObject.java,1.17,1.18

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

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

Modified Files:
	Identity.java NSTools.java SignatureRequest.java 
	SignedNamedCore.java SignedNamedObject.java 
Log Message:
Many, many clean ups. I've readded Targets in a new method.
Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers

Index: Identity.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/Identity.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** Identity.java	16 Jan 2004 23:42:09 -0000	1.29
--- Identity.java	18 Feb 2004 00:14:31 -0000	1.30
***************
*** 2,5 ****
--- 2,9 ----
   * $Id$
   * $Log$
+  * Revision 1.30  2004/02/18 00:14:31  pelle
+  * Many, many clean ups. I've readded Targets in a new method.
+  * Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers
+  *
   * Revision 1.29  2004/01/16 23:42:09  pelle
   * Added Base32 class. The Base32 encoding used wasnt following the standards.
***************
*** 314,319 ****
--- 318,325 ----
  import org.dom4j.Element;
  import org.neuclear.commons.NeuClearException;
+ import org.neuclear.commons.Utility;
  import org.neuclear.commons.crypto.CryptoException;
  import org.neuclear.commons.crypto.CryptoTools;
+ import org.neuclear.id.targets.Targets;
  import org.neuclear.xml.xmlsec.KeyInfo;
  import org.neuclear.xml.xmlsec.XMLSecTools;
***************
*** 354,396 ****
       */
      public Identity(final PublicKey pub){
!         this(new SignedNamedCore(pub),pub);
      }
  
!     protected Identity(final SignedNamedCore core, final PublicKey pub)  {
          super(core);
          this.pub = pub;
      }
  
  
!     public final String getRepository() {
!         return "http://repository.neuclear.org";
!     }
! 
      public final String getSigner() {
!         return "http://localhost:11870/Signer";
      }
  
-     public final String getLogger() {
-         return null;
-     }
- 
-     public final String getReceiver() {
-         return null;
-     }
  
      public final SignedNamedObject receive(final SignedNamedObject obj) throws NeuClearException {
! /*
!         if (!Utility.isEmpty(receiver))
!             return Sender.quickSend(receiver, obj);
!         else
! */
!             throw new NeuClearException("Cant receive object, " + getName() + " doesnt have a registered Receiver");
      }
  
      final void log(final SignedNamedObject obj) throws NeuClearException {
! /*
!         if (!Utility.isEmpty(logger))
!             Sender.quickSend(logger, obj);
! */
      }
  
--- 360,389 ----
       */
      public Identity(final PublicKey pub){
!         this(new SignedNamedCore(pub),pub,null,null);
      }
  
!     protected Identity(final SignedNamedCore core, final PublicKey pub,String signer,Targets targets)  {
          super(core);
          this.pub = pub;
+         this.targets=(targets!=null)?targets:Targets.EMPTY;
+         this.signer=Utility.denullString(signer,DEFAULT_SIGNER);
      }
  
  
!     //TODO update to use Targets
      public final String getSigner() {
!         return signer;
      }
  
  
+     //TODO update to use Targets
      public final SignedNamedObject receive(final SignedNamedObject obj) throws NeuClearException {
!         targets.send(obj);
!         return null;
      }
  
+     //TODO update to use Targets
      final void log(final SignedNamedObject obj) throws NeuClearException {
!         targets.log(obj);
      }
  
***************
*** 405,421 ****
  
      private final PublicKey pub;
  
!     private final static Identity createRootIdentity() {
! 
!         try {
!             final PublicKey rootpk = CryptoTools.createPK(NSROOTPKMOD, NSROOTPKEXP);
!             return new Identity(SignedNamedCore.createRootCore(), rootpk);
!         } catch (NeuClearException e) {
!             e.printStackTrace();
!         }
!         return null;
!     }
! 
!     public static final Identity NEUROOT = createRootIdentity();
  
      public final java.security.cert.Certificate[] getCertificateChain() {
--- 398,405 ----
  
      private final PublicKey pub;
+     private final Targets  targets;
+     private final String signer;
  
!     public static final String DEFAULT_SIGNER = "http://localhost:11870/Signer";
  
      public final java.security.cert.Certificate[] getCertificateChain() {
***************
*** 436,439 ****
--- 420,424 ----
      }
  
+ 
      private final class NeuClearCertificate extends Certificate {
          public NeuClearCertificate(Identity id) {
***************
*** 503,507 ****
                  final KeyInfo ki = new KeyInfo(InvalidNamedObjectException.assertContainsElementQName(allowElement, XMLSecTools.createQName("KeyInfo")));
                  final PublicKey pub = ki.getPublicKey();
!                 return new Identity(core, pub);
              } catch (XMLSecurityException e) {
                  throw new InvalidNamedObjectException(core.getName(),e);
--- 488,495 ----
                  final KeyInfo ki = new KeyInfo(InvalidNamedObjectException.assertContainsElementQName(allowElement, XMLSecTools.createQName("KeyInfo")));
                  final PublicKey pub = ki.getPublicKey();
!                 final Targets targets=Targets.parseList(elem);
!                 final Element se=elem.element("Signer");
!                 final String signer=(se!=null)?se.getTextTrim():null;
!                 return new Identity(core, pub,signer,targets);
              } catch (XMLSecurityException e) {
                  throw new InvalidNamedObjectException(core.getName(),e);

Index: NSTools.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/NSTools.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** NSTools.java	19 Jan 2004 23:49:44 -0000	1.28
--- NSTools.java	18 Feb 2004 00:14:32 -0000	1.29
***************
*** 2,5 ****
--- 2,9 ----
   * $Id$
   * $Log$
+  * Revision 1.29  2004/02/18 00:14:32  pelle
+  * Many, many clean ups. I've readded Targets in a new method.
+  * Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers
+  *
   * Revision 1.28  2004/01/19 23:49:44  pelle
   * Unit testing uncovered further issues with Base32
***************
*** 210,216 ****
  package org.neuclear.id;
  
! import org.dom4j.*;
  import org.neuclear.commons.Utility;
- import org.neuclear.id.resolver.NSResolver;
  
  import java.util.regex.Matcher;
--- 214,220 ----
  package org.neuclear.id;
  
! import org.dom4j.DocumentHelper;
! import org.dom4j.Namespace;
  import org.neuclear.commons.Utility;
  
  import java.util.regex.Matcher;
***************
*** 366,401 ****
      }
  
-     /**
-      * Verifies that Dom4j node is an element or document containing a NamedObject.
-      * <br><b>Important</b>
-      * It does not verify if it has been signed.
-      * 
-      * @param node 
-      * @return 
-      */
-     public static boolean isNamedObject(Node node) {
- 
-         if (node == null) return false;
-         Element elem = null;
-         if (node instanceof Document)
-             elem = ((Document) node).getRootElement();
-         else if (node instanceof Element)
-             elem = (Element) node;
-         else
-             return false;
-         return !Utility.isEmpty(elem.attributeValue(DocumentHelper.createQName("name", NS_NEUID)));
-     }
- 
-     public static String getRepositoryURL(String alias) throws InvalidNamedObjectException {
-         String url=isHttpScheme(alias);
-         if (url==null){
-             try {
-                 return NSResolver.resolveIdentity(alias).getRepository();
-             } catch (Exception e) {
-                 return getRepositoryURL(getSignatoryURI(alias));
-             }
-         }
-         return url;
-     }
  
      private static final String HTTP_SCHEME_EX = "^neu:(neuid:)?\\/\\/(([\\w-]+\\.)+[\\w-]+)$";
--- 370,373 ----

Index: SignatureRequest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/SignatureRequest.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** SignatureRequest.java	20 Jan 2004 17:39:12 -0000	1.13
--- SignatureRequest.java	18 Feb 2004 00:14:32 -0000	1.14
***************
*** 4,9 ****
  import org.dom4j.DocumentHelper;
  import org.dom4j.Element;
- import org.neuclear.commons.NeuClearException;
- import org.neuclear.id.builders.NamedObjectBuilder;
  import org.neuclear.id.builders.Builder;
  import org.neuclear.xml.xmlsec.XMLSecurityException;
--- 4,7 ----
***************
*** 29,32 ****
--- 27,34 ----
  $Id$
  $Log$
+ Revision 1.14  2004/02/18 00:14:32  pelle
+ Many, many clean ups. I've readded Targets in a new method.
+ Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers
+ 
  Revision 1.13  2004/01/20 17:39:12  pelle
  Further updates to unit tests

Index: SignedNamedCore.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/SignedNamedCore.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** SignedNamedCore.java	20 Jan 2004 17:39:12 -0000	1.18
--- SignedNamedCore.java	18 Feb 2004 00:14:32 -0000	1.19
***************
*** 2,5 ****
--- 2,9 ----
   * $Id$
   * $Log$
+  * Revision 1.19  2004/02/18 00:14:32  pelle
+  * Many, many clean ups. I've readded Targets in a new method.
+  * Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers
+  *
   * Revision 1.18  2004/01/20 17:39:12  pelle
   * Further updates to unit tests
***************
*** 294,298 ****
   * @see NamedObjectReader
   * @see SignedNamedObject
-  * @see org.neuclear.id.builders.NamedObjectBuilder
   * @see org.neuclear.id.verifier.VerifyingReader
   * @see org.neuclear.id.resolver.NSResolver
--- 298,301 ----
***************
*** 511,515 ****
      }
      static Identity createSimpleIdentity(PublicKey pub){
!         return new Identity(new SignedNamedCore(pub),pub);
      }
  
--- 514,518 ----
      }
      static Identity createSimpleIdentity(PublicKey pub){
!         return new Identity(new SignedNamedCore(pub),pub,null,null);
      }
  

Index: SignedNamedObject.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/SignedNamedObject.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** SignedNamedObject.java	10 Jan 2004 00:03:21 -0000	1.17
--- SignedNamedObject.java	18 Feb 2004 00:14:32 -0000	1.18
***************
*** 2,5 ****
--- 2,9 ----
   * $Id$
   * $Log$
+  * Revision 1.18  2004/02/18 00:14:32  pelle
+  * Many, many clean ups. I've readded Targets in a new method.
+  * Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers
+  *
   * Revision 1.17  2004/01/10 00:03:21  pelle
   * Implemented new Schema for Transfer*
***************
*** 258,262 ****
   * 
   * @see NamedObjectReader
-  * @see org.neuclear.id.builders.NamedObjectBuilder
   * @see org.neuclear.id.verifier.VerifyingReader
   * @see org.neuclear.id.resolver.NSResolver
--- 262,265 ----
***************
*** 363,367 ****
          return getEncoded().equals(((SignedNamedObject)object).getEncoded());
      }
- 
      private final SignedNamedCore core;
  
--- 366,369 ----

[Neuclear-develop] neuclear-id/src/java/org/neuclear/senders LogSender.java,1.15,1.16 SmtpSender.java,1.16,1.17

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

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

Modified Files:
	LogSender.java SmtpSender.java 
Log Message:
Many, many clean ups. I've readded Targets in a new method.
Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers

Index: LogSender.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/senders/LogSender.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** LogSender.java	10 Jan 2004 00:03:21 -0000	1.15
--- LogSender.java	18 Feb 2004 00:14:33 -0000	1.16
***************
*** 23,26 ****
--- 23,30 ----
   * $Id$
   * $Log$
+  * Revision 1.16  2004/02/18 00:14:33  pelle
+  * Many, many clean ups. I've readded Targets in a new method.
+  * Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers
+  *
   * Revision 1.15  2004/01/10 00:03:21  pelle
   * Implemented new Schema for Transfer*
***************
*** 182,189 ****
--- 186,195 ----
      }
  
+ /*
      public static Timestamp getTimeStamp(final SignedNamedObject obj) throws NeuClearException {
          return getTimeStamp(Utility.denullString(obj.getSignatory().getLogger(), LOGGER), obj.getEncoded().getBytes());
  
      }
+ */
  
  /*

Index: SmtpSender.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/senders/SmtpSender.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** SmtpSender.java	16 Dec 2003 15:05:00 -0000	1.16
--- SmtpSender.java	18 Feb 2004 00:14:33 -0000	1.17
***************
*** 8,11 ****
--- 8,15 ----
   * $Id$
   * $Log$
+  * Revision 1.17  2004/02/18 00:14:33  pelle
+  * Many, many clean ups. I've readded Targets in a new method.
+  * Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers
+  *
   * Revision 1.16  2003/12/16 15:05:00  pelle
   * Added SignedMessage contract for signing simple textual contracts.
***************
*** 124,128 ****
  import org.neuclear.commons.Utility;
  import org.neuclear.id.SignedNamedObject;
- import org.neuclear.id.Identity;
  
  import javax.mail.*;
--- 128,131 ----
***************
*** 134,138 ****
  import java.util.Properties;
  import java.util.regex.Pattern;
- import java.util.regex.Matcher;
  
  public final class SmtpSender extends Sender {
--- 137,140 ----
***************
*** 187,194 ****
  
      private String getSender(final SignedNamedObject obj) {
!         Identity senderid=obj.getSignatory();
!         final Matcher matcher = SENDER.matcher(senderid.getReceiver());
!         if (matcher.matches())
!             return matcher.group(2) ;
          return "du...@ne...";
      }
--- 189,196 ----
  
      private String getSender(final SignedNamedObject obj) {
! //        Identity senderid=obj.getSignatory();
! //        final Matcher matcher = SENDER.matcher(senderid.getReceiver());
! //        if (matcher.matches())
! //            return matcher.group(2) ;
          return "du...@ne...";
      }

[Neuclear-develop] neuclear-id/src/java/org/neuclear/signers/servlet SigningServlet.java,1.28,1.29

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

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

Modified Files:
	SigningServlet.java 
Log Message:
Many, many clean ups. I've readded Targets in a new method.
Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers

Index: SigningServlet.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/signers/servlet/SigningServlet.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** SigningServlet.java	13 Jan 2004 15:11:35 -0000	1.28
--- SigningServlet.java	18 Feb 2004 00:14:33 -0000	1.29
***************
*** 2,5 ****
--- 2,9 ----
   * $Id$
   * $Log$
+  * Revision 1.29  2004/02/18 00:14:33  pelle
+  * Many, many clean ups. I've readded Targets in a new method.
+  * Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers
+  *
   * Revision 1.28  2004/01/13 15:11:35  pelle
   * Now builds.
***************
*** 257,270 ****
  import org.neuclear.commons.NeuClearException;
  import org.neuclear.commons.Utility;
- import org.neuclear.commons.crypto.Base64;
- import org.neuclear.commons.crypto.passphraseagents.GuiDialogAgent;
  import org.neuclear.commons.crypto.passphraseagents.UserCancellationException;
! import org.neuclear.commons.crypto.signers.*;
  import org.neuclear.commons.servlets.ServletTools;
  import org.neuclear.id.InvalidNamedObjectException;
- import org.neuclear.id.NSTools;
  import org.neuclear.id.SignatureRequest;
  import org.neuclear.id.SignedNamedObject;
- import org.neuclear.id.builders.NamedObjectBuilder;
  import org.neuclear.id.builders.Builder;
  import org.neuclear.id.verifier.VerifyingReader;
--- 261,272 ----
  import org.neuclear.commons.NeuClearException;
  import org.neuclear.commons.Utility;
  import org.neuclear.commons.crypto.passphraseagents.UserCancellationException;
! import org.neuclear.commons.crypto.signers.NonExistingSignerException;
! import org.neuclear.commons.crypto.signers.ServletSignerFactory;
! import org.neuclear.commons.crypto.signers.Signer;
  import org.neuclear.commons.servlets.ServletTools;
  import org.neuclear.id.InvalidNamedObjectException;
  import org.neuclear.id.SignatureRequest;
  import org.neuclear.id.SignedNamedObject;
  import org.neuclear.id.builders.Builder;
  import org.neuclear.id.verifier.VerifyingReader;
***************
*** 280,284 ****
  import java.io.InputStream;
  import java.io.PrintWriter;
- import java.io.FileNotFoundException;
  import java.security.GeneralSecurityException;
  import java.util.regex.Matcher;
--- 282,285 ----

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

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

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

Modified Files:
	BuildAllTopLevel.java CommandLineSigner.java 
	IdentityCreator.java 
Log Message:
Many, many clean ups. I've readded Targets in a new method.
Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers

Index: BuildAllTopLevel.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/tools/commandline/BuildAllTopLevel.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** BuildAllTopLevel.java	16 Jan 2004 23:42:09 -0000	1.5
--- BuildAllTopLevel.java	18 Feb 2004 00:14:31 -0000	1.6
***************
*** 32,35 ****
--- 32,39 ----
  $Id$
  $Log$
+ Revision 1.6  2004/02/18 00:14:31  pelle
+ Many, many clean ups. I've readded Targets in a new method.
+ Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers
+ 
  Revision 1.5  2004/01/16 23:42:09  pelle
  Added Base32 class. The Base32 encoding used wasnt following the standards.
***************
*** 82,94 ****
  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(
!                 name,
!                 pubsource.getPublicKey(name),
!                 "http://repository.neuclear.org",
!                 "http://users.neuclear.org:8080/DemoSigner",
!                 "http://logger.neuclear.org",
!                 "mailto:pe...@ne...");
          System.out.println("Signing: " + name);
!         return id.sign(signer);
      }
  
--- 86,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);
      }
  

Index: CommandLineSigner.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/tools/commandline/CommandLineSigner.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** CommandLineSigner.java	19 Jan 2004 23:49:44 -0000	1.8
--- CommandLineSigner.java	18 Feb 2004 00:14:31 -0000	1.9
***************
*** 1,4 ****
--- 1,8 ----
  /* $Id$
   * $Log$
+  * Revision 1.9  2004/02/18 00:14:31  pelle
+  * Many, many clean ups. I've readded Targets in a new method.
+  * Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers
+  *
   * Revision 1.8  2004/01/19 23:49:44  pelle
   * Unit testing uncovered further issues with Base32
***************
*** 227,233 ****
  import org.neuclear.commons.time.TimeTools;
  import org.neuclear.id.Identity;
! import org.neuclear.id.InvalidNamedObjectException;
! import org.neuclear.id.NSTools;
! import org.neuclear.id.builders.NamedObjectBuilder;
  import org.neuclear.id.resolver.NSResolver;
  import org.neuclear.xml.XMLException;
--- 231,235 ----
  import org.neuclear.commons.time.TimeTools;
  import org.neuclear.id.Identity;
! import org.neuclear.id.builders.Builder;
  import org.neuclear.id.resolver.NSResolver;
  import org.neuclear.xml.XMLException;
***************
*** 258,262 ****
                      System.out.println("was signed at: " + TimeTools.formatTimeStamp(id.getTimeStamp()));
                      System.out.println("Is of type: " + id.getClass().getName());
-                     System.out.println("repository: " + id.getRepository());
                      System.out.println("signer: " + id.getSigner());
                  } else {
--- 260,263 ----
***************
*** 336,340 ****
  
      public final void execute() throws UserCancellationException {
!             final NamedObjectBuilder subject = build();
  
          try {
--- 337,341 ----
  
      public final void execute() throws UserCancellationException {
!             final Builder subject = build();
  
          try {
***************
*** 358,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 the following location:\n" +
!                     NSTools.getRepositoryURL(alias)+NSTools.name2path(subject.getName())+"/root.id");
  
!             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)) {
--- 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)) {
***************
*** 378,383 ****
              }
  */
-         } catch (InvalidNamedObjectException e) {
-             throw new LowLevelException(e);
          } catch (NonExistingSignerException e) {
              throw new LowLevelException(e);
--- 378,381 ----
***************
*** 392,398 ****
      }
  
!     protected NamedObjectBuilder build() throws UserCancellationException {
          final String sf = cmd.getOptionValue("i");
!         NamedObjectBuilder subject=null;
          try {
              InputStream source = System.in;
--- 390,396 ----
      }
  
!     protected Builder build() throws UserCancellationException {
          final String sf = cmd.getOptionValue("i");
!         Builder subject=null;
          try {
              InputStream source = System.in;
***************
*** 405,413 ****
              }
              final Document doc = XMLTools.loadDocument(source);
!             subject = new NamedObjectBuilder(doc);
  
-             if (Utility.isEmpty(alias)) {
-                 alias = Utility.denullString(NSTools.isHttpScheme(subject.getName()), NSTools.getSignatoryURI(subject.getName()));
-             }
              if (!sig.canSignFor(alias)) {
                  System.err.println("You can not sign as " + alias + " with your current keystore.");
--- 403,408 ----
              }
              final Document doc = XMLTools.loadDocument(source);
!             subject = new Builder(doc.getRootElement());
  
              if (!sig.canSignFor(alias)) {
                  System.err.println("You can not sign as " + alias + " with your current keystore.");
***************
*** 417,421 ****
              System.out.println("You are about to sign the following Contract. Please make sure that is what you want.");
              System.out.println("Type: " + subject.getElement().getName());
-             System.out.println("Proposed Name: " + subject.getName());
              System.out.println("Raw XML:\n===================");
              System.out.println(subject.asXML());
--- 412,415 ----
***************
*** 428,434 ****
  
              return subject;
-         } catch (InvalidNamedObjectException e) {
-                 System.err.println("The name: "+e.getName()+" is not valid. \nplease check the xml attribute \"neuid:name\" in the xml element: "+ subject.getElement().getQualifiedName()+" in your input file: "+sf);
-                 System.exit(1);
          } catch (FileNotFoundException e) {
              System.err.println("Couldnt find file: " + sf);
--- 422,425 ----

Index: IdentityCreator.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/tools/commandline/IdentityCreator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** IdentityCreator.java	20 Jan 2004 20:28:24 -0000	1.7
--- IdentityCreator.java	18 Feb 2004 00:14:31 -0000	1.8
***************
*** 1,4 ****
--- 1,8 ----
  /* $Id$
   * $Log$
+  * Revision 1.8  2004/02/18 00:14:31  pelle
+  * Many, many clean ups. I've readded Targets in a new method.
+  * Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers
+  *
   * Revision 1.7  2004/01/20 20:28:24  pelle
   * Fixed final issues highlighted by unit tests. Really just a bunch of smaller stuff.
***************
*** 219,225 ****
  import org.neuclear.commons.crypto.signers.PublicKeySource;
  import org.neuclear.id.InvalidNamedObjectException;
! import org.neuclear.id.NSTools;
  import org.neuclear.id.builders.IdentityBuilder;
- import org.neuclear.id.builders.NamedObjectBuilder;
  import org.neuclear.senders.LogSender;
  
--- 223,228 ----
  import org.neuclear.commons.crypto.signers.PublicKeySource;
  import org.neuclear.id.InvalidNamedObjectException;
! import org.neuclear.id.builders.Builder;
  import org.neuclear.id.builders.IdentityBuilder;
  import org.neuclear.senders.LogSender;
  
***************
*** 238,271 ****
          }
          pksource = (PublicKeySource) sig;
!         identity = cmd.getOptionValue("n");
          //final String cachedirpath = System.getProperty("user.home") + "/.neuclear/cache";
  //        final File cachedir = new File(cachedirpath);
  //        if (!cachedir.exists())
  //            cachedir.mkdirs();
!         if (!Utility.isEmpty(identity)) {
!             of = Utility.denullString(of, "_NEUID" + NSTools.name2path(identity) + "/root.id");
!             alias = Utility.denullString(alias, NSTools.getSignatoryURI(identity));
!         }
      }
  
!     protected NamedObjectBuilder build() throws UserCancellationException {
!         NamedObjectBuilder subject = null;
          if (cmd.hasOption('i')) {//If we have an input file we load that instead of creating a new one
              subject = super.build();
-             identity = subject.getName();
          }
          try {
-             String store = NSTools.isHttpScheme(identity);
-             boolean isTopLevel = !Utility.isEmpty(store);
-             if (!isTopLevel) {
-                 // If this isn't a top level we will derive the repository from its parent.
-                 store = NSTools.isHttpScheme(NSTools.getSignatoryURI(identity));
-             }
-             alias = (isTopLevel) ? identity : NSTools.getSignatoryURI(identity);
-             final String defaultstore = Utility.denullString(cmd.getOptionValue("r"), store);
              final String defaultsigner = Utility.denullString(cmd.getOptionValue("s"), "http://localhost:11870/Signer");
              final String defaultlogger = Utility.denullString(cmd.getOptionValue("l"), LogSender.LOGGER);
              final String defaultreceiver = cmd.getOptionValue("b");
!             if (!sig.canSignFor(identity)){
                  System.out.println("You do not currently have a key matching this name. Do you with to create one?");
                  if (!Utility.getAffirmative(true)) {
--- 241,262 ----
          }
          pksource = (PublicKeySource) sig;
!         alias = cmd.getOptionValue("n");
          //final String cachedirpath = System.getProperty("user.home") + "/.neuclear/cache";
  //        final File cachedir = new File(cachedirpath);
  //        if (!cachedir.exists())
  //            cachedir.mkdirs();
!         of = Utility.denullString(of, alias + ".xml");
      }
  
!     protected Builder build() throws UserCancellationException {
!         Builder subject = null;
          if (cmd.hasOption('i')) {//If we have an input file we load that instead of creating a new one
              subject = super.build();
          }
          try {
              final String defaultsigner = Utility.denullString(cmd.getOptionValue("s"), "http://localhost:11870/Signer");
              final String defaultlogger = Utility.denullString(cmd.getOptionValue("l"), LogSender.LOGGER);
              final String defaultreceiver = cmd.getOptionValue("b");
!             if (!sig.canSignFor(alias)){
                  System.out.println("You do not currently have a key matching this name. Do you with to create one?");
                  if (!Utility.getAffirmative(true)) {
***************
*** 273,278 ****
                      System.exit(0);
                  }
!                 System.out.println("Generating Keys for "+identity+"... ");
!                 PublicKey pub=sig.generateKey(identity);
                  System.out.println("DONE");
                  System.out.println("STORING Keys");
--- 264,269 ----
                      System.exit(0);
                  }
!                 System.out.println("Generating Keys for "+alias+"... ");
!                 PublicKey pub=sig.generateKey(alias);
                  System.out.println("DONE");
                  System.out.println("STORING Keys");
***************
*** 280,286 ****
  
              }
!             final PublicKey newkid = pksource.getPublicKey(identity);
  
!             return new IdentityBuilder(identity, newkid, defaultstore, defaultsigner, defaultlogger, defaultreceiver);
          } catch (InvalidNamedObjectException e) {
              System.err.println("The name: "+e.getName()+" is not valid. ");
--- 271,277 ----
  
              }
!             final PublicKey newkid = pksource.getPublicKey(alias);
  
!             return new IdentityBuilder(newkid,  defaultsigner, defaultlogger, defaultreceiver);
          } catch (InvalidNamedObjectException e) {
              System.err.println("The name: "+e.getName()+" is not valid. ");
***************
*** 314,318 ****
      protected final void getLocalOptions(final Options options) {
          options.addOption(new Option("n", "name", true, "specify name of new Identity \n[ --name neu://bob@yourdomain.com ]"));
-         options.addOption(new Option("r", "repository", true, "Identity's default Repository \n[ --repository http://repository.neuclear.org ] "));
          options.addOption(new Option("s", "signer", true, "Identity's default Interactive Signer \n[ --signer http://localhost:11870 ]"));
          options.addOption(new Option("l", "logger", true, "Identity's default Logging Service \n[ --logger http://logger.neuclear.org ]"));
--- 305,308 ----
***************
*** 321,325 ****
  
  
-     private String identity;
      private final PublicKeySource pksource;
  }
--- 311,314 ----

[Neuclear-develop] neuclear-id/src/java/org/neuclear/id/builders IdentityBuilder.java,1.18,1.19 NamedObjectBuilder.java,1.26,NONE

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

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

Modified Files:
	IdentityBuilder.java 
Removed Files:
	NamedObjectBuilder.java 
Log Message:
Many, many clean ups. I've readded Targets in a new method.
Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers

Index: IdentityBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/builders/IdentityBuilder.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** IdentityBuilder.java	13 Jan 2004 15:11:35 -0000	1.18
--- IdentityBuilder.java	18 Feb 2004 00:14:30 -0000	1.19
***************
*** 2,5 ****
--- 2,9 ----
   * $Id$
   * $Log$
+  * Revision 1.19  2004/02/18 00:14:30  pelle
+  * Many, many clean ups. I've readded Targets in a new method.
+  * Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers
+  *
   * Revision 1.18  2004/01/13 15:11:35  pelle
   * Now builds.
***************
*** 227,255 ****
  import org.neuclear.commons.NeuClearException;
  import org.neuclear.commons.Utility;
- import org.neuclear.commons.crypto.signers.Signer;
- import org.neuclear.commons.crypto.CryptoException;
- import org.neuclear.id.NSTools;
- import org.neuclear.id.Identity;
  import org.neuclear.id.InvalidNamedObjectException;
  import org.neuclear.xml.xmlsec.XMLSecTools;
  import org.neuclear.xml.xmlsec.XMLSecurityException;
- import org.neuclear.xml.XMLException;
  
  import java.security.PublicKey;
- import java.security.cert.Certificate;
  
! public class IdentityBuilder extends NamedObjectBuilder {
      /**
       * It creates a Standard Identity document, but doesn't sign it.
       * 
-      * @param name       The Name of Identity
       * @param allow      PublicKey allowed to sign in here
-      * @param repository URL of Default Store for NameSpace. (Note. A NameSpace object is stored in the default repository of it's parent namespace)
       * @param signer     URL of default interactive signing service for namespace. If null it doesnt allow interactive signing
       * @param receiver   URL of default receiver for namespace
       */
  
!     public IdentityBuilder(final String name, final PublicKey allow, final String repository, final String signer, final String logger, final String receiver) throws InvalidNamedObjectException {
!         this(createNEUIDQName(TAGNAME), name, allow, repository, signer, logger, receiver);
      }
  
--- 231,252 ----
  import org.neuclear.commons.NeuClearException;
  import org.neuclear.commons.Utility;
  import org.neuclear.id.InvalidNamedObjectException;
+ import org.neuclear.id.NSTools;
  import org.neuclear.xml.xmlsec.XMLSecTools;
  import org.neuclear.xml.xmlsec.XMLSecurityException;
  
  import java.security.PublicKey;
  
! public class IdentityBuilder extends Builder {
      /**
       * It creates a Standard Identity document, but doesn't sign it.
       * 
       * @param allow      PublicKey allowed to sign in here
       * @param signer     URL of default interactive signing service for namespace. If null it doesnt allow interactive signing
       * @param receiver   URL of default receiver for namespace
       */
  
!     public IdentityBuilder( final PublicKey allow, final String signer, final String logger, final String receiver) throws InvalidNamedObjectException {
!         this(createNEUIDQName(TAGNAME), allow, signer, logger, receiver);
      }
  
***************
*** 258,303 ****
       * 
       * @param tag        The Tag used by this sub class
-      * @param name       The Name of Identity
       * @param allow      PublicKey allowed to sign in here
-      * @param repository URL of Default Store for NameSpace. (Note. A NameSpace object is stored in the default repository of it's parent namespace)
       * @param signer     URL of default interactive signing service for namespace. If null it doesnt allow interactive signing
       * @param receiver   URL of default receiver for namespace
       */
!     protected IdentityBuilder(final QName tag, final String name, final PublicKey allow, final String repository, final String signer, final String logger, final String receiver) throws InvalidNamedObjectException {
!         super(name, tag);
  
          final Element root = getElement();
          addLineBreak();
-         // We have meaningful defaults for the following two
-         createNEUIDAttribute("repository", repository);
-         createNEUIDAttribute("logger", logger);
          if (!Utility.isEmpty(signer))
!             createNEUIDAttribute("signer", signer);
  
!         if (!Utility.isEmpty(receiver))
!             createNEUIDAttribute("receiver", receiver);
  
-         setPublicKey(allow);
      }
  
! 
!     public IdentityBuilder(final String name, final PublicKey allow, final String repository) throws XMLSecurityException, NeuClearException {
!         this(name, allow, repository, null, null, null);
      }
  
!     public IdentityBuilder(final String name, final PublicKey allow) throws XMLSecurityException, NeuClearException {
!         this(name, allow, null);
!     }
!     private void setPublicKey(final PublicKey allow) {
!         if (allow != null) {
!             final QName allowName = DocumentHelper.createQName("Allow", NSTools.NS_NEUID);
!             Element pub=getElement().element(allowName);
!             if (pub==null)
!                 pub = getElement().addElement(allowName);
!             else
!                 pub.clearContent();
!             pub.addText("\n");
!             pub.add(XMLSecTools.createKeyInfo(allow));
!         }
      }
  
--- 255,292 ----
       * 
       * @param tag        The Tag used by this sub class
       * @param allow      PublicKey allowed to sign in here
       * @param signer     URL of default interactive signing service for namespace. If null it doesnt allow interactive signing
       * @param receiver   URL of default receiver for namespace
       */
!     protected IdentityBuilder(final QName tag, final PublicKey allow,  final String signer, final String logger, final String receiver) throws InvalidNamedObjectException {
!         super(tag);
  
          final Element root = getElement();
          addLineBreak();
          if (!Utility.isEmpty(signer))
!             addElement("Signer",signer);
!         addTarget(logger,"logger");
!         addTarget(receiver,"inbox");
  
!         final QName allowName = DocumentHelper.createQName("Allow", NSTools.NS_NEUID);
!         Element pub=getElement().element(allowName);
!         if (pub==null)
!             pub = getElement().addElement(allowName);
!         else
!             pub.clearContent();
!         pub.addText("\n");
!         pub.add(XMLSecTools.createKeyInfo(allow));
  
      }
  
!     private void addTarget(final String href,final String type) {
!         if (!Utility.isEmpty(href))
!             addElement("Target",href).addAttribute("type",type);
      }
  
! 
! 
!     public IdentityBuilder(final PublicKey allow) throws XMLSecurityException, NeuClearException {
!         this( allow, null,null,null);
      }
  

--- NamedObjectBuilder.java DELETED ---

[Neuclear-develop] neuclear-id/src/java/org/neuclear/id/resolver NSResolver.java,1.18,1.19

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

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

Modified Files:
	NSResolver.java 
Log Message:
Many, many clean ups. I've readded Targets in a new method.
Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers

Index: NSResolver.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/resolver/NSResolver.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** NSResolver.java	3 Jan 2004 20:36:38 -0000	1.18
--- NSResolver.java	18 Feb 2004 00:14:31 -0000	1.19
***************
*** 1,9 ****
  package org.neuclear.id.resolver;
  
! import org.neuclear.commons.NeuClearException;
! import org.neuclear.id.*;
  import org.neuclear.id.cache.NSCache;
! import org.neuclear.source.Source;
! import org.neuclear.source.SourceException;
  
  /**
--- 1,13 ----
  package org.neuclear.id.resolver;
  
! import org.neuclear.id.Identity;
! import org.neuclear.id.InvalidNamedObjectException;
! import org.neuclear.id.NameResolutionException;
! import org.neuclear.id.SignedNamedObject;
  import org.neuclear.id.cache.NSCache;
! import org.neuclear.id.verifier.VerifyingReader;
! 
! import java.io.IOException;
! import java.net.URL;
  
  /**
***************
*** 23,29 ****
  
      /**
!      * Retrieves the Identity object of the given name
!      * defaultstore for the given namespace.
!      * This is guaranteed to be valid as it checks the signatures on each level.
       * 
       * @param name 
--- 27,31 ----
  
      /**
!      * Given a given URI this resolves the Identity object
       * 
       * @param name 
***************
*** 50,72 ****
              return obj;
  
!         final String parentname = NSTools.getSignatoryURI(name);
  
!         if (parentname == null || name.equals("neu://"))
!             return Identity.NEUROOT;
  
!         String store = NSTools.isHttpScheme(name);
!         if (store == null) {
!             final Identity parent = resolveIdentity(parentname);
!             store = parent.getRepository();
          }
          try {
!             obj = Source.getInstance().fetch(store, name);
!         } catch (SourceException e) {
!             throw new NameResolutionException(name,e.getLocalizedMessage());
          }
-         if (obj == null)
-             throw new NameResolutionException(name);
-         NSCACHE.cache(obj);
-         return obj; //This may not be null
      }
  
--- 52,81 ----
              return obj;
  
! /*
!         if (name.startsWith("neu:")) {
  
!             final String parentname = NSTools.getSignatoryURI(name);
  
!             String store = NSTools.isHttpScheme(name);
!             if (store == null) {
!                 final Identity parent = resolveIdentity(parentname);
!                 store = parent.getRepository();
!             }
!             try {
!                 obj = Source.getInstance().fetch(store, name);
!             } catch (SourceException e) {
!                 throw new NameResolutionException(name,e.getLocalizedMessage());
!             }
!             if (obj == null)
!                 throw new NameResolutionException(name);
!             NSCACHE.cache(obj);
!             return obj; //This may not be null
          }
+ */
          try {
!             return VerifyingReader.getInstance().read(new URL(name).openStream());
!         } catch (IOException e) {
!             throw new InvalidNamedObjectException(name,e);
          }
      }
  

[Neuclear-develop] neuclear-id/src/test/org/neuclear/id/jce NeuClearJCETest.java,1.13,1.14

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

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

Modified Files:
	NeuClearJCETest.java 
Log Message:
Many, many clean ups. I've readded Targets in a new method.
Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers

Index: NeuClearJCETest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/jce/NeuClearJCETest.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** NeuClearJCETest.java	20 Jan 2004 20:28:24 -0000	1.13
--- NeuClearJCETest.java	18 Feb 2004 00:14:35 -0000	1.14
***************
*** 40,43 ****
--- 40,47 ----
  $Id$
  $Log$
+ Revision 1.14  2004/02/18 00:14:35  pelle
+ Many, many clean ups. I've readded Targets in a new method.
+ Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers
+ 
  Revision 1.13  2004/01/20 20:28:24  pelle
  Fixed final issues highlighted by unit tests. Really just a bunch of smaller stuff.
***************
*** 128,132 ****
  
      public final void testGetCertificate() throws NeuClearException, XMLException {
!         final IdentityBuilder id = new IdentityBuilder("neu://bob@test", signer.getPublicKey("neu://bob@test"));
          final Identity bob = (Identity) id.convert("neu://bob@test",signer);
          final Certificate cert = bob.getCertificate();
--- 132,136 ----
  
      public final void testGetCertificate() throws NeuClearException, XMLException {
!         final IdentityBuilder id = new IdentityBuilder(signer.getPublicKey("neu://bob@test"));
          final Identity bob = (Identity) id.convert("neu://bob@test",signer);
          final Certificate cert = bob.getCertificate();
***************
*** 143,147 ****
          final KeyPair kp = kpg.generateKeyPair();
          final JCESigner sig2 = new JCESigner(ks, new AlwaysTheSamePassphraseAgent("neuclear"));
!         final IdentityBuilder id = new IdentityBuilder("neu://eve@test", kp.getPublic());
          final Identity eve = (Identity) id.convert("neu://test",signer);
  
--- 147,151 ----
          final KeyPair kp = kpg.generateKeyPair();
          final JCESigner sig2 = new JCESigner(ks, new AlwaysTheSamePassphraseAgent("neuclear"));
!         final IdentityBuilder id = new IdentityBuilder( kp.getPublic());
          final Identity eve = (Identity) id.convert("neu://test",signer);
  
***************
*** 204,209 ****
          PublicKey pub=getSigner().generateKey(IVAN);
          assertNotNull(pub);
!         final IdentityBuilder id = new IdentityBuilder(IVAN,pub);
!         assertEquals(IVAN,id.getName());
          assertTrue(signer.canSignFor(IVAN));
          assertNotNull(signer.getPublicKey(IVAN));
--- 208,212 ----
          PublicKey pub=getSigner().generateKey(IVAN);
          assertNotNull(pub);
!         final IdentityBuilder id = new IdentityBuilder(pub);
          assertTrue(signer.canSignFor(IVAN));
          assertNotNull(signer.getPublicKey(IVAN));

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

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

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

Modified Files:
	AbstractStoreTest.java 
Log Message:
Many, many clean ups. I've readded Targets in a new method.
Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers

Index: AbstractStoreTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/store/AbstractStoreTest.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** AbstractStoreTest.java	11 Dec 2003 23:57:30 -0000	1.16
--- AbstractStoreTest.java	18 Feb 2004 00:14:36 -0000	1.17
***************
*** 2,5 ****
--- 2,9 ----
    $Id$
    $Log$
+   Revision 1.17  2004/02/18 00:14:36  pelle
+   Many, many clean ups. I've readded Targets in a new method.
+   Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers
+ 
    Revision 1.16  2003/12/11 23:57:30  pelle
    Trying to test the ReceiverServlet with cactus. Still no luck. Need to return a ElementProxy of some sort.
***************
*** 195,203 ****
          System.out.println("\nTesting " + this.getClass().getName());
          System.out.println("Storing " + bobName);
!         final IdentityBuilder bob = new IdentityBuilder(bobName, signer.getPublicKey(bobName));
!         store.receive(bob.sign(signer));
          System.out.println("Storing " + aliceName);
!         final IdentityBuilder alice = new IdentityBuilder(aliceName, signer.getPublicKey(aliceName));
!         store.receive(alice.sign(signer));
  
          System.out.println("Fetching " + bobName);
--- 199,207 ----
          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);

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

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

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

Modified Files:
	ResolverTests.java 
Log Message:
Many, many clean ups. I've readded Targets in a new method.
Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers

Index: ResolverTests.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/resolver/ResolverTests.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ResolverTests.java	20 Jan 2004 20:28:24 -0000	1.4
--- ResolverTests.java	18 Feb 2004 00:14:35 -0000	1.5
***************
*** 14,20 ****
  
      public void testResolve() throws NeuClearException {
!         assertNotNull(NSResolver.resolveIdentity("neu://test"));
!         assertNotNull(NSResolver.resolveIdentity("neu://bob@test"));
!         assertNotNull(NSResolver.resolveIdentity("neu://alice@test"));
  //        assertNotNull(NSResolver.resolveIdentity("neu://neuclear.org"));
  //        assertNotNull(NSResolver.resolveIdentity("neu://pelle@neuclear.org"));
--- 14,22 ----
  
      public void testResolve() throws NeuClearException {
! //          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"));
  //        assertNotNull(NSResolver.resolveIdentity("neu://neuclear.org"));
  //        assertNotNull(NSResolver.resolveIdentity("neu://pelle@neuclear.org"));

[Neuclear-develop] neuclear-id/src/test/org/neuclear/id testid.xml,NONE,1.1 IdentityTests.java,1.3,1.4 NSToolsTest.java,1.19,1.20

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

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

Modified Files:
	IdentityTests.java NSToolsTest.java 
Added Files:
	testid.xml 
Log Message:
Many, many clean ups. I've readded Targets in a new method.
Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers

--- NEW FILE: testid.xml ---
<Identity>
    <Repository>
        http://talk.org/repository
    </Repository>
    <Target href="mailto:pe...@ne..." type="inbox"/>
    <Allow></Allow>
</Identity>
Index: IdentityTests.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/IdentityTests.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** IdentityTests.java	20 Jan 2004 17:39:13 -0000	1.3
--- IdentityTests.java	18 Feb 2004 00:14:36 -0000	1.4
***************
*** 28,35 ****
  public class IdentityTests extends AbstractObjectCreationTest {
      private static final String NAME = "neu://test";
-     private static final String REPOSITORY = "http://repository.neuclear.org";
      private static final String SIGNER = "http://localhost:11870/Signer";
-     private static final String LOGGER = "http://logger.neuclear.org";
-     private static final String RECEIVER = "mailto:pe...@ne...";
  
      public IdentityTests(String string) throws NeuClearException, GeneralSecurityException {
--- 28,32 ----
***************
*** 43,47 ****
  //        assertEquals(id.getLogger(),LOGGER);
  //        assertEquals(id.getName());
!         assertEquals(id.getRepository(),REPOSITORY);
          assertEquals(id.getSigner(),SIGNER);
  //        assertEquals(id.getReceiver(),RECEIVER);
--- 40,44 ----
  //        assertEquals(id.getLogger(),LOGGER);
  //        assertEquals(id.getName());
! //        assertEquals(id.getRepository(),REPOSITORY);
          assertEquals(id.getSigner(),SIGNER);
  //        assertEquals(id.getReceiver(),RECEIVER);
***************
*** 50,54 ****
  
      protected Builder createBuilder() throws NeuClearException {
!         return new IdentityBuilder(NAME,getSigner().getPublicKey(NAME),REPOSITORY,SIGNER,LOGGER,RECEIVER);
      }
  
--- 47,51 ----
  
      protected Builder createBuilder() throws NeuClearException {
!         return new IdentityBuilder(getSigner().getPublicKey(NAME),SIGNER,null,null);
      }
  

Index: NSToolsTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/NSToolsTest.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** NSToolsTest.java	19 Jan 2004 23:49:45 -0000	1.19
--- NSToolsTest.java	18 Feb 2004 00:14:36 -0000	1.20
***************
*** 2,5 ****
--- 2,9 ----
    $Id$
    $Log$
+   Revision 1.20  2004/02/18 00:14:36  pelle
+   Many, many clean ups. I've readded Targets in a new method.
+   Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers
+ 
    Revision 1.19  2004/01/19 23:49:45  pelle
    Unit testing uncovered further issues with Base32
***************
*** 142,150 ****
  
  import junit.framework.TestCase;
- import org.dom4j.DocumentHelper;
  import org.neuclear.commons.NeuClearException;
  import org.neuclear.commons.crypto.CryptoTools;
- import org.neuclear.id.builders.IdentityBuilder;
- import org.neuclear.xml.xmlsec.XMLSecurityException;
  
  
--- 146,151 ----
***************
*** 265,277 ****
      }
  
-     public static void testIsNamedObject() throws NeuClearException, XMLSecurityException {
- //        AuthenticationTicketBuilder builder = new AuthenticationTicketBuilder("neu://test", "neu://neuclear.org", "http://neuclear.org");
- //        assertTrue(NSTools.isNamedObject(builder.getElement()));
- //        assertTrue(NSTools.isNamedObject(new SignatureRequestBuilder("neu://neuclear.org", "neu://bob@test", builder, "Test").getElement()));
-         assertTrue(NSTools.isNamedObject(new IdentityBuilder("neu://test", Identity.getRootPK()).getElement()));
-         assertFalse(NSTools.isNamedObject(DocumentHelper.createElement("test")));
-         assertFalse(NSTools.isNamedObject(null));
- 
  
-     }
  }
\ No newline at end of file
--- 266,269 ----

[Neuclear-develop] neuclear-id project.properties,1.29,1.30

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

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

Modified Files:
	project.properties 
Log Message:
Many, many clean ups. I've readded Targets in a new method.
Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers

Index: project.properties
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/project.properties,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** project.properties	19 Jan 2004 17:54:59 -0000	1.29
--- project.properties	18 Feb 2004 00:14:36 -0000	1.30
***************
*** 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/java/org/neuclear/tests AbstractSigningTest.java,1.5,1.6

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

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

Modified Files:
	AbstractSigningTest.java 
Log Message:
Many, many clean ups. I've readded Targets in a new method.
Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers

Index: AbstractSigningTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/tests/AbstractSigningTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** AbstractSigningTest.java	17 Dec 2003 12:45:57 -0000	1.5
--- AbstractSigningTest.java	18 Feb 2004 00:14:34 -0000	1.6
***************
*** 7,11 ****
  import org.neuclear.commons.crypto.signers.TestCaseSigner;
  import org.neuclear.id.Identity;
- import org.neuclear.id.resolver.NSResolver;
  
  import java.security.GeneralSecurityException;
--- 7,10 ----
***************
*** 31,34 ****
--- 30,37 ----
  $Id$
  $Log$
+ Revision 1.6  2004/02/18 00:14:34  pelle
+ Many, many clean ups. I've readded Targets in a new method.
+ Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers
+ 
  Revision 1.5  2003/12/17 12:45:57  pelle
  NeuClear JCE Certificates now work with KeyStore.
***************
*** 70,76 ****
          assertNotNull(signer.getPublicKey("neu://bob@test"));
  
!         alice = NSResolver.resolveIdentity("neu://alice@test");
          assertNotNull(alice);
!         bob = NSResolver.resolveIdentity("neu://bob@test");
          assertNotNull(bob);
      }
--- 73,79 ----
          assertNotNull(signer.getPublicKey("neu://bob@test"));
  
!         alice = new Identity(signer.getPublicKey("neu://alice@test"));
          assertNotNull(alice);
!         bob = new Identity(signer.getPublicKey("neu://bob@test"));
          assertNotNull(bob);
      }

[Neuclear-develop] neuclear-id/src/test/org/neuclear/id/builders IdentityBuilderTest.java,1.11,1.12

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

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

Modified Files:
	IdentityBuilderTest.java 
Log Message:
Many, many clean ups. I've readded Targets in a new method.
Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers

Index: IdentityBuilderTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/test/org/neuclear/id/builders/IdentityBuilderTest.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** IdentityBuilderTest.java	20 Jan 2004 20:28:24 -0000	1.11
--- IdentityBuilderTest.java	18 Feb 2004 00:14:34 -0000	1.12
***************
*** 3,7 ****
  import org.neuclear.commons.NeuClearException;
  import org.neuclear.commons.crypto.signers.PublicKeySource;
! import org.neuclear.id.NSTools;
  import org.neuclear.id.SignedNamedObject;
  import org.neuclear.tests.AbstractSigningTest;
--- 3,7 ----
  import org.neuclear.commons.NeuClearException;
  import org.neuclear.commons.crypto.signers.PublicKeySource;
! import org.neuclear.id.Identity;
  import org.neuclear.id.SignedNamedObject;
  import org.neuclear.tests.AbstractSigningTest;
***************
*** 31,34 ****
--- 31,38 ----
  $Id$
  $Log$
+ Revision 1.12  2004/02/18 00:14:34  pelle
+ Many, many clean ups. I've readded Targets in a new method.
+ Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers
+ 
  Revision 1.11  2004/01/20 20:28:24  pelle
  Fixed final issues highlighted by unit tests. Really just a bunch of smaller stuff.
***************
*** 98,111 ****
          if (getSigner().canSignFor(name)) {
              final IdentityBuilder id = new IdentityBuilder(
!                     name,
                      ((PublicKeySource) getSigner()).getPublicKey(name),
-                     "http://repository.neuclear.org",
                      "http://users.neuclear.org:8080/Signer",
!                     "http://logger.neuclear.org",
!                     "mailto:pe...@ne...");
  
!             assertEquals("neu://test", NSTools.getSignatoryURI(id.getName()));
              final SignedNamedObject sec = id.convert(name,getSigner());
              assertNotNull(sec);
  //            assertEquals(id.getName(), sec.getName());
  
--- 102,117 ----
          if (getSigner().canSignFor(name)) {
              final IdentityBuilder id = new IdentityBuilder(
! 
                      ((PublicKeySource) getSigner()).getPublicKey(name),
                      "http://users.neuclear.org:8080/Signer",
!                     null,null);
  
! //            assertEquals("neu://test", NSTools.getSignatoryURI(id.getName()));
              final SignedNamedObject sec = id.convert(name,getSigner());
              assertNotNull(sec);
+             assertTrue(sec instanceof Identity);
+             final Identity idd=(Identity) sec;
+             assertEquals(((PublicKeySource) getSigner()).getPublicKey(name),idd.getPublicKey());
+             assertEquals("http://users.neuclear.org:8080/Signer",idd.getSigner());
  //            assertEquals(id.getName(), sec.getName());
  

[Neuclear-develop] neuclear-id/src/java/org/neuclear/id/targets Target.java,NONE,1.1 Targets.java,NONE,1.1

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

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

Added Files:
	Target.java Targets.java 
Log Message:
Many, many clean ups. I've readded Targets in a new method.
Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers

--- NEW FILE: Target.java ---
package org.neuclear.id.targets;

import org.dom4j.Element;

import java.util.HashMap;

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

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

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

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

$Id: Target.java,v 1.1 2004/02/18 00:14:31 pelle Exp $
$Log: Target.java,v $
Revision 1.1  2004/02/18 00:14:31  pelle
Many, many clean ups. I've readded Targets in a new method.
Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers

*/

/**
 * Targets are services that receive SignedObjects
 */
final class Target {
    private Target( int type, String href) {
        this.href = href;
        this.type = type;
    }

    String getHref() {
        return href;
    }

    int getType() {
        return type;
    }

    final static Target make(String type,String href){
        int t = getType(type);
        return new Target(t,href);
    }

    final static int getType(String type) {
        int t=0;
        if (type!=null&&typemap.containsKey(type))
            t=((Byte)typemap.get(type)).byteValue();
        return t;
    }

    final static Target parseElement(Element elem){
        return make(elem.attributeValue("type"),elem.getTextTrim());
    }

    private final String href;
    private final int type;

    private final static HashMap typemap=new HashMap();

    // Add further standard types here
    private final static String[] types= new String[] {"misc","auditor","receiver","logger"};
    {
        for(byte i=0;i<types.length;i++)
            typemap.put(types[i],new Byte(i));
    }
}

--- NEW FILE: Targets.java ---
package org.neuclear.id.targets;

import org.dom4j.Element;
import org.neuclear.commons.NeuClearException;
import org.neuclear.id.SignedNamedObject;
import org.neuclear.senders.Sender;

import java.util.List;

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

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

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

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

$Id: Targets.java,v 1.1 2004/02/18 00:14:31 pelle Exp $
$Log: Targets.java,v $
Revision 1.1  2004/02/18 00:14:31  pelle
Many, many clean ups. I've readded Targets in a new method.
Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers

*/

/**
 * User: pelleb
 * Date: Feb 17, 2004
 * Time: 10:39:07 PM
 */
public final class Targets {
    private Targets(Target list[]){
        targetlist=list;
    }
    public final void send(SignedNamedObject obj) throws NeuClearException {
        for (int i=0;i<targetlist.length;i++){
            Sender.quickSend(targetlist[i].getHref(),obj);
        }
    }
    public final void send(String type,SignedNamedObject obj) throws NeuClearException {
        final int ti=Target.getType(type);
        for (int i=0;i<targetlist.length;i++){
            if (targetlist[i].getType()==ti)
                Sender.quickSend(targetlist[i].getHref(),obj);
        }
    }
    public final void log(SignedNamedObject obj) throws NeuClearException {
        send("logger",obj);
    }


    public final static Targets parseList(Element elem){
        List list=elem.elements("Target");
        Target targets[]=new Target[list.size()];
        Target signer=null;
        for (int i=0;i<list.size();i++){
            targets[i]=Target.parseElement((Element) list.get(i));
        }
        return new Targets(targets);
    }

    private final Target[] targetlist;

    public static final Targets EMPTY=new Targets(new Target[0]);

}

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

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

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

Modified Files:
	AbstractElementProxy.java 
Log Message:
Many, many clean ups. I've readded Targets in a new method.
Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers

Index: AbstractElementProxy.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-xmlsig/src/java/org/neuclear/xml/AbstractElementProxy.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** AbstractElementProxy.java	16 Dec 2003 15:04:49 -0000	1.8
--- AbstractElementProxy.java	18 Feb 2004 00:13:49 -0000	1.9
***************
*** 2,5 ****
--- 2,9 ----
   * $Id$
   * $Log$
+  * Revision 1.9  2004/02/18 00:13:49  pelle
+  * Many, many clean ups. I've readded Targets in a new method.
+  * Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers
+  *
   * Revision 1.8  2003/12/16 15:04:49  pelle
   * Added SignedMessage contract for signing simple textual contracts.
***************
*** 183,186 ****
--- 187,200 ----
          return element;
      }
+     /**
+      * Adds another Element with the given name and the same Namespace as this element to this element.
+      *
+      * @param child
+      */
+     protected final Element addElement(final String child,final String text) {
+         Element elem=addElement(child);
+         elem.addText(text);
+         return elem;
+     }
  
      /**

[Neuclear-develop] neuclear-commons/src/test/org/neuclear/commons/crypto Base32Tests.java,1.4,1.5

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

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

Modified Files:
	Base32Tests.java 
Log Message:
Many, many clean ups. I've readded Targets in a new method.
Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers

Index: Base32Tests.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-commons/src/test/org/neuclear/commons/crypto/Base32Tests.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Base32Tests.java	19 Jan 2004 23:49:29 -0000	1.4
--- Base32Tests.java	18 Feb 2004 00:13:42 -0000	1.5
***************
*** 23,26 ****
--- 23,30 ----
  $Id$
  $Log$
+ Revision 1.5  2004/02/18 00:13:42  pelle
+ Many, many clean ups. I've readded Targets in a new method.
+ Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers
+ 
  Revision 1.4  2004/01/19 23:49:29  pelle
  Unit testing uncovered further issues with Base32
***************
*** 66,70 ****
  //            System.out.print("Encoding: "+TESTSTRINGS[i]+" ...");
              final String encoded = Base32.encode(TESTSTRINGS[i]);
! //            System.out.println(" ->"+encoded);
              assertEquals("TESTSTRINGS["+i+"]",TESTSTRINGS[i].getBytes(),Base32.decode(encoded));
          }
--- 70,74 ----
  //            System.out.print("Encoding: "+TESTSTRINGS[i]+" ...");
              final String encoded = Base32.encode(TESTSTRINGS[i]);
!            System.out.println(" ->"+encoded);
              assertEquals("TESTSTRINGS["+i+"]",TESTSTRINGS[i].getBytes(),Base32.decode(encoded));
          }
***************
*** 76,80 ****
              final String hash = com.waterken.url.Base32.encode(CryptoTools.digest(TESTSTRINGS[i]));
              assertEquals(32, hash.length());
! //            System.out.println(" ->"+hash);
              assertTrue("TESTSTRINGS["+i+"]",CryptoTools.equalByteArrays(CryptoTools.digest(TESTSTRINGS[i]),Base32.decode(hash)));
          }
--- 80,84 ----
              final String hash = com.waterken.url.Base32.encode(CryptoTools.digest(TESTSTRINGS[i]));
              assertEquals(32, hash.length());
!             System.out.println(" ->"+hash);
              assertTrue("TESTSTRINGS["+i+"]",CryptoTools.equalByteArrays(CryptoTools.digest(TESTSTRINGS[i]),Base32.decode(hash)));
          }

[Neuclear-develop] neuclear-commons/src/java/org/neuclear/commons/crypto CryptoTools.java,1.12,1.13

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

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

Modified Files:
	CryptoTools.java 
Log Message:
Many, many clean ups. I've readded Targets in a new method.
Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers

Index: CryptoTools.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-commons/src/java/org/neuclear/commons/crypto/CryptoTools.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** CryptoTools.java	18 Jan 2004 21:20:20 -0000	1.12
--- CryptoTools.java	18 Feb 2004 00:13:41 -0000	1.13
***************
*** 2,5 ****
--- 2,9 ----
   * $Id$
   * $Log$
+  * Revision 1.13  2004/02/18 00:13:41  pelle
+  * Many, many clean ups. I've readded Targets in a new method.
+  * Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers
+  *
   * Revision 1.12  2004/01/18 21:20:20  pelle
   * Created Base32 encoder that now fully complies with Tyler's spec.
***************
*** 747,750 ****
--- 751,755 ----
                  || (asn1Bytes[2] != 2) || (i > 20) || (asn1Bytes[4 + rLength] != 2)
                  || (j > 20)) {
+             
              throw new IOException("Invalid ASN.1 format of DSA signature");
          } else {

[Neuclear-develop] neuclear-pay/src/java/org/neuclear/asset/orders/builders TransferOrderBuilder.java,1.3,1.4

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

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

Modified Files:
	TransferOrderBuilder.java 
Log Message:
Many, many clean ups. I've readded Targets in a new method.
Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers

Index: TransferOrderBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/orders/builders/TransferOrderBuilder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TransferOrderBuilder.java	13 Jan 2004 15:11:17 -0000	1.3
--- TransferOrderBuilder.java	18 Feb 2004 00:13:30 -0000	1.4
***************
*** 11,15 ****
  import org.neuclear.id.Identity;
  import org.neuclear.id.builders.Builder;
- import org.neuclear.xml.xmlsec.SignedElement;
  
  /*
--- 11,14 ----
***************
*** 33,36 ****
--- 32,39 ----
  $Id$
  $Log$
+ Revision 1.4  2004/02/18 00:13:30  pelle
+ Many, many clean ups. I've readded Targets in a new method.
+ Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers
+ 
  Revision 1.3  2004/01/13 15:11:17  pelle
  Now builds.
***************
*** 131,138 ****
  public class TransferOrderBuilder extends Builder {
      public TransferOrderBuilder(final Asset asset, final Identity recipient, final Value amount, final String comment) throws InvalidTransferException, NegativeTransferException, NeuClearException {
          super(TransferGlobals.createQName(TransferGlobals.XFER_TAGNAME));
          if (amount.getAmount() < 0)
              throw new NegativeTransferException(amount);
!         if (asset==null)
              throw new InvalidTransferException("assetName");
          if (recipient == null)
--- 134,144 ----
  public class TransferOrderBuilder extends Builder {
      public TransferOrderBuilder(final Asset asset, final Identity recipient, final Value amount, final String comment) throws InvalidTransferException, NegativeTransferException, NeuClearException {
+         this(asset.getName(),recipient.getName(),amount,comment);
+     }
+     public TransferOrderBuilder(final String assetname, final String recipient, final Value amount, final String comment) throws InvalidTransferException, NegativeTransferException, NeuClearException {
          super(TransferGlobals.createQName(TransferGlobals.XFER_TAGNAME));
          if (amount.getAmount() < 0)
              throw new NegativeTransferException(amount);
!         if (assetname==null)
              throw new InvalidTransferException("assetName");
          if (recipient == null)
***************
*** 140,145 ****
  
          final Element element = getElement();
!         element.add(TransferGlobals.createElement(TransferGlobals.RECIPIENT_TAG, recipient.getName()));
!         element.add(TransferGlobals.createElement(TransferGlobals.ASSET_TAG, asset.getName()));
          element.add(TransferGlobals.createValueTag(amount));
  
--- 146,151 ----
  
          final Element element = getElement();
!         element.add(TransferGlobals.createElement(TransferGlobals.RECIPIENT_TAG, recipient));
!         element.add(TransferGlobals.createElement(TransferGlobals.ASSET_TAG, assetname));
          element.add(TransferGlobals.createValueTag(amount));
  

[Neuclear-develop] neuclear-pay/src/test/org/neuclear/asset/orders/builders TransferOrderBuilderTest.java,1.1,1.2

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

Update of /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/asset/orders/builders
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29255/src/test/org/neuclear/asset/orders/builders

Modified Files:
	TransferOrderBuilderTest.java 
Log Message:
Many, many clean ups. I've readded Targets in a new method.
Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers

Index: TransferOrderBuilderTest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/test/org/neuclear/asset/orders/builders/TransferOrderBuilderTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TransferOrderBuilderTest.java	21 Jan 2004 23:41:02 -0000	1.1
--- TransferOrderBuilderTest.java	18 Feb 2004 00:13:31 -0000	1.2
***************
*** 34,37 ****
--- 34,41 ----
  $Id$
  $Log$
+ Revision 1.2  2004/02/18 00:13:31  pelle
+ Many, many clean ups. I've readded Targets in a new method.
+ Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers
+ 
  Revision 1.1  2004/01/21 23:41:02  pelle
  Started the unit tests for the new payment message format.
***************
*** 62,71 ****
  
      protected Builder createBuilder() throws NeuClearException, InvalidTransferException, XMLException {
!         Builder builder=new TransferOrderBuilder(asset,getBob(),new Amount(20),"Test");
          System.out.println(builder.asXML());
          return builder;
      }
      public  Asset createTestAsset() throws NonExistingSignerException {
!         return new Asset("http://localhost",getSigner().getPublicKey("neu://test/bux"),1,1);
      }
  
--- 66,76 ----
  
      protected Builder createBuilder() throws NeuClearException, InvalidTransferException, XMLException {
!         Builder builder=new TransferOrderBuilder("neu://test/bux","neu://bob@test",new Amount(20),"Test");
          System.out.println(builder.asXML());
          return builder;
      }
      public  Asset createTestAsset() throws NonExistingSignerException {
! //        return new Asset("http://localhost",getSigner().getPublicKey("neu://test/bux"),1,1);
!         return null;//TODO FIX
      }
  

[Neuclear-develop] neuclear-pay/src/java/org/neuclear/exchange/contracts ExchangeAgent.java,1.2,1.3

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

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

Modified Files:
	ExchangeAgent.java 
Log Message:
Many, many clean ups. I've readded Targets in a new method.
Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers

Index: ExchangeAgent.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/exchange/contracts/ExchangeAgent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ExchangeAgent.java	12 Jan 2004 22:39:14 -0000	1.2
--- ExchangeAgent.java	18 Feb 2004 00:13:30 -0000	1.3
***************
*** 3,6 ****
--- 3,7 ----
  import org.neuclear.id.Identity;
  import org.neuclear.id.SignedNamedCore;
+ import org.neuclear.id.targets.Targets;
  
  import java.security.PublicKey;
***************
*** 26,29 ****
--- 27,34 ----
  $Id$
  $Log$
+ Revision 1.3  2004/02/18 00:13:30  pelle
+ Many, many clean ups. I've readded Targets in a new method.
+ Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers
+ 
  Revision 1.2  2004/01/12 22:39:14  pelle
  Completed all the builders and contracts.
***************
*** 44,49 ****
   */
  public class ExchangeAgent extends Identity{
!     public ExchangeAgent(SignedNamedCore core, PublicKey pub) {
!         super(core, pub);
      }
  
--- 49,54 ----
   */
  public class ExchangeAgent extends Identity{
!     public ExchangeAgent(SignedNamedCore core, PublicKey pub,String signer, Targets targets) {
!         super(core, pub,signer,targets);
      }
  

[Neuclear-develop] neuclear-pay/src/schemas asset.xsd,1.1,1.2

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

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

Modified Files:
	asset.xsd 
Log Message:
Many, many clean ups. I've readded Targets in a new method.
Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers

Index: asset.xsd
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/schemas/asset.xsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** asset.xsd	6 Jan 2004 23:26:49 -0000	1.1
--- asset.xsd	18 Feb 2004 00:13:31 -0000	1.2
***************
*** 0 ****
--- 1,52 ----
+ <?xml version="1.0" encoding="utf-8"?>
+ 
+ <xs:schema targetNamespace="http://neuclear.org/neu/asset.xsd"
+     xmlns:xs="http://www.w3.org/2001/XMLSchema"
+     xmlns="http://neuclear.org/neu/asset.xsd"
+     xmlns:id="http://neuclear.org/neu/neuid.xsd"
+     xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+ 
+     elementFormDefault="qualified" version="0.3" id="asset">
+  	<xs:import namespace="http://neuclear.org/neu/neuid.xsd" schemaLocation="../../../neuclear-id/src/schemas/neuid.xsd" />
+     <xs:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="../../../neuclear-id/src/schemas/xmldsig-core-schema.xsd"/>
+ 
+     <xs:element name="Asset" type="id:NamedObjectReference" nillable="false"/>
+     <xs:element name="Recipient" type="id:NamedObjectReference" nillable="false"/>
+     <xs:element name="ValueTime" type="xs:dateTime" nillable="true"/>
+     <xs:element name="Comment" type="xs:string" nillable="true"/>
+ 
+     <!-- Generic Value Identifier -->
+     <xs:element name="Value" abstract="true" nillable="false"/>
+     <!-- Specific numeric amount -->
+     <xs:element name="Amount" substitutionGroup="Value" type="xs:double"/>
+     <!-- All the serials numbers included in this Value. The numeric amount is always equals to the amount of items in
+     the list -->
+     <xs:element name="SerialNumbers" substitutionGroup="Value">
+         <xs:simpleType>
+             <xs:list itemType="id:NamedObjectReference"/>
+         </xs:simpleType>
+     </xs:element>
+ 
+     <xs:element name="TransferOrder" nillable="false">
+         <xs:complexType>
+             <xs:sequence>
+                 <xs:element ref="Recipient" minOccurs="1" maxOccurs="1"/>
+                 <xs:element ref="Asset" minOccurs="1" maxOccurs="1"/>
+                 <xs:element ref="Value" minOccurs="1" maxOccurs="1"/>
+                 <xs:element ref="Comment"  minOccurs="0" maxOccurs="1"/>
+                 <xs:group ref="id:SignedObjectGroup" minOccurs="0" maxOccurs="1"/>
+             </xs:sequence>
+         </xs:complexType>
+     </xs:element>
+ 
+     <xs:element name="TransferReceipt" nillable="false">
+         <xs:complexType >
+             <xs:sequence>
+                 <xs:element ref="ValueTime" minOccurs="1" maxOccurs="1"/>
+                 <xs:element ref="Value" minOccurs="0" maxOccurs="1"/>
+                 <xs:element ref="TransferOrder" minOccurs="1" maxOccurs="1"/>
+                 <xs:group ref="id:SignedObjectGroup" minOccurs="0" maxOccurs="1"/>
+             </xs:sequence>
+         </xs:complexType>
+     </xs:element>
+ </xs:schema>

[Neuclear-develop] neuclear-pay/src/java/org/neuclear/asset/contracts/builders AssetBuilder.java,1.6,1.7

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

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

Modified Files:
	AssetBuilder.java 
Log Message:
Many, many clean ups. I've readded Targets in a new method.
Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers

Index: AssetBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/contracts/builders/AssetBuilder.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** AssetBuilder.java	10 Jan 2004 00:00:44 -0000	1.6
--- AssetBuilder.java	18 Feb 2004 00:13:29 -0000	1.7
***************
*** 33,36 ****
--- 33,40 ----
  $Id$
  $Log$
+ Revision 1.7  2004/02/18 00:13:29  pelle
+ Many, many clean ups. I've readded Targets in a new method.
+ Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers
+ 
  Revision 1.6  2004/01/10 00:00:44  pelle
  Implemented new Schema for Transfer*
***************
*** 102,106 ****
       * Used to create new Assets
       * 
-      * @param name       The Name of Identity
       * @param allow      PublicKey allowed to sign in here
       * @param repository URL of Default Store for NameSpace. (Note. A NameSpace object is stored in the default repository of it's parent namespace)
--- 106,109 ----
***************
*** 111,116 ****
       * @param minimum    Minimum transaction size
       */
!     public AssetBuilder(final String name, final PublicKey allow, final String repository, final String signer, final String logger, final String receiver, final String controller, final int decimal, final double minimum) throws NeuClearException {
!         super(AssetGlobals.createQName(AssetGlobals.ASSET_TAGNAME), name, allow, repository, signer, logger, receiver);
          final Element elem = getElement();
          AssetGlobals.createAttribute(elem, "controller", controller);
--- 114,119 ----
       * @param minimum    Minimum transaction size
       */
!     public AssetBuilder(final PublicKey allow, final String signer, final String logger, final String receiver, final String controller, final int decimal, final double minimum) throws NeuClearException {
!         super(AssetGlobals.createQName(AssetGlobals.ASSET_TAGNAME),  allow,  signer, logger, receiver);
          final Element elem = getElement();
          AssetGlobals.createAttribute(elem, "controller", controller);
***************
*** 127,133 ****
                  assetname = args[0];
  
!             final AssetBuilder assetraw = new AssetBuilder(assetname,
                      signer.getPublicKey(assetname),
-                     "http://repository.neuclear.org/",
                      "http://bux.neuclear.org:8080",
                      "http://logger.neuclear.org",
--- 130,135 ----
                  assetname = args[0];
  
!             final AssetBuilder assetraw = new AssetBuilder(
                      signer.getPublicKey(assetname),
                      "http://bux.neuclear.org:8080",
                      "http://logger.neuclear.org",
***************
*** 137,141 ****
                      0.01
              );
!             final Asset asset= (Asset) assetraw.sign(signer);
              final Store store = new FileStore("target/testdata/repository");
              store.receive(asset);
--- 139,143 ----
                      0.01
              );
!             final Asset asset= (Asset) assetraw.convert(assetname,signer);
              final Store store = new FileStore("target/testdata/repository");
              store.receive(asset);

[Neuclear-develop] neuclear-pay/src/java/org/neuclear/asset/contracts Asset.java,1.13,1.14

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

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

Modified Files:
	Asset.java 
Log Message:
Many, many clean ups. I've readded Targets in a new method.
Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers

Index: Asset.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-pay/src/java/org/neuclear/asset/contracts/Asset.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Asset.java	21 Jan 2004 23:41:02 -0000	1.13
--- Asset.java	18 Feb 2004 00:13:30 -0000	1.14
***************
*** 2,9 ****
  
  import org.dom4j.Element;
- import org.neuclear.commons.NeuClearException;
  import org.neuclear.commons.Utility;
  import org.neuclear.id.*;
! import org.neuclear.senders.Sender;
  import org.neuclear.xml.xmlsec.KeyInfo;
  import org.neuclear.xml.xmlsec.XMLSecTools;
--- 2,8 ----
  
  import org.dom4j.Element;
  import org.neuclear.commons.Utility;
  import org.neuclear.id.*;
! import org.neuclear.id.targets.Targets;
  import org.neuclear.xml.xmlsec.KeyInfo;
  import org.neuclear.xml.xmlsec.XMLSecTools;
***************
*** 32,35 ****
--- 31,38 ----
  $Id$
  $Log$
+ Revision 1.14  2004/02/18 00:13:30  pelle
+ Many, many clean ups. I've readded Targets in a new method.
+ Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers
+ 
  Revision 1.13  2004/01/21 23:41:02  pelle
  Started the unit tests for the new payment message format.
***************
*** 120,126 ****
   */
  public final class Asset extends Identity {
!     protected Asset(final SignedNamedCore core, final String serviceurl,final PublicKey pub, final int decimal, final double minimumTransaction) {
!         super(core, pub);
!         this.serviceurl=serviceurl;
          this.decimal = decimal;
          this.multiplier = (int) Math.round(Math.pow(10, -decimal));
--- 123,128 ----
   */
  public final class Asset extends Identity {
!     protected Asset(final SignedNamedCore core, final Targets targets,final PublicKey pub, final int decimal, final double minimumTransaction) {
!         super(core, pub,null,targets); //Web services dont have signing urls
          this.decimal = decimal;
          this.multiplier = (int) Math.round(Math.pow(10, -decimal));
***************
*** 128,131 ****
--- 130,134 ----
      }
  
+ /*
      //TODO drop. This is for testing purposes only
      public Asset(final String serviceurl,final PublicKey pub, final int decimal, final double minimumTransaction) {
***************
*** 136,139 ****
--- 139,143 ----
          this.minimumTransaction = minimumTransaction;
      }
+ */
  
      /**
***************
*** 161,171 ****
      }
  
-     public final String getServiceurl() {
-         return serviceurl;
-     }
- 
-     public final SignedNamedObject send(SignedNamedObject object) throws NeuClearException {
-         return Sender.quickSend(serviceurl,object);
-     }
  
      public static final class Reader implements NamedObjectReader {
--- 165,168 ----
***************
*** 179,183 ****
              if (!elem.getNamespace().equals(AssetGlobals.NS_ASSET))
                  throw new InvalidNamedObjectException(core.getName(),"Not in XML NameSpace: "+AssetGlobals.NS_ASSET.getURI());
-             final String serviceurl = elem.attributeValue(createNEUIDQName("serviceurl"));
  
              final Element allowElement = InvalidNamedObjectException.assertContainsElementQName(core,elem,createNEUIDQName("allow"));
--- 176,179 ----
***************
*** 189,193 ****
                  final String min = elem.attributeValue("minimumxact");
                  final double minimum = (!Utility.isEmpty(min)) ? Double.parseDouble(min) : 0;
!                 return new Asset(core, serviceurl, pub, decimal, minimum);
              } catch (XMLSecurityException e) {
                  throw new InvalidNamedObjectException(core.getName(),e);
--- 185,190 ----
                  final String min = elem.attributeValue("minimumxact");
                  final double minimum = (!Utility.isEmpty(min)) ? Double.parseDouble(min) : 0;
!                 final Targets targets=Targets.parseList(elem);
!                 return new Asset(core, targets, pub, decimal, minimum);
              } catch (XMLSecurityException e) {
                  throw new InvalidNamedObjectException(core.getName(),e);
***************
*** 198,202 ****
      }
  
-     private final String serviceurl;
      private final int decimal;
      private final int multiplier;
--- 195,198 ----