From b5b6bc681836907145e388b1c085695cd522aa91 Mon Sep 17 00:00:00 2001 From: Adrian Damian <Adrian.Damian@nrc.ca> Date: Mon, 22 Aug 2016 13:37:32 -0700 Subject: [PATCH] Changed module names to lower-case and group to org.opencadc to conform to maven repo naming standards --- .../.gitignore | 0 .../README.md | 0 .../build.gradle | 12 ++++++------ .../config/ac-admin-email.properties | 0 .../local.build.properties | 0 .../scripts/userAdmin | 0 .../ca/nrc/cadc/ac/admin/AbstractCommand.java | 0 .../ca/nrc/cadc/ac/admin/AbstractListUsers.java | 0 .../ca/nrc/cadc/ac/admin/AbstractUserCommand.java | 0 .../java/ca/nrc/cadc/ac/admin/ApproveUser.java | 0 .../java/ca/nrc/cadc/ac/admin/CmdLineParser.java | 0 .../java/ca/nrc/cadc/ac/admin/CommandRunner.java | 0 .../ca/nrc/cadc/ac/admin/ContextFactoryImpl.java | 0 .../java/ca/nrc/cadc/ac/admin/ContextImpl.java | 0 .../ca/nrc/cadc/ac/admin/ListUserRequests.java | 0 .../main/java/ca/nrc/cadc/ac/admin/ListUsers.java | 0 .../src/main/java/ca/nrc/cadc/ac/admin/Main.java | 0 .../java/ca/nrc/cadc/ac/admin/RejectUser.java | 0 .../java/ca/nrc/cadc/ac/admin/UsageException.java | 0 .../main/java/ca/nrc/cadc/ac/admin/ViewUser.java | 0 .../ca/nrc/cadc/ac/admin/CmdLineParserTest.java | 0 .../src/userAdmin.mf | 0 .../README.md | 0 .../build.gradle | 12 ++++++------ .../java/ca/nrc/cadc/auth/ACIdentityManager.java | 0 .../java/ca/nrc/cadc/auth/AuthenticatorImpl.java | 0 .../.dbrc_example | 0 .../LdapConfig.properties | 0 .../PluginFactory.properties | 0 .../README.md | 0 .../build.gradle | 14 +++++++------- .../cadc/ac/server/ldap/AbstractLdapDAOTest.java | 0 .../ca/nrc/cadc/ac/server/ldap/LdapDAOTest.java | 0 .../nrc/cadc/ac/server/ldap/LdapDAOTestImpl.java | 0 .../nrc/cadc/ac/server/ldap/LdapGroupDAOTest.java | 0 .../nrc/cadc/ac/server/ldap/LdapUserDAOTest.java | 0 .../ca/nrc/cadc/ac/server/ACScopeValidator.java | 0 .../nrc/cadc/ac/server/GroupDetailSelector.java | 0 .../ca/nrc/cadc/ac/server/GroupPersistence.java | 0 .../java/ca/nrc/cadc/ac/server/PluginFactory.java | 0 .../ca/nrc/cadc/ac/server/RequestValidator.java | 0 .../ca/nrc/cadc/ac/server/UserPersistence.java | 0 .../nrc/cadc/ac/server/ldap/ConnectionPools.java | 0 .../ca/nrc/cadc/ac/server/ldap/LdapConfig.java | 0 .../cadc/ac/server/ldap/LdapConnectionPool.java | 0 .../nrc/cadc/ac/server/ldap/LdapConnections.java | 0 .../java/ca/nrc/cadc/ac/server/ldap/LdapDAO.java | 0 .../ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java | 0 .../cadc/ac/server/ldap/LdapGroupPersistence.java | 0 .../nrc/cadc/ac/server/ldap/LdapPersistence.java | 0 .../ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java | 0 .../cadc/ac/server/ldap/LdapUserPersistence.java | 0 .../ca/nrc/cadc/ac/server/web/ACSearchRunner.java | 0 .../ca/nrc/cadc/ac/server/web/GroupServlet.java | 0 .../ca/nrc/cadc/ac/server/web/LoginServlet.java | 0 .../cadc/ac/server/web/ModifyPasswordServlet.java | 0 .../cadc/ac/server/web/ResetPasswordServlet.java | 0 .../ca/nrc/cadc/ac/server/web/SyncOutput.java | 0 .../cadc/ac/server/web/UserRequestServlet.java | 0 .../ca/nrc/cadc/ac/server/web/UserServlet.java | 0 .../java/ca/nrc/cadc/ac/server/web/WebUtil.java | 0 .../ca/nrc/cadc/ac/server/web/WhoAmIServlet.java | 0 .../ac/server/web/groups/AbstractGroupAction.java | 0 .../server/web/groups/AddGroupMemberAction.java | 0 .../ac/server/web/groups/AddUserMemberAction.java | 0 .../ac/server/web/groups/CreateGroupAction.java | 0 .../ac/server/web/groups/DeleteGroupAction.java | 0 .../cadc/ac/server/web/groups/GetGroupAction.java | 0 .../ac/server/web/groups/GetGroupNamesAction.java | 0 .../cadc/ac/server/web/groups/GroupLogInfo.java | 0 .../ac/server/web/groups/GroupsActionFactory.java | 0 .../ac/server/web/groups/ModifyGroupAction.java | 0 .../web/groups/RemoveGroupMemberAction.java | 0 .../server/web/groups/RemoveUserMemberAction.java | 0 .../userrequests/AbstractUserRequestAction.java | 0 .../web/userrequests/CreateUserRequestAction.java | 0 .../userrequests/UserRequestActionFactory.java | 0 .../ac/server/web/users/AbstractUserAction.java | 0 .../ac/server/web/users/CreateUserAction.java | 0 .../ac/server/web/users/DeleteUserAction.java | 0 .../cadc/ac/server/web/users/GetUserAction.java | 0 .../ac/server/web/users/GetUserListAction.java | 0 .../ac/server/web/users/ModifyUserAction.java | 0 .../ac/server/web/users/UserActionFactory.java | 0 .../nrc/cadc/ac/server/web/users/UserLogInfo.java | 0 .../java/ca/nrc/cadc/auth/AuthenticatorImpl.java | 0 .../src/test/config/.dbrc | 0 .../src/test/config/LdapConfig.properties | 0 .../src/test/config/testConfig.offline.properties | 0 .../test/config/testConfig.read-only.properties | 0 .../src/test/config/testConfig1.properties | 0 .../src/test/config/testConfig2.properties | 0 .../nrc/cadc/ac/server/RequestValidatorTest.java | 0 .../nrc/cadc/ac/server/ldap/LdapConfigTest.java | 0 .../cadc/ac/server/ldap/LdapConnectionsTest.java | 0 .../cadc/ac/server/ldap/LdapPersistenceTest.java | 0 .../ac/server/web/ModifyPasswordServletTest.java | 0 .../ac/server/web/ResetPasswordServletTest.java | 0 .../cadc/ac/server/web/UserLoginServletTest.java | 0 .../ac/server/web/UserRequestServletTest.java | 0 .../nrc/cadc/ac/server/web/UserServletTest.java | 0 .../nrc/cadc/ac/server/web/WhoAmIServletTest.java | 0 .../web/groups/AddGroupMemberActionTest.java | 0 .../web/groups/AddUserMemberActionTest.java | 0 .../server/web/groups/DeleteGroupActionTest.java | 0 .../web/groups/GetGroupNamesActionTest.java | 0 .../server/web/groups/GroupActionFactoryTest.java | 0 .../web/groups/RemoveGroupMemberActionTest.java | 0 .../web/groups/RemoveUserMemberActionTest.java | 0 .../userrequests/CreateUserRequestActionTest.java | 0 .../UserRequestActionFactoryTest.java | 0 .../ac/server/web/users/CreateUserActionTest.java | 0 .../ac/server/web/users/GetUserActionTest.java | 0 .../server/web/users/GetUserListActionTest.java | 0 .../ac/server/web/users/ModifyUserActionTest.java | 0 .../server/web/users/UserActionFactoryTest.java | 0 .../src/test/resources/LocalAuthority.properties | 0 .../README.md | 0 .../doc/AccessControl.0.1.png | Bin .../doc/AccessControl.0.2.png | Bin .../doc/auth.0.1.zargo | Bin .../doc/auth.0.2.zargo | Bin .../scripts/cadcGMSClient | 0 .../src/main/java/ca/nrc/cadc/ac/AC.java | 0 .../main/java/ca/nrc/cadc/ac/ActivatedGroup.java | 0 .../src/main/java/ca/nrc/cadc/ac/Group.java | 0 .../nrc/cadc/ac/GroupAlreadyExistsException.java | 0 .../ca/nrc/cadc/ac/GroupNotFoundException.java | 0 .../main/java/ca/nrc/cadc/ac/GroupProperty.java | 0 .../src/main/java/ca/nrc/cadc/ac/InternalID.java | 0 .../nrc/cadc/ac/MemberAlreadyExistsException.java | 0 .../ca/nrc/cadc/ac/MemberNotFoundException.java | 0 .../main/java/ca/nrc/cadc/ac/PersonalDetails.java | 0 .../main/java/ca/nrc/cadc/ac/PosixDetails.java | 0 .../main/java/ca/nrc/cadc/ac/ReaderException.java | 0 .../src/main/java/ca/nrc/cadc/ac/Role.java | 0 .../src/main/java/ca/nrc/cadc/ac/User.java | 0 .../nrc/cadc/ac/UserAlreadyExistsException.java | 0 .../ca/nrc/cadc/ac/UserNotFoundException.java | 0 .../src/main/java/ca/nrc/cadc/ac/UserRequest.java | 0 .../src/main/java/ca/nrc/cadc/ac/UserSet.java | 0 .../main/java/ca/nrc/cadc/ac/WriterException.java | 0 .../java/ca/nrc/cadc/ac/client/GMSClient.java | 0 .../java/ca/nrc/cadc/ac/client/GMSClientMain.java | 0 .../ca/nrc/cadc/ac/client/GroupMemberships.java | 0 .../ac/client/JsonUserListInputStreamWrapper.java | 0 .../java/ca/nrc/cadc/ac/client/UserClient.java | 0 .../java/ca/nrc/cadc/ac/json/JsonGroupReader.java | 0 .../java/ca/nrc/cadc/ac/json/JsonGroupWriter.java | 0 .../ca/nrc/cadc/ac/json/JsonUserListReader.java | 0 .../ca/nrc/cadc/ac/json/JsonUserListWriter.java | 0 .../java/ca/nrc/cadc/ac/json/JsonUserReader.java | 0 .../nrc/cadc/ac/json/JsonUserRequestReader.java | 0 .../nrc/cadc/ac/json/JsonUserRequestWriter.java | 0 .../java/ca/nrc/cadc/ac/json/JsonUserWriter.java | 0 .../ca/nrc/cadc/ac/xml/AbstractReaderWriter.java | 0 .../java/ca/nrc/cadc/ac/xml/GroupListReader.java | 0 .../java/ca/nrc/cadc/ac/xml/GroupListWriter.java | 0 .../main/java/ca/nrc/cadc/ac/xml/GroupReader.java | 0 .../main/java/ca/nrc/cadc/ac/xml/GroupWriter.java | 0 .../java/ca/nrc/cadc/ac/xml/UserListReader.java | 0 .../java/ca/nrc/cadc/ac/xml/UserListWriter.java | 0 .../main/java/ca/nrc/cadc/ac/xml/UserReader.java | 0 .../ca/nrc/cadc/ac/xml/UserRequestReader.java | 0 .../ca/nrc/cadc/ac/xml/UserRequestWriter.java | 0 .../main/java/ca/nrc/cadc/ac/xml/UserWriter.java | 0 .../java/ca/nrc/cadc/ac/GroupPropertyTest.java | 0 .../src/test/java/ca/nrc/cadc/ac/GroupTest.java | 0 .../java/ca/nrc/cadc/ac/PersonalDetailsTest.java | 0 .../java/ca/nrc/cadc/ac/PosixDetailsTest.java | 0 .../src/test/java/ca/nrc/cadc/ac/RoleTest.java | 0 .../src/test/java/ca/nrc/cadc/ac/TestUtil.java | 0 .../test/java/ca/nrc/cadc/ac/UserRequestTest.java | 0 .../src/test/java/ca/nrc/cadc/ac/UserTest.java | 0 .../java/ca/nrc/cadc/ac/client/GMSClientTest.java | 0 .../JsonUserListInputStreamWrapperTest.java | 0 .../ca/nrc/cadc/ac/client/UserClientTest.java | 0 .../cadc/ac/json/JsonGroupReaderWriterTest.java | 0 .../ac/json/JsonUserListReaderWriterTest.java | 0 .../cadc/ac/json/JsonUserReaderWriterTest.java | 0 .../ac/json/JsonUserRequestReaderWriterTest.java | 0 .../cadc/ac/xml/GroupListReaderWriterTest.java | 0 .../ac/xml/GroupPropertyReaderWriterTest.java | 0 .../ca/nrc/cadc/ac/xml/GroupReaderWriterTest.java | 0 .../nrc/cadc/ac/xml/IdentityReaderWriterTest.java | 0 .../cadc/ac/xml/UserDetailsReaderWriterTest.java | 0 .../nrc/cadc/ac/xml/UserListReaderWriterTest.java | 0 .../ca/nrc/cadc/ac/xml/UserReaderWriterTest.java | 0 .../cadc/ac/xml/UserRequestReaderWriterTest.java | 0 .../src/test/resources/LocalAuthority.properties | 0 {cadcTomcat => cadc-tomcat}/README.md | 0 {cadcTomcat => cadc-tomcat}/build.gradle | 7 ++++--- .../ca/nrc/cadc/tomcat/AuthenticationLookup.java | 0 .../nrc/cadc/tomcat/CadcBasicAuthenticator.java | 0 .../ca/nrc/cadc/tomcat/CadcSSLImplementation.java | 0 .../ca/nrc/cadc/tomcat/CadcSSLSocketFactory.java | 0 .../ca/nrc/cadc/tomcat/CadcX509TrustManager.java | 0 .../cadc/tomcat/RealmMultiValuedProperties.java | 0 .../main/java/ca/nrc/cadc/tomcat/RealmUtil.java | 0 .../src/main/resources/RegistryClient.properties | 0 .../src/test/config/RegistryClient.properties | 0 .../nrc/cadc/tomcat/AuthenticationLookupTest.java | 0 .../cadc/tomcat/CadcBasicAuthenticatorTest.java | 0 203 files changed, 23 insertions(+), 22 deletions(-) rename {cadcAccessControl-Admin => cadc-access-control-admin}/.gitignore (100%) rename {cadcAccessControl-Admin => cadc-access-control-admin}/README.md (100%) rename {cadcAccessControl-Admin => cadc-access-control-admin}/build.gradle (75%) rename {cadcAccessControl-Admin => cadc-access-control-admin}/config/ac-admin-email.properties (100%) rename {cadcAccessControl-Admin => cadc-access-control-admin}/local.build.properties (100%) rename {cadcAccessControl-Admin => cadc-access-control-admin}/scripts/userAdmin (100%) rename {cadcAccessControl-Admin => cadc-access-control-admin}/src/main/java/ca/nrc/cadc/ac/admin/AbstractCommand.java (100%) rename {cadcAccessControl-Admin => cadc-access-control-admin}/src/main/java/ca/nrc/cadc/ac/admin/AbstractListUsers.java (100%) rename {cadcAccessControl-Admin => cadc-access-control-admin}/src/main/java/ca/nrc/cadc/ac/admin/AbstractUserCommand.java (100%) rename {cadcAccessControl-Admin => cadc-access-control-admin}/src/main/java/ca/nrc/cadc/ac/admin/ApproveUser.java (100%) rename {cadcAccessControl-Admin => cadc-access-control-admin}/src/main/java/ca/nrc/cadc/ac/admin/CmdLineParser.java (100%) rename {cadcAccessControl-Admin => cadc-access-control-admin}/src/main/java/ca/nrc/cadc/ac/admin/CommandRunner.java (100%) rename {cadcAccessControl-Admin => cadc-access-control-admin}/src/main/java/ca/nrc/cadc/ac/admin/ContextFactoryImpl.java (100%) rename {cadcAccessControl-Admin => cadc-access-control-admin}/src/main/java/ca/nrc/cadc/ac/admin/ContextImpl.java (100%) rename {cadcAccessControl-Admin => cadc-access-control-admin}/src/main/java/ca/nrc/cadc/ac/admin/ListUserRequests.java (100%) rename {cadcAccessControl-Admin => cadc-access-control-admin}/src/main/java/ca/nrc/cadc/ac/admin/ListUsers.java (100%) rename {cadcAccessControl-Admin => cadc-access-control-admin}/src/main/java/ca/nrc/cadc/ac/admin/Main.java (100%) rename {cadcAccessControl-Admin => cadc-access-control-admin}/src/main/java/ca/nrc/cadc/ac/admin/RejectUser.java (100%) rename {cadcAccessControl-Admin => cadc-access-control-admin}/src/main/java/ca/nrc/cadc/ac/admin/UsageException.java (100%) rename {cadcAccessControl-Admin => cadc-access-control-admin}/src/main/java/ca/nrc/cadc/ac/admin/ViewUser.java (100%) rename {cadcAccessControl-Admin => cadc-access-control-admin}/src/test/java/ca/nrc/cadc/ac/admin/CmdLineParserTest.java (100%) rename {cadcAccessControl-Admin => cadc-access-control-admin}/src/userAdmin.mf (100%) rename {cadcAccessControl-Identity => cadc-access-control-identity}/README.md (100%) rename {cadcAccessControl-Identity => cadc-access-control-identity}/build.gradle (60%) rename {cadcAccessControl-Identity => cadc-access-control-identity}/src/main/java/ca/nrc/cadc/auth/ACIdentityManager.java (100%) rename {cadcAccessControl-Identity => cadc-access-control-identity}/src/main/java/ca/nrc/cadc/auth/AuthenticatorImpl.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/.dbrc_example (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/LdapConfig.properties (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/PluginFactory.properties (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/README.md (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/build.gradle (73%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/integration/java/ca/nrc/cadc/ac/server/ldap/AbstractLdapDAOTest.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/integration/java/ca/nrc/cadc/ac/server/ldap/LdapDAOTest.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/integration/java/ca/nrc/cadc/ac/server/ldap/LdapDAOTestImpl.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/integration/java/ca/nrc/cadc/ac/server/ldap/LdapGroupDAOTest.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/integration/java/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/ACScopeValidator.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/GroupDetailSelector.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/GroupPersistence.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/PluginFactory.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/RequestValidator.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/UserPersistence.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/ldap/ConnectionPools.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapConfig.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapConnectionPool.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapConnections.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapDAO.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapGroupPersistence.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapPersistence.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapUserPersistence.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/web/ACSearchRunner.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/web/GroupServlet.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/web/LoginServlet.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/web/ModifyPasswordServlet.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/web/ResetPasswordServlet.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/web/SyncOutput.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/web/UserRequestServlet.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/web/UserServlet.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/web/WebUtil.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/web/WhoAmIServlet.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/web/groups/AbstractGroupAction.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/web/groups/AddGroupMemberAction.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/web/groups/AddUserMemberAction.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/web/groups/CreateGroupAction.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/web/groups/DeleteGroupAction.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/web/groups/GetGroupAction.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/web/groups/GetGroupNamesAction.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/web/groups/GroupLogInfo.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/web/groups/GroupsActionFactory.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/web/groups/ModifyGroupAction.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/web/groups/RemoveGroupMemberAction.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/web/groups/RemoveUserMemberAction.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/web/userrequests/AbstractUserRequestAction.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/web/userrequests/CreateUserRequestAction.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/web/userrequests/UserRequestActionFactory.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/web/users/AbstractUserAction.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/web/users/CreateUserAction.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/web/users/DeleteUserAction.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/web/users/GetUserAction.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/web/users/GetUserListAction.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/web/users/ModifyUserAction.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/web/users/UserActionFactory.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/ac/server/web/users/UserLogInfo.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/main/java/ca/nrc/cadc/auth/AuthenticatorImpl.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/test/config/.dbrc (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/test/config/LdapConfig.properties (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/test/config/testConfig.offline.properties (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/test/config/testConfig.read-only.properties (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/test/config/testConfig1.properties (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/test/config/testConfig2.properties (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/test/java/ca/nrc/cadc/ac/server/RequestValidatorTest.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/test/java/ca/nrc/cadc/ac/server/ldap/LdapConfigTest.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/test/java/ca/nrc/cadc/ac/server/ldap/LdapConnectionsTest.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/test/java/ca/nrc/cadc/ac/server/ldap/LdapPersistenceTest.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/test/java/ca/nrc/cadc/ac/server/web/ModifyPasswordServletTest.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/test/java/ca/nrc/cadc/ac/server/web/ResetPasswordServletTest.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/test/java/ca/nrc/cadc/ac/server/web/UserLoginServletTest.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/test/java/ca/nrc/cadc/ac/server/web/UserRequestServletTest.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/test/java/ca/nrc/cadc/ac/server/web/UserServletTest.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/test/java/ca/nrc/cadc/ac/server/web/WhoAmIServletTest.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/test/java/ca/nrc/cadc/ac/server/web/groups/AddGroupMemberActionTest.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/test/java/ca/nrc/cadc/ac/server/web/groups/AddUserMemberActionTest.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/test/java/ca/nrc/cadc/ac/server/web/groups/DeleteGroupActionTest.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/test/java/ca/nrc/cadc/ac/server/web/groups/GetGroupNamesActionTest.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/test/java/ca/nrc/cadc/ac/server/web/groups/GroupActionFactoryTest.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/test/java/ca/nrc/cadc/ac/server/web/groups/RemoveGroupMemberActionTest.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/test/java/ca/nrc/cadc/ac/server/web/groups/RemoveUserMemberActionTest.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/test/java/ca/nrc/cadc/ac/server/web/userrequests/CreateUserRequestActionTest.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/test/java/ca/nrc/cadc/ac/server/web/userrequests/UserRequestActionFactoryTest.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/test/java/ca/nrc/cadc/ac/server/web/users/CreateUserActionTest.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/test/java/ca/nrc/cadc/ac/server/web/users/GetUserActionTest.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/test/java/ca/nrc/cadc/ac/server/web/users/GetUserListActionTest.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/test/java/ca/nrc/cadc/ac/server/web/users/ModifyUserActionTest.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/test/java/ca/nrc/cadc/ac/server/web/users/UserActionFactoryTest.java (100%) rename {cadcAccessControl-Server => cadc-access-control-server}/src/test/resources/LocalAuthority.properties (100%) rename {cadcAccessControl => cadc-access-control}/README.md (100%) rename {cadcAccessControl => cadc-access-control}/doc/AccessControl.0.1.png (100%) rename {cadcAccessControl => cadc-access-control}/doc/AccessControl.0.2.png (100%) rename {cadcAccessControl => cadc-access-control}/doc/auth.0.1.zargo (100%) rename {cadcAccessControl => cadc-access-control}/doc/auth.0.2.zargo (100%) rename {cadcAccessControl => cadc-access-control}/scripts/cadcGMSClient (100%) rename {cadcAccessControl => cadc-access-control}/src/main/java/ca/nrc/cadc/ac/AC.java (100%) rename {cadcAccessControl => cadc-access-control}/src/main/java/ca/nrc/cadc/ac/ActivatedGroup.java (100%) rename {cadcAccessControl => cadc-access-control}/src/main/java/ca/nrc/cadc/ac/Group.java (100%) rename {cadcAccessControl => cadc-access-control}/src/main/java/ca/nrc/cadc/ac/GroupAlreadyExistsException.java (100%) rename {cadcAccessControl => cadc-access-control}/src/main/java/ca/nrc/cadc/ac/GroupNotFoundException.java (100%) rename {cadcAccessControl => cadc-access-control}/src/main/java/ca/nrc/cadc/ac/GroupProperty.java (100%) rename {cadcAccessControl => cadc-access-control}/src/main/java/ca/nrc/cadc/ac/InternalID.java (100%) rename {cadcAccessControl => cadc-access-control}/src/main/java/ca/nrc/cadc/ac/MemberAlreadyExistsException.java (100%) rename {cadcAccessControl => cadc-access-control}/src/main/java/ca/nrc/cadc/ac/MemberNotFoundException.java (100%) rename {cadcAccessControl => cadc-access-control}/src/main/java/ca/nrc/cadc/ac/PersonalDetails.java (100%) rename {cadcAccessControl => cadc-access-control}/src/main/java/ca/nrc/cadc/ac/PosixDetails.java (100%) rename {cadcAccessControl => cadc-access-control}/src/main/java/ca/nrc/cadc/ac/ReaderException.java (100%) rename {cadcAccessControl => cadc-access-control}/src/main/java/ca/nrc/cadc/ac/Role.java (100%) rename {cadcAccessControl => cadc-access-control}/src/main/java/ca/nrc/cadc/ac/User.java (100%) rename {cadcAccessControl => cadc-access-control}/src/main/java/ca/nrc/cadc/ac/UserAlreadyExistsException.java (100%) rename {cadcAccessControl => cadc-access-control}/src/main/java/ca/nrc/cadc/ac/UserNotFoundException.java (100%) rename {cadcAccessControl => cadc-access-control}/src/main/java/ca/nrc/cadc/ac/UserRequest.java (100%) rename {cadcAccessControl => cadc-access-control}/src/main/java/ca/nrc/cadc/ac/UserSet.java (100%) rename {cadcAccessControl => cadc-access-control}/src/main/java/ca/nrc/cadc/ac/WriterException.java (100%) rename {cadcAccessControl => cadc-access-control}/src/main/java/ca/nrc/cadc/ac/client/GMSClient.java (100%) rename {cadcAccessControl => cadc-access-control}/src/main/java/ca/nrc/cadc/ac/client/GMSClientMain.java (100%) rename {cadcAccessControl => cadc-access-control}/src/main/java/ca/nrc/cadc/ac/client/GroupMemberships.java (100%) rename {cadcAccessControl => cadc-access-control}/src/main/java/ca/nrc/cadc/ac/client/JsonUserListInputStreamWrapper.java (100%) rename {cadcAccessControl => cadc-access-control}/src/main/java/ca/nrc/cadc/ac/client/UserClient.java (100%) rename {cadcAccessControl => cadc-access-control}/src/main/java/ca/nrc/cadc/ac/json/JsonGroupReader.java (100%) rename {cadcAccessControl => cadc-access-control}/src/main/java/ca/nrc/cadc/ac/json/JsonGroupWriter.java (100%) rename {cadcAccessControl => cadc-access-control}/src/main/java/ca/nrc/cadc/ac/json/JsonUserListReader.java (100%) rename {cadcAccessControl => cadc-access-control}/src/main/java/ca/nrc/cadc/ac/json/JsonUserListWriter.java (100%) rename {cadcAccessControl => cadc-access-control}/src/main/java/ca/nrc/cadc/ac/json/JsonUserReader.java (100%) rename {cadcAccessControl => cadc-access-control}/src/main/java/ca/nrc/cadc/ac/json/JsonUserRequestReader.java (100%) rename {cadcAccessControl => cadc-access-control}/src/main/java/ca/nrc/cadc/ac/json/JsonUserRequestWriter.java (100%) rename {cadcAccessControl => cadc-access-control}/src/main/java/ca/nrc/cadc/ac/json/JsonUserWriter.java (100%) rename {cadcAccessControl => cadc-access-control}/src/main/java/ca/nrc/cadc/ac/xml/AbstractReaderWriter.java (100%) rename {cadcAccessControl => cadc-access-control}/src/main/java/ca/nrc/cadc/ac/xml/GroupListReader.java (100%) rename {cadcAccessControl => cadc-access-control}/src/main/java/ca/nrc/cadc/ac/xml/GroupListWriter.java (100%) rename {cadcAccessControl => cadc-access-control}/src/main/java/ca/nrc/cadc/ac/xml/GroupReader.java (100%) rename {cadcAccessControl => cadc-access-control}/src/main/java/ca/nrc/cadc/ac/xml/GroupWriter.java (100%) rename {cadcAccessControl => cadc-access-control}/src/main/java/ca/nrc/cadc/ac/xml/UserListReader.java (100%) rename {cadcAccessControl => cadc-access-control}/src/main/java/ca/nrc/cadc/ac/xml/UserListWriter.java (100%) rename {cadcAccessControl => cadc-access-control}/src/main/java/ca/nrc/cadc/ac/xml/UserReader.java (100%) rename {cadcAccessControl => cadc-access-control}/src/main/java/ca/nrc/cadc/ac/xml/UserRequestReader.java (100%) rename {cadcAccessControl => cadc-access-control}/src/main/java/ca/nrc/cadc/ac/xml/UserRequestWriter.java (100%) rename {cadcAccessControl => cadc-access-control}/src/main/java/ca/nrc/cadc/ac/xml/UserWriter.java (100%) rename {cadcAccessControl => cadc-access-control}/src/test/java/ca/nrc/cadc/ac/GroupPropertyTest.java (100%) rename {cadcAccessControl => cadc-access-control}/src/test/java/ca/nrc/cadc/ac/GroupTest.java (100%) rename {cadcAccessControl => cadc-access-control}/src/test/java/ca/nrc/cadc/ac/PersonalDetailsTest.java (100%) rename {cadcAccessControl => cadc-access-control}/src/test/java/ca/nrc/cadc/ac/PosixDetailsTest.java (100%) rename {cadcAccessControl => cadc-access-control}/src/test/java/ca/nrc/cadc/ac/RoleTest.java (100%) rename {cadcAccessControl => cadc-access-control}/src/test/java/ca/nrc/cadc/ac/TestUtil.java (100%) rename {cadcAccessControl => cadc-access-control}/src/test/java/ca/nrc/cadc/ac/UserRequestTest.java (100%) rename {cadcAccessControl => cadc-access-control}/src/test/java/ca/nrc/cadc/ac/UserTest.java (100%) rename {cadcAccessControl => cadc-access-control}/src/test/java/ca/nrc/cadc/ac/client/GMSClientTest.java (100%) rename {cadcAccessControl => cadc-access-control}/src/test/java/ca/nrc/cadc/ac/client/JsonUserListInputStreamWrapperTest.java (100%) rename {cadcAccessControl => cadc-access-control}/src/test/java/ca/nrc/cadc/ac/client/UserClientTest.java (100%) rename {cadcAccessControl => cadc-access-control}/src/test/java/ca/nrc/cadc/ac/json/JsonGroupReaderWriterTest.java (100%) rename {cadcAccessControl => cadc-access-control}/src/test/java/ca/nrc/cadc/ac/json/JsonUserListReaderWriterTest.java (100%) rename {cadcAccessControl => cadc-access-control}/src/test/java/ca/nrc/cadc/ac/json/JsonUserReaderWriterTest.java (100%) rename {cadcAccessControl => cadc-access-control}/src/test/java/ca/nrc/cadc/ac/json/JsonUserRequestReaderWriterTest.java (100%) rename {cadcAccessControl => cadc-access-control}/src/test/java/ca/nrc/cadc/ac/xml/GroupListReaderWriterTest.java (100%) rename {cadcAccessControl => cadc-access-control}/src/test/java/ca/nrc/cadc/ac/xml/GroupPropertyReaderWriterTest.java (100%) rename {cadcAccessControl => cadc-access-control}/src/test/java/ca/nrc/cadc/ac/xml/GroupReaderWriterTest.java (100%) rename {cadcAccessControl => cadc-access-control}/src/test/java/ca/nrc/cadc/ac/xml/IdentityReaderWriterTest.java (100%) rename {cadcAccessControl => cadc-access-control}/src/test/java/ca/nrc/cadc/ac/xml/UserDetailsReaderWriterTest.java (100%) rename {cadcAccessControl => cadc-access-control}/src/test/java/ca/nrc/cadc/ac/xml/UserListReaderWriterTest.java (100%) rename {cadcAccessControl => cadc-access-control}/src/test/java/ca/nrc/cadc/ac/xml/UserReaderWriterTest.java (100%) rename {cadcAccessControl => cadc-access-control}/src/test/java/ca/nrc/cadc/ac/xml/UserRequestReaderWriterTest.java (100%) rename {cadcAccessControl => cadc-access-control}/src/test/resources/LocalAuthority.properties (100%) rename {cadcTomcat => cadc-tomcat}/README.md (100%) rename {cadcTomcat => cadc-tomcat}/build.gradle (84%) rename {cadcTomcat => cadc-tomcat}/src/main/java/ca/nrc/cadc/tomcat/AuthenticationLookup.java (100%) rename {cadcTomcat => cadc-tomcat}/src/main/java/ca/nrc/cadc/tomcat/CadcBasicAuthenticator.java (100%) rename {cadcTomcat => cadc-tomcat}/src/main/java/ca/nrc/cadc/tomcat/CadcSSLImplementation.java (100%) rename {cadcTomcat => cadc-tomcat}/src/main/java/ca/nrc/cadc/tomcat/CadcSSLSocketFactory.java (100%) rename {cadcTomcat => cadc-tomcat}/src/main/java/ca/nrc/cadc/tomcat/CadcX509TrustManager.java (100%) rename {cadcTomcat => cadc-tomcat}/src/main/java/ca/nrc/cadc/tomcat/RealmMultiValuedProperties.java (100%) rename {cadcTomcat => cadc-tomcat}/src/main/java/ca/nrc/cadc/tomcat/RealmUtil.java (100%) rename {cadcTomcat => cadc-tomcat}/src/main/resources/RegistryClient.properties (100%) rename {cadcTomcat => cadc-tomcat}/src/test/config/RegistryClient.properties (100%) rename {cadcTomcat => cadc-tomcat}/src/test/java/ca/nrc/cadc/tomcat/AuthenticationLookupTest.java (100%) rename {cadcTomcat => cadc-tomcat}/src/test/java/ca/nrc/cadc/tomcat/CadcBasicAuthenticatorTest.java (100%) diff --git a/cadcAccessControl-Admin/.gitignore b/cadc-access-control-admin/.gitignore similarity index 100% rename from cadcAccessControl-Admin/.gitignore rename to cadc-access-control-admin/.gitignore diff --git a/cadcAccessControl-Admin/README.md b/cadc-access-control-admin/README.md similarity index 100% rename from cadcAccessControl-Admin/README.md rename to cadc-access-control-admin/README.md diff --git a/cadcAccessControl-Admin/build.gradle b/cadc-access-control-admin/build.gradle similarity index 75% rename from cadcAccessControl-Admin/build.gradle rename to cadc-access-control-admin/build.gradle index 84e21231..9edf85b7 100644 --- a/cadcAccessControl-Admin/build.gradle +++ b/cadc-access-control-admin/build.gradle @@ -16,7 +16,7 @@ repositories { } sourceCompatibility = 1.7 -group = 'opencadc' +group = 'org.opencadc' version = '1.0' @@ -29,11 +29,11 @@ dependencies { compile 'commons-fileupload:commons-fileupload:1.3.+' compile 'com.sun.mail:javax.mail:1.+' - compile 'opencadc:cadcUtil:1.+' - compile 'opencadc:cadcLog:1.+' - compile 'opencadc:cadcRegistry:1.+' - compile 'opencadc:cadcAccessControl:1.+' - compile 'opencadc:cadcAccessControl-Server:1.+' + compile 'org.opencadc:cadc-util:1.+' + compile 'org.opencadc:cadc-log:1.+' + compile 'org.opencadc:cadc-registry:1.+' + compile 'org.opencadc:cadc-access-control:1.+' + compile 'org.opencadc:cadc-access-control-server:1.+' testCompile 'junit:junit:4.+' testCompile 'org.easymock:easymock:3.+' diff --git a/cadcAccessControl-Admin/config/ac-admin-email.properties b/cadc-access-control-admin/config/ac-admin-email.properties similarity index 100% rename from cadcAccessControl-Admin/config/ac-admin-email.properties rename to cadc-access-control-admin/config/ac-admin-email.properties diff --git a/cadcAccessControl-Admin/local.build.properties b/cadc-access-control-admin/local.build.properties similarity index 100% rename from cadcAccessControl-Admin/local.build.properties rename to cadc-access-control-admin/local.build.properties diff --git a/cadcAccessControl-Admin/scripts/userAdmin b/cadc-access-control-admin/scripts/userAdmin similarity index 100% rename from cadcAccessControl-Admin/scripts/userAdmin rename to cadc-access-control-admin/scripts/userAdmin diff --git a/cadcAccessControl-Admin/src/main/java/ca/nrc/cadc/ac/admin/AbstractCommand.java b/cadc-access-control-admin/src/main/java/ca/nrc/cadc/ac/admin/AbstractCommand.java similarity index 100% rename from cadcAccessControl-Admin/src/main/java/ca/nrc/cadc/ac/admin/AbstractCommand.java rename to cadc-access-control-admin/src/main/java/ca/nrc/cadc/ac/admin/AbstractCommand.java diff --git a/cadcAccessControl-Admin/src/main/java/ca/nrc/cadc/ac/admin/AbstractListUsers.java b/cadc-access-control-admin/src/main/java/ca/nrc/cadc/ac/admin/AbstractListUsers.java similarity index 100% rename from cadcAccessControl-Admin/src/main/java/ca/nrc/cadc/ac/admin/AbstractListUsers.java rename to cadc-access-control-admin/src/main/java/ca/nrc/cadc/ac/admin/AbstractListUsers.java diff --git a/cadcAccessControl-Admin/src/main/java/ca/nrc/cadc/ac/admin/AbstractUserCommand.java b/cadc-access-control-admin/src/main/java/ca/nrc/cadc/ac/admin/AbstractUserCommand.java similarity index 100% rename from cadcAccessControl-Admin/src/main/java/ca/nrc/cadc/ac/admin/AbstractUserCommand.java rename to cadc-access-control-admin/src/main/java/ca/nrc/cadc/ac/admin/AbstractUserCommand.java diff --git a/cadcAccessControl-Admin/src/main/java/ca/nrc/cadc/ac/admin/ApproveUser.java b/cadc-access-control-admin/src/main/java/ca/nrc/cadc/ac/admin/ApproveUser.java similarity index 100% rename from cadcAccessControl-Admin/src/main/java/ca/nrc/cadc/ac/admin/ApproveUser.java rename to cadc-access-control-admin/src/main/java/ca/nrc/cadc/ac/admin/ApproveUser.java diff --git a/cadcAccessControl-Admin/src/main/java/ca/nrc/cadc/ac/admin/CmdLineParser.java b/cadc-access-control-admin/src/main/java/ca/nrc/cadc/ac/admin/CmdLineParser.java similarity index 100% rename from cadcAccessControl-Admin/src/main/java/ca/nrc/cadc/ac/admin/CmdLineParser.java rename to cadc-access-control-admin/src/main/java/ca/nrc/cadc/ac/admin/CmdLineParser.java diff --git a/cadcAccessControl-Admin/src/main/java/ca/nrc/cadc/ac/admin/CommandRunner.java b/cadc-access-control-admin/src/main/java/ca/nrc/cadc/ac/admin/CommandRunner.java similarity index 100% rename from cadcAccessControl-Admin/src/main/java/ca/nrc/cadc/ac/admin/CommandRunner.java rename to cadc-access-control-admin/src/main/java/ca/nrc/cadc/ac/admin/CommandRunner.java diff --git a/cadcAccessControl-Admin/src/main/java/ca/nrc/cadc/ac/admin/ContextFactoryImpl.java b/cadc-access-control-admin/src/main/java/ca/nrc/cadc/ac/admin/ContextFactoryImpl.java similarity index 100% rename from cadcAccessControl-Admin/src/main/java/ca/nrc/cadc/ac/admin/ContextFactoryImpl.java rename to cadc-access-control-admin/src/main/java/ca/nrc/cadc/ac/admin/ContextFactoryImpl.java diff --git a/cadcAccessControl-Admin/src/main/java/ca/nrc/cadc/ac/admin/ContextImpl.java b/cadc-access-control-admin/src/main/java/ca/nrc/cadc/ac/admin/ContextImpl.java similarity index 100% rename from cadcAccessControl-Admin/src/main/java/ca/nrc/cadc/ac/admin/ContextImpl.java rename to cadc-access-control-admin/src/main/java/ca/nrc/cadc/ac/admin/ContextImpl.java diff --git a/cadcAccessControl-Admin/src/main/java/ca/nrc/cadc/ac/admin/ListUserRequests.java b/cadc-access-control-admin/src/main/java/ca/nrc/cadc/ac/admin/ListUserRequests.java similarity index 100% rename from cadcAccessControl-Admin/src/main/java/ca/nrc/cadc/ac/admin/ListUserRequests.java rename to cadc-access-control-admin/src/main/java/ca/nrc/cadc/ac/admin/ListUserRequests.java diff --git a/cadcAccessControl-Admin/src/main/java/ca/nrc/cadc/ac/admin/ListUsers.java b/cadc-access-control-admin/src/main/java/ca/nrc/cadc/ac/admin/ListUsers.java similarity index 100% rename from cadcAccessControl-Admin/src/main/java/ca/nrc/cadc/ac/admin/ListUsers.java rename to cadc-access-control-admin/src/main/java/ca/nrc/cadc/ac/admin/ListUsers.java diff --git a/cadcAccessControl-Admin/src/main/java/ca/nrc/cadc/ac/admin/Main.java b/cadc-access-control-admin/src/main/java/ca/nrc/cadc/ac/admin/Main.java similarity index 100% rename from cadcAccessControl-Admin/src/main/java/ca/nrc/cadc/ac/admin/Main.java rename to cadc-access-control-admin/src/main/java/ca/nrc/cadc/ac/admin/Main.java diff --git a/cadcAccessControl-Admin/src/main/java/ca/nrc/cadc/ac/admin/RejectUser.java b/cadc-access-control-admin/src/main/java/ca/nrc/cadc/ac/admin/RejectUser.java similarity index 100% rename from cadcAccessControl-Admin/src/main/java/ca/nrc/cadc/ac/admin/RejectUser.java rename to cadc-access-control-admin/src/main/java/ca/nrc/cadc/ac/admin/RejectUser.java diff --git a/cadcAccessControl-Admin/src/main/java/ca/nrc/cadc/ac/admin/UsageException.java b/cadc-access-control-admin/src/main/java/ca/nrc/cadc/ac/admin/UsageException.java similarity index 100% rename from cadcAccessControl-Admin/src/main/java/ca/nrc/cadc/ac/admin/UsageException.java rename to cadc-access-control-admin/src/main/java/ca/nrc/cadc/ac/admin/UsageException.java diff --git a/cadcAccessControl-Admin/src/main/java/ca/nrc/cadc/ac/admin/ViewUser.java b/cadc-access-control-admin/src/main/java/ca/nrc/cadc/ac/admin/ViewUser.java similarity index 100% rename from cadcAccessControl-Admin/src/main/java/ca/nrc/cadc/ac/admin/ViewUser.java rename to cadc-access-control-admin/src/main/java/ca/nrc/cadc/ac/admin/ViewUser.java diff --git a/cadcAccessControl-Admin/src/test/java/ca/nrc/cadc/ac/admin/CmdLineParserTest.java b/cadc-access-control-admin/src/test/java/ca/nrc/cadc/ac/admin/CmdLineParserTest.java similarity index 100% rename from cadcAccessControl-Admin/src/test/java/ca/nrc/cadc/ac/admin/CmdLineParserTest.java rename to cadc-access-control-admin/src/test/java/ca/nrc/cadc/ac/admin/CmdLineParserTest.java diff --git a/cadcAccessControl-Admin/src/userAdmin.mf b/cadc-access-control-admin/src/userAdmin.mf similarity index 100% rename from cadcAccessControl-Admin/src/userAdmin.mf rename to cadc-access-control-admin/src/userAdmin.mf diff --git a/cadcAccessControl-Identity/README.md b/cadc-access-control-identity/README.md similarity index 100% rename from cadcAccessControl-Identity/README.md rename to cadc-access-control-identity/README.md diff --git a/cadcAccessControl-Identity/build.gradle b/cadc-access-control-identity/build.gradle similarity index 60% rename from cadcAccessControl-Identity/build.gradle rename to cadc-access-control-identity/build.gradle index 47533be4..c7314f5a 100644 --- a/cadcAccessControl-Identity/build.gradle +++ b/cadc-access-control-identity/build.gradle @@ -16,16 +16,16 @@ repositories { } sourceCompatibility = 1.7 -group = 'opencadc' +group = 'org.opencadc' version = '1.0' dependencies { compile 'log4j:log4j:1.2.+' - compile 'opencadc:cadcUtil:1.+' - compile 'opencadc:cadcLog:1.+' - compile 'opencadc:cadcRegistry:1.+' - compile 'opencadc:cadcVOSI:1.+' - compile 'opencadc:cadcAccessControl:1.+' + compile 'org.opencadc:cadc-util:1.+' + compile 'org.opencadc:cadc-log:1.+' + compile 'org.opencadc:cadc-registry:1.+' + compile 'org.opencadc:cadc-vosi:1.+' + compile 'org.opencadc:cadc-access-control:1.+' } diff --git a/cadcAccessControl-Identity/src/main/java/ca/nrc/cadc/auth/ACIdentityManager.java b/cadc-access-control-identity/src/main/java/ca/nrc/cadc/auth/ACIdentityManager.java similarity index 100% rename from cadcAccessControl-Identity/src/main/java/ca/nrc/cadc/auth/ACIdentityManager.java rename to cadc-access-control-identity/src/main/java/ca/nrc/cadc/auth/ACIdentityManager.java diff --git a/cadcAccessControl-Identity/src/main/java/ca/nrc/cadc/auth/AuthenticatorImpl.java b/cadc-access-control-identity/src/main/java/ca/nrc/cadc/auth/AuthenticatorImpl.java similarity index 100% rename from cadcAccessControl-Identity/src/main/java/ca/nrc/cadc/auth/AuthenticatorImpl.java rename to cadc-access-control-identity/src/main/java/ca/nrc/cadc/auth/AuthenticatorImpl.java diff --git a/cadcAccessControl-Server/.dbrc_example b/cadc-access-control-server/.dbrc_example similarity index 100% rename from cadcAccessControl-Server/.dbrc_example rename to cadc-access-control-server/.dbrc_example diff --git a/cadcAccessControl-Server/LdapConfig.properties b/cadc-access-control-server/LdapConfig.properties similarity index 100% rename from cadcAccessControl-Server/LdapConfig.properties rename to cadc-access-control-server/LdapConfig.properties diff --git a/cadcAccessControl-Server/PluginFactory.properties b/cadc-access-control-server/PluginFactory.properties similarity index 100% rename from cadcAccessControl-Server/PluginFactory.properties rename to cadc-access-control-server/PluginFactory.properties diff --git a/cadcAccessControl-Server/README.md b/cadc-access-control-server/README.md similarity index 100% rename from cadcAccessControl-Server/README.md rename to cadc-access-control-server/README.md diff --git a/cadcAccessControl-Server/build.gradle b/cadc-access-control-server/build.gradle similarity index 73% rename from cadcAccessControl-Server/build.gradle rename to cadc-access-control-server/build.gradle index 300ab4ae..64243608 100644 --- a/cadcAccessControl-Server/build.gradle +++ b/cadc-access-control-server/build.gradle @@ -16,7 +16,7 @@ repositories { } sourceCompatibility = 1.7 -group = 'opencadc' +group = 'org.opencadc' version = '1.0' @@ -28,12 +28,12 @@ dependencies { compile 'xerces:xercesImpl:2.+' compile 'com.unboundid:unboundid-ldapsdk:2.3.+' - compile 'opencadc:cadcAccessControl:1.+' - compile 'opencadc:cadcUtil:1.+' - compile 'opencadc:cadcLog:1.+' - compile 'opencadc:cadcRegistry:1.+' - compile 'opencadc:cadcUWS:1.+' - compile 'opencadc:cadcUWS-Server:1.+' + compile 'org.opencadc:cadc-access-control:1.+' + compile 'org.opencadc:cadc-util:1.+' + compile 'org.opencadc:cadc-log:1.+' + compile 'org.opencadc:cadc-registry:1.+' + compile 'org.opencadc:cadc-uws:1.+' + compile 'org.opencadc:cadc-uws-server:1.+' testCompile 'junit:junit:4.+' testCompile 'org.easymock:easymock:3.+' diff --git a/cadcAccessControl-Server/src/integration/java/ca/nrc/cadc/ac/server/ldap/AbstractLdapDAOTest.java b/cadc-access-control-server/src/integration/java/ca/nrc/cadc/ac/server/ldap/AbstractLdapDAOTest.java similarity index 100% rename from cadcAccessControl-Server/src/integration/java/ca/nrc/cadc/ac/server/ldap/AbstractLdapDAOTest.java rename to cadc-access-control-server/src/integration/java/ca/nrc/cadc/ac/server/ldap/AbstractLdapDAOTest.java diff --git a/cadcAccessControl-Server/src/integration/java/ca/nrc/cadc/ac/server/ldap/LdapDAOTest.java b/cadc-access-control-server/src/integration/java/ca/nrc/cadc/ac/server/ldap/LdapDAOTest.java similarity index 100% rename from cadcAccessControl-Server/src/integration/java/ca/nrc/cadc/ac/server/ldap/LdapDAOTest.java rename to cadc-access-control-server/src/integration/java/ca/nrc/cadc/ac/server/ldap/LdapDAOTest.java diff --git a/cadcAccessControl-Server/src/integration/java/ca/nrc/cadc/ac/server/ldap/LdapDAOTestImpl.java b/cadc-access-control-server/src/integration/java/ca/nrc/cadc/ac/server/ldap/LdapDAOTestImpl.java similarity index 100% rename from cadcAccessControl-Server/src/integration/java/ca/nrc/cadc/ac/server/ldap/LdapDAOTestImpl.java rename to cadc-access-control-server/src/integration/java/ca/nrc/cadc/ac/server/ldap/LdapDAOTestImpl.java diff --git a/cadcAccessControl-Server/src/integration/java/ca/nrc/cadc/ac/server/ldap/LdapGroupDAOTest.java b/cadc-access-control-server/src/integration/java/ca/nrc/cadc/ac/server/ldap/LdapGroupDAOTest.java similarity index 100% rename from cadcAccessControl-Server/src/integration/java/ca/nrc/cadc/ac/server/ldap/LdapGroupDAOTest.java rename to cadc-access-control-server/src/integration/java/ca/nrc/cadc/ac/server/ldap/LdapGroupDAOTest.java diff --git a/cadcAccessControl-Server/src/integration/java/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java b/cadc-access-control-server/src/integration/java/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java similarity index 100% rename from cadcAccessControl-Server/src/integration/java/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java rename to cadc-access-control-server/src/integration/java/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/ACScopeValidator.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/ACScopeValidator.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/ACScopeValidator.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/ACScopeValidator.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/GroupDetailSelector.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/GroupDetailSelector.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/GroupDetailSelector.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/GroupDetailSelector.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/GroupPersistence.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/GroupPersistence.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/GroupPersistence.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/GroupPersistence.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/PluginFactory.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/PluginFactory.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/PluginFactory.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/PluginFactory.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/RequestValidator.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/RequestValidator.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/RequestValidator.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/RequestValidator.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/UserPersistence.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/UserPersistence.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/UserPersistence.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/UserPersistence.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/ldap/ConnectionPools.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/ldap/ConnectionPools.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/ldap/ConnectionPools.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/ldap/ConnectionPools.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapConfig.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapConfig.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapConfig.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapConfig.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapConnectionPool.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapConnectionPool.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapConnectionPool.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapConnectionPool.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapConnections.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapConnections.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapConnections.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapConnections.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapDAO.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapDAO.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapDAO.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapDAO.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapGroupPersistence.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapGroupPersistence.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapGroupPersistence.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapGroupPersistence.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapPersistence.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapPersistence.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapPersistence.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapPersistence.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapUserPersistence.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapUserPersistence.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapUserPersistence.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/ldap/LdapUserPersistence.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/ACSearchRunner.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/ACSearchRunner.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/ACSearchRunner.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/ACSearchRunner.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/GroupServlet.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/GroupServlet.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/GroupServlet.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/GroupServlet.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/LoginServlet.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/LoginServlet.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/LoginServlet.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/LoginServlet.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/ModifyPasswordServlet.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/ModifyPasswordServlet.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/ModifyPasswordServlet.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/ModifyPasswordServlet.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/ResetPasswordServlet.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/ResetPasswordServlet.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/ResetPasswordServlet.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/ResetPasswordServlet.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/SyncOutput.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/SyncOutput.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/SyncOutput.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/SyncOutput.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/UserRequestServlet.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/UserRequestServlet.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/UserRequestServlet.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/UserRequestServlet.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/UserServlet.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/UserServlet.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/UserServlet.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/UserServlet.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/WebUtil.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/WebUtil.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/WebUtil.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/WebUtil.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/WhoAmIServlet.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/WhoAmIServlet.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/WhoAmIServlet.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/WhoAmIServlet.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/groups/AbstractGroupAction.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/groups/AbstractGroupAction.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/groups/AbstractGroupAction.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/groups/AbstractGroupAction.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/groups/AddGroupMemberAction.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/groups/AddGroupMemberAction.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/groups/AddGroupMemberAction.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/groups/AddGroupMemberAction.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/groups/AddUserMemberAction.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/groups/AddUserMemberAction.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/groups/AddUserMemberAction.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/groups/AddUserMemberAction.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/groups/CreateGroupAction.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/groups/CreateGroupAction.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/groups/CreateGroupAction.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/groups/CreateGroupAction.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/groups/DeleteGroupAction.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/groups/DeleteGroupAction.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/groups/DeleteGroupAction.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/groups/DeleteGroupAction.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/groups/GetGroupAction.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/groups/GetGroupAction.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/groups/GetGroupAction.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/groups/GetGroupAction.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/groups/GetGroupNamesAction.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/groups/GetGroupNamesAction.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/groups/GetGroupNamesAction.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/groups/GetGroupNamesAction.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/groups/GroupLogInfo.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/groups/GroupLogInfo.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/groups/GroupLogInfo.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/groups/GroupLogInfo.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/groups/GroupsActionFactory.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/groups/GroupsActionFactory.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/groups/GroupsActionFactory.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/groups/GroupsActionFactory.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/groups/ModifyGroupAction.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/groups/ModifyGroupAction.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/groups/ModifyGroupAction.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/groups/ModifyGroupAction.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/groups/RemoveGroupMemberAction.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/groups/RemoveGroupMemberAction.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/groups/RemoveGroupMemberAction.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/groups/RemoveGroupMemberAction.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/groups/RemoveUserMemberAction.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/groups/RemoveUserMemberAction.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/groups/RemoveUserMemberAction.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/groups/RemoveUserMemberAction.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/userrequests/AbstractUserRequestAction.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/userrequests/AbstractUserRequestAction.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/userrequests/AbstractUserRequestAction.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/userrequests/AbstractUserRequestAction.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/userrequests/CreateUserRequestAction.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/userrequests/CreateUserRequestAction.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/userrequests/CreateUserRequestAction.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/userrequests/CreateUserRequestAction.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/userrequests/UserRequestActionFactory.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/userrequests/UserRequestActionFactory.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/userrequests/UserRequestActionFactory.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/userrequests/UserRequestActionFactory.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/users/AbstractUserAction.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/users/AbstractUserAction.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/users/AbstractUserAction.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/users/AbstractUserAction.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/users/CreateUserAction.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/users/CreateUserAction.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/users/CreateUserAction.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/users/CreateUserAction.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/users/DeleteUserAction.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/users/DeleteUserAction.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/users/DeleteUserAction.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/users/DeleteUserAction.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/users/GetUserAction.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/users/GetUserAction.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/users/GetUserAction.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/users/GetUserAction.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/users/GetUserListAction.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/users/GetUserListAction.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/users/GetUserListAction.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/users/GetUserListAction.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/users/ModifyUserAction.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/users/ModifyUserAction.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/users/ModifyUserAction.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/users/ModifyUserAction.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/users/UserActionFactory.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/users/UserActionFactory.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/users/UserActionFactory.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/users/UserActionFactory.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/users/UserLogInfo.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/users/UserLogInfo.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/ac/server/web/users/UserLogInfo.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/ac/server/web/users/UserLogInfo.java diff --git a/cadcAccessControl-Server/src/main/java/ca/nrc/cadc/auth/AuthenticatorImpl.java b/cadc-access-control-server/src/main/java/ca/nrc/cadc/auth/AuthenticatorImpl.java similarity index 100% rename from cadcAccessControl-Server/src/main/java/ca/nrc/cadc/auth/AuthenticatorImpl.java rename to cadc-access-control-server/src/main/java/ca/nrc/cadc/auth/AuthenticatorImpl.java diff --git a/cadcAccessControl-Server/src/test/config/.dbrc b/cadc-access-control-server/src/test/config/.dbrc similarity index 100% rename from cadcAccessControl-Server/src/test/config/.dbrc rename to cadc-access-control-server/src/test/config/.dbrc diff --git a/cadcAccessControl-Server/src/test/config/LdapConfig.properties b/cadc-access-control-server/src/test/config/LdapConfig.properties similarity index 100% rename from cadcAccessControl-Server/src/test/config/LdapConfig.properties rename to cadc-access-control-server/src/test/config/LdapConfig.properties diff --git a/cadcAccessControl-Server/src/test/config/testConfig.offline.properties b/cadc-access-control-server/src/test/config/testConfig.offline.properties similarity index 100% rename from cadcAccessControl-Server/src/test/config/testConfig.offline.properties rename to cadc-access-control-server/src/test/config/testConfig.offline.properties diff --git a/cadcAccessControl-Server/src/test/config/testConfig.read-only.properties b/cadc-access-control-server/src/test/config/testConfig.read-only.properties similarity index 100% rename from cadcAccessControl-Server/src/test/config/testConfig.read-only.properties rename to cadc-access-control-server/src/test/config/testConfig.read-only.properties diff --git a/cadcAccessControl-Server/src/test/config/testConfig1.properties b/cadc-access-control-server/src/test/config/testConfig1.properties similarity index 100% rename from cadcAccessControl-Server/src/test/config/testConfig1.properties rename to cadc-access-control-server/src/test/config/testConfig1.properties diff --git a/cadcAccessControl-Server/src/test/config/testConfig2.properties b/cadc-access-control-server/src/test/config/testConfig2.properties similarity index 100% rename from cadcAccessControl-Server/src/test/config/testConfig2.properties rename to cadc-access-control-server/src/test/config/testConfig2.properties diff --git a/cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/RequestValidatorTest.java b/cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/RequestValidatorTest.java similarity index 100% rename from cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/RequestValidatorTest.java rename to cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/RequestValidatorTest.java diff --git a/cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/ldap/LdapConfigTest.java b/cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/ldap/LdapConfigTest.java similarity index 100% rename from cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/ldap/LdapConfigTest.java rename to cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/ldap/LdapConfigTest.java diff --git a/cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/ldap/LdapConnectionsTest.java b/cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/ldap/LdapConnectionsTest.java similarity index 100% rename from cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/ldap/LdapConnectionsTest.java rename to cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/ldap/LdapConnectionsTest.java diff --git a/cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/ldap/LdapPersistenceTest.java b/cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/ldap/LdapPersistenceTest.java similarity index 100% rename from cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/ldap/LdapPersistenceTest.java rename to cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/ldap/LdapPersistenceTest.java diff --git a/cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/web/ModifyPasswordServletTest.java b/cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/web/ModifyPasswordServletTest.java similarity index 100% rename from cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/web/ModifyPasswordServletTest.java rename to cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/web/ModifyPasswordServletTest.java diff --git a/cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/web/ResetPasswordServletTest.java b/cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/web/ResetPasswordServletTest.java similarity index 100% rename from cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/web/ResetPasswordServletTest.java rename to cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/web/ResetPasswordServletTest.java diff --git a/cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/web/UserLoginServletTest.java b/cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/web/UserLoginServletTest.java similarity index 100% rename from cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/web/UserLoginServletTest.java rename to cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/web/UserLoginServletTest.java diff --git a/cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/web/UserRequestServletTest.java b/cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/web/UserRequestServletTest.java similarity index 100% rename from cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/web/UserRequestServletTest.java rename to cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/web/UserRequestServletTest.java diff --git a/cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/web/UserServletTest.java b/cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/web/UserServletTest.java similarity index 100% rename from cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/web/UserServletTest.java rename to cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/web/UserServletTest.java diff --git a/cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/web/WhoAmIServletTest.java b/cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/web/WhoAmIServletTest.java similarity index 100% rename from cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/web/WhoAmIServletTest.java rename to cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/web/WhoAmIServletTest.java diff --git a/cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/web/groups/AddGroupMemberActionTest.java b/cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/web/groups/AddGroupMemberActionTest.java similarity index 100% rename from cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/web/groups/AddGroupMemberActionTest.java rename to cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/web/groups/AddGroupMemberActionTest.java diff --git a/cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/web/groups/AddUserMemberActionTest.java b/cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/web/groups/AddUserMemberActionTest.java similarity index 100% rename from cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/web/groups/AddUserMemberActionTest.java rename to cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/web/groups/AddUserMemberActionTest.java diff --git a/cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/web/groups/DeleteGroupActionTest.java b/cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/web/groups/DeleteGroupActionTest.java similarity index 100% rename from cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/web/groups/DeleteGroupActionTest.java rename to cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/web/groups/DeleteGroupActionTest.java diff --git a/cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/web/groups/GetGroupNamesActionTest.java b/cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/web/groups/GetGroupNamesActionTest.java similarity index 100% rename from cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/web/groups/GetGroupNamesActionTest.java rename to cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/web/groups/GetGroupNamesActionTest.java diff --git a/cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/web/groups/GroupActionFactoryTest.java b/cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/web/groups/GroupActionFactoryTest.java similarity index 100% rename from cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/web/groups/GroupActionFactoryTest.java rename to cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/web/groups/GroupActionFactoryTest.java diff --git a/cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/web/groups/RemoveGroupMemberActionTest.java b/cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/web/groups/RemoveGroupMemberActionTest.java similarity index 100% rename from cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/web/groups/RemoveGroupMemberActionTest.java rename to cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/web/groups/RemoveGroupMemberActionTest.java diff --git a/cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/web/groups/RemoveUserMemberActionTest.java b/cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/web/groups/RemoveUserMemberActionTest.java similarity index 100% rename from cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/web/groups/RemoveUserMemberActionTest.java rename to cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/web/groups/RemoveUserMemberActionTest.java diff --git a/cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/web/userrequests/CreateUserRequestActionTest.java b/cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/web/userrequests/CreateUserRequestActionTest.java similarity index 100% rename from cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/web/userrequests/CreateUserRequestActionTest.java rename to cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/web/userrequests/CreateUserRequestActionTest.java diff --git a/cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/web/userrequests/UserRequestActionFactoryTest.java b/cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/web/userrequests/UserRequestActionFactoryTest.java similarity index 100% rename from cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/web/userrequests/UserRequestActionFactoryTest.java rename to cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/web/userrequests/UserRequestActionFactoryTest.java diff --git a/cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/web/users/CreateUserActionTest.java b/cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/web/users/CreateUserActionTest.java similarity index 100% rename from cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/web/users/CreateUserActionTest.java rename to cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/web/users/CreateUserActionTest.java diff --git a/cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/web/users/GetUserActionTest.java b/cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/web/users/GetUserActionTest.java similarity index 100% rename from cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/web/users/GetUserActionTest.java rename to cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/web/users/GetUserActionTest.java diff --git a/cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/web/users/GetUserListActionTest.java b/cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/web/users/GetUserListActionTest.java similarity index 100% rename from cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/web/users/GetUserListActionTest.java rename to cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/web/users/GetUserListActionTest.java diff --git a/cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/web/users/ModifyUserActionTest.java b/cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/web/users/ModifyUserActionTest.java similarity index 100% rename from cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/web/users/ModifyUserActionTest.java rename to cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/web/users/ModifyUserActionTest.java diff --git a/cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/web/users/UserActionFactoryTest.java b/cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/web/users/UserActionFactoryTest.java similarity index 100% rename from cadcAccessControl-Server/src/test/java/ca/nrc/cadc/ac/server/web/users/UserActionFactoryTest.java rename to cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/web/users/UserActionFactoryTest.java diff --git a/cadcAccessControl-Server/src/test/resources/LocalAuthority.properties b/cadc-access-control-server/src/test/resources/LocalAuthority.properties similarity index 100% rename from cadcAccessControl-Server/src/test/resources/LocalAuthority.properties rename to cadc-access-control-server/src/test/resources/LocalAuthority.properties diff --git a/cadcAccessControl/README.md b/cadc-access-control/README.md similarity index 100% rename from cadcAccessControl/README.md rename to cadc-access-control/README.md diff --git a/cadcAccessControl/doc/AccessControl.0.1.png b/cadc-access-control/doc/AccessControl.0.1.png similarity index 100% rename from cadcAccessControl/doc/AccessControl.0.1.png rename to cadc-access-control/doc/AccessControl.0.1.png diff --git a/cadcAccessControl/doc/AccessControl.0.2.png b/cadc-access-control/doc/AccessControl.0.2.png similarity index 100% rename from cadcAccessControl/doc/AccessControl.0.2.png rename to cadc-access-control/doc/AccessControl.0.2.png diff --git a/cadcAccessControl/doc/auth.0.1.zargo b/cadc-access-control/doc/auth.0.1.zargo similarity index 100% rename from cadcAccessControl/doc/auth.0.1.zargo rename to cadc-access-control/doc/auth.0.1.zargo diff --git a/cadcAccessControl/doc/auth.0.2.zargo b/cadc-access-control/doc/auth.0.2.zargo similarity index 100% rename from cadcAccessControl/doc/auth.0.2.zargo rename to cadc-access-control/doc/auth.0.2.zargo diff --git a/cadcAccessControl/scripts/cadcGMSClient b/cadc-access-control/scripts/cadcGMSClient similarity index 100% rename from cadcAccessControl/scripts/cadcGMSClient rename to cadc-access-control/scripts/cadcGMSClient diff --git a/cadcAccessControl/src/main/java/ca/nrc/cadc/ac/AC.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/AC.java similarity index 100% rename from cadcAccessControl/src/main/java/ca/nrc/cadc/ac/AC.java rename to cadc-access-control/src/main/java/ca/nrc/cadc/ac/AC.java diff --git a/cadcAccessControl/src/main/java/ca/nrc/cadc/ac/ActivatedGroup.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/ActivatedGroup.java similarity index 100% rename from cadcAccessControl/src/main/java/ca/nrc/cadc/ac/ActivatedGroup.java rename to cadc-access-control/src/main/java/ca/nrc/cadc/ac/ActivatedGroup.java diff --git a/cadcAccessControl/src/main/java/ca/nrc/cadc/ac/Group.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/Group.java similarity index 100% rename from cadcAccessControl/src/main/java/ca/nrc/cadc/ac/Group.java rename to cadc-access-control/src/main/java/ca/nrc/cadc/ac/Group.java diff --git a/cadcAccessControl/src/main/java/ca/nrc/cadc/ac/GroupAlreadyExistsException.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/GroupAlreadyExistsException.java similarity index 100% rename from cadcAccessControl/src/main/java/ca/nrc/cadc/ac/GroupAlreadyExistsException.java rename to cadc-access-control/src/main/java/ca/nrc/cadc/ac/GroupAlreadyExistsException.java diff --git a/cadcAccessControl/src/main/java/ca/nrc/cadc/ac/GroupNotFoundException.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/GroupNotFoundException.java similarity index 100% rename from cadcAccessControl/src/main/java/ca/nrc/cadc/ac/GroupNotFoundException.java rename to cadc-access-control/src/main/java/ca/nrc/cadc/ac/GroupNotFoundException.java diff --git a/cadcAccessControl/src/main/java/ca/nrc/cadc/ac/GroupProperty.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/GroupProperty.java similarity index 100% rename from cadcAccessControl/src/main/java/ca/nrc/cadc/ac/GroupProperty.java rename to cadc-access-control/src/main/java/ca/nrc/cadc/ac/GroupProperty.java diff --git a/cadcAccessControl/src/main/java/ca/nrc/cadc/ac/InternalID.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/InternalID.java similarity index 100% rename from cadcAccessControl/src/main/java/ca/nrc/cadc/ac/InternalID.java rename to cadc-access-control/src/main/java/ca/nrc/cadc/ac/InternalID.java diff --git a/cadcAccessControl/src/main/java/ca/nrc/cadc/ac/MemberAlreadyExistsException.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/MemberAlreadyExistsException.java similarity index 100% rename from cadcAccessControl/src/main/java/ca/nrc/cadc/ac/MemberAlreadyExistsException.java rename to cadc-access-control/src/main/java/ca/nrc/cadc/ac/MemberAlreadyExistsException.java diff --git a/cadcAccessControl/src/main/java/ca/nrc/cadc/ac/MemberNotFoundException.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/MemberNotFoundException.java similarity index 100% rename from cadcAccessControl/src/main/java/ca/nrc/cadc/ac/MemberNotFoundException.java rename to cadc-access-control/src/main/java/ca/nrc/cadc/ac/MemberNotFoundException.java diff --git a/cadcAccessControl/src/main/java/ca/nrc/cadc/ac/PersonalDetails.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/PersonalDetails.java similarity index 100% rename from cadcAccessControl/src/main/java/ca/nrc/cadc/ac/PersonalDetails.java rename to cadc-access-control/src/main/java/ca/nrc/cadc/ac/PersonalDetails.java diff --git a/cadcAccessControl/src/main/java/ca/nrc/cadc/ac/PosixDetails.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/PosixDetails.java similarity index 100% rename from cadcAccessControl/src/main/java/ca/nrc/cadc/ac/PosixDetails.java rename to cadc-access-control/src/main/java/ca/nrc/cadc/ac/PosixDetails.java diff --git a/cadcAccessControl/src/main/java/ca/nrc/cadc/ac/ReaderException.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/ReaderException.java similarity index 100% rename from cadcAccessControl/src/main/java/ca/nrc/cadc/ac/ReaderException.java rename to cadc-access-control/src/main/java/ca/nrc/cadc/ac/ReaderException.java diff --git a/cadcAccessControl/src/main/java/ca/nrc/cadc/ac/Role.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/Role.java similarity index 100% rename from cadcAccessControl/src/main/java/ca/nrc/cadc/ac/Role.java rename to cadc-access-control/src/main/java/ca/nrc/cadc/ac/Role.java diff --git a/cadcAccessControl/src/main/java/ca/nrc/cadc/ac/User.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/User.java similarity index 100% rename from cadcAccessControl/src/main/java/ca/nrc/cadc/ac/User.java rename to cadc-access-control/src/main/java/ca/nrc/cadc/ac/User.java diff --git a/cadcAccessControl/src/main/java/ca/nrc/cadc/ac/UserAlreadyExistsException.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/UserAlreadyExistsException.java similarity index 100% rename from cadcAccessControl/src/main/java/ca/nrc/cadc/ac/UserAlreadyExistsException.java rename to cadc-access-control/src/main/java/ca/nrc/cadc/ac/UserAlreadyExistsException.java diff --git a/cadcAccessControl/src/main/java/ca/nrc/cadc/ac/UserNotFoundException.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/UserNotFoundException.java similarity index 100% rename from cadcAccessControl/src/main/java/ca/nrc/cadc/ac/UserNotFoundException.java rename to cadc-access-control/src/main/java/ca/nrc/cadc/ac/UserNotFoundException.java diff --git a/cadcAccessControl/src/main/java/ca/nrc/cadc/ac/UserRequest.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/UserRequest.java similarity index 100% rename from cadcAccessControl/src/main/java/ca/nrc/cadc/ac/UserRequest.java rename to cadc-access-control/src/main/java/ca/nrc/cadc/ac/UserRequest.java diff --git a/cadcAccessControl/src/main/java/ca/nrc/cadc/ac/UserSet.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/UserSet.java similarity index 100% rename from cadcAccessControl/src/main/java/ca/nrc/cadc/ac/UserSet.java rename to cadc-access-control/src/main/java/ca/nrc/cadc/ac/UserSet.java diff --git a/cadcAccessControl/src/main/java/ca/nrc/cadc/ac/WriterException.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/WriterException.java similarity index 100% rename from cadcAccessControl/src/main/java/ca/nrc/cadc/ac/WriterException.java rename to cadc-access-control/src/main/java/ca/nrc/cadc/ac/WriterException.java diff --git a/cadcAccessControl/src/main/java/ca/nrc/cadc/ac/client/GMSClient.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/client/GMSClient.java similarity index 100% rename from cadcAccessControl/src/main/java/ca/nrc/cadc/ac/client/GMSClient.java rename to cadc-access-control/src/main/java/ca/nrc/cadc/ac/client/GMSClient.java diff --git a/cadcAccessControl/src/main/java/ca/nrc/cadc/ac/client/GMSClientMain.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/client/GMSClientMain.java similarity index 100% rename from cadcAccessControl/src/main/java/ca/nrc/cadc/ac/client/GMSClientMain.java rename to cadc-access-control/src/main/java/ca/nrc/cadc/ac/client/GMSClientMain.java diff --git a/cadcAccessControl/src/main/java/ca/nrc/cadc/ac/client/GroupMemberships.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/client/GroupMemberships.java similarity index 100% rename from cadcAccessControl/src/main/java/ca/nrc/cadc/ac/client/GroupMemberships.java rename to cadc-access-control/src/main/java/ca/nrc/cadc/ac/client/GroupMemberships.java diff --git a/cadcAccessControl/src/main/java/ca/nrc/cadc/ac/client/JsonUserListInputStreamWrapper.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/client/JsonUserListInputStreamWrapper.java similarity index 100% rename from cadcAccessControl/src/main/java/ca/nrc/cadc/ac/client/JsonUserListInputStreamWrapper.java rename to cadc-access-control/src/main/java/ca/nrc/cadc/ac/client/JsonUserListInputStreamWrapper.java diff --git a/cadcAccessControl/src/main/java/ca/nrc/cadc/ac/client/UserClient.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/client/UserClient.java similarity index 100% rename from cadcAccessControl/src/main/java/ca/nrc/cadc/ac/client/UserClient.java rename to cadc-access-control/src/main/java/ca/nrc/cadc/ac/client/UserClient.java diff --git a/cadcAccessControl/src/main/java/ca/nrc/cadc/ac/json/JsonGroupReader.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/json/JsonGroupReader.java similarity index 100% rename from cadcAccessControl/src/main/java/ca/nrc/cadc/ac/json/JsonGroupReader.java rename to cadc-access-control/src/main/java/ca/nrc/cadc/ac/json/JsonGroupReader.java diff --git a/cadcAccessControl/src/main/java/ca/nrc/cadc/ac/json/JsonGroupWriter.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/json/JsonGroupWriter.java similarity index 100% rename from cadcAccessControl/src/main/java/ca/nrc/cadc/ac/json/JsonGroupWriter.java rename to cadc-access-control/src/main/java/ca/nrc/cadc/ac/json/JsonGroupWriter.java diff --git a/cadcAccessControl/src/main/java/ca/nrc/cadc/ac/json/JsonUserListReader.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/json/JsonUserListReader.java similarity index 100% rename from cadcAccessControl/src/main/java/ca/nrc/cadc/ac/json/JsonUserListReader.java rename to cadc-access-control/src/main/java/ca/nrc/cadc/ac/json/JsonUserListReader.java diff --git a/cadcAccessControl/src/main/java/ca/nrc/cadc/ac/json/JsonUserListWriter.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/json/JsonUserListWriter.java similarity index 100% rename from cadcAccessControl/src/main/java/ca/nrc/cadc/ac/json/JsonUserListWriter.java rename to cadc-access-control/src/main/java/ca/nrc/cadc/ac/json/JsonUserListWriter.java diff --git a/cadcAccessControl/src/main/java/ca/nrc/cadc/ac/json/JsonUserReader.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/json/JsonUserReader.java similarity index 100% rename from cadcAccessControl/src/main/java/ca/nrc/cadc/ac/json/JsonUserReader.java rename to cadc-access-control/src/main/java/ca/nrc/cadc/ac/json/JsonUserReader.java diff --git a/cadcAccessControl/src/main/java/ca/nrc/cadc/ac/json/JsonUserRequestReader.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/json/JsonUserRequestReader.java similarity index 100% rename from cadcAccessControl/src/main/java/ca/nrc/cadc/ac/json/JsonUserRequestReader.java rename to cadc-access-control/src/main/java/ca/nrc/cadc/ac/json/JsonUserRequestReader.java diff --git a/cadcAccessControl/src/main/java/ca/nrc/cadc/ac/json/JsonUserRequestWriter.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/json/JsonUserRequestWriter.java similarity index 100% rename from cadcAccessControl/src/main/java/ca/nrc/cadc/ac/json/JsonUserRequestWriter.java rename to cadc-access-control/src/main/java/ca/nrc/cadc/ac/json/JsonUserRequestWriter.java diff --git a/cadcAccessControl/src/main/java/ca/nrc/cadc/ac/json/JsonUserWriter.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/json/JsonUserWriter.java similarity index 100% rename from cadcAccessControl/src/main/java/ca/nrc/cadc/ac/json/JsonUserWriter.java rename to cadc-access-control/src/main/java/ca/nrc/cadc/ac/json/JsonUserWriter.java diff --git a/cadcAccessControl/src/main/java/ca/nrc/cadc/ac/xml/AbstractReaderWriter.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/xml/AbstractReaderWriter.java similarity index 100% rename from cadcAccessControl/src/main/java/ca/nrc/cadc/ac/xml/AbstractReaderWriter.java rename to cadc-access-control/src/main/java/ca/nrc/cadc/ac/xml/AbstractReaderWriter.java diff --git a/cadcAccessControl/src/main/java/ca/nrc/cadc/ac/xml/GroupListReader.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/xml/GroupListReader.java similarity index 100% rename from cadcAccessControl/src/main/java/ca/nrc/cadc/ac/xml/GroupListReader.java rename to cadc-access-control/src/main/java/ca/nrc/cadc/ac/xml/GroupListReader.java diff --git a/cadcAccessControl/src/main/java/ca/nrc/cadc/ac/xml/GroupListWriter.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/xml/GroupListWriter.java similarity index 100% rename from cadcAccessControl/src/main/java/ca/nrc/cadc/ac/xml/GroupListWriter.java rename to cadc-access-control/src/main/java/ca/nrc/cadc/ac/xml/GroupListWriter.java diff --git a/cadcAccessControl/src/main/java/ca/nrc/cadc/ac/xml/GroupReader.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/xml/GroupReader.java similarity index 100% rename from cadcAccessControl/src/main/java/ca/nrc/cadc/ac/xml/GroupReader.java rename to cadc-access-control/src/main/java/ca/nrc/cadc/ac/xml/GroupReader.java diff --git a/cadcAccessControl/src/main/java/ca/nrc/cadc/ac/xml/GroupWriter.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/xml/GroupWriter.java similarity index 100% rename from cadcAccessControl/src/main/java/ca/nrc/cadc/ac/xml/GroupWriter.java rename to cadc-access-control/src/main/java/ca/nrc/cadc/ac/xml/GroupWriter.java diff --git a/cadcAccessControl/src/main/java/ca/nrc/cadc/ac/xml/UserListReader.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/xml/UserListReader.java similarity index 100% rename from cadcAccessControl/src/main/java/ca/nrc/cadc/ac/xml/UserListReader.java rename to cadc-access-control/src/main/java/ca/nrc/cadc/ac/xml/UserListReader.java diff --git a/cadcAccessControl/src/main/java/ca/nrc/cadc/ac/xml/UserListWriter.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/xml/UserListWriter.java similarity index 100% rename from cadcAccessControl/src/main/java/ca/nrc/cadc/ac/xml/UserListWriter.java rename to cadc-access-control/src/main/java/ca/nrc/cadc/ac/xml/UserListWriter.java diff --git a/cadcAccessControl/src/main/java/ca/nrc/cadc/ac/xml/UserReader.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/xml/UserReader.java similarity index 100% rename from cadcAccessControl/src/main/java/ca/nrc/cadc/ac/xml/UserReader.java rename to cadc-access-control/src/main/java/ca/nrc/cadc/ac/xml/UserReader.java diff --git a/cadcAccessControl/src/main/java/ca/nrc/cadc/ac/xml/UserRequestReader.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/xml/UserRequestReader.java similarity index 100% rename from cadcAccessControl/src/main/java/ca/nrc/cadc/ac/xml/UserRequestReader.java rename to cadc-access-control/src/main/java/ca/nrc/cadc/ac/xml/UserRequestReader.java diff --git a/cadcAccessControl/src/main/java/ca/nrc/cadc/ac/xml/UserRequestWriter.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/xml/UserRequestWriter.java similarity index 100% rename from cadcAccessControl/src/main/java/ca/nrc/cadc/ac/xml/UserRequestWriter.java rename to cadc-access-control/src/main/java/ca/nrc/cadc/ac/xml/UserRequestWriter.java diff --git a/cadcAccessControl/src/main/java/ca/nrc/cadc/ac/xml/UserWriter.java b/cadc-access-control/src/main/java/ca/nrc/cadc/ac/xml/UserWriter.java similarity index 100% rename from cadcAccessControl/src/main/java/ca/nrc/cadc/ac/xml/UserWriter.java rename to cadc-access-control/src/main/java/ca/nrc/cadc/ac/xml/UserWriter.java diff --git a/cadcAccessControl/src/test/java/ca/nrc/cadc/ac/GroupPropertyTest.java b/cadc-access-control/src/test/java/ca/nrc/cadc/ac/GroupPropertyTest.java similarity index 100% rename from cadcAccessControl/src/test/java/ca/nrc/cadc/ac/GroupPropertyTest.java rename to cadc-access-control/src/test/java/ca/nrc/cadc/ac/GroupPropertyTest.java diff --git a/cadcAccessControl/src/test/java/ca/nrc/cadc/ac/GroupTest.java b/cadc-access-control/src/test/java/ca/nrc/cadc/ac/GroupTest.java similarity index 100% rename from cadcAccessControl/src/test/java/ca/nrc/cadc/ac/GroupTest.java rename to cadc-access-control/src/test/java/ca/nrc/cadc/ac/GroupTest.java diff --git a/cadcAccessControl/src/test/java/ca/nrc/cadc/ac/PersonalDetailsTest.java b/cadc-access-control/src/test/java/ca/nrc/cadc/ac/PersonalDetailsTest.java similarity index 100% rename from cadcAccessControl/src/test/java/ca/nrc/cadc/ac/PersonalDetailsTest.java rename to cadc-access-control/src/test/java/ca/nrc/cadc/ac/PersonalDetailsTest.java diff --git a/cadcAccessControl/src/test/java/ca/nrc/cadc/ac/PosixDetailsTest.java b/cadc-access-control/src/test/java/ca/nrc/cadc/ac/PosixDetailsTest.java similarity index 100% rename from cadcAccessControl/src/test/java/ca/nrc/cadc/ac/PosixDetailsTest.java rename to cadc-access-control/src/test/java/ca/nrc/cadc/ac/PosixDetailsTest.java diff --git a/cadcAccessControl/src/test/java/ca/nrc/cadc/ac/RoleTest.java b/cadc-access-control/src/test/java/ca/nrc/cadc/ac/RoleTest.java similarity index 100% rename from cadcAccessControl/src/test/java/ca/nrc/cadc/ac/RoleTest.java rename to cadc-access-control/src/test/java/ca/nrc/cadc/ac/RoleTest.java diff --git a/cadcAccessControl/src/test/java/ca/nrc/cadc/ac/TestUtil.java b/cadc-access-control/src/test/java/ca/nrc/cadc/ac/TestUtil.java similarity index 100% rename from cadcAccessControl/src/test/java/ca/nrc/cadc/ac/TestUtil.java rename to cadc-access-control/src/test/java/ca/nrc/cadc/ac/TestUtil.java diff --git a/cadcAccessControl/src/test/java/ca/nrc/cadc/ac/UserRequestTest.java b/cadc-access-control/src/test/java/ca/nrc/cadc/ac/UserRequestTest.java similarity index 100% rename from cadcAccessControl/src/test/java/ca/nrc/cadc/ac/UserRequestTest.java rename to cadc-access-control/src/test/java/ca/nrc/cadc/ac/UserRequestTest.java diff --git a/cadcAccessControl/src/test/java/ca/nrc/cadc/ac/UserTest.java b/cadc-access-control/src/test/java/ca/nrc/cadc/ac/UserTest.java similarity index 100% rename from cadcAccessControl/src/test/java/ca/nrc/cadc/ac/UserTest.java rename to cadc-access-control/src/test/java/ca/nrc/cadc/ac/UserTest.java diff --git a/cadcAccessControl/src/test/java/ca/nrc/cadc/ac/client/GMSClientTest.java b/cadc-access-control/src/test/java/ca/nrc/cadc/ac/client/GMSClientTest.java similarity index 100% rename from cadcAccessControl/src/test/java/ca/nrc/cadc/ac/client/GMSClientTest.java rename to cadc-access-control/src/test/java/ca/nrc/cadc/ac/client/GMSClientTest.java diff --git a/cadcAccessControl/src/test/java/ca/nrc/cadc/ac/client/JsonUserListInputStreamWrapperTest.java b/cadc-access-control/src/test/java/ca/nrc/cadc/ac/client/JsonUserListInputStreamWrapperTest.java similarity index 100% rename from cadcAccessControl/src/test/java/ca/nrc/cadc/ac/client/JsonUserListInputStreamWrapperTest.java rename to cadc-access-control/src/test/java/ca/nrc/cadc/ac/client/JsonUserListInputStreamWrapperTest.java diff --git a/cadcAccessControl/src/test/java/ca/nrc/cadc/ac/client/UserClientTest.java b/cadc-access-control/src/test/java/ca/nrc/cadc/ac/client/UserClientTest.java similarity index 100% rename from cadcAccessControl/src/test/java/ca/nrc/cadc/ac/client/UserClientTest.java rename to cadc-access-control/src/test/java/ca/nrc/cadc/ac/client/UserClientTest.java diff --git a/cadcAccessControl/src/test/java/ca/nrc/cadc/ac/json/JsonGroupReaderWriterTest.java b/cadc-access-control/src/test/java/ca/nrc/cadc/ac/json/JsonGroupReaderWriterTest.java similarity index 100% rename from cadcAccessControl/src/test/java/ca/nrc/cadc/ac/json/JsonGroupReaderWriterTest.java rename to cadc-access-control/src/test/java/ca/nrc/cadc/ac/json/JsonGroupReaderWriterTest.java diff --git a/cadcAccessControl/src/test/java/ca/nrc/cadc/ac/json/JsonUserListReaderWriterTest.java b/cadc-access-control/src/test/java/ca/nrc/cadc/ac/json/JsonUserListReaderWriterTest.java similarity index 100% rename from cadcAccessControl/src/test/java/ca/nrc/cadc/ac/json/JsonUserListReaderWriterTest.java rename to cadc-access-control/src/test/java/ca/nrc/cadc/ac/json/JsonUserListReaderWriterTest.java diff --git a/cadcAccessControl/src/test/java/ca/nrc/cadc/ac/json/JsonUserReaderWriterTest.java b/cadc-access-control/src/test/java/ca/nrc/cadc/ac/json/JsonUserReaderWriterTest.java similarity index 100% rename from cadcAccessControl/src/test/java/ca/nrc/cadc/ac/json/JsonUserReaderWriterTest.java rename to cadc-access-control/src/test/java/ca/nrc/cadc/ac/json/JsonUserReaderWriterTest.java diff --git a/cadcAccessControl/src/test/java/ca/nrc/cadc/ac/json/JsonUserRequestReaderWriterTest.java b/cadc-access-control/src/test/java/ca/nrc/cadc/ac/json/JsonUserRequestReaderWriterTest.java similarity index 100% rename from cadcAccessControl/src/test/java/ca/nrc/cadc/ac/json/JsonUserRequestReaderWriterTest.java rename to cadc-access-control/src/test/java/ca/nrc/cadc/ac/json/JsonUserRequestReaderWriterTest.java diff --git a/cadcAccessControl/src/test/java/ca/nrc/cadc/ac/xml/GroupListReaderWriterTest.java b/cadc-access-control/src/test/java/ca/nrc/cadc/ac/xml/GroupListReaderWriterTest.java similarity index 100% rename from cadcAccessControl/src/test/java/ca/nrc/cadc/ac/xml/GroupListReaderWriterTest.java rename to cadc-access-control/src/test/java/ca/nrc/cadc/ac/xml/GroupListReaderWriterTest.java diff --git a/cadcAccessControl/src/test/java/ca/nrc/cadc/ac/xml/GroupPropertyReaderWriterTest.java b/cadc-access-control/src/test/java/ca/nrc/cadc/ac/xml/GroupPropertyReaderWriterTest.java similarity index 100% rename from cadcAccessControl/src/test/java/ca/nrc/cadc/ac/xml/GroupPropertyReaderWriterTest.java rename to cadc-access-control/src/test/java/ca/nrc/cadc/ac/xml/GroupPropertyReaderWriterTest.java diff --git a/cadcAccessControl/src/test/java/ca/nrc/cadc/ac/xml/GroupReaderWriterTest.java b/cadc-access-control/src/test/java/ca/nrc/cadc/ac/xml/GroupReaderWriterTest.java similarity index 100% rename from cadcAccessControl/src/test/java/ca/nrc/cadc/ac/xml/GroupReaderWriterTest.java rename to cadc-access-control/src/test/java/ca/nrc/cadc/ac/xml/GroupReaderWriterTest.java diff --git a/cadcAccessControl/src/test/java/ca/nrc/cadc/ac/xml/IdentityReaderWriterTest.java b/cadc-access-control/src/test/java/ca/nrc/cadc/ac/xml/IdentityReaderWriterTest.java similarity index 100% rename from cadcAccessControl/src/test/java/ca/nrc/cadc/ac/xml/IdentityReaderWriterTest.java rename to cadc-access-control/src/test/java/ca/nrc/cadc/ac/xml/IdentityReaderWriterTest.java diff --git a/cadcAccessControl/src/test/java/ca/nrc/cadc/ac/xml/UserDetailsReaderWriterTest.java b/cadc-access-control/src/test/java/ca/nrc/cadc/ac/xml/UserDetailsReaderWriterTest.java similarity index 100% rename from cadcAccessControl/src/test/java/ca/nrc/cadc/ac/xml/UserDetailsReaderWriterTest.java rename to cadc-access-control/src/test/java/ca/nrc/cadc/ac/xml/UserDetailsReaderWriterTest.java diff --git a/cadcAccessControl/src/test/java/ca/nrc/cadc/ac/xml/UserListReaderWriterTest.java b/cadc-access-control/src/test/java/ca/nrc/cadc/ac/xml/UserListReaderWriterTest.java similarity index 100% rename from cadcAccessControl/src/test/java/ca/nrc/cadc/ac/xml/UserListReaderWriterTest.java rename to cadc-access-control/src/test/java/ca/nrc/cadc/ac/xml/UserListReaderWriterTest.java diff --git a/cadcAccessControl/src/test/java/ca/nrc/cadc/ac/xml/UserReaderWriterTest.java b/cadc-access-control/src/test/java/ca/nrc/cadc/ac/xml/UserReaderWriterTest.java similarity index 100% rename from cadcAccessControl/src/test/java/ca/nrc/cadc/ac/xml/UserReaderWriterTest.java rename to cadc-access-control/src/test/java/ca/nrc/cadc/ac/xml/UserReaderWriterTest.java diff --git a/cadcAccessControl/src/test/java/ca/nrc/cadc/ac/xml/UserRequestReaderWriterTest.java b/cadc-access-control/src/test/java/ca/nrc/cadc/ac/xml/UserRequestReaderWriterTest.java similarity index 100% rename from cadcAccessControl/src/test/java/ca/nrc/cadc/ac/xml/UserRequestReaderWriterTest.java rename to cadc-access-control/src/test/java/ca/nrc/cadc/ac/xml/UserRequestReaderWriterTest.java diff --git a/cadcAccessControl/src/test/resources/LocalAuthority.properties b/cadc-access-control/src/test/resources/LocalAuthority.properties similarity index 100% rename from cadcAccessControl/src/test/resources/LocalAuthority.properties rename to cadc-access-control/src/test/resources/LocalAuthority.properties diff --git a/cadcTomcat/README.md b/cadc-tomcat/README.md similarity index 100% rename from cadcTomcat/README.md rename to cadc-tomcat/README.md diff --git a/cadcTomcat/build.gradle b/cadc-tomcat/build.gradle similarity index 84% rename from cadcTomcat/build.gradle rename to cadc-tomcat/build.gradle index d7aca070..30015f33 100644 --- a/cadcTomcat/build.gradle +++ b/cadc-tomcat/build.gradle @@ -16,7 +16,7 @@ repositories { } sourceCompatibility = 1.7 -group = 'opencadc' +group = 'org.opencadc' version = '1.0' @@ -24,8 +24,9 @@ dependencies { compile 'log4j:log4j:1.2.+' compile 'org.apache.tomcat:tomcat-catalina:7.0.+' compile 'org.apache.tomcat:tomcat-coyote:7.0.+' - compile 'opencadc:cadcUtil:1.+' - compile 'opencadc:cadcRegistry:1.+' + + compile 'org.opencadc:cadc-util:1.+' + compile 'org.opencadc:cadc-registry:1.+' testCompile 'junit:junit:4.+' testCompile 'javax.servlet:javax.servlet-api:3.1.+' diff --git a/cadcTomcat/src/main/java/ca/nrc/cadc/tomcat/AuthenticationLookup.java b/cadc-tomcat/src/main/java/ca/nrc/cadc/tomcat/AuthenticationLookup.java similarity index 100% rename from cadcTomcat/src/main/java/ca/nrc/cadc/tomcat/AuthenticationLookup.java rename to cadc-tomcat/src/main/java/ca/nrc/cadc/tomcat/AuthenticationLookup.java diff --git a/cadcTomcat/src/main/java/ca/nrc/cadc/tomcat/CadcBasicAuthenticator.java b/cadc-tomcat/src/main/java/ca/nrc/cadc/tomcat/CadcBasicAuthenticator.java similarity index 100% rename from cadcTomcat/src/main/java/ca/nrc/cadc/tomcat/CadcBasicAuthenticator.java rename to cadc-tomcat/src/main/java/ca/nrc/cadc/tomcat/CadcBasicAuthenticator.java diff --git a/cadcTomcat/src/main/java/ca/nrc/cadc/tomcat/CadcSSLImplementation.java b/cadc-tomcat/src/main/java/ca/nrc/cadc/tomcat/CadcSSLImplementation.java similarity index 100% rename from cadcTomcat/src/main/java/ca/nrc/cadc/tomcat/CadcSSLImplementation.java rename to cadc-tomcat/src/main/java/ca/nrc/cadc/tomcat/CadcSSLImplementation.java diff --git a/cadcTomcat/src/main/java/ca/nrc/cadc/tomcat/CadcSSLSocketFactory.java b/cadc-tomcat/src/main/java/ca/nrc/cadc/tomcat/CadcSSLSocketFactory.java similarity index 100% rename from cadcTomcat/src/main/java/ca/nrc/cadc/tomcat/CadcSSLSocketFactory.java rename to cadc-tomcat/src/main/java/ca/nrc/cadc/tomcat/CadcSSLSocketFactory.java diff --git a/cadcTomcat/src/main/java/ca/nrc/cadc/tomcat/CadcX509TrustManager.java b/cadc-tomcat/src/main/java/ca/nrc/cadc/tomcat/CadcX509TrustManager.java similarity index 100% rename from cadcTomcat/src/main/java/ca/nrc/cadc/tomcat/CadcX509TrustManager.java rename to cadc-tomcat/src/main/java/ca/nrc/cadc/tomcat/CadcX509TrustManager.java diff --git a/cadcTomcat/src/main/java/ca/nrc/cadc/tomcat/RealmMultiValuedProperties.java b/cadc-tomcat/src/main/java/ca/nrc/cadc/tomcat/RealmMultiValuedProperties.java similarity index 100% rename from cadcTomcat/src/main/java/ca/nrc/cadc/tomcat/RealmMultiValuedProperties.java rename to cadc-tomcat/src/main/java/ca/nrc/cadc/tomcat/RealmMultiValuedProperties.java diff --git a/cadcTomcat/src/main/java/ca/nrc/cadc/tomcat/RealmUtil.java b/cadc-tomcat/src/main/java/ca/nrc/cadc/tomcat/RealmUtil.java similarity index 100% rename from cadcTomcat/src/main/java/ca/nrc/cadc/tomcat/RealmUtil.java rename to cadc-tomcat/src/main/java/ca/nrc/cadc/tomcat/RealmUtil.java diff --git a/cadcTomcat/src/main/resources/RegistryClient.properties b/cadc-tomcat/src/main/resources/RegistryClient.properties similarity index 100% rename from cadcTomcat/src/main/resources/RegistryClient.properties rename to cadc-tomcat/src/main/resources/RegistryClient.properties diff --git a/cadcTomcat/src/test/config/RegistryClient.properties b/cadc-tomcat/src/test/config/RegistryClient.properties similarity index 100% rename from cadcTomcat/src/test/config/RegistryClient.properties rename to cadc-tomcat/src/test/config/RegistryClient.properties diff --git a/cadcTomcat/src/test/java/ca/nrc/cadc/tomcat/AuthenticationLookupTest.java b/cadc-tomcat/src/test/java/ca/nrc/cadc/tomcat/AuthenticationLookupTest.java similarity index 100% rename from cadcTomcat/src/test/java/ca/nrc/cadc/tomcat/AuthenticationLookupTest.java rename to cadc-tomcat/src/test/java/ca/nrc/cadc/tomcat/AuthenticationLookupTest.java diff --git a/cadcTomcat/src/test/java/ca/nrc/cadc/tomcat/CadcBasicAuthenticatorTest.java b/cadc-tomcat/src/test/java/ca/nrc/cadc/tomcat/CadcBasicAuthenticatorTest.java similarity index 100% rename from cadcTomcat/src/test/java/ca/nrc/cadc/tomcat/CadcBasicAuthenticatorTest.java rename to cadc-tomcat/src/test/java/ca/nrc/cadc/tomcat/CadcBasicAuthenticatorTest.java -- GitLab