Commit 190003f6 authored 9 years ago by Jeff Burke

Merge branch 's1840' into ac2

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

parents b993ddbf 737ed18d

No related branches found

No related tags found

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing

projects/cadcAccessControl-Admin/build.xml 5 additions, 9 deletions

projects/cadcAccessControl-Admin/build.xml
projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/AbstractCommand.java 96 additions, 2 deletions

...ntrol-Admin/src/ca/nrc/cadc/ac/admin/AbstractCommand.java
projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/AbstractListUsers.java 81 additions, 25 deletions

...rol-Admin/src/ca/nrc/cadc/ac/admin/AbstractListUsers.java
projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/AbstractUserCommand.java 120 additions, 0 deletions

...l-Admin/src/ca/nrc/cadc/ac/admin/AbstractUserCommand.java
projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/ApproveUser.java 88 additions, 15 deletions

...ssControl-Admin/src/ca/nrc/cadc/ac/admin/ApproveUser.java
projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/CmdLineParser.java 92 additions, 64 deletions

...Control-Admin/src/ca/nrc/cadc/ac/admin/CmdLineParser.java
projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/ListActiveUsers.java 71 additions, 12 deletions

...ntrol-Admin/src/ca/nrc/cadc/ac/admin/ListActiveUsers.java
projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/ListPendingUsers.java 70 additions, 11 deletions

...trol-Admin/src/ca/nrc/cadc/ac/admin/ListPendingUsers.java
projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/Main.java 20 additions, 52 deletions

...adcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/Main.java
projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/RejectUser.java 88 additions, 14 deletions

...essControl-Admin/src/ca/nrc/cadc/ac/admin/RejectUser.java
projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/UsageException.java 64 additions, 26 deletions

...ontrol-Admin/src/ca/nrc/cadc/ac/admin/UsageException.java
projects/cadcAccessControl-Admin/src/ca/nrc/cadc/ac/admin/ViewUser.java 120 additions, 16 deletions

...ccessControl-Admin/src/ca/nrc/cadc/ac/admin/ViewUser.java
projects/cadcAccessControl-Admin/test/src/ca/nrc/cadc/ac/admin/CmdLineParserTest.java 337 additions, 0 deletions

...dmin/test/src/ca/nrc/cadc/ac/admin/CmdLineParserTest.java
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/UserPersistence.java 83 additions, 29 deletions

...rol-Server/src/ca/nrc/cadc/ac/server/UserPersistence.java
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java 72 additions, 24 deletions

...ol-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserPersistence.java 140 additions, 49 deletions

...r/src/ca/nrc/cadc/ac/server/ldap/LdapUserPersistence.java
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/LoginServlet.java 12 additions, 6 deletions

...ol-Server/src/ca/nrc/cadc/ac/server/web/LoginServlet.java
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/UserServlet.java 2 additions, 1 deletion

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

...c/ca/nrc/cadc/ac/server/web/users/AbstractUserAction.java
projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/ModifyUserAction.java 64 additions, 3 deletions

...src/ca/nrc/cadc/ac/server/web/users/ModifyUserAction.java

with 1625 additions and 365 deletions

Please register or to comment