From 839bc5a6caeab6d58d959f685ace73cc179ea033 Mon Sep 17 00:00:00 2001
From: Alinga Yeung <Alinga.Yeung@nrc-cnrc.gc.ca>
Date: Mon, 25 Jul 2016 10:03:21 -0700
Subject: [PATCH] Story 1849. Update resource ID for ums and gms.
---
.../src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java | 4 ++--
.../src/ca/nrc/cadc/ac/server/web/WhoAmIServlet.java | 2 +-
.../test/src/ca/nrc/cadc/ac/server/web/WhoAmIServletTest.java | 2 +-
.../cadc/ac/server/web/groups/RemoveUserMemberActionTest.java | 4 ++--
.../src/ca/nrc/cadc/ac/xml/AbstractReaderWriter.java | 2 +-
.../test/src/ca/nrc/cadc/ac/client/UserClientTest.java | 2 +-
cadcTomcat/src/ca/nrc/cadc/tomcat/CadcBasicAuthenticator.java | 2 +-
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
index 9ebf8657..24d3e033 100755
--- a/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
+++ b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
@@ -739,7 +739,7 @@ public class LdapUserDAO extends LdapDAO
// cache memberOf values in the user
LocalAuthority localAuthority = new LocalAuthority();
- URI gmsServiceURI = localAuthority.getServiceURI("gms");
+ URI gmsServiceURI = localAuthority.getServiceURI("ac");
GroupMemberships gms = new GroupMemberships(gmsServiceURI.toString(), userID);
user.appData = gms; // add even if empty
@@ -1277,7 +1277,7 @@ public class LdapUserDAO extends LdapDAO
{
UUID uuid = new UUID(0L, Long.parseLong(numericID));
LocalAuthority localAuthority = new LocalAuthority();
- URI umsServiceURI = localAuthority.getServiceURI("ums");
+ URI umsServiceURI = localAuthority.getServiceURI("ac");
String uriString = umsServiceURI.toString() + "?" + uuid.toString();
URI uri;
try
diff --git a/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/WhoAmIServlet.java b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/WhoAmIServlet.java
index 6a11fdc6..b9a53b82 100644
--- a/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/WhoAmIServlet.java
+++ b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/WhoAmIServlet.java
@@ -168,7 +168,7 @@ public class WhoAmIServlet extends HttpServlet
final RegistryClient registryClient = getRegistryClient();
LocalAuthority localAuthority = new LocalAuthority();
- URI umsServiceURI = localAuthority.getServiceURI("ums");
+ URI umsServiceURI = localAuthority.getServiceURI("ac");
log.debug("ums service uri: " + umsServiceURI);
diff --git a/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/WhoAmIServletTest.java b/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/WhoAmIServletTest.java
index 1dd59011..86402ceb 100644
--- a/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/WhoAmIServletTest.java
+++ b/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/WhoAmIServletTest.java
@@ -135,7 +135,7 @@ public class WhoAmIServletTest
expectLastCall().once();
LocalAuthority localAuthority = new LocalAuthority();
- URI umsServiceURI = localAuthority.getServiceURI("ums");
+ URI umsServiceURI = localAuthority.getServiceURI("ac");
// expect(mockRegistry.getServiceURL(URI.create(umsServiceURI.toString() + "#users"),
// "http", "/%s?idType=HTTP")).
diff --git a/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/groups/RemoveUserMemberActionTest.java b/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/groups/RemoveUserMemberActionTest.java
index ac1960db..0b7cfeed 100644
--- a/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/groups/RemoveUserMemberActionTest.java
+++ b/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/groups/RemoveUserMemberActionTest.java
@@ -118,7 +118,7 @@ public class RemoveUserMemberActionTest
{
User user = new User();
LocalAuthority localAuthority = new LocalAuthority();
- URI umsServiceURI = localAuthority.getServiceURI("ums");
+ URI umsServiceURI = localAuthority.getServiceURI("ac");
InternalID internalID = new InternalID(new URI(umsServiceURI.toASCIIString() + "?" + UUID.randomUUID()));
ObjectUtil.setField(user, internalID, "id");
@@ -172,7 +172,7 @@ public class RemoveUserMemberActionTest
{
User user = new User();
LocalAuthority localAuthority = new LocalAuthority();
- URI umsServiceURI = localAuthority.getServiceURI("ums");
+ URI umsServiceURI = localAuthority.getServiceURI("ac");
InternalID internalID = new InternalID(new URI(umsServiceURI.toString() + "?" + UUID.randomUUID()));
ObjectUtil.setField(user, internalID, "id");
diff --git a/cadcAccessControl/src/ca/nrc/cadc/ac/xml/AbstractReaderWriter.java b/cadcAccessControl/src/ca/nrc/cadc/ac/xml/AbstractReaderWriter.java
index 3940001c..8c57ebe2 100644
--- a/cadcAccessControl/src/ca/nrc/cadc/ac/xml/AbstractReaderWriter.java
+++ b/cadcAccessControl/src/ca/nrc/cadc/ac/xml/AbstractReaderWriter.java
@@ -156,7 +156,7 @@ public abstract class AbstractReaderWriter
public AbstractReaderWriter()
{
LocalAuthority localAuthority = new LocalAuthority();
- URI serviceURI = localAuthority.getServiceURI("gms");
+ URI serviceURI = localAuthority.getServiceURI("ac");
gmsServiceURI = serviceURI.toString();
}
diff --git a/cadcAccessControl/test/src/ca/nrc/cadc/ac/client/UserClientTest.java b/cadcAccessControl/test/src/ca/nrc/cadc/ac/client/UserClientTest.java
index 8217c085..63244e38 100644
--- a/cadcAccessControl/test/src/ca/nrc/cadc/ac/client/UserClientTest.java
+++ b/cadcAccessControl/test/src/ca/nrc/cadc/ac/client/UserClientTest.java
@@ -101,7 +101,7 @@ public class UserClientTest
{
Log4jInit.setLevel("ca.nrc.cadc.ac", Level.INFO);
LocalAuthority localAuthority = new LocalAuthority();
- umsServiceURI = localAuthority.getServiceURI("ums");
+ umsServiceURI = localAuthority.getServiceURI("ac");
}
@Test
diff --git a/cadcTomcat/src/ca/nrc/cadc/tomcat/CadcBasicAuthenticator.java b/cadcTomcat/src/ca/nrc/cadc/tomcat/CadcBasicAuthenticator.java
index e4866d8f..431cc1eb 100644
--- a/cadcTomcat/src/ca/nrc/cadc/tomcat/CadcBasicAuthenticator.java
+++ b/cadcTomcat/src/ca/nrc/cadc/tomcat/CadcBasicAuthenticator.java
@@ -97,7 +97,7 @@ public class CadcBasicAuthenticator extends RealmBase
{
private static Logger log = Logger.getLogger(CadcBasicAuthenticator.class);
- private static final String AC_URI = "ivo://cadc.nrc.ca/ums";
+ private static final String AC_URI = "ivo://cadc.nrc.ca/ac";
static
{
--
GitLab