Merge branch 'ac2' of ssh://gimli2/srv/cadc/git/wopencadc into ac2

projects/cadcAccessControl-Server/test/config/testConfig1.properties

+###############################################################
+#
+# Test ldap config #1
+#
+#
+###############################################################
+
+# Read-only connection pool
+readOnly.servers = server1 server2 server3
+readOnly.poolInitSize = 3
+readOnly.poolMaxSize = 8
+readOnly.poolPolicy = roundRobin
+readOnly.maxWait = 30000
+readOnly.createIfNeeded = false
+
+# Read-write connection pool
+readWrite.servers = server4 server5
+readWrite.poolInitSize = 4
+readWrite.poolMaxSize = 9
+readWrite.poolPolicy = fewestConnections
+readWrite.maxWait = 30000
+readWrite.createIfNeeded = false
+
+# server configuration -- applies to all servers
+dbrcHost = devLdap
+port = 389
+proxyUser = uid=testproxy,ou=SpecialUsers,dc=testcanfar
+usersDN = usersDN
+userRequestsDN = userRequestsDN
+groupsDN = groupsDN
+adminGroupsDN = adminGroupsDN
\ No newline at end of file

projects/cadcAccessControl-Server/test/config/testConfig2.properties

+###############################################################
+#
+# Test ldap config #2
+#
+#
+###############################################################
+
+# Read-only connection pool
+readOnly.servers = serverA serverB serverC
+readOnly.poolInitSize = 0
+readOnly.poolMaxSize = 1
+readOnly.poolPolicy = fewestConnections
+readOnly.maxWait = 30000
+readOnly.createIfNeeded = false
+
+# Read-write connection pool
+readWrite.servers = serverC
+readWrite.poolInitSize = 1
+readWrite.poolMaxSize = 2
+readWrite.poolPolicy = fewestConnections
+readWrite.maxWait = 30000
+readWrite.createIfNeeded = false
+
+# server configuration -- applies to all servers
+dbrcHost = devLdap
+port = 389
+proxyUser = uid=testproxy,ou=SpecialUsers,dc=testcanfar
+usersDN = usersDN
+userRequestsDN = userRequestsDN
+groupsDN = groupsDN
+adminGroupsDN = adminGroupsDN
\ No newline at end of file