[Neuclear-develop] neuclear-id/src/java/org/neuclear/id/builders NamedObjectBuilder.java,1.9,1.10

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

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

Modified Files:
	NamedObjectBuilder.java 
Log Message:
Getting all the tests to work in id
Removing usage of BC in CryptoTools as it was causing issues.
First version of EntityLedger that will use OFB's EntityEngine. This will allow us to support a vast amount databases without
writing SQL. (Yipee)

Index: NamedObjectBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/builders/NamedObjectBuilder.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** NamedObjectBuilder.java	19 Nov 2003 23:33:58 -0000	1.9
--- NamedObjectBuilder.java	20 Nov 2003 23:42:24 -0000	1.10
***************
*** 2,5 ****
--- 2,11 ----
   * $Id$
   * $Log$
+  * Revision 1.10  2003/11/20 23:42:24  pelle
+  * Getting all the tests to work in id
+  * Removing usage of BC in CryptoTools as it was causing issues.
+  * First version of EntityLedger that will use OFB's EntityEngine. This will allow us to support a vast amount databases without
+  * writing SQL. (Yipee)
+  *
   * Revision 1.9  2003/11/19 23:33:58  pelle
   * Signers now can generatekeys via the generateKey() method.
***************
*** 166,170 ****
  import org.neuclear.commons.crypto.signers.Signer;
  import org.neuclear.commons.time.TimeTools;
! import org.neuclear.id.*;
  import org.neuclear.id.resolver.NSResolver;
  import org.neuclear.id.verifier.VerifyingReader;
--- 172,179 ----
  import org.neuclear.commons.crypto.signers.Signer;
  import org.neuclear.commons.time.TimeTools;
! import org.neuclear.id.Identity;
! import org.neuclear.id.NSTools;
! import org.neuclear.id.Named;
! import org.neuclear.id.SignedNamedObject;
  import org.neuclear.id.resolver.NSResolver;
  import org.neuclear.id.verifier.VerifyingReader;
***************
*** 174,178 ****
  import org.neuclear.xml.xmlsec.XMLSecurityException;
  
- import java.io.ByteArrayInputStream;
  import java.sql.Timestamp;
  import java.util.Iterator;
--- 183,186 ----
***************
*** 225,235 ****
      final public SignedNamedObject sign(Signer signer) throws NeuClearException, XMLException {
          sign(getParent().getName(), signer);
!         return verify();
!     }
! 
!     private final SignedNamedObject verify() throws NeuClearException, XMLException {
!         if (!isSigned())
!             throw new InvalidNamedObject("Invalid: " + this.getName());
!         return VerifyingReader.getInstance().read(new ByteArrayInputStream(canonicalize()));
      }
  
--- 233,237 ----
      final public SignedNamedObject sign(Signer signer) throws NeuClearException, XMLException {
          sign(getParent().getName(), signer);
!         return VerifyingReader.getInstance().read(getElement());
      }
  
***************
*** 240,248 ****
       */
      public String getName() {
!         try {
!             return NSTools.normalizeNameURI(getElement().attributeValue(getNameAttrQName()));
!         } catch (NeuClearException e) {
!             return "Unknown";
!         }
      }
  
--- 242,246 ----
       */
      public String getName() {
!         return getElement().attributeValue(getNameAttrQName());
      }