Commit 773fa9a3 authored by Jeff Burke's avatar Jeff Burke
Browse files

s1728: move WhoAmIServlet from ac_ws to cadcAccessControl-Server, put all... 

s1728: move WhoAmIServlet from ac_ws to cadcAccessControl-Server, put all servlets in the same package, fix unit tests.
parent e5791a3e

projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/ACSearchRunner.java→projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/ACSearchRunner.java

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ 
 *

 ************************************************************************

 */

package ca.nrc.cadc.ac.server.web.groups;

package ca.nrc.cadc.ac.server.web;



import ca.nrc.cadc.ac.Group;

import ca.nrc.cadc.ac.GroupNotFoundException;

projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/GroupServlet.java→projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/GroupServlet.java

+4 −2
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ 
 *

 ************************************************************************

 */

package ca.nrc.cadc.ac.server.web.groups;

package ca.nrc.cadc.ac.server.web;



import java.io.IOException;

import java.security.PrivilegedActionException;
@@ -76,9 +76,11 @@ import javax.servlet.http.HttpServlet; 
import javax.servlet.http.HttpServletRequest;

import javax.servlet.http.HttpServletResponse;



import ca.nrc.cadc.ac.server.web.groups.AbstractGroupAction;

import ca.nrc.cadc.ac.server.web.groups.GroupLogInfo;

import ca.nrc.cadc.ac.server.web.groups.GroupsActionFactory;

import org.apache.log4j.Logger;



import ca.nrc.cadc.ac.server.web.SyncOutput;

import ca.nrc.cadc.auth.AuthenticationUtil;



/**

projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/LoginServlet.java→projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/LoginServlet.java

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ 
 *

 ************************************************************************

 */

package ca.nrc.cadc.ac.server.web.users;

package ca.nrc.cadc.ac.server.web;



import java.io.IOException;

import java.security.AccessControlException;

projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/PasswordServlet.java→projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/PasswordServlet.java

+12 −21
Original line number Diff line number Diff line
@@ -66,33 +66,25 @@ 
 *

 ************************************************************************

 */

package ca.nrc.cadc.ac.server.web.users;



import java.io.IOException;

import java.security.AccessControlException;

import java.security.Principal;

import java.security.PrivilegedExceptionAction;

import java.util.Set;

import java.util.TreeSet;



import javax.security.auth.Subject;

import javax.servlet.http.HttpServlet;

import javax.servlet.http.HttpServletRequest;

import javax.servlet.http.HttpServletResponse;



import ca.nrc.cadc.ac.UserNotFoundException;

import ca.nrc.cadc.ac.server.ldap.LdapUserDAO;

import ca.nrc.cadc.net.TransientException;

import org.apache.log4j.Logger;

package ca.nrc.cadc.ac.server.web;



import ca.nrc.cadc.ac.User;

import ca.nrc.cadc.ac.UserNotFoundException;

import ca.nrc.cadc.ac.server.ldap.LdapUserPersistence;

import ca.nrc.cadc.auth.AuthenticationUtil;

import ca.nrc.cadc.auth.HttpPrincipal;

import ca.nrc.cadc.log.ServletLogInfo;

import ca.nrc.cadc.util.StringUtil;

import org.omg.CORBA.UserException;

import org.apache.log4j.Logger;



import javax.security.auth.Subject;

import javax.servlet.http.HttpServlet;

import javax.servlet.http.HttpServletRequest;

import javax.servlet.http.HttpServletResponse;

import java.io.IOException;

import java.security.AccessControlException;

import java.security.Principal;

import java.security.PrivilegedExceptionAction;

import java.util.TreeSet;



/**

 * Servlet to handle password changes.  Passwords are an integral part of the
@@ -106,7 +98,6 @@ public class PasswordServlet extends HttpServlet 
{

    private static final Logger log = Logger.getLogger(PasswordServlet.class);





    /**

     * Attempt to change password.

     *

projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/UserServlet.java→projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/UserServlet.java

+5 −6
Original line number Diff line number Diff line
@@ -66,13 +66,14 @@ 
 *

 ************************************************************************

 */

package ca.nrc.cadc.ac.server.web.users;

package ca.nrc.cadc.ac.server.web;



import ca.nrc.cadc.ac.server.web.SyncOutput;

import ca.nrc.cadc.ac.server.web.users.AbstractUserAction;

import ca.nrc.cadc.ac.server.web.users.GetUserAction;

import ca.nrc.cadc.ac.server.web.users.UserActionFactory;

import ca.nrc.cadc.ac.server.web.users.UserLogInfo;

import ca.nrc.cadc.auth.AuthenticationUtil;

import ca.nrc.cadc.auth.ServletPrincipalExtractor;

import ca.nrc.cadc.auth.X509CertificateChain;

import ca.nrc.cadc.util.ArrayUtil;

import ca.nrc.cadc.util.StringUtil;

import org.apache.log4j.Logger;
@@ -87,8 +88,6 @@ import java.io.IOException; 
import java.security.AccessController;

import java.security.Principal;

import java.security.PrivilegedActionException;

import java.security.cert.X509Certificate;

import java.util.Arrays;

import java.util.Set;



public class UserServlet extends HttpServlet