Commits · ef06e9f4a94fc8f9c000377c339481b17c9b25a1 · OATS-CADC / ac

Sep 02, 2015
- Story 1657 rework. Updated based on Brian's review comments. Moved... · ef06e9f4
  Alinga Yeung authored Sep 02, 2015
```
Story 1657 rework. Updated based on Brian's review comments. Moved IdentityType to cadcUtil to consolidate its usage.
```
  ef06e9f4
Aug 28, 2015
- Merge branch 'ac2' of gimli2:/srv/cadc/git/wopencadc into ac2 · ed7c3c02
  Jeff Burke authored Aug 28, 2015
```
Conflicts:
	projects/cadcAccessControl/src/ca/nrc/cadc/ac/client/JsonUserListInputStreamWrapper.java
```
  ed7c3c02
- ac2 rework: fixes for unit and int tests · 49b5c7e3
  Jeff Burke authored Aug 28, 2015
  
  49b5c7e3
Aug 27, 2015
- Story ac2. Renamed JsonUserListInputStreamWrapperTest.java · 7bf5caf5
  Alinga Yeung authored Aug 27, 2015
  
  7bf5caf5
Aug 25, 2015
- Story ac2. Deleted file with an incorrect lowercase file name. Identical file... · 2b34aabc
  Alinga Yeung authored Aug 25, 2015
```
Story ac2. Deleted file with an incorrect lowercase file name. Identical file with JSONUser... already exists.
```
  2b34aabc
- Merge branch 'ac2' of gimli2:/srv/cadc/git/wopencadc into ac2 · efd157bb
  Jeff Burke authored Aug 25, 2015
  
  efd157bb
- ac2 rework to repackage the XML and JSON reader and writers · 1ef4184d
  Jeff Burke authored Aug 25, 2015
  
  1ef4184d
Aug 24, 2015
- Story 1658: Post rework fixes. · 74204533
  Dustin Jenkins authored Aug 24, 2015
  
  74204533
- Story 1659: Re-implement missing function. · 92a215fc
  Dustin Jenkins authored Aug 24, 2015
  
  92a215fc
Aug 21, 2015
- Merge branch 'ac2' of /srv/cadc/git/wopencadc into ac2 · 2561d233
  Alinga Yeung authored Aug 21, 2015
  
  2561d233
- Story ac2. Removed unnecessary type casts. · efff48c4
  Alinga Yeung authored Aug 21, 2015
  
  efff48c4
- ac2 - merged master into ac2 (opencadc) · e13c7bd0
  Brian Major authored Aug 21, 2015
  
  e13c7bd0
- make checkGroupExists only look at public attributes · 08a6ce99
  Patrick Dowler authored Aug 21, 2015
  
  08a6ce99
- Small fix for numeric id · adaeb6b8
  Adrian Damian authored Aug 21, 2015
  
  adaeb6b8
Aug 20, 2015
- Small fix for numeric id - take 4 · 2a89ce61
  Adrian Damian authored Aug 20, 2015
  
  2a89ce61
- Small fix for numeric id - take 3 · b986659f
  Adrian Damian authored Aug 20, 2015
  
  b986659f
- Merge branch 'ac2' of /srv/cadc/git/wopencadc into ac2 · b49c4354
  Adrian Damian authored Aug 20, 2015
  
  b49c4354
- Another small fix for numeric id · 1a79f982
  Adrian Damian authored Aug 20, 2015
  
  1a79f982
- Story ac2. Added unit test for UserClient. · d4373c4e
  Alinga Yeung authored Aug 20, 2015
  
  d4373c4e
- Small fix for numeric id · ee1d7511
  Adrian Damian authored Aug 20, 2015
  
  ee1d7511
- 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
- added Group.setOwner · 51ec1cf6
  Patrick Dowler authored Aug 20, 2015
  
  51ec1cf6
- added GroupDetailSelector so GroupPersistence implementation can configure... · d9504b19
  Patrick Dowler authored Aug 20, 2015
```
added GroupDetailSelector so GroupPersistence implementation can configure whether group details should be returned from searches
```
  d9504b19
- 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
- added support for incomplete cache of groups to improve isMember and getGroup when possible · 1e44bdb6
  Patrick Dowler authored Aug 19, 2015
  
  1e44bdb6
- 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 18, 2015
- implemented public-attribute-only get option so caller doesn't need permission... · 3e46884c
  Patrick Dowler authored Aug 18, 2015
```
implemented public-attribute-only get option so caller doesn't need permission to get a member group
```
  3e46884c
Aug 17, 2015
- ac2 - Added SyncOutput to wrap the http servlet response · 833b0a4a
  Brian Major authored Aug 17, 2015
  
  833b0a4a