From 9f355157144ee1130cfccd34052ed18d683abf74 Mon Sep 17 00:00:00 2001
From: Patrick Dowler <patrick.dowler@nrc-cnrc.gc.ca>
Date: Mon, 14 Dec 2015 08:49:47 -0800
Subject: [PATCH] split and reorg
---
.../.gitignore | 0
.../build.xml | 0
.../config/ac-admin-email.properties | 0
.../local.build.properties | 0
.../scripts/userAdmin | 0
.../src/ca/nrc/cadc/ac/admin/AbstractCommand.java | 0
.../src/ca/nrc/cadc/ac/admin/AbstractListUsers.java | 0
.../ca/nrc/cadc/ac/admin/AbstractUserCommand.java | 0
.../src/ca/nrc/cadc/ac/admin/ApproveUser.java | 0
.../src/ca/nrc/cadc/ac/admin/CmdLineParser.java | 0
.../src/ca/nrc/cadc/ac/admin/CommandRunner.java | 0
.../ca/nrc/cadc/ac/admin/ContextFactoryImpl.java | 0
.../src/ca/nrc/cadc/ac/admin/ContextImpl.java | 0
.../src/ca/nrc/cadc/ac/admin/ListActiveUsers.java | 0
.../src/ca/nrc/cadc/ac/admin/ListPendingUsers.java | 0
.../src/ca/nrc/cadc/ac/admin/Main.java | 0
.../src/ca/nrc/cadc/ac/admin/RejectUser.java | 0
.../src/ca/nrc/cadc/ac/admin/UsageException.java | 0
.../src/ca/nrc/cadc/ac/admin/ViewUser.java | 0
.../src/userAdmin.mf | 0
.../test/LdapConfig.properties | 0
.../test/scripts/userAdminTest | 0
.../src/ca/nrc/cadc/ac/admin/CmdLineParserTest.java | 0
.../src/ca/nrc/cadc/ac/admin/CommandRunnerTest.java | 0
.../cadc/ac/admin/integration/UserAdminIntTest.java | 0
.../Dependencies.txt | 0
.../PluginFactory.properties | 0
.../build.xml | 0
.../config/.dbrc_example | 0
.../config/LdapConfig.dev.properties | 0
.../config/LdapConfig.properties | 0
.../ca/nrc/cadc/ac/server/GroupDetailSelector.java | 0
.../src/ca/nrc/cadc/ac/server/GroupPersistence.java | 0
.../src/ca/nrc/cadc/ac/server/PluginFactory.java | 0
.../src/ca/nrc/cadc/ac/server/RequestValidator.java | 0
.../src/ca/nrc/cadc/ac/server/UserPersistence.java | 0
.../ca/nrc/cadc/ac/server/ldap/ConnectionPools.java | 0
.../src/ca/nrc/cadc/ac/server/ldap/LdapConfig.java | 0
.../nrc/cadc/ac/server/ldap/LdapConnectionPool.java | 0
.../ca/nrc/cadc/ac/server/ldap/LdapConnections.java | 0
.../src/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
.../ca/nrc/cadc/ac/server/ldap/LdapPersistence.java | 0
.../src/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
.../src/ca/nrc/cadc/ac/server/web/GroupServlet.java | 0
.../src/ca/nrc/cadc/ac/server/web/LoginServlet.java | 0
.../ca/nrc/cadc/ac/server/web/PasswordServlet.java | 0
.../src/ca/nrc/cadc/ac/server/web/SyncOutput.java | 0
.../src/ca/nrc/cadc/ac/server/web/UserServlet.java | 0
.../src/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
.../ac/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
.../nrc/cadc/ac/server/web/groups/GroupLogInfo.java | 0
.../ac/server/web/groups/GroupsActionFactory.java | 0
.../ac/server/web/groups/ModifyGroupAction.java | 0
.../server/web/groups/RemoveGroupMemberAction.java | 0
.../server/web/groups/RemoveUserMemberAction.java | 0
.../ac/server/web/users/AbstractUserAction.java | 0
.../cadc/ac/server/web/users/CreateUserAction.java | 0
.../cadc/ac/server/web/users/DeleteUserAction.java | 0
.../nrc/cadc/ac/server/web/users/GetUserAction.java | 0
.../cadc/ac/server/web/users/GetUserListAction.java | 0
.../cadc/ac/server/web/users/ModifyUserAction.java | 0
.../cadc/ac/server/web/users/UserActionFactory.java | 0
.../nrc/cadc/ac/server/web/users/UserLogInfo.java | 0
.../src/ca/nrc/cadc/auth/AuthenticatorImpl.java | 0
.../test/LdapConfig.test.properties | 0
.../test/config/testConfig1.properties | 0
.../test/config/testConfig2.properties | 0
.../ca/nrc/cadc/ac/server/RequestValidatorTest.java | 0
.../cadc/ac/server/ldap/AbstractLdapDAOTest.java | 0
.../ca/nrc/cadc/ac/server/ldap/LdapConfigTest.java | 0
.../cadc/ac/server/ldap/LdapConnectionsTest.java | 0
.../src/ca/nrc/cadc/ac/server/ldap/LdapDAOTest.java | 0
.../ca/nrc/cadc/ac/server/ldap/LdapDAOTestImpl.java | 0
.../nrc/cadc/ac/server/ldap/LdapGroupDAOTest.java | 0
.../cadc/ac/server/ldap/LdapPersistenceTest.java | 0
.../ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java | 0
.../cadc/ac/server/web/UserLoginServletTest.java | 0
.../ca/nrc/cadc/ac/server/web/UserServletTest.java | 0
.../nrc/cadc/ac/server/web/WhoAmIServletTest.java | 0
.../server/web/groups/AbstractGroupActionTest.java | 0
.../server/web/groups/AddGroupMemberActionTest.java | 0
.../server/web/groups/AddUserMemberActionTest.java | 0
.../ac/server/web/groups/DeleteGroupActionTest.java | 0
.../server/web/groups/GetGroupNamesActionTest.java | 0
.../server/web/groups/GroupActionFactoryTest.java | 0
.../web/groups/RemoveGroupMemberActionTest.java | 0
.../web/groups/RemoveUserMemberActionTest.java | 0
.../ac/server/web/users/AbstractUserActionTest.java | 0
.../cadc/ac/server/web/users/GetUserActionTest.java | 0
.../ac/server/web/users/GetUserListActionTest.java | 0
.../ac/server/web/users/ModifyUserActionTest.java | 0
.../ac/server/web/users/UserActionFactoryTest.java | 0
.../build.xml | 0
.../doc/AccessControl.png | Bin
.../doc/auth.html | 0
.../doc/auth.zargo | Bin
.../doc/uml/UserAuth.png | Bin
.../scripts/cadcGMSClient | 0
.../src/ca/nrc/cadc/ac/AC.java | 0
.../src/ca/nrc/cadc/ac/ActivatedGroup.java | 0
.../src/ca/nrc/cadc/ac/Group.java | 0
.../ca/nrc/cadc/ac/GroupAlreadyExistsException.java | 0
.../src/ca/nrc/cadc/ac/GroupNotFoundException.java | 0
.../src/ca/nrc/cadc/ac/GroupProperty.java | 0
.../nrc/cadc/ac/MemberAlreadyExistsException.java | 0
.../src/ca/nrc/cadc/ac/MemberNotFoundException.java | 0
.../src/ca/nrc/cadc/ac/PersonalDetails.java | 0
.../src/ca/nrc/cadc/ac/PosixDetails.java | 0
.../src/ca/nrc/cadc/ac/ReaderException.java | 0
.../src/ca/nrc/cadc/ac/Role.java | 0
.../src/ca/nrc/cadc/ac/User.java | 0
.../ca/nrc/cadc/ac/UserAlreadyExistsException.java | 0
.../src/ca/nrc/cadc/ac/UserDetails.java | 0
.../src/ca/nrc/cadc/ac/UserNotFoundException.java | 0
.../src/ca/nrc/cadc/ac/UserRequest.java | 0
.../src/ca/nrc/cadc/ac/WriterException.java | 0
.../src/ca/nrc/cadc/ac/client/GMSClient.java | 0
.../src/ca/nrc/cadc/ac/client/GMSClientMain.java | 0
.../src/ca/nrc/cadc/ac/client/GroupMemberships.java | 0
.../ac/client/JsonUserListInputStreamWrapper.java | 0
.../src/ca/nrc/cadc/ac/client/UserClient.java | 0
.../src/ca/nrc/cadc/ac/json/JsonGroupReader.java | 0
.../src/ca/nrc/cadc/ac/json/JsonGroupWriter.java | 0
.../src/ca/nrc/cadc/ac/json/JsonUserListReader.java | 0
.../src/ca/nrc/cadc/ac/json/JsonUserListWriter.java | 0
.../src/ca/nrc/cadc/ac/json/JsonUserReader.java | 0
.../ca/nrc/cadc/ac/json/JsonUserRequestReader.java | 0
.../ca/nrc/cadc/ac/json/JsonUserRequestWriter.java | 0
.../src/ca/nrc/cadc/ac/json/JsonUserWriter.java | 0
.../ca/nrc/cadc/ac/xml/AbstractReaderWriter.java | 0
.../src/ca/nrc/cadc/ac/xml/GroupListReader.java | 0
.../src/ca/nrc/cadc/ac/xml/GroupListWriter.java | 0
.../src/ca/nrc/cadc/ac/xml/GroupReader.java | 0
.../src/ca/nrc/cadc/ac/xml/GroupWriter.java | 0
.../src/ca/nrc/cadc/ac/xml/UserListReader.java | 0
.../src/ca/nrc/cadc/ac/xml/UserListWriter.java | 0
.../src/ca/nrc/cadc/ac/xml/UserReader.java | 0
.../src/ca/nrc/cadc/ac/xml/UserRequestReader.java | 0
.../src/ca/nrc/cadc/ac/xml/UserRequestWriter.java | 0
.../src/ca/nrc/cadc/ac/xml/UserWriter.java | 0
.../test/src/ca/nrc/cadc/ac/GroupPropertyTest.java | 0
.../test/src/ca/nrc/cadc/ac/GroupTest.java | 0
.../src/ca/nrc/cadc/ac/PersonalDetailsTest.java | 0
.../test/src/ca/nrc/cadc/ac/PosixDetailsTest.java | 0
.../test/src/ca/nrc/cadc/ac/RoleTest.java | 0
.../test/src/ca/nrc/cadc/ac/UserRequestTest.java | 0
.../test/src/ca/nrc/cadc/ac/UserTest.java | 0
.../src/ca/nrc/cadc/ac/client/GMSClientTest.java | 0
.../client/JsonUserListInputStreamWrapperTest.java | 0
.../src/ca/nrc/cadc/ac/client/UserClientTest.java | 0
.../nrc/cadc/ac/json/JsonGroupReaderWriterTest.java | 0
.../cadc/ac/json/JsonUserListReaderWriterTest.java | 0
.../nrc/cadc/ac/json/JsonUserReaderWriterTest.java | 0
.../ac/json/JsonUserRequestReaderWriterTest.java | 0
.../nrc/cadc/ac/xml/GroupListReaderWriterTest.java | 0
.../cadc/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
173 files changed, 0 insertions(+), 0 deletions(-)
rename {projects/cadcAccessControl-Admin => cadcAccessControl-Admin}/.gitignore (100%)
rename {projects/cadcAccessControl-Admin => cadcAccessControl-Admin}/build.xml (100%)
rename {projects/cadcAccessControl-Admin => cadcAccessControl-Admin}/config/ac-admin-email.properties (100%)
rename {projects/cadcAccessControl-Admin => cadcAccessControl-Admin}/local.build.properties (100%)
rename {projects/cadcAccessControl-Admin => cadcAccessControl-Admin}/scripts/userAdmin (100%)
rename {projects/cadcAccessControl-Admin => cadcAccessControl-Admin}/src/ca/nrc/cadc/ac/admin/AbstractCommand.java (100%)
rename {projects/cadcAccessControl-Admin => cadcAccessControl-Admin}/src/ca/nrc/cadc/ac/admin/AbstractListUsers.java (100%)
rename {projects/cadcAccessControl-Admin => cadcAccessControl-Admin}/src/ca/nrc/cadc/ac/admin/AbstractUserCommand.java (100%)
rename {projects/cadcAccessControl-Admin => cadcAccessControl-Admin}/src/ca/nrc/cadc/ac/admin/ApproveUser.java (100%)
rename {projects/cadcAccessControl-Admin => cadcAccessControl-Admin}/src/ca/nrc/cadc/ac/admin/CmdLineParser.java (100%)
rename {projects/cadcAccessControl-Admin => cadcAccessControl-Admin}/src/ca/nrc/cadc/ac/admin/CommandRunner.java (100%)
rename {projects/cadcAccessControl-Admin => cadcAccessControl-Admin}/src/ca/nrc/cadc/ac/admin/ContextFactoryImpl.java (100%)
rename {projects/cadcAccessControl-Admin => cadcAccessControl-Admin}/src/ca/nrc/cadc/ac/admin/ContextImpl.java (100%)
rename {projects/cadcAccessControl-Admin => cadcAccessControl-Admin}/src/ca/nrc/cadc/ac/admin/ListActiveUsers.java (100%)
rename {projects/cadcAccessControl-Admin => cadcAccessControl-Admin}/src/ca/nrc/cadc/ac/admin/ListPendingUsers.java (100%)
rename {projects/cadcAccessControl-Admin => cadcAccessControl-Admin}/src/ca/nrc/cadc/ac/admin/Main.java (100%)
rename {projects/cadcAccessControl-Admin => cadcAccessControl-Admin}/src/ca/nrc/cadc/ac/admin/RejectUser.java (100%)
rename {projects/cadcAccessControl-Admin => cadcAccessControl-Admin}/src/ca/nrc/cadc/ac/admin/UsageException.java (100%)
rename {projects/cadcAccessControl-Admin => cadcAccessControl-Admin}/src/ca/nrc/cadc/ac/admin/ViewUser.java (100%)
rename {projects/cadcAccessControl-Admin => cadcAccessControl-Admin}/src/userAdmin.mf (100%)
rename {projects/cadcAccessControl-Admin => cadcAccessControl-Admin}/test/LdapConfig.properties (100%)
rename {projects/cadcAccessControl-Admin => cadcAccessControl-Admin}/test/scripts/userAdminTest (100%)
rename {projects/cadcAccessControl-Admin => cadcAccessControl-Admin}/test/src/ca/nrc/cadc/ac/admin/CmdLineParserTest.java (100%)
rename {projects/cadcAccessControl-Admin => cadcAccessControl-Admin}/test/src/ca/nrc/cadc/ac/admin/CommandRunnerTest.java (100%)
rename {projects/cadcAccessControl-Admin => cadcAccessControl-Admin}/test/src/ca/nrc/cadc/ac/admin/integration/UserAdminIntTest.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/Dependencies.txt (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/PluginFactory.properties (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/build.xml (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/config/.dbrc_example (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/config/LdapConfig.dev.properties (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/config/LdapConfig.properties (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/src/ca/nrc/cadc/ac/server/GroupDetailSelector.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/src/ca/nrc/cadc/ac/server/GroupPersistence.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/src/ca/nrc/cadc/ac/server/PluginFactory.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/src/ca/nrc/cadc/ac/server/RequestValidator.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/src/ca/nrc/cadc/ac/server/UserPersistence.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/src/ca/nrc/cadc/ac/server/ldap/ConnectionPools.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/src/ca/nrc/cadc/ac/server/ldap/LdapConfig.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/src/ca/nrc/cadc/ac/server/ldap/LdapConnectionPool.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/src/ca/nrc/cadc/ac/server/ldap/LdapConnections.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/src/ca/nrc/cadc/ac/server/ldap/LdapDAO.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/src/ca/nrc/cadc/ac/server/ldap/LdapGroupPersistence.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/src/ca/nrc/cadc/ac/server/ldap/LdapPersistence.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/src/ca/nrc/cadc/ac/server/ldap/LdapUserPersistence.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/src/ca/nrc/cadc/ac/server/web/ACSearchRunner.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/src/ca/nrc/cadc/ac/server/web/GroupServlet.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/src/ca/nrc/cadc/ac/server/web/LoginServlet.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/src/ca/nrc/cadc/ac/server/web/PasswordServlet.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/src/ca/nrc/cadc/ac/server/web/SyncOutput.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/src/ca/nrc/cadc/ac/server/web/UserServlet.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/src/ca/nrc/cadc/ac/server/web/WebUtil.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/src/ca/nrc/cadc/ac/server/web/WhoAmIServlet.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/src/ca/nrc/cadc/ac/server/web/groups/AbstractGroupAction.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/src/ca/nrc/cadc/ac/server/web/groups/AddGroupMemberAction.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/src/ca/nrc/cadc/ac/server/web/groups/AddUserMemberAction.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/src/ca/nrc/cadc/ac/server/web/groups/CreateGroupAction.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/src/ca/nrc/cadc/ac/server/web/groups/DeleteGroupAction.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/src/ca/nrc/cadc/ac/server/web/groups/GetGroupAction.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/src/ca/nrc/cadc/ac/server/web/groups/GetGroupNamesAction.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/src/ca/nrc/cadc/ac/server/web/groups/GroupLogInfo.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/src/ca/nrc/cadc/ac/server/web/groups/GroupsActionFactory.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/src/ca/nrc/cadc/ac/server/web/groups/ModifyGroupAction.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/src/ca/nrc/cadc/ac/server/web/groups/RemoveGroupMemberAction.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/src/ca/nrc/cadc/ac/server/web/groups/RemoveUserMemberAction.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/src/ca/nrc/cadc/ac/server/web/users/AbstractUserAction.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/src/ca/nrc/cadc/ac/server/web/users/CreateUserAction.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/src/ca/nrc/cadc/ac/server/web/users/DeleteUserAction.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/src/ca/nrc/cadc/ac/server/web/users/GetUserAction.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/src/ca/nrc/cadc/ac/server/web/users/GetUserListAction.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/src/ca/nrc/cadc/ac/server/web/users/ModifyUserAction.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/src/ca/nrc/cadc/ac/server/web/users/UserActionFactory.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/src/ca/nrc/cadc/ac/server/web/users/UserLogInfo.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/src/ca/nrc/cadc/auth/AuthenticatorImpl.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/test/LdapConfig.test.properties (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/test/config/testConfig1.properties (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/test/config/testConfig2.properties (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/test/src/ca/nrc/cadc/ac/server/RequestValidatorTest.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/test/src/ca/nrc/cadc/ac/server/ldap/AbstractLdapDAOTest.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/test/src/ca/nrc/cadc/ac/server/ldap/LdapConfigTest.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/test/src/ca/nrc/cadc/ac/server/ldap/LdapConnectionsTest.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/test/src/ca/nrc/cadc/ac/server/ldap/LdapDAOTest.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/test/src/ca/nrc/cadc/ac/server/ldap/LdapDAOTestImpl.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/test/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAOTest.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/test/src/ca/nrc/cadc/ac/server/ldap/LdapPersistenceTest.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/test/src/ca/nrc/cadc/ac/server/web/UserLoginServletTest.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/test/src/ca/nrc/cadc/ac/server/web/UserServletTest.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/test/src/ca/nrc/cadc/ac/server/web/WhoAmIServletTest.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/test/src/ca/nrc/cadc/ac/server/web/groups/AbstractGroupActionTest.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/test/src/ca/nrc/cadc/ac/server/web/groups/AddGroupMemberActionTest.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/test/src/ca/nrc/cadc/ac/server/web/groups/AddUserMemberActionTest.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/test/src/ca/nrc/cadc/ac/server/web/groups/DeleteGroupActionTest.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/test/src/ca/nrc/cadc/ac/server/web/groups/GetGroupNamesActionTest.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/test/src/ca/nrc/cadc/ac/server/web/groups/GroupActionFactoryTest.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/test/src/ca/nrc/cadc/ac/server/web/groups/RemoveGroupMemberActionTest.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/test/src/ca/nrc/cadc/ac/server/web/groups/RemoveUserMemberActionTest.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/test/src/ca/nrc/cadc/ac/server/web/users/AbstractUserActionTest.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/test/src/ca/nrc/cadc/ac/server/web/users/GetUserActionTest.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/test/src/ca/nrc/cadc/ac/server/web/users/GetUserListActionTest.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/test/src/ca/nrc/cadc/ac/server/web/users/ModifyUserActionTest.java (100%)
rename {projects/cadcAccessControl-Server => cadcAccessControl-Server}/test/src/ca/nrc/cadc/ac/server/web/users/UserActionFactoryTest.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/build.xml (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/doc/AccessControl.png (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/doc/auth.html (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/doc/auth.zargo (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/doc/uml/UserAuth.png (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/scripts/cadcGMSClient (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/src/ca/nrc/cadc/ac/AC.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/src/ca/nrc/cadc/ac/ActivatedGroup.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/src/ca/nrc/cadc/ac/Group.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/src/ca/nrc/cadc/ac/GroupAlreadyExistsException.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/src/ca/nrc/cadc/ac/GroupNotFoundException.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/src/ca/nrc/cadc/ac/GroupProperty.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/src/ca/nrc/cadc/ac/MemberAlreadyExistsException.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/src/ca/nrc/cadc/ac/MemberNotFoundException.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/src/ca/nrc/cadc/ac/PersonalDetails.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/src/ca/nrc/cadc/ac/PosixDetails.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/src/ca/nrc/cadc/ac/ReaderException.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/src/ca/nrc/cadc/ac/Role.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/src/ca/nrc/cadc/ac/User.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/src/ca/nrc/cadc/ac/UserAlreadyExistsException.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/src/ca/nrc/cadc/ac/UserDetails.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/src/ca/nrc/cadc/ac/UserNotFoundException.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/src/ca/nrc/cadc/ac/UserRequest.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/src/ca/nrc/cadc/ac/WriterException.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/src/ca/nrc/cadc/ac/client/GMSClient.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/src/ca/nrc/cadc/ac/client/GMSClientMain.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/src/ca/nrc/cadc/ac/client/GroupMemberships.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/src/ca/nrc/cadc/ac/client/JsonUserListInputStreamWrapper.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/src/ca/nrc/cadc/ac/client/UserClient.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/src/ca/nrc/cadc/ac/json/JsonGroupReader.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/src/ca/nrc/cadc/ac/json/JsonGroupWriter.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/src/ca/nrc/cadc/ac/json/JsonUserListReader.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/src/ca/nrc/cadc/ac/json/JsonUserListWriter.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/src/ca/nrc/cadc/ac/json/JsonUserReader.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/src/ca/nrc/cadc/ac/json/JsonUserRequestReader.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/src/ca/nrc/cadc/ac/json/JsonUserRequestWriter.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/src/ca/nrc/cadc/ac/json/JsonUserWriter.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/src/ca/nrc/cadc/ac/xml/AbstractReaderWriter.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/src/ca/nrc/cadc/ac/xml/GroupListReader.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/src/ca/nrc/cadc/ac/xml/GroupListWriter.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/src/ca/nrc/cadc/ac/xml/GroupReader.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/src/ca/nrc/cadc/ac/xml/GroupWriter.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/src/ca/nrc/cadc/ac/xml/UserListReader.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/src/ca/nrc/cadc/ac/xml/UserListWriter.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/src/ca/nrc/cadc/ac/xml/UserReader.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/src/ca/nrc/cadc/ac/xml/UserRequestReader.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/src/ca/nrc/cadc/ac/xml/UserRequestWriter.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/src/ca/nrc/cadc/ac/xml/UserWriter.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/test/src/ca/nrc/cadc/ac/GroupPropertyTest.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/test/src/ca/nrc/cadc/ac/GroupTest.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/test/src/ca/nrc/cadc/ac/PersonalDetailsTest.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/test/src/ca/nrc/cadc/ac/PosixDetailsTest.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/test/src/ca/nrc/cadc/ac/RoleTest.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/test/src/ca/nrc/cadc/ac/UserRequestTest.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/test/src/ca/nrc/cadc/ac/UserTest.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/test/src/ca/nrc/cadc/ac/client/GMSClientTest.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/test/src/ca/nrc/cadc/ac/client/JsonUserListInputStreamWrapperTest.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/test/src/ca/nrc/cadc/ac/client/UserClientTest.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/test/src/ca/nrc/cadc/ac/json/JsonGroupReaderWriterTest.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/test/src/ca/nrc/cadc/ac/json/JsonUserListReaderWriterTest.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/test/src/ca/nrc/cadc/ac/json/JsonUserReaderWriterTest.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/test/src/ca/nrc/cadc/ac/json/JsonUserRequestReaderWriterTest.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/test/src/ca/nrc/cadc/ac/xml/GroupListReaderWriterTest.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/test/src/ca/nrc/cadc/ac/xml/GroupPropertyReaderWriterTest.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/test/src/ca/nrc/cadc/ac/xml/GroupReaderWriterTest.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/test/src/ca/nrc/cadc/ac/xml/IdentityReaderWriterTest.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/test/src/ca/nrc/cadc/ac/xml/UserDetailsReaderWriterTest.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/test/src/ca/nrc/cadc/ac/xml/UserListReaderWriterTest.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/test/src/ca/nrc/cadc/ac/xml/UserReaderWriterTest.java (100%)
rename {projects/cadcAccessControl => cadcAccessControl}/test/src/ca/nrc/cadc/ac/xml/UserRequestReaderWriterTest.java (100%)
diff --git a/projects/cadcAccessControl-Admin/.gitignore b/cadcAccessControl-Admin/.gitignore
similarity index 100%
rename from projects/cadcAccessControl-Admin/.gitignore
rename to cadcAccessControl-Admin/.gitignore
diff --git a/projects/cadcAccessControl-Admin/build.xml b/cadcAccessControl-Admin/build.xml
similarity index 100%
rename from projects/cadcAccessControl-Admin/build.xml
rename to cadcAccessControl-Admin/build.xml
diff --git a/projects/cadcAccessControl-Admin/config/ac-admin-email.properties b/cadcAccessControl-Admin/config/ac-admin-email.properties
similarity index 100%
rename from projects/cadcAccessControl-Admin/config/ac-admin-email.properties
rename to cadcAccessControl-Admin/config/ac-admin-email.properties
diff --git a/projects/cadcAccessControl-Admin/local.build.properties b/cadcAccessControl-Admin/local.build.properties
similarity index 100%
rename from projects/cadcAccessControl-Admin/local.build.properties
rename to cadcAccessControl-Admin/local.build.properties
diff --git a/projects/cadcAccessControl-Admin/scripts/userAdmin b/cadcAccessControl-Admin/scripts/userAdmin
similarity index 100%
rename from projects/cadcAccessControl-Admin/scripts/userAdmin
rename to cadcAccessControl-Admin/scripts/userAdmin
diff --git a/projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/AbstractCommand.java b/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/AbstractCommand.java
similarity index 100%
rename from projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/AbstractCommand.java
rename to cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/AbstractCommand.java
diff --git a/projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/AbstractListUsers.java b/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/AbstractListUsers.java
similarity index 100%
rename from projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/AbstractListUsers.java
rename to cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/AbstractListUsers.java
diff --git a/projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/AbstractUserCommand.java b/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/AbstractUserCommand.java
similarity index 100%
rename from projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/AbstractUserCommand.java
rename to cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/AbstractUserCommand.java
diff --git a/projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/ApproveUser.java b/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/ApproveUser.java
similarity index 100%
rename from projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/ApproveUser.java
rename to cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/ApproveUser.java
diff --git a/projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/CmdLineParser.java b/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/CmdLineParser.java
similarity index 100%
rename from projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/CmdLineParser.java
rename to cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/CmdLineParser.java
diff --git a/projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/CommandRunner.java b/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/CommandRunner.java
similarity index 100%
rename from projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/CommandRunner.java
rename to cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/CommandRunner.java
diff --git a/projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/ContextFactoryImpl.java b/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/ContextFactoryImpl.java
similarity index 100%
rename from projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/ContextFactoryImpl.java
rename to cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/ContextFactoryImpl.java
diff --git a/projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/ContextImpl.java b/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/ContextImpl.java
similarity index 100%
rename from projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/ContextImpl.java
rename to cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/ContextImpl.java
diff --git a/projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/ListActiveUsers.java b/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/ListActiveUsers.java
similarity index 100%
rename from projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/ListActiveUsers.java
rename to cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/ListActiveUsers.java
diff --git a/projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/ListPendingUsers.java b/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/ListPendingUsers.java
similarity index 100%
rename from projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/ListPendingUsers.java
rename to cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/ListPendingUsers.java
diff --git a/projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/Main.java b/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/Main.java
similarity index 100%
rename from projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/Main.java
rename to cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/Main.java
diff --git a/projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/RejectUser.java b/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/RejectUser.java
similarity index 100%
rename from projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/RejectUser.java
rename to cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/RejectUser.java
diff --git a/projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/UsageException.java b/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/UsageException.java
similarity index 100%
rename from projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/UsageException.java
rename to cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/UsageException.java
diff --git a/projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/ViewUser.java b/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/ViewUser.java
similarity index 100%
rename from projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/ViewUser.java
rename to cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/ViewUser.java
diff --git a/projects/cadcAccessControl-Admin/src/userAdmin.mf b/cadcAccessControl-Admin/src/userAdmin.mf
similarity index 100%
rename from projects/cadcAccessControl-Admin/src/userAdmin.mf
rename to cadcAccessControl-Admin/src/userAdmin.mf
diff --git a/projects/cadcAccessControl-Admin/test/LdapConfig.properties b/cadcAccessControl-Admin/test/LdapConfig.properties
similarity index 100%
rename from projects/cadcAccessControl-Admin/test/LdapConfig.properties
rename to cadcAccessControl-Admin/test/LdapConfig.properties
diff --git a/projects/cadcAccessControl-Admin/test/scripts/userAdminTest b/cadcAccessControl-Admin/test/scripts/userAdminTest
similarity index 100%
rename from projects/cadcAccessControl-Admin/test/scripts/userAdminTest
rename to cadcAccessControl-Admin/test/scripts/userAdminTest
diff --git a/projects/cadcAccessControl-Admin/test/src/ca/nrc/cadc/ac/admin/CmdLineParserTest.java b/cadcAccessControl-Admin/test/src/ca/nrc/cadc/ac/admin/CmdLineParserTest.java
similarity index 100%
rename from projects/cadcAccessControl-Admin/test/src/ca/nrc/cadc/ac/admin/CmdLineParserTest.java
rename to cadcAccessControl-Admin/test/src/ca/nrc/cadc/ac/admin/CmdLineParserTest.java
diff --git a/projects/cadcAccessControl-Admin/test/src/ca/nrc/cadc/ac/admin/CommandRunnerTest.java b/cadcAccessControl-Admin/test/src/ca/nrc/cadc/ac/admin/CommandRunnerTest.java
similarity index 100%
rename from projects/cadcAccessControl-Admin/test/src/ca/nrc/cadc/ac/admin/CommandRunnerTest.java
rename to cadcAccessControl-Admin/test/src/ca/nrc/cadc/ac/admin/CommandRunnerTest.java
diff --git a/projects/cadcAccessControl-Admin/test/src/ca/nrc/cadc/ac/admin/integration/UserAdminIntTest.java b/cadcAccessControl-Admin/test/src/ca/nrc/cadc/ac/admin/integration/UserAdminIntTest.java
similarity index 100%
rename from projects/cadcAccessControl-Admin/test/src/ca/nrc/cadc/ac/admin/integration/UserAdminIntTest.java
rename to cadcAccessControl-Admin/test/src/ca/nrc/cadc/ac/admin/integration/UserAdminIntTest.java
diff --git a/projects/cadcAccessControl-Server/Dependencies.txt b/cadcAccessControl-Server/Dependencies.txt
similarity index 100%
rename from projects/cadcAccessControl-Server/Dependencies.txt
rename to cadcAccessControl-Server/Dependencies.txt
diff --git a/projects/cadcAccessControl-Server/PluginFactory.properties b/cadcAccessControl-Server/PluginFactory.properties
similarity index 100%
rename from projects/cadcAccessControl-Server/PluginFactory.properties
rename to cadcAccessControl-Server/PluginFactory.properties
diff --git a/projects/cadcAccessControl-Server/build.xml b/cadcAccessControl-Server/build.xml
similarity index 100%
rename from projects/cadcAccessControl-Server/build.xml
rename to cadcAccessControl-Server/build.xml
diff --git a/projects/cadcAccessControl-Server/config/.dbrc_example b/cadcAccessControl-Server/config/.dbrc_example
similarity index 100%
rename from projects/cadcAccessControl-Server/config/.dbrc_example
rename to cadcAccessControl-Server/config/.dbrc_example
diff --git a/projects/cadcAccessControl-Server/config/LdapConfig.dev.properties b/cadcAccessControl-Server/config/LdapConfig.dev.properties
similarity index 100%
rename from projects/cadcAccessControl-Server/config/LdapConfig.dev.properties
rename to cadcAccessControl-Server/config/LdapConfig.dev.properties
diff --git a/projects/cadcAccessControl-Server/config/LdapConfig.properties b/cadcAccessControl-Server/config/LdapConfig.properties
similarity index 100%
rename from projects/cadcAccessControl-Server/config/LdapConfig.properties
rename to cadcAccessControl-Server/config/LdapConfig.properties
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/GroupDetailSelector.java b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/GroupDetailSelector.java
similarity index 100%
rename from projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/GroupDetailSelector.java
rename to cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/GroupDetailSelector.java
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/GroupPersistence.java b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/GroupPersistence.java
similarity index 100%
rename from projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/GroupPersistence.java
rename to cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/GroupPersistence.java
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/PluginFactory.java b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/PluginFactory.java
similarity index 100%
rename from projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/PluginFactory.java
rename to cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/PluginFactory.java
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/RequestValidator.java b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/RequestValidator.java
similarity index 100%
rename from projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/RequestValidator.java
rename to cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/RequestValidator.java
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/UserPersistence.java b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/UserPersistence.java
similarity index 100%
rename from projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/UserPersistence.java
rename to cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/UserPersistence.java
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/ConnectionPools.java b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/ConnectionPools.java
similarity index 100%
rename from projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/ConnectionPools.java
rename to cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/ConnectionPools.java
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapConfig.java b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapConfig.java
similarity index 100%
rename from projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapConfig.java
rename to cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapConfig.java
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapConnectionPool.java b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapConnectionPool.java
similarity index 100%
rename from projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapConnectionPool.java
rename to cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapConnectionPool.java
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapConnections.java b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapConnections.java
similarity index 100%
rename from projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapConnections.java
rename to cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapConnections.java
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapDAO.java b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapDAO.java
similarity index 100%
rename from projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapDAO.java
rename to cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapDAO.java
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java
similarity index 100%
rename from projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java
rename to cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupPersistence.java b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupPersistence.java
similarity index 100%
rename from projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupPersistence.java
rename to cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupPersistence.java
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapPersistence.java b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapPersistence.java
similarity index 100%
rename from projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapPersistence.java
rename to cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapPersistence.java
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
similarity index 100%
rename from projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
rename to cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserPersistence.java b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserPersistence.java
similarity index 100%
rename from projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserPersistence.java
rename to cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserPersistence.java
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/ACSearchRunner.java b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/ACSearchRunner.java
similarity index 100%
rename from projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/ACSearchRunner.java
rename to cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/ACSearchRunner.java
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/GroupServlet.java b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/GroupServlet.java
similarity index 100%
rename from projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/GroupServlet.java
rename to cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/GroupServlet.java
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/LoginServlet.java b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/LoginServlet.java
similarity index 100%
rename from projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/LoginServlet.java
rename to cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/LoginServlet.java
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/PasswordServlet.java b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/PasswordServlet.java
similarity index 100%
rename from projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/PasswordServlet.java
rename to cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/PasswordServlet.java
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/SyncOutput.java b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/SyncOutput.java
similarity index 100%
rename from projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/SyncOutput.java
rename to cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/SyncOutput.java
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/UserServlet.java b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/UserServlet.java
similarity index 100%
rename from projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/UserServlet.java
rename to cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/UserServlet.java
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/WebUtil.java b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/WebUtil.java
similarity index 100%
rename from projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/WebUtil.java
rename to cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/WebUtil.java
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/WhoAmIServlet.java b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/WhoAmIServlet.java
similarity index 100%
rename from projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/WhoAmIServlet.java
rename to cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/WhoAmIServlet.java
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/AbstractGroupAction.java b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/AbstractGroupAction.java
similarity index 100%
rename from projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/AbstractGroupAction.java
rename to cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/AbstractGroupAction.java
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/AddGroupMemberAction.java b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/AddGroupMemberAction.java
similarity index 100%
rename from projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/AddGroupMemberAction.java
rename to cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/AddGroupMemberAction.java
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/AddUserMemberAction.java b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/AddUserMemberAction.java
similarity index 100%
rename from projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/AddUserMemberAction.java
rename to cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/AddUserMemberAction.java
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/CreateGroupAction.java b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/CreateGroupAction.java
similarity index 100%
rename from projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/CreateGroupAction.java
rename to cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/CreateGroupAction.java
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/DeleteGroupAction.java b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/DeleteGroupAction.java
similarity index 100%
rename from projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/DeleteGroupAction.java
rename to cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/DeleteGroupAction.java
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/GetGroupAction.java b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/GetGroupAction.java
similarity index 100%
rename from projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/GetGroupAction.java
rename to cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/GetGroupAction.java
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/GetGroupNamesAction.java b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/GetGroupNamesAction.java
similarity index 100%
rename from projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/GetGroupNamesAction.java
rename to cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/GetGroupNamesAction.java
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/GroupLogInfo.java b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/GroupLogInfo.java
similarity index 100%
rename from projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/GroupLogInfo.java
rename to cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/GroupLogInfo.java
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/GroupsActionFactory.java b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/GroupsActionFactory.java
similarity index 100%
rename from projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/GroupsActionFactory.java
rename to cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/GroupsActionFactory.java
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/ModifyGroupAction.java b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/ModifyGroupAction.java
similarity index 100%
rename from projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/ModifyGroupAction.java
rename to cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/ModifyGroupAction.java
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/RemoveGroupMemberAction.java b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/RemoveGroupMemberAction.java
similarity index 100%
rename from projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/RemoveGroupMemberAction.java
rename to cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/RemoveGroupMemberAction.java
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/RemoveUserMemberAction.java b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/RemoveUserMemberAction.java
similarity index 100%
rename from projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/RemoveUserMemberAction.java
rename to cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/RemoveUserMemberAction.java
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/AbstractUserAction.java b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/AbstractUserAction.java
similarity index 100%
rename from projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/AbstractUserAction.java
rename to cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/AbstractUserAction.java
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/CreateUserAction.java b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/CreateUserAction.java
similarity index 100%
rename from projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/CreateUserAction.java
rename to cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/CreateUserAction.java
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/DeleteUserAction.java b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/DeleteUserAction.java
similarity index 100%
rename from projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/DeleteUserAction.java
rename to cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/DeleteUserAction.java
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/GetUserAction.java b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/GetUserAction.java
similarity index 100%
rename from projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/GetUserAction.java
rename to cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/GetUserAction.java
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/GetUserListAction.java b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/GetUserListAction.java
similarity index 100%
rename from projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/GetUserListAction.java
rename to cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/GetUserListAction.java
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/ModifyUserAction.java b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/ModifyUserAction.java
similarity index 100%
rename from projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/ModifyUserAction.java
rename to cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/ModifyUserAction.java
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/UserActionFactory.java b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/UserActionFactory.java
similarity index 100%
rename from projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/UserActionFactory.java
rename to cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/UserActionFactory.java
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/UserLogInfo.java b/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/UserLogInfo.java
similarity index 100%
rename from projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/UserLogInfo.java
rename to cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/UserLogInfo.java
diff --git a/projects/cadcAccessControl-Server/src/ca/nrc/cadc/auth/AuthenticatorImpl.java b/cadcAccessControl-Server/src/ca/nrc/cadc/auth/AuthenticatorImpl.java
similarity index 100%
rename from projects/cadcAccessControl-Server/src/ca/nrc/cadc/auth/AuthenticatorImpl.java
rename to cadcAccessControl-Server/src/ca/nrc/cadc/auth/AuthenticatorImpl.java
diff --git a/projects/cadcAccessControl-Server/test/LdapConfig.test.properties b/cadcAccessControl-Server/test/LdapConfig.test.properties
similarity index 100%
rename from projects/cadcAccessControl-Server/test/LdapConfig.test.properties
rename to cadcAccessControl-Server/test/LdapConfig.test.properties
diff --git a/projects/cadcAccessControl-Server/test/config/testConfig1.properties b/cadcAccessControl-Server/test/config/testConfig1.properties
similarity index 100%
rename from projects/cadcAccessControl-Server/test/config/testConfig1.properties
rename to cadcAccessControl-Server/test/config/testConfig1.properties
diff --git a/projects/cadcAccessControl-Server/test/config/testConfig2.properties b/cadcAccessControl-Server/test/config/testConfig2.properties
similarity index 100%
rename from projects/cadcAccessControl-Server/test/config/testConfig2.properties
rename to cadcAccessControl-Server/test/config/testConfig2.properties
diff --git a/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/RequestValidatorTest.java b/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/RequestValidatorTest.java
similarity index 100%
rename from projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/RequestValidatorTest.java
rename to cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/RequestValidatorTest.java
diff --git a/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/AbstractLdapDAOTest.java b/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/AbstractLdapDAOTest.java
similarity index 100%
rename from projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/AbstractLdapDAOTest.java
rename to cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/AbstractLdapDAOTest.java
diff --git a/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapConfigTest.java b/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapConfigTest.java
similarity index 100%
rename from projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapConfigTest.java
rename to cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapConfigTest.java
diff --git a/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapConnectionsTest.java b/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapConnectionsTest.java
similarity index 100%
rename from projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapConnectionsTest.java
rename to cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapConnectionsTest.java
diff --git a/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapDAOTest.java b/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapDAOTest.java
similarity index 100%
rename from projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapDAOTest.java
rename to cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapDAOTest.java
diff --git a/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapDAOTestImpl.java b/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapDAOTestImpl.java
similarity index 100%
rename from projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapDAOTestImpl.java
rename to cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapDAOTestImpl.java
diff --git a/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAOTest.java b/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAOTest.java
similarity index 100%
rename from projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAOTest.java
rename to cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAOTest.java
diff --git a/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapPersistenceTest.java b/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapPersistenceTest.java
similarity index 100%
rename from projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapPersistenceTest.java
rename to cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapPersistenceTest.java
diff --git a/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java b/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java
similarity index 100%
rename from projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java
rename to cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java
diff --git a/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/UserLoginServletTest.java b/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/UserLoginServletTest.java
similarity index 100%
rename from projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/UserLoginServletTest.java
rename to cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/UserLoginServletTest.java
diff --git a/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/UserServletTest.java b/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/UserServletTest.java
similarity index 100%
rename from projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/UserServletTest.java
rename to cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/UserServletTest.java
diff --git a/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/WhoAmIServletTest.java b/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/WhoAmIServletTest.java
similarity index 100%
rename from projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/WhoAmIServletTest.java
rename to cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/WhoAmIServletTest.java
diff --git a/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/groups/AbstractGroupActionTest.java b/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/groups/AbstractGroupActionTest.java
similarity index 100%
rename from projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/groups/AbstractGroupActionTest.java
rename to cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/groups/AbstractGroupActionTest.java
diff --git a/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/groups/AddGroupMemberActionTest.java b/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/groups/AddGroupMemberActionTest.java
similarity index 100%
rename from projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/groups/AddGroupMemberActionTest.java
rename to cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/groups/AddGroupMemberActionTest.java
diff --git a/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/groups/AddUserMemberActionTest.java b/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/groups/AddUserMemberActionTest.java
similarity index 100%
rename from projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/groups/AddUserMemberActionTest.java
rename to cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/groups/AddUserMemberActionTest.java
diff --git a/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/groups/DeleteGroupActionTest.java b/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/groups/DeleteGroupActionTest.java
similarity index 100%
rename from projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/groups/DeleteGroupActionTest.java
rename to cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/groups/DeleteGroupActionTest.java
diff --git a/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/groups/GetGroupNamesActionTest.java b/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/groups/GetGroupNamesActionTest.java
similarity index 100%
rename from projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/groups/GetGroupNamesActionTest.java
rename to cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/groups/GetGroupNamesActionTest.java
diff --git a/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/groups/GroupActionFactoryTest.java b/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/groups/GroupActionFactoryTest.java
similarity index 100%
rename from projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/groups/GroupActionFactoryTest.java
rename to cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/groups/GroupActionFactoryTest.java
diff --git a/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/groups/RemoveGroupMemberActionTest.java b/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/groups/RemoveGroupMemberActionTest.java
similarity index 100%
rename from projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/groups/RemoveGroupMemberActionTest.java
rename to cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/groups/RemoveGroupMemberActionTest.java
diff --git a/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/groups/RemoveUserMemberActionTest.java b/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/groups/RemoveUserMemberActionTest.java
similarity index 100%
rename from projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/groups/RemoveUserMemberActionTest.java
rename to cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/groups/RemoveUserMemberActionTest.java
diff --git a/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/users/AbstractUserActionTest.java b/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/users/AbstractUserActionTest.java
similarity index 100%
rename from projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/users/AbstractUserActionTest.java
rename to cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/users/AbstractUserActionTest.java
diff --git a/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/users/GetUserActionTest.java b/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/users/GetUserActionTest.java
similarity index 100%
rename from projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/users/GetUserActionTest.java
rename to cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/users/GetUserActionTest.java
diff --git a/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/users/GetUserListActionTest.java b/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/users/GetUserListActionTest.java
similarity index 100%
rename from projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/users/GetUserListActionTest.java
rename to cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/users/GetUserListActionTest.java
diff --git a/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/users/ModifyUserActionTest.java b/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/users/ModifyUserActionTest.java
similarity index 100%
rename from projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/users/ModifyUserActionTest.java
rename to cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/users/ModifyUserActionTest.java
diff --git a/projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/users/UserActionFactoryTest.java b/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/users/UserActionFactoryTest.java
similarity index 100%
rename from projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/users/UserActionFactoryTest.java
rename to cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/users/UserActionFactoryTest.java
diff --git a/projects/cadcAccessControl/build.xml b/cadcAccessControl/build.xml
similarity index 100%
rename from projects/cadcAccessControl/build.xml
rename to cadcAccessControl/build.xml
diff --git a/projects/cadcAccessControl/doc/AccessControl.png b/cadcAccessControl/doc/AccessControl.png
similarity index 100%
rename from projects/cadcAccessControl/doc/AccessControl.png
rename to cadcAccessControl/doc/AccessControl.png
diff --git a/projects/cadcAccessControl/doc/auth.html b/cadcAccessControl/doc/auth.html
similarity index 100%
rename from projects/cadcAccessControl/doc/auth.html
rename to cadcAccessControl/doc/auth.html
diff --git a/projects/cadcAccessControl/doc/auth.zargo b/cadcAccessControl/doc/auth.zargo
similarity index 100%
rename from projects/cadcAccessControl/doc/auth.zargo
rename to cadcAccessControl/doc/auth.zargo
diff --git a/projects/cadcAccessControl/doc/uml/UserAuth.png b/cadcAccessControl/doc/uml/UserAuth.png
similarity index 100%
rename from projects/cadcAccessControl/doc/uml/UserAuth.png
rename to cadcAccessControl/doc/uml/UserAuth.png
diff --git a/projects/cadcAccessControl/scripts/cadcGMSClient b/cadcAccessControl/scripts/cadcGMSClient
similarity index 100%
rename from projects/cadcAccessControl/scripts/cadcGMSClient
rename to cadcAccessControl/scripts/cadcGMSClient
diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/AC.java b/cadcAccessControl/src/ca/nrc/cadc/ac/AC.java
similarity index 100%
rename from projects/cadcAccessControl/src/ca/nrc/cadc/ac/AC.java
rename to cadcAccessControl/src/ca/nrc/cadc/ac/AC.java
diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/ActivatedGroup.java b/cadcAccessControl/src/ca/nrc/cadc/ac/ActivatedGroup.java
similarity index 100%
rename from projects/cadcAccessControl/src/ca/nrc/cadc/ac/ActivatedGroup.java
rename to cadcAccessControl/src/ca/nrc/cadc/ac/ActivatedGroup.java
diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/Group.java b/cadcAccessControl/src/ca/nrc/cadc/ac/Group.java
similarity index 100%
rename from projects/cadcAccessControl/src/ca/nrc/cadc/ac/Group.java
rename to cadcAccessControl/src/ca/nrc/cadc/ac/Group.java
diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/GroupAlreadyExistsException.java b/cadcAccessControl/src/ca/nrc/cadc/ac/GroupAlreadyExistsException.java
similarity index 100%
rename from projects/cadcAccessControl/src/ca/nrc/cadc/ac/GroupAlreadyExistsException.java
rename to cadcAccessControl/src/ca/nrc/cadc/ac/GroupAlreadyExistsException.java
diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/GroupNotFoundException.java b/cadcAccessControl/src/ca/nrc/cadc/ac/GroupNotFoundException.java
similarity index 100%
rename from projects/cadcAccessControl/src/ca/nrc/cadc/ac/GroupNotFoundException.java
rename to cadcAccessControl/src/ca/nrc/cadc/ac/GroupNotFoundException.java
diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/GroupProperty.java b/cadcAccessControl/src/ca/nrc/cadc/ac/GroupProperty.java
similarity index 100%
rename from projects/cadcAccessControl/src/ca/nrc/cadc/ac/GroupProperty.java
rename to cadcAccessControl/src/ca/nrc/cadc/ac/GroupProperty.java
diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/MemberAlreadyExistsException.java b/cadcAccessControl/src/ca/nrc/cadc/ac/MemberAlreadyExistsException.java
similarity index 100%
rename from projects/cadcAccessControl/src/ca/nrc/cadc/ac/MemberAlreadyExistsException.java
rename to cadcAccessControl/src/ca/nrc/cadc/ac/MemberAlreadyExistsException.java
diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/MemberNotFoundException.java b/cadcAccessControl/src/ca/nrc/cadc/ac/MemberNotFoundException.java
similarity index 100%
rename from projects/cadcAccessControl/src/ca/nrc/cadc/ac/MemberNotFoundException.java
rename to cadcAccessControl/src/ca/nrc/cadc/ac/MemberNotFoundException.java
diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/PersonalDetails.java b/cadcAccessControl/src/ca/nrc/cadc/ac/PersonalDetails.java
similarity index 100%
rename from projects/cadcAccessControl/src/ca/nrc/cadc/ac/PersonalDetails.java
rename to cadcAccessControl/src/ca/nrc/cadc/ac/PersonalDetails.java
diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/PosixDetails.java b/cadcAccessControl/src/ca/nrc/cadc/ac/PosixDetails.java
similarity index 100%
rename from projects/cadcAccessControl/src/ca/nrc/cadc/ac/PosixDetails.java
rename to cadcAccessControl/src/ca/nrc/cadc/ac/PosixDetails.java
diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/ReaderException.java b/cadcAccessControl/src/ca/nrc/cadc/ac/ReaderException.java
similarity index 100%
rename from projects/cadcAccessControl/src/ca/nrc/cadc/ac/ReaderException.java
rename to cadcAccessControl/src/ca/nrc/cadc/ac/ReaderException.java
diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/Role.java b/cadcAccessControl/src/ca/nrc/cadc/ac/Role.java
similarity index 100%
rename from projects/cadcAccessControl/src/ca/nrc/cadc/ac/Role.java
rename to cadcAccessControl/src/ca/nrc/cadc/ac/Role.java
diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/User.java b/cadcAccessControl/src/ca/nrc/cadc/ac/User.java
similarity index 100%
rename from projects/cadcAccessControl/src/ca/nrc/cadc/ac/User.java
rename to cadcAccessControl/src/ca/nrc/cadc/ac/User.java
diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/UserAlreadyExistsException.java b/cadcAccessControl/src/ca/nrc/cadc/ac/UserAlreadyExistsException.java
similarity index 100%
rename from projects/cadcAccessControl/src/ca/nrc/cadc/ac/UserAlreadyExistsException.java
rename to cadcAccessControl/src/ca/nrc/cadc/ac/UserAlreadyExistsException.java
diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/UserDetails.java b/cadcAccessControl/src/ca/nrc/cadc/ac/UserDetails.java
similarity index 100%
rename from projects/cadcAccessControl/src/ca/nrc/cadc/ac/UserDetails.java
rename to cadcAccessControl/src/ca/nrc/cadc/ac/UserDetails.java
diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/UserNotFoundException.java b/cadcAccessControl/src/ca/nrc/cadc/ac/UserNotFoundException.java
similarity index 100%
rename from projects/cadcAccessControl/src/ca/nrc/cadc/ac/UserNotFoundException.java
rename to cadcAccessControl/src/ca/nrc/cadc/ac/UserNotFoundException.java
diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/UserRequest.java b/cadcAccessControl/src/ca/nrc/cadc/ac/UserRequest.java
similarity index 100%
rename from projects/cadcAccessControl/src/ca/nrc/cadc/ac/UserRequest.java
rename to cadcAccessControl/src/ca/nrc/cadc/ac/UserRequest.java
diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/WriterException.java b/cadcAccessControl/src/ca/nrc/cadc/ac/WriterException.java
similarity index 100%
rename from projects/cadcAccessControl/src/ca/nrc/cadc/ac/WriterException.java
rename to cadcAccessControl/src/ca/nrc/cadc/ac/WriterException.java
diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/client/GMSClient.java b/cadcAccessControl/src/ca/nrc/cadc/ac/client/GMSClient.java
similarity index 100%
rename from projects/cadcAccessControl/src/ca/nrc/cadc/ac/client/GMSClient.java
rename to cadcAccessControl/src/ca/nrc/cadc/ac/client/GMSClient.java
diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/client/GMSClientMain.java b/cadcAccessControl/src/ca/nrc/cadc/ac/client/GMSClientMain.java
similarity index 100%
rename from projects/cadcAccessControl/src/ca/nrc/cadc/ac/client/GMSClientMain.java
rename to cadcAccessControl/src/ca/nrc/cadc/ac/client/GMSClientMain.java
diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/client/GroupMemberships.java b/cadcAccessControl/src/ca/nrc/cadc/ac/client/GroupMemberships.java
similarity index 100%
rename from projects/cadcAccessControl/src/ca/nrc/cadc/ac/client/GroupMemberships.java
rename to cadcAccessControl/src/ca/nrc/cadc/ac/client/GroupMemberships.java
diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/client/JsonUserListInputStreamWrapper.java b/cadcAccessControl/src/ca/nrc/cadc/ac/client/JsonUserListInputStreamWrapper.java
similarity index 100%
rename from projects/cadcAccessControl/src/ca/nrc/cadc/ac/client/JsonUserListInputStreamWrapper.java
rename to cadcAccessControl/src/ca/nrc/cadc/ac/client/JsonUserListInputStreamWrapper.java
diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/client/UserClient.java b/cadcAccessControl/src/ca/nrc/cadc/ac/client/UserClient.java
similarity index 100%
rename from projects/cadcAccessControl/src/ca/nrc/cadc/ac/client/UserClient.java
rename to cadcAccessControl/src/ca/nrc/cadc/ac/client/UserClient.java
diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/json/JsonGroupReader.java b/cadcAccessControl/src/ca/nrc/cadc/ac/json/JsonGroupReader.java
similarity index 100%
rename from projects/cadcAccessControl/src/ca/nrc/cadc/ac/json/JsonGroupReader.java
rename to cadcAccessControl/src/ca/nrc/cadc/ac/json/JsonGroupReader.java
diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/json/JsonGroupWriter.java b/cadcAccessControl/src/ca/nrc/cadc/ac/json/JsonGroupWriter.java
similarity index 100%
rename from projects/cadcAccessControl/src/ca/nrc/cadc/ac/json/JsonGroupWriter.java
rename to cadcAccessControl/src/ca/nrc/cadc/ac/json/JsonGroupWriter.java
diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/json/JsonUserListReader.java b/cadcAccessControl/src/ca/nrc/cadc/ac/json/JsonUserListReader.java
similarity index 100%
rename from projects/cadcAccessControl/src/ca/nrc/cadc/ac/json/JsonUserListReader.java
rename to cadcAccessControl/src/ca/nrc/cadc/ac/json/JsonUserListReader.java
diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/json/JsonUserListWriter.java b/cadcAccessControl/src/ca/nrc/cadc/ac/json/JsonUserListWriter.java
similarity index 100%
rename from projects/cadcAccessControl/src/ca/nrc/cadc/ac/json/JsonUserListWriter.java
rename to cadcAccessControl/src/ca/nrc/cadc/ac/json/JsonUserListWriter.java
diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/json/JsonUserReader.java b/cadcAccessControl/src/ca/nrc/cadc/ac/json/JsonUserReader.java
similarity index 100%
rename from projects/cadcAccessControl/src/ca/nrc/cadc/ac/json/JsonUserReader.java
rename to cadcAccessControl/src/ca/nrc/cadc/ac/json/JsonUserReader.java
diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/json/JsonUserRequestReader.java b/cadcAccessControl/src/ca/nrc/cadc/ac/json/JsonUserRequestReader.java
similarity index 100%
rename from projects/cadcAccessControl/src/ca/nrc/cadc/ac/json/JsonUserRequestReader.java
rename to cadcAccessControl/src/ca/nrc/cadc/ac/json/JsonUserRequestReader.java
diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/json/JsonUserRequestWriter.java b/cadcAccessControl/src/ca/nrc/cadc/ac/json/JsonUserRequestWriter.java
similarity index 100%
rename from projects/cadcAccessControl/src/ca/nrc/cadc/ac/json/JsonUserRequestWriter.java
rename to cadcAccessControl/src/ca/nrc/cadc/ac/json/JsonUserRequestWriter.java
diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/json/JsonUserWriter.java b/cadcAccessControl/src/ca/nrc/cadc/ac/json/JsonUserWriter.java
similarity index 100%
rename from projects/cadcAccessControl/src/ca/nrc/cadc/ac/json/JsonUserWriter.java
rename to cadcAccessControl/src/ca/nrc/cadc/ac/json/JsonUserWriter.java
diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/xml/AbstractReaderWriter.java b/cadcAccessControl/src/ca/nrc/cadc/ac/xml/AbstractReaderWriter.java
similarity index 100%
rename from projects/cadcAccessControl/src/ca/nrc/cadc/ac/xml/AbstractReaderWriter.java
rename to cadcAccessControl/src/ca/nrc/cadc/ac/xml/AbstractReaderWriter.java
diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/xml/GroupListReader.java b/cadcAccessControl/src/ca/nrc/cadc/ac/xml/GroupListReader.java
similarity index 100%
rename from projects/cadcAccessControl/src/ca/nrc/cadc/ac/xml/GroupListReader.java
rename to cadcAccessControl/src/ca/nrc/cadc/ac/xml/GroupListReader.java
diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/xml/GroupListWriter.java b/cadcAccessControl/src/ca/nrc/cadc/ac/xml/GroupListWriter.java
similarity index 100%
rename from projects/cadcAccessControl/src/ca/nrc/cadc/ac/xml/GroupListWriter.java
rename to cadcAccessControl/src/ca/nrc/cadc/ac/xml/GroupListWriter.java
diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/xml/GroupReader.java b/cadcAccessControl/src/ca/nrc/cadc/ac/xml/GroupReader.java
similarity index 100%
rename from projects/cadcAccessControl/src/ca/nrc/cadc/ac/xml/GroupReader.java
rename to cadcAccessControl/src/ca/nrc/cadc/ac/xml/GroupReader.java
diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/xml/GroupWriter.java b/cadcAccessControl/src/ca/nrc/cadc/ac/xml/GroupWriter.java
similarity index 100%
rename from projects/cadcAccessControl/src/ca/nrc/cadc/ac/xml/GroupWriter.java
rename to cadcAccessControl/src/ca/nrc/cadc/ac/xml/GroupWriter.java
diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/xml/UserListReader.java b/cadcAccessControl/src/ca/nrc/cadc/ac/xml/UserListReader.java
similarity index 100%
rename from projects/cadcAccessControl/src/ca/nrc/cadc/ac/xml/UserListReader.java
rename to cadcAccessControl/src/ca/nrc/cadc/ac/xml/UserListReader.java
diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/xml/UserListWriter.java b/cadcAccessControl/src/ca/nrc/cadc/ac/xml/UserListWriter.java
similarity index 100%
rename from projects/cadcAccessControl/src/ca/nrc/cadc/ac/xml/UserListWriter.java
rename to cadcAccessControl/src/ca/nrc/cadc/ac/xml/UserListWriter.java
diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/xml/UserReader.java b/cadcAccessControl/src/ca/nrc/cadc/ac/xml/UserReader.java
similarity index 100%
rename from projects/cadcAccessControl/src/ca/nrc/cadc/ac/xml/UserReader.java
rename to cadcAccessControl/src/ca/nrc/cadc/ac/xml/UserReader.java
diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/xml/UserRequestReader.java b/cadcAccessControl/src/ca/nrc/cadc/ac/xml/UserRequestReader.java
similarity index 100%
rename from projects/cadcAccessControl/src/ca/nrc/cadc/ac/xml/UserRequestReader.java
rename to cadcAccessControl/src/ca/nrc/cadc/ac/xml/UserRequestReader.java
diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/xml/UserRequestWriter.java b/cadcAccessControl/src/ca/nrc/cadc/ac/xml/UserRequestWriter.java
similarity index 100%
rename from projects/cadcAccessControl/src/ca/nrc/cadc/ac/xml/UserRequestWriter.java
rename to cadcAccessControl/src/ca/nrc/cadc/ac/xml/UserRequestWriter.java
diff --git a/projects/cadcAccessControl/src/ca/nrc/cadc/ac/xml/UserWriter.java b/cadcAccessControl/src/ca/nrc/cadc/ac/xml/UserWriter.java
similarity index 100%
rename from projects/cadcAccessControl/src/ca/nrc/cadc/ac/xml/UserWriter.java
rename to cadcAccessControl/src/ca/nrc/cadc/ac/xml/UserWriter.java
diff --git a/projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/GroupPropertyTest.java b/cadcAccessControl/test/src/ca/nrc/cadc/ac/GroupPropertyTest.java
similarity index 100%
rename from projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/GroupPropertyTest.java
rename to cadcAccessControl/test/src/ca/nrc/cadc/ac/GroupPropertyTest.java
diff --git a/projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/GroupTest.java b/cadcAccessControl/test/src/ca/nrc/cadc/ac/GroupTest.java
similarity index 100%
rename from projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/GroupTest.java
rename to cadcAccessControl/test/src/ca/nrc/cadc/ac/GroupTest.java
diff --git a/projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/PersonalDetailsTest.java b/cadcAccessControl/test/src/ca/nrc/cadc/ac/PersonalDetailsTest.java
similarity index 100%
rename from projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/PersonalDetailsTest.java
rename to cadcAccessControl/test/src/ca/nrc/cadc/ac/PersonalDetailsTest.java
diff --git a/projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/PosixDetailsTest.java b/cadcAccessControl/test/src/ca/nrc/cadc/ac/PosixDetailsTest.java
similarity index 100%
rename from projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/PosixDetailsTest.java
rename to cadcAccessControl/test/src/ca/nrc/cadc/ac/PosixDetailsTest.java
diff --git a/projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/RoleTest.java b/cadcAccessControl/test/src/ca/nrc/cadc/ac/RoleTest.java
similarity index 100%
rename from projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/RoleTest.java
rename to cadcAccessControl/test/src/ca/nrc/cadc/ac/RoleTest.java
diff --git a/projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/UserRequestTest.java b/cadcAccessControl/test/src/ca/nrc/cadc/ac/UserRequestTest.java
similarity index 100%
rename from projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/UserRequestTest.java
rename to cadcAccessControl/test/src/ca/nrc/cadc/ac/UserRequestTest.java
diff --git a/projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/UserTest.java b/cadcAccessControl/test/src/ca/nrc/cadc/ac/UserTest.java
similarity index 100%
rename from projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/UserTest.java
rename to cadcAccessControl/test/src/ca/nrc/cadc/ac/UserTest.java
diff --git a/projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/client/GMSClientTest.java b/cadcAccessControl/test/src/ca/nrc/cadc/ac/client/GMSClientTest.java
similarity index 100%
rename from projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/client/GMSClientTest.java
rename to cadcAccessControl/test/src/ca/nrc/cadc/ac/client/GMSClientTest.java
diff --git a/projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/client/JsonUserListInputStreamWrapperTest.java b/cadcAccessControl/test/src/ca/nrc/cadc/ac/client/JsonUserListInputStreamWrapperTest.java
similarity index 100%
rename from projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/client/JsonUserListInputStreamWrapperTest.java
rename to cadcAccessControl/test/src/ca/nrc/cadc/ac/client/JsonUserListInputStreamWrapperTest.java
diff --git a/projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/client/UserClientTest.java b/cadcAccessControl/test/src/ca/nrc/cadc/ac/client/UserClientTest.java
similarity index 100%
rename from projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/client/UserClientTest.java
rename to cadcAccessControl/test/src/ca/nrc/cadc/ac/client/UserClientTest.java
diff --git a/projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/json/JsonGroupReaderWriterTest.java b/cadcAccessControl/test/src/ca/nrc/cadc/ac/json/JsonGroupReaderWriterTest.java
similarity index 100%
rename from projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/json/JsonGroupReaderWriterTest.java
rename to cadcAccessControl/test/src/ca/nrc/cadc/ac/json/JsonGroupReaderWriterTest.java
diff --git a/projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/json/JsonUserListReaderWriterTest.java b/cadcAccessControl/test/src/ca/nrc/cadc/ac/json/JsonUserListReaderWriterTest.java
similarity index 100%
rename from projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/json/JsonUserListReaderWriterTest.java
rename to cadcAccessControl/test/src/ca/nrc/cadc/ac/json/JsonUserListReaderWriterTest.java
diff --git a/projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/json/JsonUserReaderWriterTest.java b/cadcAccessControl/test/src/ca/nrc/cadc/ac/json/JsonUserReaderWriterTest.java
similarity index 100%
rename from projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/json/JsonUserReaderWriterTest.java
rename to cadcAccessControl/test/src/ca/nrc/cadc/ac/json/JsonUserReaderWriterTest.java
diff --git a/projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/json/JsonUserRequestReaderWriterTest.java b/cadcAccessControl/test/src/ca/nrc/cadc/ac/json/JsonUserRequestReaderWriterTest.java
similarity index 100%
rename from projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/json/JsonUserRequestReaderWriterTest.java
rename to cadcAccessControl/test/src/ca/nrc/cadc/ac/json/JsonUserRequestReaderWriterTest.java
diff --git a/projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/xml/GroupListReaderWriterTest.java b/cadcAccessControl/test/src/ca/nrc/cadc/ac/xml/GroupListReaderWriterTest.java
similarity index 100%
rename from projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/xml/GroupListReaderWriterTest.java
rename to cadcAccessControl/test/src/ca/nrc/cadc/ac/xml/GroupListReaderWriterTest.java
diff --git a/projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/xml/GroupPropertyReaderWriterTest.java b/cadcAccessControl/test/src/ca/nrc/cadc/ac/xml/GroupPropertyReaderWriterTest.java
similarity index 100%
rename from projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/xml/GroupPropertyReaderWriterTest.java
rename to cadcAccessControl/test/src/ca/nrc/cadc/ac/xml/GroupPropertyReaderWriterTest.java
diff --git a/projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/xml/GroupReaderWriterTest.java b/cadcAccessControl/test/src/ca/nrc/cadc/ac/xml/GroupReaderWriterTest.java
similarity index 100%
rename from projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/xml/GroupReaderWriterTest.java
rename to cadcAccessControl/test/src/ca/nrc/cadc/ac/xml/GroupReaderWriterTest.java
diff --git a/projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/xml/IdentityReaderWriterTest.java b/cadcAccessControl/test/src/ca/nrc/cadc/ac/xml/IdentityReaderWriterTest.java
similarity index 100%
rename from projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/xml/IdentityReaderWriterTest.java
rename to cadcAccessControl/test/src/ca/nrc/cadc/ac/xml/IdentityReaderWriterTest.java
diff --git a/projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/xml/UserDetailsReaderWriterTest.java b/cadcAccessControl/test/src/ca/nrc/cadc/ac/xml/UserDetailsReaderWriterTest.java
similarity index 100%
rename from projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/xml/UserDetailsReaderWriterTest.java
rename to cadcAccessControl/test/src/ca/nrc/cadc/ac/xml/UserDetailsReaderWriterTest.java
diff --git a/projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/xml/UserListReaderWriterTest.java b/cadcAccessControl/test/src/ca/nrc/cadc/ac/xml/UserListReaderWriterTest.java
similarity index 100%
rename from projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/xml/UserListReaderWriterTest.java
rename to cadcAccessControl/test/src/ca/nrc/cadc/ac/xml/UserListReaderWriterTest.java
diff --git a/projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/xml/UserReaderWriterTest.java b/cadcAccessControl/test/src/ca/nrc/cadc/ac/xml/UserReaderWriterTest.java
similarity index 100%
rename from projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/xml/UserReaderWriterTest.java
rename to cadcAccessControl/test/src/ca/nrc/cadc/ac/xml/UserReaderWriterTest.java
diff --git a/projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/xml/UserRequestReaderWriterTest.java b/cadcAccessControl/test/src/ca/nrc/cadc/ac/xml/UserRequestReaderWriterTest.java
similarity index 100%
rename from projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/xml/UserRequestReaderWriterTest.java
rename to cadcAccessControl/test/src/ca/nrc/cadc/ac/xml/UserRequestReaderWriterTest.java
--
GitLab