Commit 0f5198c2 authored by Jeff Burke's avatar Jeff Burke
Browse files

s1734: initial JSON reader writers

parent 5de755cb

projects/cadcAccessControl-Server/build.xml

+2 −3
Original line number Diff line number Diff line
@@ -113,16 +113,15 @@ 
    </target>



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

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

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

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

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

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

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

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

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

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



    <property name="testingJars"    value="${jars}:${gson}:${easyMock}:${junit}:${xmlunit}:${xerces}:${cglib}:${asm}:${objenesis}" />

    <property name="testingJars"    value="${jars}:${json}:${easyMock}:${junit}:${xmlunit}:${cglib}:${asm}:${objenesis}" />



    <target name="resources">

        <copy todir="${build}/class">

projects/cadcAccessControl/build.xml

+20 −3
Original line number Diff line number Diff line
@@ -90,13 +90,14 @@ 
    <property name="cadcUtil"           value="${lib}/cadcUtil.jar" />

	<property name="cadcRegistryClient" value="${lib}/cadcRegistryClient.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="${jdom2}:${log4j}:${javacsv}:${unboundid}:${cadcUtil}:${cadcRegistryClient}" />

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

    

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

        <jar jarfile="${build}/lib/${project}.jar"
@@ -116,4 +117,20 @@ 
    

    <property name="testingJars" value="${build}/class:${jars}:${xerces}:${asm}:${cglib}:${easymock}:${junit}:${objenesis}" />



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

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

        <junit printsummary="yes" haltonfailure="yes" fork="yes">

            <classpath>

                <pathelement path="${build}/class"/>

                <pathelement path="${build}/test/class"/>

                <pathelement path="${testingJars}"/>

            </classpath>

            <test name="ca.nrc.cadc.ac.json.GroupPropertyReaderWriterTest" />

            <test name="ca.nrc.cadc.ac.json.UserDetailsReaderWriterTest" />

            <test name="ca.nrc.cadc.ac.json.IdentityReaderWriterTest" />

            <test name="ca.nrc.cadc.ac.json.UserReaderWriterTest" />

            <formatter type="plain" usefile="false" />

        </junit>

    </target>



</project>

projects/cadcAccessControl/src/ca/nrc/cadc/ac/Group.java

+2 −0
Original line number Diff line number Diff line
@@ -97,6 +97,8 @@ public class Group 
    public String description;

    public Date lastModified;



    public Group() {}

    

    /**

     * Ctor.

     *

projects/cadcAccessControl/src/ca/nrc/cadc/ac/xml/ReaderException.java→projects/cadcAccessControl/src/ca/nrc/cadc/ac/ReaderException.java

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ 
 *

 ************************************************************************

 */

package ca.nrc.cadc.ac.xml;

package ca.nrc.cadc.ac;



import java.io.IOException;

projects/cadcAccessControl/src/ca/nrc/cadc/ac/xml/WriterException.java→projects/cadcAccessControl/src/ca/nrc/cadc/ac/WriterException.java

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ 
 *

 ************************************************************************

 */

package ca.nrc.cadc.ac.xml;

package ca.nrc.cadc.ac;



import java.io.IOException;