[Neuclear-develop] neuclear-id/src/java/org/neuclear/id/builders AuthenticationTicketBuilder.java,1.11,1.12 SignatureRequestBuilder.java,1.10,1.11

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

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

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

Index: AuthenticationTicketBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/builders/AuthenticationTicketBuilder.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** AuthenticationTicketBuilder.java	2 Mar 2004 18:59:10 -0000	1.11
--- AuthenticationTicketBuilder.java	14 Apr 2004 23:44:28 -0000	1.12
***************
*** 2,9 ****
  
  import org.dom4j.DocumentHelper;
- import org.neuclear.id.auth.AuthenticationTicket;
  import org.neuclear.commons.time.TimeTools;
  import org.neuclear.id.InvalidNamedObjectException;
! import org.neuclear.id.NSTools;
  
  import java.sql.Timestamp;
--- 2,8 ----
  
  import org.dom4j.DocumentHelper;
  import org.neuclear.commons.time.TimeTools;
  import org.neuclear.id.InvalidNamedObjectException;
! import org.neuclear.id.auth.AuthenticationTicket;
  
  import java.sql.Timestamp;
***************
*** 30,33 ****
--- 29,35 ----
  $Id$
  $Log$
+ Revision 1.12  2004/04/14 23:44:28  pelle
+ Got the cactus tests working and the sample web app
+ 
  Revision 1.11  2004/03/02 18:59:10  pelle
  Further cleanups in neuclear-id. Moved everything under id.
***************
*** 89,100 ****
   */
  public final class AuthenticationTicketBuilder extends Builder {
!     public AuthenticationTicketBuilder(final String user, final String requester, final String site) throws InvalidNamedObjectException {
!         this(user, requester, new Timestamp(new Date().getTime() + 1800000), site);
      }
  
!     public AuthenticationTicketBuilder(final String user, final String requester, final Date validto, final String site) throws InvalidNamedObjectException {
          super(DocumentHelper.createQName(AuthenticationTicket.TAG_NAME, AuthenticationTicket.NS_NSAUTH));
-         createAttribute("userid",user);
-         createAttribute("requester", NSTools.normalizeNameURI(requester));
          createAttribute("validto", TimeTools.formatTimeStamp(validto));
          createAttribute("sitehref", site);
--- 91,100 ----
   */
  public final class AuthenticationTicketBuilder extends Builder {
!     public AuthenticationTicketBuilder(final String site) throws InvalidNamedObjectException {
!         this(new Timestamp(new Date().getTime() + 1800000), site);
      }
  
!     public AuthenticationTicketBuilder(final Date validto, final String site) throws InvalidNamedObjectException {
          super(DocumentHelper.createQName(AuthenticationTicket.TAG_NAME, AuthenticationTicket.NS_NSAUTH));
          createAttribute("validto", TimeTools.formatTimeStamp(validto));
          createAttribute("sitehref", site);
***************
*** 102,105 ****
  
  
- 
  }
--- 102,104 ----

Index: SignatureRequestBuilder.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/builders/SignatureRequestBuilder.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** SignatureRequestBuilder.java	19 Jan 2004 23:49:44 -0000	1.10
--- SignatureRequestBuilder.java	14 Apr 2004 23:44:28 -0000	1.11
***************
*** 26,29 ****
--- 26,32 ----
  $Id$
  $Log$
+ Revision 1.11  2004/04/14 23:44:28  pelle
+ Got the cactus tests working and the sample web app
+ 
  Revision 1.10  2004/01/19 23:49:44  pelle
  Unit testing uncovered further issues with Base32
***************
*** 85,93 ****
   */
  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());
-         createAttribute("userid", userid);
          if (!Utility.isEmpty(description))
              addElement("Description").setText(description);
--- 88,95 ----
   */
  public final class SignatureRequestBuilder extends Builder {
!     public SignatureRequestBuilder(final Builder unsigned, final String description) throws NeuClearException {
          super(createNEUIDQName(SignatureRequest.SIGREQUEST_TAG));
          final Element unsignedElem = addElement("Unsigned");
          unsignedElem.add(unsigned.getElement());
          if (!Utility.isEmpty(description))
              addElement("Description").setText(description);