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

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

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

Modified Files:
	CommandLineSigner.java IdentityCreator.java 
Log Message:
Split Identity into Signatory and Identity class.
Identity remains a signed named object and will in the future just be used for self declared information.
Signatory now contains the PublicKey etc and is NOT a signed object.

Index: CommandLineSigner.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/tools/commandline/CommandLineSigner.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** CommandLineSigner.java	3 Mar 2004 23:26:43 -0000	1.12
--- CommandLineSigner.java	1 Apr 2004 23:19:49 -0000	1.13
***************
*** 1,4 ****
--- 1,9 ----
  /* $Id$
   * $Log$
+  * Revision 1.13  2004/04/01 23:19:49  pelle
+  * Split Identity into Signatory and Identity class.
+  * Identity remains a signed named object and will in the future just be used for self declared information.
+  * Signatory now contains the PublicKey etc and is NOT a signed object.
+  *
   * Revision 1.12  2004/03/03 23:26:43  pelle
   * Updated various tests to use the AbstractObjectCreationTest
***************
*** 242,246 ****
  import org.neuclear.id.Identity;
  import org.neuclear.id.builders.Builder;
! import org.neuclear.id.resolver.NSResolver;
  import org.neuclear.xml.XMLException;
  import org.neuclear.xml.XMLTools;
--- 247,251 ----
  import org.neuclear.id.Identity;
  import org.neuclear.id.builders.Builder;
! import org.neuclear.id.resolver.Resolver;
  import org.neuclear.xml.XMLException;
  import org.neuclear.xml.XMLTools;
***************
*** 265,269 ****
              System.out.println("Resolving and Verifying: " + name);
              try {
!                 Identity id = NSResolver.resolveIdentity(name);
                  if (id != null) {
                      System.out.println("Signed Object: " + id.getName() + " is verified");
--- 270,274 ----
              System.out.println("Resolving and Verifying: " + name);
              try {
!                 Identity id = Resolver.resolveIdentity(name);
                  if (id != null) {
                      System.out.println("Signed Object: " + id.getName() + " is verified");

Index: IdentityCreator.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/tools/commandline/IdentityCreator.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** IdentityCreator.java	3 Mar 2004 23:26:43 -0000	1.10
--- IdentityCreator.java	1 Apr 2004 23:19:49 -0000	1.11
***************
*** 1,4 ****
--- 1,9 ----
  /* $Id$
   * $Log$
+  * Revision 1.11  2004/04/01 23:19:49  pelle
+  * Split Identity into Signatory and Identity class.
+  * Identity remains a signed named object and will in the future just be used for self declared information.
+  * Signatory now contains the PublicKey etc and is NOT a signed object.
+  *
   * Revision 1.10  2004/03/03 23:26:43  pelle
   * Updated various tests to use the AbstractObjectCreationTest
***************
*** 226,230 ****
  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.PublicKeySource;
  import org.neuclear.id.InvalidNamedObjectException;
--- 231,234 ----
***************
*** 246,250 ****
              System.exit(1);
          }
-         pksource = (PublicKeySource) sig;
          alias = cmd.getOptionValue("n");
          //final String cachedirpath = System.getProperty("user.home") + "/.neuclear/cache";
--- 250,253 ----
***************
*** 256,262 ****
  
      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 {
--- 259,264 ----
  
      protected Builder build() throws UserCancellationException {
          if (cmd.hasOption('i')) {//If we have an input file we load that instead of creating a new one
!             return super.build();
          }
          try {
***************
*** 277,288 ****
  
              }
-             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. ");
              System.exit(1);
-         } catch (NonExistingSignerException e) {
-             e.printStackTrace();
          }
          return null;
--- 279,287 ----
  
              }
  
!             return new IdentityBuilder(defaultsigner, defaultlogger, defaultreceiver);
          } catch (InvalidNamedObjectException e) {
              System.err.println("The name: " + e.getName() + " is not valid. ");
              System.exit(1);
          }
          return null;
***************
*** 317,320 ****
  
  
-     private final PublicKeySource pksource;
  }
--- 316,318 ----