Commit f8561636 authored by Jeff Burke's avatar Jeff Burke
Browse files

s1849: updates for LocalAuthority constuctor taking a Standard.

parent b537af89

cadcAccessControl-Identity/src/ca/nrc/cadc/auth/ACIdentityManager.java

+3 −3
Original line number Original line Diff line number Diff line
@@ -110,7 +110,7 @@ public class ACIdentityManager implements IdentityManager 
            public NumericPrincipal run() throws Exception

            public NumericPrincipal run() throws Exception

            {

            {

                LocalAuthority localAuth = new LocalAuthority();

                LocalAuthority localAuth = new LocalAuthority();

                URI serviceURI = localAuth.getServiceURI("ums");

                URI serviceURI = localAuth.getServiceURI(Standards.UMS_USERS_01.toString());





                UserClient userClient = new UserClient(serviceURI);

                UserClient userClient = new UserClient(serviceURI);

                User newUser = userClient.createUser(x500Principal);

                User newUser = userClient.createUser(x500Principal);
@@ -206,7 +206,7 @@ public class ACIdentityManager implements IdentityManager 
                public Object run() throws Exception

                public Object run() throws Exception

                {

                {

                    LocalAuthority localAuth = new LocalAuthority();

                    LocalAuthority localAuth = new LocalAuthority();

                    URI serviceURI = localAuth.getServiceURI("ums");

                    URI serviceURI = localAuth.getServiceURI(Standards.UMS_USERS_01.toString());





                    UserClient userClient = new UserClient(serviceURI);

                    UserClient userClient = new UserClient(serviceURI);

                    userClient.augmentSubject(subject);

                    userClient.augmentSubject(subject);
@@ -236,7 +236,7 @@ public class ACIdentityManager implements IdentityManager 
        {

        {

            RegistryClient regClient = new RegistryClient();

            RegistryClient regClient = new RegistryClient();

            LocalAuthority localAuth = new LocalAuthority();

            LocalAuthority localAuth = new LocalAuthority();

            URI serviceURI = localAuth.getServiceURI("gms");

            URI serviceURI = localAuth.getServiceURI(Standards.GMS_GROUPS_01.toString());

            URL serviceURL = regClient.getServiceURL(serviceURI, Standards.GMS_GROUPS_01, AuthMethod.ANON);

            URL serviceURL = regClient.getServiceURL(serviceURI, Standards.GMS_GROUPS_01, AuthMethod.ANON);





            // Hack to strip off the groups endpoint to get the base url of the service.

            // Hack to strip off the groups endpoint to get the base url of the service.

cadcAccessControl-Identity/src/ca/nrc/cadc/auth/AuthenticatorImpl.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -74,7 +74,7 @@ public class AuthenticatorImpl implements Authenticator 
        {

        {

            RegistryClient regClient = new RegistryClient();

            RegistryClient regClient = new RegistryClient();

            LocalAuthority localAuth = new LocalAuthority();

            LocalAuthority localAuth = new LocalAuthority();

            URI serviceURI = localAuth.getServiceURI("gms");

            URI serviceURI = localAuth.getServiceURI(Standards.GMS_GROUPS_01.toString());

            URL serviceURL = regClient.getServiceURL(serviceURI, Standards.GMS_GROUPS_01, AuthMethod.ANON);

            URL serviceURL = regClient.getServiceURL(serviceURI, Standards.GMS_GROUPS_01, AuthMethod.ANON);





            // Hack to strip off the groups endpoint to get the base url of the service.

            // Hack to strip off the groups endpoint to get the base url of the service.