Merge branch 'release_candidate'

# ac

client and server implementations for user and group management

Access Control: client and server implementations for user and group management

- cadcAccessControl - Access control clients and common model objects and exceptions.

- cadcAccessControl-Server - Access control web service implementation.

- cadcAccessControl-Admin - Administrative tool for managing users.

- cadcTomcat - Tomcal 7 authentication realm implementation that uses the AC web service.

  <property environment="env"/>

  <property file="local.build.properties"/>

  <property file="${env.A}/compilers/setup.ant.java.properties"/>

  <import file="${env.A}/compilers/setup.ant.java.targets.xml"/>

  <!-- site-specific build properties or overrides of values in opencadc.properties -->

  <property file="${env.CADC_PREFIX}/etc/local.properties" />

  <!-- site-specific targets, e.g. install, cannot duplicate those in opencadc.targets.xml -->

  <import file="${env.CADC_PREFIX}/etc/local.targets.xml" optional="true" />

  <!-- default properties and targets -->

  <property file="${env.CADC_PREFIX}/etc/opencadc.properties" />

  <import file="${env.CADC_PREFIX}/etc/opencadc.targets.xml"/>

  <!-- developer convenience: place for extra targets and properties -->

  <import file="extras.xml" optional="true" />

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

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

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

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

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

  <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="xerces" value="${ext.lib}/xerces.jar"/>

  <property name="jars"

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

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

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

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

# cadcAccessControl

## Description

The cadcAccessControl module contains the shared model classes and exceptions used by the access control clients and server.  It also contains the UserClient and GMSClient (group management service client).

## Build and Test Dependencies

### opencadc dependencies:

- opencadc/core/cadcUtil

- opencadc/reg/cadcRegistry

### external build dependencies

- json.jar (json.org-20110818.jar)

- jdom2.jar (jdom-2.0.5.jar)

- log4j.jar (log4j-1.2.17.jar)

### external test dependencies

- xerces.jar (xerces-2_9_1)

- asm.jar (hibernate-3.2.3)

- cglib.jar (hibernate-3.2.3)

- easymock.jar (easymock-3.0.jar)

- junit.jar (junit-4.6.jar)

- objenesis.jar (objenesis-1.2.jar)

    <property name="project"    value="cadcAccessControl" />

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

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

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

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

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

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

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

    <property name="unboundid"  value="${ext.lib}/unboundid-ldapsdk-se.jar" />

    <property name="jars" value="${json}:${jdom2}:${log4j}:${javacsv}:${unboundid}:${cadcUtil}:${cadcRegistryClient}" />

    <property name="jars" value="${json}:${jdom2}:${log4j}:${cadcUtil}:${cadcRegistryClient}" />

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

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