[Neuclear-develop] neuclear-id/src/java/org/neuclear/signers/commandline CommandLineSigner.java,1.5,1.6

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

Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/signers/commandline
In directory sc8-pr-cvs1:/tmp/cvs-serv19838/src/java/org/neuclear/signers/commandline

Modified Files:
	CommandLineSigner.java 
Log Message:
Changed XML Format. Now NameSpace has been modified to Identity also the 
xml namespace prefix nsdl has been changed to neuid.
The standard constants for using these have been moved into NSTools.
The NamedObjectBuilder can also now take an Element, such as an unsigned template.

Index: CommandLineSigner.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/signers/commandline/CommandLineSigner.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** CommandLineSigner.java	26 Sep 2003 00:22:07 -0000	1.5
--- CommandLineSigner.java	1 Oct 2003 19:08:31 -0000	1.6
***************
*** 1,4 ****
--- 1,10 ----
  /* $Id$
   * $Log$
+  * Revision 1.6  2003/10/01 19:08:31  pelle
+  * Changed XML Format. Now NameSpace has been modified to Identity also the
+  * xml namespace prefix nsdl has been changed to neuid.
+  * The standard constants for using these have been moved into NSTools.
+  * The NamedObjectBuilder can also now take an Element, such as an unsigned template.
+  *
   * Revision 1.5  2003/09/26 00:22:07  pelle
   * Cleanups and final changes to code for refactoring of the Verifier and Reader part.
***************
*** 121,127 ****
  import org.dom4j.Document;
  import org.neuclear.id.NSTools;
- import org.neuclear.id.Identity;
  import org.neuclear.id.SignedNamedObject;
! 
  import org.neuclear.id.resolver.NSResolver;
  import org.neuclear.senders.LogSender;
--- 127,133 ----
  import org.dom4j.Document;
  import org.neuclear.id.NSTools;
  import org.neuclear.id.SignedNamedObject;
! import org.neuclear.id.builders.IdentityBuilder;
! import org.neuclear.id.builders.NamedObjectBuilder;
  import org.neuclear.id.resolver.NSResolver;
  import org.neuclear.senders.LogSender;
***************
*** 147,151 ****
          CryptoTools.ensureProvider();
          String keystore = System.getProperty("user.home") + "/.keystore";
! /*
  
          try {
--- 153,157 ----
          CryptoTools.ensureProvider();
          String keystore = System.getProperty("user.home") + "/.keystore";
! 
  
          try {
***************
*** 195,199 ****
                  }
              }
!             SignedNamedObject subject;
              if (!doCreate) {
                  subject = loadNamedObject(sf);
--- 201,205 ----
                  }
              }
!             NamedObjectBuilder subject;
              if (!doCreate) {
                  subject = loadNamedObject(sf);
***************
*** 209,213 ****
                  } else
                      newkid = ks.getCertificate(alias).getPublicKey(); //Self Sign
!                 subject = new Identity(namespace, newkid, defaultstore, defaultsigner, defaultlogger, defaultreceiver);
  
              }
--- 215,219 ----
                  } else
                      newkid = ks.getCertificate(alias).getPublicKey(); //Self Sign
!                 subject = new IdentityBuilder(namespace, newkid, defaultstore, defaultsigner, defaultlogger, defaultreceiver);
  
              }
***************
*** 239,248 ****
              e.printStackTrace(System.err);
          }
- */
  
      }
- /*
  
!     private static SignedNamedObject loadNamedObject(String sf) throws FileNotFoundException, NeudistException {
          SignedNamedObject subject;
          InputStream source = System.in;
--- 245,252 ----
              e.printStackTrace(System.err);
          }
  
      }
  
!     private static NamedObjectBuilder loadNamedObject(String sf) throws FileNotFoundException, NeudistException {
          SignedNamedObject subject;
          InputStream source = System.in;
***************
*** 251,258 ****
          }
          Document doc = XMLTools.loadDocument(source);
!         subject = NamedObjectFactory.createNamedObject(doc);
!         return subject;
      }
- */
  
      private static Options createOptions() {
--- 255,260 ----
          }
          Document doc = XMLTools.loadDocument(source);
!         return new NamedObjectBuilder(doc);
      }
  
      private static Options createOptions() {