[Neuclear-develop] neuclear-id/src/java/org/neuclear/id/builders IdentityBuilder.java,1.20,1.21

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

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

Modified Files:
	IdentityBuilder.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: IdentityBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/builders/IdentityBuilder.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** IdentityBuilder.java	22 Mar 2004 20:09:43 -0000	1.20
--- IdentityBuilder.java	1 Apr 2004 23:19:47 -0000	1.21
***************
*** 2,5 ****
--- 2,10 ----
   * $Id$
   * $Log$
+  * Revision 1.21  2004/04/01 23:19:47  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.20  2004/03/22 20:09:43  pelle
   * Added simple ledger for unit testing and in memory use
***************
*** 229,255 ****
  package org.neuclear.id.builders;
  
- import org.dom4j.DocumentHelper;
  import org.dom4j.Element;
  import org.dom4j.QName;
- import org.neuclear.commons.NeuClearException;
  import org.neuclear.commons.Utility;
  import org.neuclear.id.InvalidNamedObjectException;
- import org.neuclear.id.NSTools;
- import org.neuclear.xml.xmlsec.XMLSecTools;
- import org.neuclear.xml.xmlsec.XMLSecurityException;
- 
- import java.security.PublicKey;
  
  public class IdentityBuilder extends Builder {
      /**
       * It creates a Standard Identity document, but doesn't sign it.
       *
-      * @param allow    PublicKey allowed to sign in here
       * @param signer   URL of default interactive signing service for namespace. If null it doesnt allow interactive signing
       * @param receiver URL of default receiver for namespace
       */
  
!     public IdentityBuilder(final PublicKey allow, final String signer, final String logger, final String receiver) throws InvalidNamedObjectException {
!         this(createNEUIDQName(TAGNAME), allow, signer, logger, receiver);
      }
  
--- 234,262 ----
  package org.neuclear.id.builders;
  
  import org.dom4j.Element;
  import org.dom4j.QName;
  import org.neuclear.commons.Utility;
+ import org.neuclear.id.Identity;
  import org.neuclear.id.InvalidNamedObjectException;
  
  public class IdentityBuilder extends Builder {
+ 
+     public IdentityBuilder() throws InvalidNamedObjectException {
+         this(Identity.DEFAULT_SIGNER);
+     }
+ 
      /**
       * It creates a Standard Identity document, but doesn't sign it.
       *
       * @param signer   URL of default interactive signing service for namespace. If null it doesnt allow interactive signing
       * @param receiver URL of default receiver for namespace
       */
  
!     public IdentityBuilder(final String signer, final String logger, final String receiver) throws InvalidNamedObjectException {
!         this(createNEUIDQName(TAGNAME), signer, logger, receiver);
!     }
! 
!     public IdentityBuilder(final String signer) throws InvalidNamedObjectException {
!         this(createNEUIDQName(TAGNAME), signer);
      }
  
***************
*** 258,266 ****
       *
       * @param tag      The Tag used by this sub class
-      * @param allow    PublicKey allowed to sign in here
       * @param signer   URL of default interactive signing service for namespace. If null it doesnt allow interactive signing
       * @param receiver URL of default receiver for namespace
       */
!     protected IdentityBuilder(final QName tag, final PublicKey allow, final String signer, final String logger, final String receiver) throws InvalidNamedObjectException {
          super(tag);
  
--- 265,285 ----
       *
       * @param tag      The Tag used by this sub class
       * @param signer   URL of default interactive signing service for namespace. If null it doesnt allow interactive signing
       * @param receiver URL of default receiver for namespace
       */
!     protected IdentityBuilder(final QName tag, final String signer, final String logger, final String receiver) throws InvalidNamedObjectException {
!         this(tag, signer);
! 
!         addTarget(logger, "logger");
!         addTarget(receiver, "inbox");
!     }
! 
!     /**
!      * This constructor should be used by subclasses of Identity. It creates a Standard Identity document, but doesn't sign it.
!      *
!      * @param tag    The Tag used by this sub class
!      * @param signer URL of default interactive signing service for namespace. If null it doesnt allow interactive signing
!      */
!     protected IdentityBuilder(final QName tag, final String signer) throws InvalidNamedObjectException {
          super(tag);
  
***************
*** 269,286 ****
          if (!Utility.isEmpty(signer))
              addElement("Signer", signer);
-         addTarget(logger, "logger");
-         addTarget(receiver, "inbox");
- 
-         final QName allowName = DocumentHelper.createQName("Allow", NSTools.NS_NEUID);
-         Element pub = getElement().element(allowName);
-         if (pub == null)
-             pub = getElement().addElement(allowName);
-         else
-             pub.clearContent();
-         pub.addText("\n");
-         pub.add(XMLSecTools.createKeyInfo(allow));
- 
      }
  
      private void addTarget(final String href, final String type) {
          if (!Utility.isEmpty(href))
--- 288,294 ----
          if (!Utility.isEmpty(signer))
              addElement("Signer", signer);
      }
  
+ 
      private void addTarget(final String href, final String type) {
          if (!Utility.isEmpty(href))
***************
*** 289,297 ****
  
  
-     public IdentityBuilder(final PublicKey allow) throws XMLSecurityException, NeuClearException {
-         this(allow, null, null, null);
-     }
- 
- 
      private static final String TAGNAME = "Identity";
  
--- 297,300 ----