Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OATS-CADC
ac
Commits
839bc5a6
Commit
839bc5a6
authored
Jul 25, 2016
by
Alinga Yeung
Browse files
Story 1849. Update resource ID for ums and gms.
parent
745ddef3
Changes
7
Hide whitespace changes
Inline
Side-by-side
cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
View file @
839bc5a6
...
...
@@ -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
...
...
cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/WhoAmIServlet.java
View file @
839bc5a6
...
...
@@ -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
);
...
...
cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/WhoAmIServletTest.java
View file @
839bc5a6
...
...
@@ -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")).
...
...
cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/groups/RemoveUserMemberActionTest.java
View file @
839bc5a6
...
...
@@ -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"
);
...
...
cadcAccessControl/src/ca/nrc/cadc/ac/xml/AbstractReaderWriter.java
View file @
839bc5a6
...
...
@@ -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
();
}
...
...
cadcAccessControl/test/src/ca/nrc/cadc/ac/client/UserClientTest.java
View file @
839bc5a6
...
...
@@ -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
...
...
cadcTomcat/src/ca/nrc/cadc/tomcat/CadcBasicAuthenticator.java
View file @
839bc5a6
...
...
@@ -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
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment