From 4e8ffb5710351a68ac3eb7d22357bedfa5d180c4 Mon Sep 17 00:00:00 2001
From: Brian Major <major.brian@gmail.com>
Date: Fri, 15 Apr 2016 11:48:52 -0700
Subject: [PATCH] s1885 - changed UserClient createX509User to createUser

---
 .../src/ca/nrc/cadc/ac/client/UserClient.java             | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/cadcAccessControl/src/ca/nrc/cadc/ac/client/UserClient.java b/cadcAccessControl/src/ca/nrc/cadc/ac/client/UserClient.java
index 389ceab4..2ec7944f 100644
--- a/cadcAccessControl/src/ca/nrc/cadc/ac/client/UserClient.java
+++ b/cadcAccessControl/src/ca/nrc/cadc/ac/client/UserClient.java
@@ -249,7 +249,7 @@ public class UserClient
 
     /**
      * 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
      * @throws UserAlreadyExistsException
@@ -258,13 +258,13 @@ public class UserClient
      * @throws URISyntaxException
      * @throws ReaderException
      */
-    public User createX509User(X500Principal principal)
+    public User createUser(Principal principal)
             throws UserAlreadyExistsException, IOException, WriterException,
                    ReaderException, URISyntaxException
     {
         if (principal == null)
         {
-            throw new IllegalArgumentException("x500 principal required");
+            throw new IllegalArgumentException("principal required");
         }
 
         User user = new User();
@@ -277,7 +277,7 @@ public class UserClient
 
         if (createUserURL == null)
             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());
         HttpUpload put = new HttpUpload(in, createUserURL);
-- 
GitLab