Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

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

Snippets Groups Projects

1ca469a9

Commit 1ca469a9 authored 9 years ago by Dustin Jenkins

Downloads
- Plain Diff

Merge branch 's1832' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into s1832

parents 773fa9a3 e00017cd

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/GroupPersistence.java 0 additions, 16 deletions

...ol-Server/src/ca/nrc/cadc/ac/server/GroupPersistence.java
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java 4 additions, 2 deletions

...l-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupPersistence.java 2 additions, 11 deletions

.../src/ca/nrc/cadc/ac/server/ldap/LdapGroupPersistence.java
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/LoginServlet.java 153 additions, 7 deletions

...ol-Server/src/ca/nrc/cadc/ac/server/web/LoginServlet.java
projects/cadcAccessControl-Server/src/ca/nrc/cadc/auth/AuthenticatorImpl.java 1 addition, 1 deletion

...ontrol-Server/src/ca/nrc/cadc/auth/AuthenticatorImpl.java
projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/users/UserLoginServletTest.java 109 additions, 0 deletions

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

with 269 additions and 37 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