[Neuclear-develop] neuclear-id/src/java/org/neuclear/id SignatureRequest.java,1.15,1.16

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

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

Modified Files:
	SignatureRequest.java 
Log Message:
Got the cactus tests working and the sample web app

Index: SignatureRequest.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/SignatureRequest.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** SignatureRequest.java	22 Mar 2004 20:09:49 -0000	1.15
--- SignatureRequest.java	14 Apr 2004 23:44:45 -0000	1.16
***************
*** 27,30 ****
--- 27,33 ----
  $Id$
  $Log$
+ Revision 1.16  2004/04/14 23:44:45  pelle
+ Got the cactus tests working and the sample web app
+ 
  Revision 1.15  2004/03/22 20:09:49  pelle
  Added simple ledger for unit testing and in memory use
***************
*** 120,134 ****
   */
  public final class SignatureRequest extends SignedNamedObject {
!     private SignatureRequest(final SignedNamedCore core, final String userid, final Builder unsigned, final String description) {
          super(core);
-         this.userid = userid;
          this.unsigned = unsigned;
          this.description = description;
      }
  
-     public final String getUserid() {
-         return userid;
-     }
- 
      public final Builder getUnsigned() {
          return (Builder) unsigned.clone();
--- 123,132 ----
   */
  public final class SignatureRequest extends SignedNamedObject {
!     private SignatureRequest(final SignedNamedCore core, final Builder unsigned, final String description) {
          super(core);
          this.unsigned = unsigned;
          this.description = description;
      }
  
      public final Builder getUnsigned() {
          return (Builder) unsigned.clone();
***************
*** 149,153 ****
              InvalidNamedObjectException.assertElementQName(core, elem, createNEUIDQName(SIGREQUEST_TAG));
              final Element request = InvalidNamedObjectException.assertContainsElementQName(core, elem, createNEUIDQName("Unsigned"));
-             final String userid = InvalidNamedObjectException.assertAttributeQName(core, elem, createNEUIDQName("userid"));
              final Element uelem = ((Element) request.elements().get(0)).createCopy();
              final Document doc = DocumentHelper.createDocument(uelem);
--- 147,150 ----
***************
*** 159,163 ****
                      description = descrelem.getText();
  
!                 return new SignatureRequest(core, userid, unsigned, description);
              } catch (XMLSecurityException e) {
                  throw new InvalidNamedObjectException(core.getName(), e);
--- 156,160 ----
                      description = descrelem.getText();
  
!                 return new SignatureRequest(core, unsigned, description);
              } catch (XMLSecurityException e) {
                  throw new InvalidNamedObjectException(core.getName(), e);
***************
*** 168,172 ****
      }
  
-     private final String userid;
      private final Builder unsigned;
      private final String description;
--- 165,168 ----