Commit 1db071aa authored by Patrick Dowler's avatar Patrick Dowler
Browse files

added --remove-member to command-line GMSClient

parent 308bf3b4

projects/cadcAccessControl/src/ca/nrc/cadc/ac/client/GMSClientMain.java

+17 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ public class GMSClientMain implements PrivilegedAction<Object> 
    private static Logger log = Logger.getLogger(GMSClientMain.class);



    public static final String ARG_ADD_MEMBER = "add-member";

    public static final String ARG_DEL_MEMBER = "remove-member";

    public static final String ARG_CREATE_GROUP = "create";

    public static final String ARG_GET_GROUP = "get";

    public static final String ARG_DELETE_GROUP = "delete";
@@ -186,12 +187,16 @@ public class GMSClientMain implements PrivilegedAction<Object> 
        if (argMap.isSet(ARG_DELETE_GROUP))

            return ARG_DELETE_GROUP;

        

        if (argMap.isSet(ARG_DEL_MEMBER))

            return ARG_DEL_MEMBER;



        throw new IllegalArgumentException("No valid commands");

    }



    private static void usage()

    {

        System.out.println("--add-member --group=<g> --userid=<u>");

        System.out.println("--remove-member --group=<g> --userid=<u>");

        System.out.println("--create --group=<g>");

        System.out.println("--get --group=<g>");

        System.out.println("--delete --group=<g>");
@@ -217,6 +222,18 @@ public class GMSClientMain implements PrivilegedAction<Object> 


                client.addUserMember(group, new HttpPrincipal(userID));

            }

            else if (command.equals(ARG_DEL_MEMBER))

            {

                String group = argMap.getValue(ARG_GROUP);

                if (group == null)

                    throw new IllegalArgumentException("No group specified");



                String member = argMap.getValue(ARG_USERID);

                if (member == null)

                    throw new IllegalArgumentException("No user specified");

                

                client.removeUserMember(group, new HttpPrincipal(member));

            }

            else if (command.equals(ARG_CREATE_GROUP))

            {

                String group = argMap.getValue(ARG_GROUP);