master - build and property file cleanup

  <property name="cadcUWS" value="${lib}/cadcUWS.jar"/>

  <property name="cadcUWS-Server" value="${lib}/cadcUWS-Server.jar"/>

  <property name="json" value="${ext.lib}/json.jar" />

  <property name="javacsv" value="${ext.lib}/javacsv.jar"/>

  <property name="jdom2" value="${ext.lib}/jdom2.jar"/>

  <property name="log4j" value="${ext.lib}/log4j.jar"/>

  <property name="servlet" value="${ext.lib}/servlet-api.jar"/>

  <property name="xerces" value="${ext.lib}/xerces.jar"/>

  <property name="jars"

            value="${javacsv}:${jdom2}:${json}:${log4j}:${servlet}:${unboundid}:${xerces}:${cadcAccessControl}:${cadcLog}:${cadcRegistry}:${cadcUtil}:${cadcUWS}:${cadcUWS-Server}"/>

            value="${jdom2}:${json}:${log4j}:${servlet}:${unboundid}:${xerces}:${cadcAccessControl}:${cadcLog}:${cadcRegistry}:${cadcUtil}:${cadcUWS}:${cadcUWS-Server}"/>

  <target name="build" depends="compile">

    <jar jarfile="${build}/lib/${project}.jar"

  </target>

  <target name="setup-test" depends="init">

    <!-- Why do the tests need this configuration in two places? -->

    <!-- jenkinsd 2015.07.20 -->

    <!--

    <copy overwrite="true" file="test/LdapConfig.test.properties"

          todir="build/test/class"/>

    <mkdir dir="${user.home}/config" />

    <copy overwrite="true" file="test/LdapConfig.test.properties"

          todir="${user.home}/config/"/>

    -->

  </target>

  <!-- JAR files needed to run the test suite -->

  <property name="dev.junit" value="${ext.dev}/junit.jar"/>

  <property name="dev.httpunit" value="${ext.dev}/httpunit.jar"/>

  <property name="dev.asm"            value="${ext.dev}/asm.jar" />

  <property name="dev.cglib"          value="${ext.dev}/cglib.jar" />

  <property name="dev.easyMock" value="${ext.dev}/easymock.jar"/>

  <property name="dev.objenesis" value="${ext.dev}/objenesis.jar"/>

  <property name="dev.jsonassert" value="${ext.dev}/jsonassert.jar" />

  <property name="dev.selenium.server"

            value="${ext.dev}/selenium-server-standalone.jar" />

  <property name="lib.js" value="${ext.lib}/js.jar"/>

  <property name="lib.nekoHTML" value="${ext.lib}/nekohtml.jar"/>

  <property name="lib.xerces" value="${ext.lib}/xerces.jar"/>

  <property name="lib.commons-logging"

            value="${ext.lib}/commons-logging.jar"/>

  <property name="testingJars"

            value="${lib.commons-logging}:${dev.junit}:${dev.jsonassert}:${dev.httpunit}:${dev.easyMock}:${dev.selenium.server}:${dev.objenesis}:${lib.js}:${lib.nekoHTML}:${lib.xerces}"/>

  <property name="lib.commons-logging" value="${ext.lib}/commons-logging.jar"/>

  <property name="testingJars" value="${lib.commons-logging}:${dev.junit}:${dev.jsonassert}:${dev.asm}:${dev.cglib}:${dev.easyMock}:${dev.objenesis}:${lib.xerces}"/>

  <target name="single-test" depends="compile,compile-test">

    <echo message="Running test suite..." />

# This are the configuration fields required by the Ldap ldap-dao unit tests

# Tests are more accurate running on Port 636.  If it fails due to SSL/Security

# issues, then make very sure the ca.crt (gimli2.cadc.dao.nrc.ca:~miscsw/ca.crt)

# is installed in your Java Keystore:

# scp gimli2.cadc.dao.nrc.ca:~miscsw/ca.crt /tmp/ca.crt

# ${JAVA_HOME}/bin/keytool -importcert -keystore ${JAVA_HOME}/jre/lib/security/cacerts -file /tmp/ca.crt

# Read-only connection pool

readOnly.servers = proc5-03.cadc.dao.nrc.ca

readOnly.poolInitSize = 1

readOnly.poolMaxSize = 1

readOnly.poolPolicy = roundRobin

readOnly.maxWait = 30000

readOnly.createIfNeeded = false

# Read-write connection pool

readWrite.servers = proc5-03.cadc.dao.nrc.ca

readWrite.poolInitSize = 1

readWrite.poolMaxSize = 1

readWrite.poolPolicy = roundRobin

readWrite.maxWait = 30000

readWrite.createIfNeeded = false

# Unbound-Read-write connection pool

unboundReadOnly.servers = proc5-03.cadc.dao.nrc.ca

unboundReadOnly.poolInitSize = 1

unboundReadOnly.poolMaxSize = 1

unboundReadOnly.poolPolicy = roundRobin

unboundReadOnly.maxWait = 30000

unboundReadOnly.createIfNeeded = false

# server configuration -- applies to all servers

dbrcHost = devLdap

port = 636

proxyUser = uid=testproxy,ou=SpecialUsers,dc=testcanfar

usersDN = ou=Users,ou=ds,dc=testcanfar

userRequestsDN = ou=UserRequests,ou=ds,dc=testcanfar

groupsDN = ou=Groups,ou=ds,dc=testcanfar

adminGroupsDN = ou=adminGroups,ou=ds,dc=testcanfar

 No newline at end of file