Commits · 1ef4184dbeaa6197a8a5f4e943b9c34d315a13fe · OATS-CADC / ac

Aug 25, 2015
- ac2 rework to repackage the XML and JSON reader and writers · 1ef4184d
  Jeff Burke authored Aug 25, 2015
  
  1ef4184d
Aug 20, 2015
- ac2: fix for UserActionFactoryTest unit test. · dc0d82ef
  Jeff Burke authored Aug 20, 2015
  
  dc0d82ef
- Story ac2. Reverted changes made by git :-) · ac8df62b
  Alinga Yeung authored Aug 20, 2015
  
  ac8df62b
- Story ac2. Fixed merge conflicts. · 88d1507d
  Alinga Yeung authored Aug 20, 2015
  
  88d1507d
- Story ac2. Corrected spelling. · c3b6ae16
  Alinga Yeung authored Aug 20, 2015
  
  c3b6ae16
- Merge branch 'ac2' of gimli2:/srv/cadc/git/wopencadc into ac2 · cd4d9671
  Jeff Burke authored Aug 20, 2015
```
Conflicts:
	projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/web/users/GetUserAction.java
```
  cd4d9671
- s1657: support for detail parameter getting a user. · 1fbebeb5
  Jeff Burke authored Aug 20, 2015
  
  1fbebeb5
- Story ac2. Fixed issue with adding principals to the subject. · 064d1c33
  Alinga Yeung authored Aug 19, 2015
  
  064d1c33
- Story ac2. Added code to check for null subject. · 20c46180
  Alinga Yeung authored Aug 19, 2015
  
  20c46180
Aug 19, 2015
- Merged with s1657 · 9ce9301b
  Adrian Damian authored Aug 19, 2015
  
  9ce9301b
- Merged with ac2 · 188a95d3
  Adrian Damian authored Aug 19, 2015
  
  188a95d3
- Merge branch 'ac2' of /srv/cadc/git/wopencadc into ac2 · dface76d
  Alinga Yeung authored Aug 19, 2015
  
  dface76d
- Story ac2. Added UserClient to perform subject augmentation. Updated... · 87fedc22
  Alinga Yeung authored Aug 19, 2015
```
Story ac2. Added UserClient to perform subject augmentation. Updated LdapUserDAO to add X500Principal. NumericPrincipal is to be added later when it is ready. Fixed UserActionFactory to ignore case when comparing idType.
```
  87fedc22
- ac2 rework: add JsonInputter to parse a json String into a DOM, updated JSON... · 57295495
  Jeff Burke authored Aug 19, 2015
```
ac2 rework: add JsonInputter to parse a json String into a DOM, updated JSON readers and writers to use the cadcUtil Json Inputter and Outputter.
```
  57295495
- Merge branch 'ac2' of /srv/cadc/git/wopencadc into ac2 · e3d933f7
  Alinga Yeung authored Aug 19, 2015
  
  e3d933f7
- Story ac2. Added super user support to UserAction. · 1ecd0c53
  Alinga Yeung authored Aug 19, 2015
  
  1ecd0c53
Aug 17, 2015
- ac2 - Added SyncOutput to wrap the http servlet response · 833b0a4a
  Brian Major authored Aug 17, 2015
  
  833b0a4a
Aug 14, 2015
- ac2 - Added missing file WebUtil.java · 4c0353bc
  Brian Major authored Aug 14, 2015
  
  4c0353bc
- ac2 - merged action refactoring with ac2 branch · 6634cb98
  Brian Major authored Aug 14, 2015
  
  6634cb98
- ac2 - Refactored action classes in cadcAccessControl-Server · 93bd37b9
  Brian Major authored Aug 14, 2015
  
  93bd37b9
- Renamed Uppercase JSON to lowercase. · 49c9ab4b
  Dustin Nicholas Jenkins authored Aug 14, 2015
  
  49c9ab4b
Aug 13, 2015
- ac2 rework · b0df4c2c
  Jeff Burke authored Aug 13, 2015
  
  b0df4c2c
Aug 12, 2015
- Story ac2. Reformatted code. · b4e49af8
  Alinga Yeung authored Aug 11, 2015
  
  b4e49af8
- Story ac2. Removed unnecessary modifiers from the interface. · b9f1f7a4
  Alinga Yeung authored Aug 11, 2015
  
  b9f1f7a4
Aug 11, 2015
- Story ac2 rework. Removed unused import. · 9b6b6623
  Alinga Yeung authored Aug 11, 2015
  
  9b6b6623
- Story ac2 rework. Changed getMember() to getX500User(). · 4c360a11
  Alinga Yeung authored Aug 11, 2015
  
  4c360a11
- Story ac2 rework. Removed getUserGroups() from the API since we already have... · 6b3f7fda
  Alinga Yeung authored Aug 11, 2015
```
Story ac2 rework. Removed getUserGroups() from the API since we already have getGroups(). This also stops us from exposing com.unboundid.ldap.sdk.DN to the API.
```
  6b3f7fda
- Story ac2 rework. Changed methods to package level. · 7db520cc
  Alinga Yeung authored Aug 11, 2015
  
  7db520cc
- Story ac2 rework. Added comments. · 0f352e9c
  Alinga Yeung authored Aug 11, 2015
  
  0f352e9c
- Story ac2 rework. We now expose isMember() in GroupPersistence instead of in UserPersistence. · a42ea472
  Alinga Yeung authored Aug 11, 2015
  
  a42ea472
- Story ac2 rework. We now expose getUserGroups() in GroupPersistence instead of in UserPersistence. · dea40303
  Alinga Yeung authored Aug 11, 2015
  
  dea40303
Aug 10, 2015
- Story ac2 rework. Changed method name from 'loginUser' to 'doLogin'. · b6be3715
  Alinga Yeung authored Aug 10, 2015
  
  b6be3715
- Story ac2. Fixed merge conflicts. Simplified code as well. · ffef3d08
  Alinga Yeung authored Aug 10, 2015
  
  ffef3d08
- Story ac2. Updated after Brian's code review comments. · 6f184419
  Alinga Yeung authored Aug 10, 2015
  
  6f184419
- Story 1731: Re-use the AccessControlFilter for the password change servlet. · 611cf34e
  Dustin Jenkins authored Aug 10, 2015
  
  611cf34e
- Story ac2. Updated Password servlet as per Brian's code review comments. · f7b8e184
  Alinga Yeung authored Aug 10, 2015
  
  f7b8e184
Aug 07, 2015
- Merge branch 'ac2' of /srv/cadc/git/wopencadc into ac2 · 2ab9e92b
  Alinga Yeung authored Aug 07, 2015
  
  2ab9e92b
- Story ac2. Adde password servlet. · 5bff784b
  Alinga Yeung authored Aug 07, 2015
  
  5bff784b
- Merge branch 'ac2' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into ac2 · b90a6b89
  Brian Major authored Aug 07, 2015
  
  b90a6b89
- Story 1658: Finish update user. · 04f57abf
  Dustin Jenkins authored Aug 07, 2015
  
  04f57abf