Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

ac
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Incidents

Snippets Groups Projects

18fe2524

Commit 18fe2524 authored 9 years ago by Brian Major

Downloads
- Plain Diff

Merge branch 's1890' of ssh://gimli2/srv/cadc/git/ac into s1890

parents b52ceefe 6a68dd5b

No related branches found

No related tags found

No related merge requests found

Changes 9

Expand all Hide whitespace changes

Inline Side-by-side

Showing

cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java 61 additions, 36 deletions

...ol-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/AbstractGroupAction.java 24 additions, 0 deletions

...ca/nrc/cadc/ac/server/web/groups/AbstractGroupAction.java
cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/groups/RemoveUserMemberAction.java 1 addition, 7 deletions

...nrc/cadc/ac/server/web/groups/RemoveUserMemberAction.java
cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/AbstractLdapDAOTest.java 163 additions, 0 deletions

...t/src/ca/nrc/cadc/ac/server/ldap/AbstractLdapDAOTest.java
cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapDAOTest.java 0 additions, 9 deletions

...rver/test/src/ca/nrc/cadc/ac/server/ldap/LdapDAOTest.java
cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAOTest.java 33 additions, 137 deletions

...test/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAOTest.java
cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java 170 additions, 198 deletions

.../test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java
cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/groups/RemoveUserMemberActionTest.java 4 additions, 2 deletions

...cadc/ac/server/web/groups/RemoveUserMemberActionTest.java
cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/users/CreateUserActionTest.java 6 additions, 9 deletions

...ca/nrc/cadc/ac/server/web/users/CreateUserActionTest.java

with 462 additions and 398 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment