Commit 839bc5a6 authored by Alinga Yeung's avatar Alinga Yeung
Browse files

Story 1849. Update resource ID for ums and gms.

parent 745ddef3
......@@ -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
......
......@@ -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);
......
......@@ -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")).
......
......@@ -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");
......
......@@ -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();
}
......
......@@ -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
......
......@@ -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
{
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment