[Neuclear-develop] neuclear-id/src/java/org/neuclear/id/jce NeuClearCertificateFactory.java,1.9,1.10

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

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

Modified Files:
	NeuClearCertificateFactory.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: NeuClearCertificateFactory.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/jce/NeuClearCertificateFactory.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** NeuClearCertificateFactory.java	19 Dec 2003 18:03:34 -0000	1.9
--- NeuClearCertificateFactory.java	1 Apr 2004 23:19:48 -0000	1.10
***************
*** 1,17 ****
  package org.neuclear.id.jce;
  
  import org.neuclear.id.Identity;
- import org.neuclear.id.NSTools;
- import org.neuclear.id.resolver.NSResolver;
  import org.neuclear.id.verifier.VerifyingReader;
- import org.neuclear.commons.NeuClearException;
- import org.neuclear.xml.XMLException;
  
  import java.security.cert.*;
! import java.io.*;
  import java.util.Collection;
- import java.util.List;
  import java.util.LinkedList;
! import java.util.ArrayList;
  
  /*
--- 1,17 ----
  package org.neuclear.id.jce;
  
+ import org.neuclear.commons.NeuClearException;
  import org.neuclear.id.Identity;
  import org.neuclear.id.verifier.VerifyingReader;
  
+ import java.io.BufferedReader;
+ import java.io.IOException;
+ import java.io.InputStream;
+ import java.io.InputStreamReader;
  import java.security.cert.*;
! import java.util.ArrayList;
  import java.util.Collection;
  import java.util.LinkedList;
! import java.util.List;
  
  /*
***************
*** 35,38 ****
--- 35,43 ----
  $Id$
  $Log$
+ Revision 1.10  2004/04/01 23:19:48  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.9  2003/12/19 18:03:34  pelle
  Revamped a lot of exception handling throughout the framework, it has been simplified in most places:
***************
*** 83,91 ****
   * NeuClear to be plugged in relatively easily for other types of applications such as
   * Code signing.
!  * <p>
   * Currently the provider provides a CertificateFactory with the name NeuClear. This
   * can be instantiated using:<br>
   * <tt> CertificateFactory certfact=CertificateFactory.getInstance("NeuClear");</tt><p>
!  *
   * User: pelleb
   * Date: Sep 30, 2003
--- 88,96 ----
   * NeuClear to be plugged in relatively easily for other types of applications such as
   * Code signing.
!  * <p/>
   * Currently the provider provides a CertificateFactory with the name NeuClear. This
   * can be instantiated using:<br>
   * <tt> CertificateFactory certfact=CertificateFactory.getInstance("NeuClear");</tt><p>
!  * <p/>
   * User: pelleb
   * Date: Sep 30, 2003
***************
*** 97,110 ****
              //Identity id=(Identity) VerifyingReader.getInstance().read(inputStream);
              final BufferedReader d = new BufferedReader(new InputStreamReader(inputStream));
!             return ((Identity)VerifyingReader.getInstance().read(inputStream)).getCertificate();
          } catch (NeuClearException e) {
!             throw new CertificateException("NeuClear: Problem reading Certificate:"+e.getMessage());
          }
      }
  
      final public Collection engineGenerateCertificates(final InputStream inputStream) throws CertificateException {
!         final List list=new LinkedList();
          try {
!             while(inputStream.available()>0) {
                  list.add(engineGenerateCertificate(inputStream));
              }
--- 102,115 ----
              //Identity id=(Identity) VerifyingReader.getInstance().read(inputStream);
              final BufferedReader d = new BufferedReader(new InputStreamReader(inputStream));
!             return ((Identity) VerifyingReader.getInstance().read(inputStream)).getSignatory().getCertificate();
          } catch (NeuClearException e) {
!             throw new CertificateException("NeuClear: Problem reading Certificate:" + e.getMessage());
          }
      }
  
      final public Collection engineGenerateCertificates(final InputStream inputStream) throws CertificateException {
!         final List list = new LinkedList();
          try {
!             while (inputStream.available() > 0) {
                  list.add(engineGenerateCertificate(inputStream));
              }