Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

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

Snippets Groups Projects

7b9232ef

Commit 7b9232ef authored 9 years ago by Brian Major

Downloads
- Plain Diff

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

parents a26444d8 c67b5fa6

No related branches found

No related tags found

Loading

Changes 5

Show whitespace changes

Inline Side-by-side

Showing

cadcAccessControl-Identity/build.xml 119 additions, 0 deletions

cadcAccessControl-Identity/build.xml
cadcAccessControl-Identity/src/ca/nrc/cadc/auth/ACIdentityManager.java 247 additions, 0 deletions

...trol-Identity/src/ca/nrc/cadc/auth/ACIdentityManager.java
cadcAccessControl-Identity/src/ca/nrc/cadc/auth/AuthenticatorImpl.java 85 additions, 0 deletions

...trol-Identity/src/ca/nrc/cadc/auth/AuthenticatorImpl.java
cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/LoginServlet.java 32 additions, 3 deletions

...ol-Server/src/ca/nrc/cadc/ac/server/web/LoginServlet.java
cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java 52 additions, 59 deletions

.../test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java

with 535 additions and 62 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