[Neuclear-develop] neuclear-id/src/java/org/neuclear/id/signers SignatureRequestServlet.java,1.1,1.2

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

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

Modified Files:
	SignatureRequestServlet.java 
Log Message:
Split Identity into Signatory and Identity class.
Identity remains a signed named object and will in the future just be used for self declared information.
Signatory now contains the PublicKey etc and is NOT a signed object.

Index: SignatureRequestServlet.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/signers/SignatureRequestServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SignatureRequestServlet.java	2 Mar 2004 18:59:10 -0000	1.1
--- SignatureRequestServlet.java	1 Apr 2004 23:19:48 -0000	1.2
***************
*** 9,13 ****
  import org.neuclear.id.builders.Builder;
  import org.neuclear.id.builders.SignatureRequestBuilder;
! import org.neuclear.id.resolver.NSResolver;
  import org.neuclear.xml.XMLException;
  import org.neuclear.xml.xmlsec.XMLSecTools;
--- 9,13 ----
  import org.neuclear.id.builders.Builder;
  import org.neuclear.id.builders.SignatureRequestBuilder;
! import org.neuclear.id.resolver.Resolver;
  import org.neuclear.xml.XMLException;
  import org.neuclear.xml.xmlsec.XMLSecTools;
***************
*** 44,47 ****
--- 44,52 ----
  $Id$
  $Log$
+ Revision 1.2  2004/04/01 23:19:48  pelle
+ Split Identity into Signatory and Identity class.
+ Identity remains a signed named object and will in the future just be used for self declared information.
+ Signatory now contains the PublicKey etc and is NOT a signed object.
+ 
  Revision 1.1  2004/03/02 18:59:10  pelle
  Further cleanups in neuclear-id. Moved everything under id.
***************
*** 79,84 ****
      public final void init(final ServletConfig servletConfig) throws ServletException {
          super.init(servletConfig);
!         serviceid = ServletTools.getInitParam("serviceid",servletConfig);
!         title = ServletTools.getInitParam("title",servletConfig);
  
          try {
--- 84,89 ----
      public final void init(final ServletConfig servletConfig) throws ServletException {
          super.init(servletConfig);
!         serviceid = ServletTools.getInitParam("serviceid", servletConfig);
!         title = ServletTools.getInitParam("title", servletConfig);
  
          try {
***************
*** 94,102 ****
      }
  
!     protected final  String getServiceid() {
          return serviceid;
      }
  
!     protected final  String getTitle() {
          return title;
      }
--- 99,107 ----
      }
  
!     protected final String getServiceid() {
          return serviceid;
      }
  
!     protected final String getTitle() {
          return title;
      }
***************
*** 161,170 ****
  
      protected Identity getUserNS(final HttpServletRequest request) throws NeuClearException {
!         if (request.getUserPrincipal()!=null)
!             return (Identity)request.getUserPrincipal();
          final String username = request.getParameter("identity");
          if (Utility.isEmpty(username))
              throw new NeuClearException("No Identity Provided");
!         return NSResolver.resolveIdentity(username);
      }
  
--- 166,175 ----
  
      protected Identity getUserNS(final HttpServletRequest request) throws NeuClearException {
!         if (request.getUserPrincipal() != null)
!             return (Identity) request.getUserPrincipal();
          final String username = request.getParameter("identity");
          if (Utility.isEmpty(username))
              throw new NeuClearException("No Identity Provided");
!         return Resolver.resolveIdentity(username);
      }