Commit ba23b978 authored by Jeff Burke's avatar Jeff Burke
Browse files

ac2: move group web classes into own package, update and change user passwords in DAO.

parent 0bc7947b

projects/cadcAccessControl-Server/build.xml

+1 −14
Original line number Diff line number Diff line
@@ -137,19 +137,7 @@ 
  <property name="lib.commons-logging"

            value="${ext.lib}/commons-logging.jar"/>

  <property name="testingJars"

<<<<<<< HEAD

            value="${lib.commons-logging}:${dev.junit}:${dev.jsonassert}:${dev.httpunit}:${dev.easyMock}:${dev.selenium.server}:${dev.objenesis}:${lib.js}:${lib.nekoHTML}:${lib.xerces}"/>

=======

            value="${lib.commons-logging}:${dev.junit}:${dev.httpunit}:${dev.easyMock}:${dev.selenium.server}:${dev.objenesis}:${lib.js}:${lib.nekoHTML}:${lib.xerces}"/>



  <target name="setup-test">

    <echo>******************</echo>

    <echo>******************</echo>

    <echo>Don't forget to set the ca.nrc.cadc.util.PropertiesReader.dir system property first!</echo>

    <echo>e.g. ant -Dca.nrc.cadc.util.PropertiesReader.dir=test clean build test</echo>

    <echo>******************</echo>

    <echo>******************</echo>

  </target>



  <target name="test" depends="compile,compile-test">

    <echo message="Running test suite..." />
@@ -161,10 +149,9 @@ 
      </classpath>

      <sysproperty key="ca.nrc.cadc.util.PropertiesReader.dir" value="test"/>

      <test name="ca.nrc.cadc.ac.server.ldap.LdapUserDAOTest" />

      <!--<test name="ca.nrc.cadc.ac.server.ldap.LdapGroupDAOTest" />-->

      <test name="ca.nrc.cadc.ac.server.ldap.LdapGroupDAOTest" />

      <formatter type="plain" usefile="false" />

    </junit>

  </target>



>>>>>>> s1734

</project>

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

+16 −18
Original line number Diff line number Diff line
@@ -66,31 +66,15 @@ 
 *

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

 */

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



import java.io.IOException;

import java.security.AccessControlContext;

import java.security.AccessControlException;

import java.security.AccessController;

import java.security.Principal;

import java.util.Collection;

import java.util.Date;

import java.util.Iterator;

import java.util.Set;



import javax.security.auth.Subject;

import javax.security.auth.x500.X500Principal;

import javax.servlet.http.HttpServletResponse;



import org.apache.log4j.Logger;

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



import ca.nrc.cadc.ac.Group;

import ca.nrc.cadc.ac.GroupNotFoundException;

import ca.nrc.cadc.ac.xml.GroupsWriter;

import ca.nrc.cadc.ac.UserNotFoundException;

import ca.nrc.cadc.ac.server.GroupPersistence;

import ca.nrc.cadc.ac.server.PluginFactory;

import ca.nrc.cadc.ac.server.RequestValidator;

import ca.nrc.cadc.ac.xml.GroupsWriter;

import ca.nrc.cadc.auth.AuthenticationUtil;

import ca.nrc.cadc.auth.HttpPrincipal;

import ca.nrc.cadc.net.TransientException;
@@ -100,9 +84,23 @@ import ca.nrc.cadc.uws.server.JobRunner; 
import ca.nrc.cadc.uws.server.JobUpdater;

import ca.nrc.cadc.uws.server.SyncOutput;

import ca.nrc.cadc.uws.util.JobLogInfo;

import org.apache.log4j.Logger;



import javax.security.auth.Subject;

import javax.security.auth.x500.X500Principal;

import javax.servlet.http.HttpServletResponse;

import java.io.IOException;

import java.io.OutputStream;

import java.io.OutputStreamWriter;

import java.security.AccessControlContext;

import java.security.AccessControlException;

import java.security.AccessController;

import java.security.Principal;

import java.util.ArrayList;

import java.util.Collection;

import java.util.Date;

import java.util.Iterator;

import java.util.Set;



public class ACSearchRunner implements JobRunner

{

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

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

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

 */

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

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



import ca.nrc.cadc.ac.Group;

import ca.nrc.cadc.ac.GroupAlreadyExistsException;

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

+1 −3
Original line number Diff line number Diff line
@@ -66,18 +66,16 @@ 
 *

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

 */

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

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



import ca.nrc.cadc.ac.Group;

import ca.nrc.cadc.ac.MemberAlreadyExistsException;

import ca.nrc.cadc.ac.User;

import ca.nrc.cadc.ac.server.GroupPersistence;

import ca.nrc.cadc.ac.server.UserPersistence;

import ca.nrc.cadc.auth.AuthenticationUtil;

import java.security.Principal;

import java.util.ArrayList;

import java.util.List;

import java.util.Set;



public class AddUserMemberAction extends GroupsAction

{

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

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

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

 */

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

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



import java.io.InputStream;

import java.util.ArrayList;