[Neuclear-develop] neuclear-id/src/java/org/neuclear/id/builders NamedObjectBuilder.java,1.8,1.9 TargetReference.java,1.4,1.5

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

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

Modified Files:
	NamedObjectBuilder.java TargetReference.java 
Log Message:
Signers now can generatekeys via the generateKey() method.
Refactored the relationship between SignedNamedObject and NamedObjectBuilder a bit.
SignedNamedObject now contains the full xml which is returned with getEncoded()
This means that it is now possible to further send on or process a SignedNamedObject, leaving
NamedObjectBuilder for its original purposes of purely generating new Contracts.
NamedObjectBuilder.sign() now returns a SignedNamedObject which is the prefered way of processing it.
Updated all major interfaces that used the old model to use the new model.

Index: NamedObjectBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/builders/NamedObjectBuilder.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** NamedObjectBuilder.java	15 Nov 2003 01:58:16 -0000	1.8
--- NamedObjectBuilder.java	19 Nov 2003 23:33:58 -0000	1.9
***************
*** 2,5 ****
--- 2,14 ----
   * $Id$
   * $Log$
+  * Revision 1.9  2003/11/19 23:33:58  pelle
+  * Signers now can generatekeys via the generateKey() method.
+  * Refactored the relationship between SignedNamedObject and NamedObjectBuilder a bit.
+  * SignedNamedObject now contains the full xml which is returned with getEncoded()
+  * This means that it is now possible to further send on or process a SignedNamedObject, leaving
+  * NamedObjectBuilder for its original purposes of purely generating new Contracts.
+  * NamedObjectBuilder.sign() now returns a SignedNamedObject which is the prefered way of processing it.
+  * Updated all major interfaces that used the old model to use the new model.
+  *
   * Revision 1.8  2003/11/15 01:58:16  pelle
   * More work all around on web applications.
***************
*** 160,168 ****
  import org.neuclear.id.resolver.NSResolver;
  import org.neuclear.id.verifier.VerifyingReader;
- import org.neuclear.senders.Sender;
  import org.neuclear.xml.AbstractElementProxy;
  import org.neuclear.xml.XMLException;
  import org.neuclear.xml.xmlsec.SignedElement;
- import org.neuclear.xml.xmlsec.XMLSecTools;
  import org.neuclear.xml.xmlsec.XMLSecurityException;
  
--- 169,175 ----
***************
*** 216,224 ****
      }
  
!     final public void sign(Signer signer) throws NeuClearException, XMLSecurityException {
          sign(getParent().getName(), signer);
      }
  
!     public final SignedNamedObject verify() throws NeuClearException, XMLException {
          if (!isSigned())
              throw new InvalidNamedObject("Invalid: " + this.getName());
--- 223,232 ----
      }
  
!     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());
***************
*** 293,308 ****
      }
  
-     /**
-      * This is called after signing to handle any post signing tasks such as logging
-      * 
-      * @throws XMLSecurityException 
-      */
-     protected void postSign() throws XMLSecurityException {
-         try {
-             log();
-         } catch (NeuClearException e) {
-             XMLSecTools.rethrowException(e);
-         }
-     }
  
      /**
--- 301,304 ----
***************
*** 350,354 ****
              while (iter.hasNext()) {
                  TargetReference tg = ((TargetReference) iter.next());
-                 tg.send();
                  System.out.println("NEUDIST: Sent to " + tg.getHref());
              }
--- 346,349 ----
***************
*** 373,381 ****
      }
  
-     public final void log() throws NeuClearException {
-         Identity ns = getParent();
-         if (ns != null && ns.getLogger() != null)
-             Sender.quickSend(ns.getLogger(), this);
-     }
  
      public Identity getParent() throws NeuClearException {
--- 368,371 ----

Index: TargetReference.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/builders/TargetReference.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TargetReference.java	11 Nov 2003 21:18:42 -0000	1.4
--- TargetReference.java	19 Nov 2003 23:33:59 -0000	1.5
***************
*** 2,5 ****
--- 2,14 ----
   * $Id$
   * $Log$
+  * Revision 1.5  2003/11/19 23:33:59  pelle
+  * Signers now can generatekeys via the generateKey() method.
+  * Refactored the relationship between SignedNamedObject and NamedObjectBuilder a bit.
+  * SignedNamedObject now contains the full xml which is returned with getEncoded()
+  * This means that it is now possible to further send on or process a SignedNamedObject, leaving
+  * NamedObjectBuilder for its original purposes of purely generating new Contracts.
+  * NamedObjectBuilder.sign() now returns a SignedNamedObject which is the prefered way of processing it.
+  * Updated all major interfaces that used the old model to use the new model.
+  *
   * Revision 1.4  2003/11/11 21:18:42  pelle
   * Further vital reshuffling.
***************
*** 58,65 ****
  import org.dom4j.Element;
  import org.dom4j.Namespace;
- import org.neuclear.id.NSTools;
- import org.neuclear.senders.Sender;
  import org.neuclear.commons.NeuClearException;
  import org.neuclear.commons.Utility;
  import org.neuclear.xml.AbstractElementProxy;
  
--- 67,73 ----
  import org.dom4j.Element;
  import org.dom4j.Namespace;
  import org.neuclear.commons.NeuClearException;
  import org.neuclear.commons.Utility;
+ import org.neuclear.id.NSTools;
  import org.neuclear.xml.AbstractElementProxy;
  
***************
*** 99,105 ****
      }
  
-     public void send() throws NeuClearException {
-         Sender.quickSend(getHref(), owner);
-     }
  
      private NamedObjectBuilder owner;
--- 107,110 ----