Merge branch 'master' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/ac into t72959
No related branches found
No related tags found
Showing
- cadcAccessControl-Admin/build.xml 0 additions, 12 deletionscadcAccessControl-Admin/build.xml
- cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/AbstractCommand.java 14 additions, 15 deletions...ntrol-Admin/src/ca/nrc/cadc/ac/admin/AbstractCommand.java
- cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/AbstractListUsers.java 29 additions, 13 deletions...rol-Admin/src/ca/nrc/cadc/ac/admin/AbstractListUsers.java
- cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/AbstractUserCommand.java 14 additions, 16 deletions...l-Admin/src/ca/nrc/cadc/ac/admin/AbstractUserCommand.java
- cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/ApproveUser.java 7 additions, 11 deletions...ssControl-Admin/src/ca/nrc/cadc/ac/admin/ApproveUser.java
- cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/CmdLineParser.java 2 additions, 2 deletions...Control-Admin/src/ca/nrc/cadc/ac/admin/CmdLineParser.java
- cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/CommandRunner.java 2 additions, 2 deletions...Control-Admin/src/ca/nrc/cadc/ac/admin/CommandRunner.java
- cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/ListUserRequests.java 7 additions, 8 deletions...trol-Admin/src/ca/nrc/cadc/ac/admin/ListUserRequests.java
- cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/ListUsers.java 5 additions, 6 deletions...cessControl-Admin/src/ca/nrc/cadc/ac/admin/ListUsers.java
- cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/Main.java 1 addition, 2 deletionscadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/Main.java
- cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/RejectUser.java 1 addition, 1 deletion...essControl-Admin/src/ca/nrc/cadc/ac/admin/RejectUser.java
- cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/ViewUser.java 11 additions, 12 deletions...ccessControl-Admin/src/ca/nrc/cadc/ac/admin/ViewUser.java
- cadcAccessControl-Admin/test/src/ca/nrc/cadc/ac/admin/CmdLineParserTest.java 2 additions, 2 deletions...dmin/test/src/ca/nrc/cadc/ac/admin/CmdLineParserTest.java
- cadcAccessControl-Server/build.xml 28 additions, 0 deletionscadcAccessControl-Server/build.xml
- cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/GroupPersistence.java 1 addition, 2 deletions...ol-Server/src/ca/nrc/cadc/ac/server/GroupPersistence.java
- cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/PluginFactory.java 8 additions, 12 deletions...ntrol-Server/src/ca/nrc/cadc/ac/server/PluginFactory.java
- cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/UserPersistence.java 44 additions, 31 deletions...rol-Server/src/ca/nrc/cadc/ac/server/UserPersistence.java
- cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapConfig.java 45 additions, 2 deletions...rol-Server/src/ca/nrc/cadc/ac/server/ldap/LdapConfig.java
- cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapConnectionPool.java 3 additions, 42 deletions...er/src/ca/nrc/cadc/ac/server/ldap/LdapConnectionPool.java
- cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapDAO.java 0 additions, 13 deletions...ontrol-Server/src/ca/nrc/cadc/ac/server/ldap/LdapDAO.java
Loading
Please register or sign in to comment