Commits · 979f0aa428204fa63af8528ba1121d8eeacc6199 · OATS-CADC / ac

Sep 30, 2015
- ac2 - Unit test for LdapConnections object · 979f0aa4
  Brian Major authored Sep 30, 2015
  
  979f0aa4
- Merge branch 'ac2' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into ac2 · b387ff73
  Brian Major authored Sep 30, 2015
  
  b387ff73
- ac2 - fixed logging messages · b8bffe8c
  Brian Major authored Sep 30, 2015
  
  b8bffe8c
Sep 29, 2015
- Merge branch 'ac2' of ssh://gimli2/srv/cadc/git/wopencadc into ac2 · 308bf3b4
  Patrick Dowler authored Sep 29, 2015
  
  308bf3b4
- simplified encoding of userIDs and apparently fixed a multiple-encoding bug in GMSClient · 847b25a4
  Patrick Dowler authored Sep 29, 2015
  
  847b25a4
- Merge branch 'master' of ssh://gimli2/srv/cadc/git/wopencadc into ac2 · 77e24e2e
  Patrick Dowler authored Sep 29, 2015
  
  77e24e2e
Sep 28, 2015
- Merge branch 'ac2' of ssh://gimli2.cadc.dao.nrc.ca/srv/cadc/git/wopencadc into ac2 · c2d12dcd
  Brian Major authored Sep 28, 2015
  
  c2d12dcd
Sep 25, 2015
- ac2 - Unit tests passing with connection pool · 412ff7a7
  Brian Major authored Sep 25, 2015
  
  412ff7a7
- ac2 - added LdapConfigTest, fixed test config · cc07c99f
  Brian Major authored Sep 25, 2015
  
  cc07c99f
Sep 24, 2015
- ac2 - LDAP Connection Pool · 20133e41
  Brian Major authored Sep 24, 2015
  
  20133e41
Sep 18, 2015
- s1840: more int-test fixes · 96bbf0c1
  Jeff Burke authored Sep 18, 2015
  
  96bbf0c1
- Merge branch 'ac2' into s1840 · 5fac7b1e
  Jeff Burke authored Sep 18, 2015
```
Conflicts:
	projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
```
  5fac7b1e
- s1840: updated int-tests · 3a47a616
  Jeff Burke authored Sep 18, 2015
  
  3a47a616
- s1840: updated int-tests · a43e2478
  Jeff Burke authored Sep 18, 2015
  
  a43e2478
Sep 17, 2015
- ac2 - user log debugging info · f13b7606
  Brian Major authored Sep 17, 2015
  
  f13b7606
- ac2 - user log info for 'augment user' · 3da74b47
  Brian Major authored Sep 17, 2015
  
  3da74b47
- Story 1840. Minor formatting change when printing user details. · 7096ec20
  Alinga Yeung authored Sep 17, 2015
  
  7096ec20
Sep 16, 2015
- Story 1840. Since approvePendingUser() returns the approved user, added code... · d3a60287
  Alinga Yeung authored Sep 16, 2015
```
Story 1840. Since approvePendingUser() returns the approved user, added code to print details of the approved user.
```
  d3a60287
- added profiling to augment user path · 0837d469
  Brian Major authored Sep 16, 2015
  
  0837d469
- ac2 - added more profiling · 46207e97
  Brian Major authored Sep 16, 2015
  
  46207e97
- ac2 - added profiler start new request · 0a486bbe
  Brian Major authored Sep 16, 2015
  
  0a486bbe
- added profiling to augment user path · 61f5d800
  Brian Major authored Sep 16, 2015
  
  61f5d800
Sep 15, 2015
- fix conflicts in deleteUser · 9385e1e6
  Patrick Dowler authored Sep 15, 2015
  
  9385e1e6
- improve ldap query with minimal scope, remove redundant filters; fix... · 931f1c82
  Patrick Dowler authored Sep 15, 2015
```
improve ldap query with minimal scope, remove redundant filters; fix deleteUser to really delete pending users
```
  931f1c82
- ac2 - Added profiling to LDAPUserDAO.getAugmentedUser() · 6ce93e33
  Brian Major authored Sep 15, 2015
  
  6ce93e33
- ac2: delete an approved user from the pending tree. · da63d846
  Jeff Burke authored Sep 15, 2015
  
  da63d846
- Merge branch 'ac2' of ssh://gimli2/srv/cadc/git/wopencadc into ac2 · 827c01f7
  Patrick Dowler authored Sep 15, 2015
  
  827c01f7
- added profiler usage to getConnection and getGroupNames · ecf2a476
  Patrick Dowler authored Sep 15, 2015
  
  ecf2a476
- ac2: allow a get from another dao method as an anon user · 7abd64aa
  Jeff Burke authored Sep 15, 2015
  
  7abd64aa
- ac2: fix for LdapUserDAOTest unit tests. · 925d6834
  Jeff Burke authored Sep 15, 2015
  
  925d6834
- Merge branch 's1840' into ac2 · c0dd1819
  Jeff Burke authored Sep 15, 2015
  
  c0dd1819
- s1840: fix for numeric changed to Integer, check for existing users before adding. · 77f8e066
  Jeff Burke authored Sep 15, 2015
  
  77f8e066
- s1840: set some test debug level to INFO · 2b677bcd
  Jeff Burke authored Sep 15, 2015
  
  2b677bcd
- ac2: fix unit tests after merge of s1840 · 5710c998
  Jeff Burke authored Sep 14, 2015
  
  5710c998
- Merge branch 's1840' into ac2 · 190003f6
  Jeff Burke authored Sep 14, 2015
```
Conflicts:
	projects/cadcAccessControl-Server/src/ca/nrc/cadc/ac/server/ldap/LdapUserDAO.java
```
  190003f6
- Merge branch 'ac2' of gimli2:/srv/cadc/git/wopencadc into ac2 · b993ddbf
  Jeff Burke authored Sep 14, 2015
  
  b993ddbf
Sep 14, 2015
- Story ac2. Changed NumericPrincipal to use an int instead of a long. · 8170966a
  Alinga Yeung authored Sep 14, 2015
  
  8170966a
- s1840: int testing fixes. · 737ed18d
  Jeff Burke authored Sep 14, 2015
  
  737ed18d
- Story 1840. Simplified code. · d0f841ed
  Alinga Yeung authored Sep 14, 2015
  
  d0f841ed
Sep 11, 2015

Story 1840. Minor change to set the print stream of a command while parsing so... · 83def454

Alinga Yeung authored Sep 11, 2015

Story 1840. Minor change to set the print stream of a command while parsing so that the command is ready after the parser has been instatiated.

83def454