You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by st...@apache.org on 2003/10/29 01:25:01 UTC

cvs commit: cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/acting UserAuthenticatorAction.java

stefano     2003/10/28 16:25:01

  Modified:    src/java/org/apache/lenya/cms/cocoon/acting
                        UserAuthenticatorAction.java
  Log:
  make it compile against the latest excalibur-xmlutil shipped in cocoon
  
  Revision  Changes    Path
  1.11      +5 -7      cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/acting/UserAuthenticatorAction.java
  
  Index: UserAuthenticatorAction.java
  ===================================================================
  RCS file: /home/cvs/cocoon-lenya/src/java/org/apache/lenya/cms/cocoon/acting/UserAuthenticatorAction.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- UserAuthenticatorAction.java	2 Sep 2003 18:22:37 -0000	1.10
  +++ UserAuthenticatorAction.java	29 Oct 2003 00:25:01 -0000	1.11
  @@ -55,26 +55,24 @@
   */
   package org.apache.lenya.cms.cocoon.acting;
   
  +import java.util.Map;
  +
   import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.parameters.Parameters;
  -
  +import org.apache.avalon.framework.service.ServiceException;
   import org.apache.cocoon.environment.ObjectModelHelper;
   import org.apache.cocoon.environment.Redirector;
   import org.apache.cocoon.environment.Request;
   import org.apache.cocoon.environment.Session;
   import org.apache.cocoon.environment.SourceResolver;
  -
   import org.apache.lenya.cms.ac.AccessControlException;
   import org.apache.lenya.cms.ac.Identity;
   import org.apache.lenya.cms.ac.User;
   import org.apache.lenya.cms.ac2.AccessController;
   import org.apache.lenya.cms.ac2.AccessControllerResolver;
   import org.apache.lenya.cms.ac2.DefaultAccessController;
  -
   import org.w3c.dom.Document;
   
  -import java.util.Map;
  -
   
   /**
    * @author egli
  @@ -148,7 +146,7 @@
        * @throws AccessControlException if there was a problem creating the access controler.
        * @throws ComponentException if the access control manager component cannot be found.
        */
  -    protected User getUser(String username) throws AccessControlException, ComponentException {
  +    protected User getUser(String username) throws AccessControlException, ComponentException, ServiceException {
           User user;
           AccessControllerResolver resolver = null;
           AccessController accessController = null;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: lenya-cvs-unsubscribe@cocoon.apache.org
For additional commands, e-mail: lenya-cvs-help@cocoon.apache.org