[Neuclear-develop] neuclear-id/src/java/org/neuclear/id/verifier VerifyingReader.java,1.4,1.5

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

Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/verifier
In directory sc8-pr-cvs1:/tmp/cvs-serv8101/src/java/org/neuclear/id/verifier

Modified Files:
	VerifyingReader.java 
Log Message:
Fixed SmtpSender it now sends the messages.
Refactored CommandLineSigner. Now it simply signs files read from command line. However new class IdentityCreator
is subclassed and creates new Identities. You can subclass CommandLineSigner to create your own variants.
Several problems with configuration. Trying to solve at the moment. Updated PicoContainer to beta-2

Index: VerifyingReader.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/verifier/VerifyingReader.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** VerifyingReader.java	21 Oct 2003 22:31:12 -0000	1.4
--- VerifyingReader.java	25 Oct 2003 00:39:54 -0000	1.5
***************
*** 4,14 ****
  import org.dom4j.Element;
  import org.dom4j.QName;
  import org.neuclear.id.*;
  import org.neuclear.id.resolver.NSResolver;
  import org.neuclear.time.TimeTools;
  import org.neudist.crypto.CryptoTools;
- import org.neuclear.commons.NeuClearException;
- import org.neudist.xml.XMLTools;
  import org.neudist.xml.XMLException;
  import org.neudist.xml.xmlsec.XMLSecTools;
  
--- 4,14 ----
  import org.dom4j.Element;
  import org.dom4j.QName;
+ import org.neuclear.commons.NeuClearException;
  import org.neuclear.id.*;
  import org.neuclear.id.resolver.NSResolver;
  import org.neuclear.time.TimeTools;
  import org.neudist.crypto.CryptoTools;
  import org.neudist.xml.XMLException;
+ import org.neudist.xml.XMLTools;
  import org.neudist.xml.xmlsec.XMLSecTools;
  
***************
*** 39,42 ****
--- 39,48 ----
  $Id$
  $Log$
+ Revision 1.5  2003/10/25 00:39:54  pelle
+ Fixed SmtpSender it now sends the messages.
+ Refactored CommandLineSigner. Now it simply signs files read from command line. However new class IdentityCreator
+ is subclassed and creates new Identities. You can subclass CommandLineSigner to create your own variants.
+ Several problems with configuration. Trying to solve at the moment. Updated PicoContainer to beta-2
+ 
  Revision 1.4  2003/10/21 22:31:12  pelle
  Renamed NeudistException to NeuClearException and moved it to org.neuclear.commons where it makes more sense.
***************
*** 65,69 ****
  
  /**
-  * 
   * User: pelleb
   * Date: Sep 23, 2003
--- 71,74 ----
***************
*** 78,82 ****
  
      public static VerifyingReader getInstance() {
!         return new VerifyingReader();
      }
  
--- 83,87 ----
  
      public static VerifyingReader getInstance() {
!         return instance;
      }
  
***************
*** 84,90 ****
       * Read Object from input stream.
       * Verify signature with parent Identity
!      * @param is
!      * @return
!      * @throws NeuClearException
       */
      public SignedNamedObject read(InputStream is) throws XMLException, NeuClearException {
--- 89,96 ----
       * Read Object from input stream.
       * Verify signature with parent Identity
!      * 
!      * @param is 
!      * @return 
!      * @throws NeuClearException 
       */
      public SignedNamedObject read(InputStream is) throws XMLException, NeuClearException {
***************
*** 115,119 ****
--- 121,130 ----
      }
  
+     public void registerReader(String name, NamedObjectReader reader) {
+         readers.put(name, reader);
+     }
+ 
      private Map readers;
      private NamedObjectReader defaultReader;
+     private static VerifyingReader instance = new VerifyingReader();
  }