Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

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

Snippets Groups Projects

88d1507d

Commit 88d1507d authored 9 years ago by Alinga Yeung

Downloads
- Plain Diff

Story ac2. Fixed merge conflicts.

parents c3b6ae16 cd4d9671

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

projects/cadcAccessControl-Server/build.xml 1 addition, 1 deletion

projects/cadcAccessControl-Server/build.xml
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java 24 additions, 59 deletions

...ol-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/GetUserAction.java 31 additions, 1 deletion

...er/src/ca/nrc/cadc/ac/server/web/users/GetUserAction.java
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/UserActionFactory.java 6 additions, 6 deletions

...rc/ca/nrc/cadc/ac/server/web/users/UserActionFactory.java
projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java 26 additions, 75 deletions

.../test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java
projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/users/GetUserActionTest.java 122 additions, 2 deletions

...rc/ca/nrc/cadc/ac/server/web/users/GetUserActionTest.java

with 210 additions and 144 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