Commit 4e8ffb57 authored by Brian Major's avatar Brian Major
Browse files

s1885 - changed UserClient createX509User to createUser

parent ef93b36c

cadcAccessControl/src/ca/nrc/cadc/ac/client/UserClient.java

+4 −4
Original line number Original line Diff line number Diff line
@@ -249,7 +249,7 @@ public class UserClient 




    /**

    /**

     * Create an auto-approved user directly in the user tree (not

     * Create an auto-approved user directly in the user tree (not

     * the userRequest tree) from their x.500 principal.

     * the userRequest tree) from the principal.

     *

     *

     * @param principal Their x500 Principal

     * @param principal Their x500 Principal

     * @throws UserAlreadyExistsException

     * @throws UserAlreadyExistsException
@@ -258,13 +258,13 @@ public class UserClient 
     * @throws URISyntaxException

     * @throws URISyntaxException

     * @throws ReaderException

     * @throws ReaderException

     */

     */

    public User createX509User(X500Principal principal)

    public User createUser(Principal principal)

            throws UserAlreadyExistsException, IOException, WriterException,

            throws UserAlreadyExistsException, IOException, WriterException,

                   ReaderException, URISyntaxException

                   ReaderException, URISyntaxException

    {

    {

        if (principal == null)

        if (principal == null)

        {

        {

            throw new IllegalArgumentException("x500 principal required");

            throw new IllegalArgumentException("principal required");

        }

        }





        User user = new User();

        User user = new User();
@@ -277,7 +277,7 @@ public class UserClient 




        if (createUserURL == null)

        if (createUserURL == null)

            throw new IllegalArgumentException("No service endpoint for uri " + usersURI);

            throw new IllegalArgumentException("No service endpoint for uri " + usersURI);

        log.debug("createX509User request to " + createUserURL.toString());

        log.debug("createUser request to " + createUserURL.toString());





        ByteArrayInputStream in = new ByteArrayInputStream(userXML.toString().getBytes());

        ByteArrayInputStream in = new ByteArrayInputStream(userXML.toString().getBytes());

        HttpUpload put = new HttpUpload(in, createUserURL);

        HttpUpload put = new HttpUpload(in, createUserURL);