Commit 5fac7b1e authored 9 years ago by Jeff Burke

Merge branch 'ac2' into s1840

Conflicts:
	projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java

parents 3a47a616 f13b7606

No related branches found

No related tags found

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing

projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapDAO.java 8 additions, 8 deletions

...ontrol-Server/src/ca/nrc/cadc/ac/server/ldap/LdapDAO.java
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java 47 additions, 16 deletions

...l-Server/src/ca/nrc/cadc/ac/server/ldap/LdapGroupDAO.java
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java 128 additions, 83 deletions

...ol-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserPersistence.java 8 additions, 1 deletion

...r/src/ca/nrc/cadc/ac/server/ldap/LdapUserPersistence.java
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/UserServlet.java 25 additions, 2 deletions

...rol-Server/src/ca/nrc/cadc/ac/server/web/UserServlet.java
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/AbstractUserAction.java 11 additions, 4 deletions

...c/ca/nrc/cadc/ac/server/web/users/AbstractUserAction.java
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/GetUserAction.java 12 additions, 0 deletions

...er/src/ca/nrc/cadc/ac/server/web/users/GetUserAction.java
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/UserActionFactory.java 1 addition, 1 deletion

...rc/ca/nrc/cadc/ac/server/web/users/UserActionFactory.java
projects/cadcAccessControl-Server/src/ca/nrc/cadc/auth/AuthenticatorImpl.java 4 additions, 0 deletions

...ontrol-Server/src/ca/nrc/cadc/auth/AuthenticatorImpl.java
projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapDAOTest.java 23 additions, 11 deletions

...rver/test/src/ca/nrc/cadc/ac/server/ldap/LdapDAOTest.java
projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java 27 additions, 11 deletions

.../test/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAOTest.java
projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/users/ModifyUserActionTest.java 24 additions, 10 deletions

...ca/nrc/cadc/ac/server/web/users/ModifyUserActionTest.java
projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/users/UserActionFactoryTest.java 1 addition, 6 deletions

...a/nrc/cadc/ac/server/web/users/UserActionFactoryTest.java
projects/cadcAccessControl/src/ca/nrc/cadc/ac/client/GMSClient.java 11 additions, 2 deletions

...adcAccessControl/src/ca/nrc/cadc/ac/client/GMSClient.java
projects/cadcAccessControl/src/ca/nrc/cadc/ac/client/UserClient.java 29 additions, 26 deletions

...dcAccessControl/src/ca/nrc/cadc/ac/client/UserClient.java
projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/client/GMSClientTest.java 1 addition, 1 deletion

...Control/test/src/ca/nrc/cadc/ac/client/GMSClientTest.java
projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/client/UserClientTest.java 1 addition, 1 deletion

...ontrol/test/src/ca/nrc/cadc/ac/client/UserClientTest.java
projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/json/JsonUserListReaderWriterTest.java 1 addition, 1 deletion

...src/ca/nrc/cadc/ac/json/JsonUserListReaderWriterTest.java
projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/json/JsonUserReaderWriterTest.java 1 addition, 1 deletion

...est/src/ca/nrc/cadc/ac/json/JsonUserReaderWriterTest.java
projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/xml/IdentityReaderWriterTest.java 1 addition, 1 deletion

...test/src/ca/nrc/cadc/ac/xml/IdentityReaderWriterTest.java

with 364 additions and 186 deletions

Please register or to comment