[Neuclear-develop] neuclear-id/src/java/org/neuclear/id/builders Builder.java,1.3,1.4 NamedObjectBuilder.java,1.25,1.26 SignatureRequestBuilder.java,1.9,1.10 SignedMessageBuilder.java,1.2,1.3

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

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

Modified Files:
	Builder.java NamedObjectBuilder.java 
	SignatureRequestBuilder.java SignedMessageBuilder.java 
Log Message:
Unit testing uncovered further issues with Base32
NSTools is now uptodate as are many other classes. All transactional builders habe been updated.
Well on the way towards full "green" on Junit.

Index: Builder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/builders/Builder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Builder.java	19 Jan 2004 17:55:00 -0000	1.3
--- Builder.java	19 Jan 2004 23:49:44 -0000	1.4
***************
*** 1,16 ****
  package org.neuclear.id.builders;
  
! import org.neuclear.xml.xmlsec.SignedElement;
! import org.neuclear.xml.xmlsec.XMLSecurityException;
! import org.neuclear.id.SignedNamedObject;
  import org.neuclear.id.InvalidNamedObjectException;
- import org.neuclear.id.NameResolutionException;
  import org.neuclear.id.NSTools;
  import org.neuclear.id.verifier.VerifyingReader;
! import org.neuclear.commons.time.TimeTools;
! import org.neuclear.commons.crypto.signers.Signer;
! import org.neuclear.commons.crypto.signers.NonExistingSignerException;
! import org.neuclear.commons.crypto.passphraseagents.UserCancellationException;
! import org.dom4j.*;
  
  /**
--- 1,16 ----
  package org.neuclear.id.builders;
  
! import org.dom4j.*;
! import org.neuclear.commons.crypto.passphraseagents.UserCancellationException;
! import org.neuclear.commons.crypto.signers.NonExistingSignerException;
! import org.neuclear.commons.crypto.signers.Signer;
! import org.neuclear.commons.time.TimeTools;
  import org.neuclear.id.InvalidNamedObjectException;
  import org.neuclear.id.NSTools;
+ import org.neuclear.id.NameResolutionException;
+ import org.neuclear.id.SignedNamedObject;
  import org.neuclear.id.verifier.VerifyingReader;
! import org.neuclear.xml.xmlsec.SignedElement;
! import org.neuclear.xml.xmlsec.XMLSecurityException;
  
  /**
***************
*** 36,44 ****
          createDocument();    }
  
-     public Builder(final String name, final String prefix, final String nsURI) {
-         super(name, prefix, nsURI);
-         createDocument();
-     }
- 
      final public SignedNamedObject convert() throws InvalidNamedObjectException, NameResolutionException{
  
--- 36,39 ----
***************
*** 80,82 ****
--- 75,96 ----
          return convert();
      }
+ 
+     /**
+      * Helper method to create and add an attribute to this element within the NEUID namespace
+      *
+      * @param name
+      */
+     protected final void createNEUIDAttribute(String name, String value) {
+         getElement().addAttribute(createNEUIDQName(name), value);
+     }
+ 
+     /**
+      * Helper method to create a QName within the NEUID namespace
+      *
+      * @param name
+      * @return
+      */
+     protected static QName createNEUIDQName(String name) {
+         return DocumentHelper.createQName(name, NSTools.NS_NEUID);
+     }
  }

Index: NamedObjectBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/builders/NamedObjectBuilder.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** NamedObjectBuilder.java	19 Jan 2004 17:55:00 -0000	1.25
--- NamedObjectBuilder.java	19 Jan 2004 23:49:44 -0000	1.26
***************
*** 2,5 ****
--- 2,10 ----
   * $Id$
   * $Log$
+  * Revision 1.26  2004/01/19 23:49:44  pelle
+  * Unit testing uncovered further issues with Base32
+  * NSTools is now uptodate as are many other classes. All transactional builders habe been updated.
+  * Well on the way towards full "green" on Junit.
+  *
   * Revision 1.25  2004/01/19 17:55:00  pelle
   * Updated the NeuClear ID naming scheme to support various levels of semantics
***************
*** 236,240 ****
  package org.neuclear.id.builders;
  
! import org.dom4j.*;
  import org.neuclear.commons.crypto.passphraseagents.UserCancellationException;
  import org.neuclear.commons.crypto.signers.NonExistingSignerException;
--- 241,247 ----
  package org.neuclear.id.builders;
  
! import org.dom4j.Document;
! import org.dom4j.Element;
! import org.dom4j.QName;
  import org.neuclear.commons.crypto.passphraseagents.UserCancellationException;
  import org.neuclear.commons.crypto.signers.NonExistingSignerException;
***************
*** 248,271 ****
   */
  public class NamedObjectBuilder extends Builder implements  Cloneable {
- /*
-     protected NamedObjectBuilder(final String name, final String tagName, final String prefix, final String nsURI) throws InvalidNamedObjectException {
-         super(tagName, prefix, nsURI);
-         createDocument();
-         setName(name);
-     }
- */
- 
- /*
-     protected NamedObjectBuilder(final String name, final String tagName, final Namespace ns) throws InvalidNamedObjectException {
-         super(tagName, ns);
-         createDocument();
-         setName(name);
-     }
- */
- 
-     protected NamedObjectBuilder(final String name, final String tagName) throws InvalidNamedObjectException {
-         super(tagName, NSTools.NS_NEUID);
-         setName(name);
-     }
  
      protected NamedObjectBuilder(final String name, final QName qname) throws InvalidNamedObjectException {
--- 255,258 ----
***************
*** 310,321 ****
      }
  
-     /**
-      * The Name of an object within it's parent NameSpace
-      * 
-      * @return Parent Name
-      */
-     public final String getLocalName() throws InvalidNamedObjectException {
-         return NSTools.getLocalName(getName());
-     }
  
      private void setName(final String name) throws InvalidNamedObjectException {
--- 297,300 ----
***************
*** 328,350 ****
      }
  
-     /**
-      * Helper method to create and add an attribute to this element within the NEUID namespace
-      * 
-      * @param name 
-      */
-     protected final void createNEUIDAttribute(String name, String value) {
-         getElement().addAttribute(createNEUIDQName(name), value);
-     }
- 
-     /**
-      * Helper method to create a QName within the NEUID namespace
-      * 
-      * @param name 
-      * @return 
-      */
-     protected static QName createNEUIDQName(String name) {
-         return DocumentHelper.createQName(name, NSTools.NS_NEUID);
-     }
- 
  
  
--- 307,310 ----

Index: SignatureRequestBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/builders/SignatureRequestBuilder.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** SignatureRequestBuilder.java	13 Jan 2004 15:11:35 -0000	1.9
--- SignatureRequestBuilder.java	19 Jan 2004 23:49:44 -0000	1.10
***************
*** 4,8 ****
  import org.neuclear.commons.NeuClearException;
  import org.neuclear.commons.Utility;
- import org.neuclear.id.NSTools;
  import org.neuclear.id.SignatureRequest;
  
--- 4,7 ----
***************
*** 27,30 ****
--- 26,34 ----
  $Id$
  $Log$
+ Revision 1.10  2004/01/19 23:49:44  pelle
+ Unit testing uncovered further issues with Base32
+ NSTools is now uptodate as are many other classes. All transactional builders habe been updated.
+ Well on the way towards full "green" on Junit.
+ 
  Revision 1.9  2004/01/13 15:11:35  pelle
  Now builds.
***************
*** 80,86 ****
   * Time: 12:45:14 PM
   */
! public final class SignatureRequestBuilder extends NamedObjectBuilder {
!     public SignatureRequestBuilder(final String requestor, final String userid, final Builder unsigned, final String description) throws NeuClearException {
!         super(NSTools.createUniqueTransactionID(requestor, userid), SignatureRequest.SIGREQUEST_TAG);
          final Element unsignedElem = addElement("Unsigned");
          unsignedElem.add(unsigned.getElement());
--- 84,90 ----
   * Time: 12:45:14 PM
   */
! public final class SignatureRequestBuilder extends Builder {
!     public SignatureRequestBuilder(final String userid, final Builder unsigned, final String description) throws NeuClearException {
!         super(createNEUIDQName(SignatureRequest.SIGREQUEST_TAG));
          final Element unsignedElem = addElement("Unsigned");
          unsignedElem.add(unsigned.getElement());

Index: SignedMessageBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/builders/SignedMessageBuilder.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SignedMessageBuilder.java	13 Jan 2004 15:11:35 -0000	1.2
--- SignedMessageBuilder.java	19 Jan 2004 23:49:44 -0000	1.3
***************
*** 1,9 ****
  package org.neuclear.id.builders;
  
- import org.dom4j.Namespace;
  import org.neuclear.commons.NeuClearException;
- import org.neuclear.id.NSTools;
  import org.neuclear.id.SignedMessage;
- import org.neuclear.id.Identity;
  
  /**
--- 1,6 ----
***************
*** 14,23 ****
   * To change this template use Options | File Templates.
   */
! public class SignedMessageBuilder extends NamedObjectBuilder{
!     public SignedMessageBuilder(Identity signer, String recipient, String subject, String message) throws NeuClearException {
!         super(NSTools.createUniqueTransactionID(signer.getName(), recipient), SignedMessage.TAG_NAME);
!         createAttribute("recipient",recipient);
!         addElement("subject").setText(subject);
!         addElement("message").setText(message);
      }
  }
--- 11,20 ----
   * To change this template use Options | File Templates.
   */
! public class SignedMessageBuilder extends Builder{
!     public SignedMessageBuilder(String recipient, String subject, String message) throws NeuClearException {
!         super(createNEUIDQName(SignedMessage.TAG_NAME));
!         addElement("Recipient").setText(recipient);
!         addElement("Subject").setText(subject);
!         addElement("Message").setText(message);
      }
  }