[Neuclear-develop] neuclear-id/src/java/org/neuclear/id/auth AuthenticationServlet.java,1.2,1.3 AuthenticationTicket.java,1.1,1.2

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

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

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

Index: AuthenticationServlet.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/auth/AuthenticationServlet.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AuthenticationServlet.java	22 Mar 2004 20:09:43 -0000	1.2
--- AuthenticationServlet.java	14 Apr 2004 23:44:28 -0000	1.3
***************
*** 28,31 ****
--- 28,34 ----
  $Id$
  $Log$
+ Revision 1.3  2004/04/14 23:44:28  pelle
+ Got the cactus tests working and the sample web app
+ 
  Revision 1.2  2004/03/22 20:09:43  pelle
  Added simple ledger for unit testing and in memory use
***************
*** 108,114 ****
  
      protected Builder createBuilder(final HttpServletRequest request) throws NeuClearException {
!         final String userns = request.getParameter("identity");
          request.getSession(true).setAttribute("auth", userns);
!         return new AuthenticationTicketBuilder(userns, getServiceid(), request.getRequestURI());
      }
  
--- 111,117 ----
  
      protected Builder createBuilder(final HttpServletRequest request) throws NeuClearException {
!         final String userns = request.getParameter("signer");
          request.getSession(true).setAttribute("auth", userns);
!         return new AuthenticationTicketBuilder(request.getRequestURI());
      }
  

Index: AuthenticationTicket.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/auth/AuthenticationTicket.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AuthenticationTicket.java	2 Mar 2004 18:59:10 -0000	1.1
--- AuthenticationTicket.java	14 Apr 2004 23:44:28 -0000	1.2
***************
*** 14,21 ****
  import org.dom4j.QName;
  import org.neuclear.commons.NeuClearException;
- import org.neuclear.commons.Utility;
  import org.neuclear.commons.time.TimeTools;
! import org.neuclear.id.*;
! import org.neuclear.xml.xmlsec.XMLSecurityException;
  
  import java.sql.Timestamp;
--- 14,22 ----
  import org.dom4j.QName;
  import org.neuclear.commons.NeuClearException;
  import org.neuclear.commons.time.TimeTools;
! import org.neuclear.id.InvalidNamedObjectException;
! import org.neuclear.id.NamedObjectReader;
! import org.neuclear.id.SignedNamedCore;
! import org.neuclear.id.SignedNamedObject;
  
  import java.sql.Timestamp;
***************
*** 35,50 ****
       * </auth:AuthenticationTicket>
       * </pre>
!      * 
       * @param core
!      * @param requester
!      * @param validto   
!      * @param siteurl   
       */
!     private AuthenticationTicket(final SignedNamedCore core, final String requester, final Timestamp validto, final String siteurl)  {
          super(core);
          this.validTo = validto.getTime();
          this.siteurl = siteurl;
-         this.requester = requester;
- 
      }
  
--- 36,48 ----
       * &lt;/auth:AuthenticationTicket&gt;
       * </pre>
!      *
       * @param core
!      * @param validto
!      * @param siteurl
       */
!     private AuthenticationTicket(final SignedNamedCore core, final Timestamp validto, final String siteurl) {
          super(core);
          this.validTo = validto.getTime();
          this.siteurl = siteurl;
      }
  
***************
*** 77,92 ****
           */
          public final SignedNamedObject read(final SignedNamedCore core, final Element elem) throws InvalidNamedObjectException {
!             final QName qelem=DocumentHelper.createQName(TAG_NAME,NS_NSAUTH);
!             InvalidNamedObjectException.assertElementQName(core,elem,qelem);
!             final QName qreq = DocumentHelper.createQName("requester", NS_NSAUTH);
!             final String requester = InvalidNamedObjectException.assertAttributeQName(core,elem,qreq);
              final QName qsite = DocumentHelper.createQName("sitehref", NS_NSAUTH);
!             final String sitehref = InvalidNamedObjectException.assertAttributeQName(core,elem,qsite);
              try {
                  final QName qtime = DocumentHelper.createQName("validto", NS_NSAUTH);
!                 final Timestamp validto = TimeTools.parseTimeStamp(InvalidNamedObjectException.assertAttributeQName(core,elem,qtime));
!                 return new AuthenticationTicket(core, requester, validto, sitehref);
              } catch (ParseException e) {
!                 throw new InvalidNamedObjectException(core.getName(),e.getLocalizedMessage());
              }
          }
--- 75,88 ----
           */
          public final SignedNamedObject read(final SignedNamedCore core, final Element elem) throws InvalidNamedObjectException {
!             final QName qelem = DocumentHelper.createQName(TAG_NAME, NS_NSAUTH);
!             InvalidNamedObjectException.assertElementQName(core, elem, qelem);
              final QName qsite = DocumentHelper.createQName("sitehref", NS_NSAUTH);
!             final String sitehref = InvalidNamedObjectException.assertAttributeQName(core, elem, qsite);
              try {
                  final QName qtime = DocumentHelper.createQName("validto", NS_NSAUTH);
!                 final Timestamp validto = TimeTools.parseTimeStamp(InvalidNamedObjectException.assertAttributeQName(core, elem, qtime));
!                 return new AuthenticationTicket(core, validto, sitehref);
              } catch (ParseException e) {
!                 throw new InvalidNamedObjectException(core.getName(), e.getLocalizedMessage());
              }
          }
***************
*** 94,98 ****
      }
  
-     private final String requester;
      private final String siteurl;
      private final long validTo;
--- 90,93 ----