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

[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-serv30148/src/java/org/neuclear/id/tools/commandline

Modified Files:
	CommandLineSigner.java IdentityCreator.java 
Log Message:
Identity is now fully html based as is the ServiceBuilder.
VerifyingReader correctly identifies html files and parses them as such.
Targets and Target now parse html link tags
AssetBuilder and ExchangeAgentBuilder have been updated to support it and provide html formatted contracts.
The Asset.Reader and ExchangeAgent.Reader still need to be updated.

Index: CommandLineSigner.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/tools/commandline/CommandLineSigner.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** CommandLineSigner.java	15 Apr 2004 16:10:24 -0000	1.14
--- CommandLineSigner.java	17 Apr 2004 19:28:22 -0000	1.15
***************
*** 1,4 ****
--- 1,11 ----
  /* $Id$
   * $Log$
+  * Revision 1.15  2004/04/17 19:28:22  pelle
+  * Identity is now fully html based as is the ServiceBuilder.
+  * VerifyingReader correctly identifies html files and parses them as such.
+  * Targets and Target now parse html link tags
+  * AssetBuilder and ExchangeAgentBuilder have been updated to support it and provide html formatted contracts.
+  * The Asset.Reader and ExchangeAgent.Reader still need to be updated.
+  *
   * Revision 1.14  2004/04/15 16:10:24  pelle
   * Got rid of unnecessary catch clause for InvalidPassphrase
***************
*** 277,281 ****
                      System.out.println("was signed at: " + TimeTools.formatTimeStamp(id.getTimeStamp()));
                      System.out.println("Is of type: " + id.getClass().getName());
-                     System.out.println("signer: " + id.getSigner());
                  } else {
                      System.out.println("Couldnt Resolve or Verify the object.");
--- 284,287 ----

Index: IdentityCreator.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/tools/commandline/IdentityCreator.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** IdentityCreator.java	1 Apr 2004 23:19:49 -0000	1.11
--- IdentityCreator.java	17 Apr 2004 19:28:22 -0000	1.12
***************
*** 1,4 ****
--- 1,11 ----
  /* $Id$
   * $Log$
+  * Revision 1.12  2004/04/17 19:28:22  pelle
+  * Identity is now fully html based as is the ServiceBuilder.
+  * VerifyingReader correctly identifies html files and parses them as such.
+  * Targets and Target now parse html link tags
+  * AssetBuilder and ExchangeAgentBuilder have been updated to support it and provide html formatted contracts.
+  * The Asset.Reader and ExchangeAgent.Reader still need to be updated.
+  *
   * Revision 1.11  2004/04/01 23:19:49  pelle
   * Split Identity into Signatory and Identity class.
***************
*** 262,289 ****
              return 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)) {
!                     System.out.println("OK, Bye");
!                     System.exit(0);
!                 }
!                 System.out.println("Generating Keys for " + alias + "... ");
!                 PublicKey pub = sig.generateKey(alias);
!                 System.out.println("DONE");
!                 System.out.println("STORING Keys");
!                 sig.save();
! 
              }
  
-             return new IdentityBuilder(defaultsigner, defaultlogger, defaultreceiver);
-         } catch (InvalidNamedObjectException e) {
-             System.err.println("The name: " + e.getName() + " is not valid. ");
-             System.exit(1);
          }
!         return null;
      }
  
--- 269,290 ----
              return super.build();
          }
!         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)) {
!                 System.out.println("OK, Bye");
!                 System.exit(0);
              }
+             System.out.println("Generating Keys for " + alias + "... ");
+             PublicKey pub = sig.generateKey(alias);
+             System.out.println("DONE");
+             System.out.println("STORING Keys");
+             sig.save();
  
          }
! 
!         return new IdentityBuilder(defaultsigner, defaultlogger, defaultreceiver);
      }