[Neuclear-develop] neuclear-id/src/java/org/neuclear/id/builders IdentityBuilder.java,1.18,1.19 NamedObjectBuilder.java,1.26,NONE

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

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

Modified Files:
	IdentityBuilder.java 
Removed Files:
	NamedObjectBuilder.java 
Log Message:
Many, many clean ups. I've readded Targets in a new method.
Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers

Index: IdentityBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/builders/IdentityBuilder.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** IdentityBuilder.java	13 Jan 2004 15:11:35 -0000	1.18
--- IdentityBuilder.java	18 Feb 2004 00:14:30 -0000	1.19
***************
*** 2,5 ****
--- 2,9 ----
   * $Id$
   * $Log$
+  * Revision 1.19  2004/02/18 00:14:30  pelle
+  * Many, many clean ups. I've readded Targets in a new method.
+  * Gotten rid of NamedObjectBuilder and revamped Identity and Resolvers
+  *
   * Revision 1.18  2004/01/13 15:11:35  pelle
   * Now builds.
***************
*** 227,255 ****
  import org.neuclear.commons.NeuClearException;
  import org.neuclear.commons.Utility;
- import org.neuclear.commons.crypto.signers.Signer;
- import org.neuclear.commons.crypto.CryptoException;
- import org.neuclear.id.NSTools;
- import org.neuclear.id.Identity;
  import org.neuclear.id.InvalidNamedObjectException;
  import org.neuclear.xml.xmlsec.XMLSecTools;
  import org.neuclear.xml.xmlsec.XMLSecurityException;
- import org.neuclear.xml.XMLException;
  
  import java.security.PublicKey;
- import java.security.cert.Certificate;
  
! public class IdentityBuilder extends NamedObjectBuilder {
      /**
       * It creates a Standard Identity document, but doesn't sign it.
       * 
-      * @param name       The Name of Identity
       * @param allow      PublicKey allowed to sign in here
-      * @param repository URL of Default Store for NameSpace. (Note. A NameSpace object is stored in the default repository of it's parent namespace)
       * @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 name, final PublicKey allow, final String repository, final String signer, final String logger, final String receiver) throws InvalidNamedObjectException {
!         this(createNEUIDQName(TAGNAME), name, allow, repository, signer, logger, receiver);
      }
  
--- 231,252 ----
  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);
      }
  
***************
*** 258,303 ****
       * 
       * @param tag        The Tag used by this sub class
-      * @param name       The Name of Identity
       * @param allow      PublicKey allowed to sign in here
-      * @param repository URL of Default Store for NameSpace. (Note. A NameSpace object is stored in the default repository of it's parent namespace)
       * @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 name, final PublicKey allow, final String repository, final String signer, final String logger, final String receiver) throws InvalidNamedObjectException {
!         super(name, tag);
  
          final Element root = getElement();
          addLineBreak();
-         // We have meaningful defaults for the following two
-         createNEUIDAttribute("repository", repository);
-         createNEUIDAttribute("logger", logger);
          if (!Utility.isEmpty(signer))
!             createNEUIDAttribute("signer", signer);
  
!         if (!Utility.isEmpty(receiver))
!             createNEUIDAttribute("receiver", receiver);
  
-         setPublicKey(allow);
      }
  
! 
!     public IdentityBuilder(final String name, final PublicKey allow, final String repository) throws XMLSecurityException, NeuClearException {
!         this(name, allow, repository, null, null, null);
      }
  
!     public IdentityBuilder(final String name, final PublicKey allow) throws XMLSecurityException, NeuClearException {
!         this(name, allow, null);
!     }
!     private void setPublicKey(final PublicKey allow) {
!         if (allow != null) {
!             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));
!         }
      }
  
--- 255,292 ----
       * 
       * @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);
  
          final Element root = getElement();
          addLineBreak();
          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))
!             addElement("Target",href).addAttribute("type",type);
      }
  
! 
! 
!     public IdentityBuilder(final PublicKey allow) throws XMLSecurityException, NeuClearException {
!         this( allow, null,null,null);
      }
  

--- NamedObjectBuilder.java DELETED ---