[Neuclear-develop] neuclear-id/src/java/org/neuclear/id/builders IdentityBuilder.java,1.12,1.13 NamedObjectBuilder.java,1.17,1.18 SignatureRequestBuilder.java,1.6,1.7 TargetReference.java,1.7,NONE

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

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

Modified Files:
	IdentityBuilder.java NamedObjectBuilder.java 
	SignatureRequestBuilder.java 
Removed Files:
	TargetReference.java 
Log Message:
Trying to test the ReceiverServlet with cactus. Still no luck. Need to return a ElementProxy of some sort.
Cleaned up some missing fluff in the ElementProxy interface. getTagName(), getQName() and getNameSpace() have been killed.

Index: IdentityBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/builders/IdentityBuilder.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** IdentityBuilder.java	11 Dec 2003 16:29:26 -0000	1.12
--- IdentityBuilder.java	11 Dec 2003 23:57:29 -0000	1.13
***************
*** 2,5 ****
--- 2,9 ----
   * $Id$
   * $Log$
+  * Revision 1.13  2003/12/11 23:57:29  pelle
+  * Trying to test the ReceiverServlet with cactus. Still no luck. Need to return a ElementProxy of some sort.
+  * Cleaned up some missing fluff in the ElementProxy interface. getTagName(), getQName() and getNameSpace() have been killed.
+  *
   * Revision 1.12  2003/12/11 16:29:26  pelle
   * Updated various builders to use the new helper methods in AbstractElementProxy hopefully making them more readable.
***************
*** 209,213 ****
  
      public IdentityBuilder(final String name, final PublicKey allow, final String repository, final String signer, final String logger, final String receiver) throws NeuClearException {
!         this(DocumentHelper.createQName("Identity", NSTools.NS_NEUID), name, allow, repository, signer, logger, receiver);
  
      }
--- 213,217 ----
  
      public IdentityBuilder(final String name, final PublicKey allow, final String repository, final String signer, final String logger, final String receiver) throws NeuClearException {
!         this(createNEUIDQName(TAGNAME), name, allow, repository, signer, logger, receiver);
  
      }
***************
*** 232,239 ****
          createNEUIDAttribute("logger", receiver);
          if (!Utility.isEmpty(signer))
!             createNEUIDAttribute("signer",signer);
  
          if (!Utility.isEmpty(receiver))
!             createNEUIDAttribute("receiver",receiver);
  
          if (allow != null) {
--- 236,243 ----
          createNEUIDAttribute("logger", receiver);
          if (!Utility.isEmpty(signer))
!             createNEUIDAttribute("signer", signer);
  
          if (!Utility.isEmpty(receiver))
!             createNEUIDAttribute("receiver", receiver);
  
          if (allow != null) {
***************
*** 254,260 ****
  
  
!     public final String getTagName() {
!         return "Identity";
!     }
  
  
--- 258,262 ----
  
  
!     private static final String TAGNAME = "Identity";
  
  

Index: NamedObjectBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/builders/NamedObjectBuilder.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** NamedObjectBuilder.java	11 Dec 2003 16:29:26 -0000	1.17
--- NamedObjectBuilder.java	11 Dec 2003 23:57:29 -0000	1.18
***************
*** 2,5 ****
--- 2,9 ----
   * $Id$
   * $Log$
+  * Revision 1.18  2003/12/11 23:57:29  pelle
+  * Trying to test the ReceiverServlet with cactus. Still no luck. Need to return a ElementProxy of some sort.
+  * Cleaned up some missing fluff in the ElementProxy interface. getTagName(), getQName() and getNameSpace() have been killed.
+  *
   * Revision 1.17  2003/12/11 16:29:26  pelle
   * Updated various builders to use the new helper methods in AbstractElementProxy hopefully making them more readable.
***************
*** 209,213 ****
  import org.neuclear.id.resolver.NSResolver;
  import org.neuclear.id.verifier.VerifyingReader;
- import org.neuclear.xml.AbstractElementProxy;
  import org.neuclear.xml.XMLException;
  import org.neuclear.xml.xmlsec.SignedElement;
--- 213,216 ----
***************
*** 254,262 ****
      }
  
-     public String getTagName() {
-         if (getElement() == null)
-             return "Invalid";
-         return getElement().getName();
-     }
  
      final public SignedNamedObject sign(final Signer signer) throws NeuClearException, XMLException {
--- 257,260 ----
***************
*** 299,311 ****
      /**
       * 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) {
--- 297,312 ----
      /**
       * 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) {
***************
*** 325,335 ****
      public final String getURI() throws XMLSecurityException {
          return getName();
-     }
- 
-     /**
-      * @return the XML NameSpace object
-      */
-     public final Namespace getNS() {
-         return NSTools.NS_NEUID;
      }
  
--- 326,329 ----

Index: SignatureRequestBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/builders/SignatureRequestBuilder.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SignatureRequestBuilder.java	11 Dec 2003 16:29:26 -0000	1.6
--- SignatureRequestBuilder.java	11 Dec 2003 23:57:29 -0000	1.7
***************
*** 1,5 ****
  package org.neuclear.id.builders;
  
- import org.dom4j.DocumentHelper;
  import org.dom4j.Element;
  import org.neuclear.commons.NeuClearException;
--- 1,4 ----
***************
*** 28,31 ****
--- 27,34 ----
  $Id$
  $Log$
+ Revision 1.7  2003/12/11 23:57:29  pelle
+ Trying to test the ReceiverServlet with cactus. Still no luck. Need to return a ElementProxy of some sort.
+ Cleaned up some missing fluff in the ElementProxy interface. getTagName(), getQName() and getNameSpace() have been killed.
+ 
  Revision 1.6  2003/12/11 16:29:26  pelle
  Updated various builders to use the new helper methods in AbstractElementProxy hopefully making them more readable.
***************
*** 73,84 ****
          final Element unsignedElem = addElement("Unsigned");
          unsignedElem.add(unsigned.getElement());
!         createAttribute("userid",  userid);
          if (!Utility.isEmpty(description))
              addElement("Description").setText(description);
  
-     }
- 
-     public final String getTagName() {
-         return SignatureRequest.SIGREQUEST_TAG;
      }
  
--- 76,83 ----
          final Element unsignedElem = addElement("Unsigned");
          unsignedElem.add(unsigned.getElement());
!         createAttribute("userid", userid);
          if (!Utility.isEmpty(description))
              addElement("Description").setText(description);
  
      }
  

--- TargetReference.java DELETED ---