]> git.aero2k.de Git - tmp/jakarta-migration.git/commitdiff
DRYD-328: First draft of Use of Collections procedure.
authorRichard Millet <remillet@yahoo.com>
Thu, 10 May 2018 06:00:18 +0000 (23:00 -0700)
committerRichard Millet <remillet@yahoo.com>
Thu, 10 May 2018 06:00:18 +0000 (23:00 -0700)
28 files changed:
services/JaxRsServiceProvider/pom.xml
services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
services/pom.xml
services/uoc/3rdparty/build.xml [new file with mode: 0644]
services/uoc/3rdparty/nuxeo-platform-cs-loanin/build.xml [new file with mode: 0644]
services/uoc/3rdparty/nuxeo-platform-cs-loanin/pom.xml [new file with mode: 0644]
services/uoc/3rdparty/nuxeo-platform-cs-loanin/src/main/resources/OSGI-INF/README.txt [new file with mode: 0644]
services/uoc/3rdparty/nuxeo-platform-cs-loanin/src/main/resources/schemas/README.txt [new file with mode: 0644]
services/uoc/3rdparty/pom.xml [new file with mode: 0644]
services/uoc/build.xml [new file with mode: 0644]
services/uoc/client/pom.xml [new file with mode: 0644]
services/uoc/client/src/main/java/org/collectionspace/services/client/UocClient.java [new file with mode: 0644]
services/uoc/client/src/main/java/org/collectionspace/services/client/UocProxy.java [new file with mode: 0644]
services/uoc/client/src/test/java/org/collectionspace/services/client/test/UocAuthRefsTest.java [new file with mode: 0644]
services/uoc/client/src/test/java/org/collectionspace/services/client/test/UocServiceTest.java [new file with mode: 0644]
services/uoc/client/src/test/resources/log4j.properties [new file with mode: 0644]
services/uoc/jaxb/pom.xml [new file with mode: 0644]
services/uoc/jaxb/src/main/java/org/collectionspace/services/UocJAXBSchema.java [new file with mode: 0644]
services/uoc/jaxb/src/main/java/org/collectionspace/services/UocListItemJAXBSchema.java [new file with mode: 0644]
services/uoc/jaxb/src/main/resources/uoc-common.xsd [new file with mode: 0644]
services/uoc/pom.xml [new file with mode: 0644]
services/uoc/service/pom.xml [new file with mode: 0644]
services/uoc/service/src/main/java/org/collectionspace/services/uoc/UocResource.java [new file with mode: 0644]
services/uoc/service/src/main/java/org/collectionspace/services/uoc/nuxeo/UocConstants.java [new file with mode: 0644]
services/uoc/service/src/main/java/org/collectionspace/services/uoc/nuxeo/UocDocumentModelHandler.java [new file with mode: 0644]
services/uoc/service/src/main/java/org/collectionspace/services/uoc/nuxeo/UocValidatorHandler.java [new file with mode: 0644]
services/uoc/service/src/test/java/org/collectionspace/services/test/UocServiceTest.java [new file with mode: 0644]
services/uoc/service/src/test/resources/log4j.xml [new file with mode: 0644]

index d423776ecc4a90dce07ceff5c61bff32e44907c8..aab1359656b9edd7c2002baf111e1f694780aa72 100644 (file)
             <artifactId>org.collectionspace.services.loanout.service</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.collectionspace.services</groupId>
+            <artifactId>org.collectionspace.services.uoc.service</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.claim.service</artifactId>
index 8409726bea58835b46b75fbe986f6727f37cfb0d..5d17455f2e247b691e638a4437fcc04e9a2b2c61 100644 (file)
@@ -32,6 +32,7 @@ import org.collectionspace.services.group.GroupResource;
 import org.collectionspace.services.intake.IntakeResource;
 import org.collectionspace.services.loanin.LoaninResource;
 import org.collectionspace.services.loanout.LoanoutResource;
+import org.collectionspace.services.uoc.UocResource;
 import org.collectionspace.services.valuationcontrol.ValuationcontrolResource;
 import org.collectionspace.services.objectexit.ObjectExitResource;
 import org.collectionspace.services.batch.BatchResource;
@@ -133,6 +134,7 @@ public class CollectionSpaceJaxRsApplication extends Application
         addResourceToMapAndSingletons(new ExhibitionResource());
         addResourceToMapAndSingletons(new ConditioncheckResource());
         addResourceToMapAndSingletons(new ConservationResource());
+        addResourceToMapAndSingletons(new UocResource());        
         addResourceToMapAndSingletons(new ValuationcontrolResource());
         addResourceToMapAndSingletons(new ObjectExitResource());
         addResourceToMapAndSingletons(new BatchResource());
index 53cd8fab2155522f1c52a6c725970b4f3755d117..8c1775988653e8c9640be6d8209c3d1e7d9d9f7f 100644 (file)
@@ -87,6 +87,7 @@
         <module>workflow</module>
         <module>index</module>
         <module>media</module>
+        <module>uoc</module>
         <module>publicitem</module>        
         <module>IntegrationTests</module>
         <module>PerformanceTests</module>
diff --git a/services/uoc/3rdparty/build.xml b/services/uoc/3rdparty/build.xml
new file mode 100644 (file)
index 0000000..658bd88
--- /dev/null
@@ -0,0 +1,130 @@
+<project name="uoc.3rdparty" default="package" basedir=".">
+    <description>
+        uoc service 3rdparty
+    </description>
+  <!-- set global properties for this build -->
+    <property name="services.trunk" value="../../.."/>
+    <!-- enviornment should be declared before reading build.properties -->
+    <property environment="env" />
+    <property file="${services.trunk}/build.properties" />
+    <property name="mvn.opts" value="-V" />
+    <property name="src" location="src"/>
+
+    <condition property="osfamily-unix">
+        <os family="unix" />
+    </condition>
+    <condition property="osfamily-windows">
+        <os family="windows" />
+    </condition>
+
+    <target name="init" >
+    <!-- Create the time stamp -->
+        <tstamp/>
+    </target>
+
+    <target name="package" depends="package-unix,package-windows"
+  description="Package CollectionSpace Services" />
+    <target name="package-unix" if="osfamily-unix">
+        <exec executable="mvn" failonerror="true">
+            <arg value="package" />
+            <arg value="-Dmaven.test.skip=true" />
+            <arg value="-f" />
+            <arg value="${basedir}/pom.xml" />
+            <arg value="-N" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+    <target name="package-windows" if="osfamily-windows">
+        <exec executable="cmd" failonerror="true">
+            <arg value="/c" />
+            <arg value="mvn" />
+            <arg value="package" />
+            <arg value="-Dmaven.test.skip=true" />
+            <arg value="-f" />
+            <arg value="${basedir}/pom.xml" />
+            <arg value="-N" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+
+    <target name="install" depends="install-unix,install-windows"
+  description="Install" />
+    <target name="install-unix" if="osfamily-unix">
+        <exec executable="mvn" failonerror="true">
+            <arg value="install" />
+            <arg value="-Dmaven.test.skip=true" />
+            <arg value="-f" />
+            <arg value="${basedir}/pom.xml" />
+            <arg value="-N" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+    <target name="install-windows" if="osfamily-windows">
+        <exec executable="cmd" failonerror="true">
+            <arg value="/c" />
+            <arg value="mvn" />
+            <arg value="install" />
+            <arg value="-Dmaven.test.skip=true" />
+            <arg value="-f" />
+            <arg value="${basedir}/pom.xml" />
+            <arg value="-N" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+    
+    <target name="clean" depends="clean-unix,clean-windows"
+  description="Delete target directories" >
+        <delete dir="${build}"/>
+    </target>
+    <target name="clean-unix" if="osfamily-unix">
+        <exec executable="mvn" failonerror="true">
+            <arg value="clean" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+    <target name="clean-windows" if="osfamily-windows">
+        <exec executable="cmd" failonerror="true">
+            <arg value="/c" />
+            <arg value="mvn" />
+            <arg value="clean" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+
+    <target name="test" depends="test-unix,test-windows" description="Run tests" />
+    <target name="test-unix" if="osfamily-unix">
+        <exec executable="mvn" failonerror="true">
+            <arg value="test" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+    <target name="test-windows" if="osfamily-windows">
+        <exec executable="cmd" failonerror="true">
+            <arg value="/c" />
+            <arg value="mvn" />
+            <arg value="test" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+
+    <target name="deploy" depends="install"
+    description="deploy uoc in ${jee.server.nuxeo}">
+       <!-- This target is obsolete.  The Nuxeo artifacts are now created and deployed using the "csmake" tool
+        <ant antfile="nuxeo-platform-cs-uoc/build.xml" target="deploy" inheritall="false"/>
+        -->
+    </target>
+
+    <target name="undeploy"
+    description="undeploy uoc from ${jee.server.nuxeo}">
+       <!-- This target is obsolete.  The Nuxeo artifacts are now created and deployed using the "csmake" tool
+       leaving this only for backwards compatibility reasons. -->
+        <ant antfile="nuxeo-platform-cs-uoc/build.xml" target="undeploy" inheritall="false"/>
+    </target>
+
+    <target name="dist"
+    description="generate distribution for uoc" depends="package">
+        <ant antfile="nuxeo-platform-cs-uoc/build.xml" target="dist" inheritall="false"/>
+    </target>
+
+
+</project>
diff --git a/services/uoc/3rdparty/nuxeo-platform-cs-loanin/build.xml b/services/uoc/3rdparty/nuxeo-platform-cs-loanin/build.xml
new file mode 100644 (file)
index 0000000..c271e01
--- /dev/null
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="nuxeo-platform-cs-uoc" default="package" basedir=".">
+    <description>
+        uoc nuxeo document type
+    </description>
+    <!-- set global properties for this build -->
+    <property name="services.trunk" value="../../../.."/>
+    <!-- environment should be declared before reading build.properties -->
+    <property environment="env" />
+    <property file="${services.trunk}/build.properties" />
+    <property name="mvn.opts" value="-V" />
+    <property name="src" location="src"/>
+    
+    <!-- JAR files used by CollectionSpace 4.0 and later -->
+    <property name="nuxeo.uoc.doctype.jars.all"
+        value="collectionspace.uoc.doctype.*.jar"/>
+    <property name="nuxeo.uoc.schema.jars.all"
+        value="collectionspace.uoc.schema.*.jar"/>
+    <!-- Legacy JAR files used by CollectionSpace 3.3 and earlier --> 
+    <property name="nuxeo.uoc.legacy.jars.all"
+        value="org.collectionspace.services.uoc.3rdparty.nuxeo-*.jar"/>
+    <property name="nuxeo.uoc.legacy.jar"
+        value="org.collectionspace.services.uoc.3rdparty.nuxeo-${cspace.release}.jar"/>
+
+    <condition property="osfamily-unix">
+        <os family="unix" />
+    </condition>
+    <condition property="osfamily-windows">
+        <os family="windows" />
+    </condition>
+
+    <target name="init" >
+        <!-- Create the time stamp -->
+        <tstamp/>
+    </target>
+
+    <target name="package" depends="package-unix,package-windows"
+        description="Package CollectionSpace Services" />
+    <target name="package-unix" if="osfamily-unix">
+        <exec executable="mvn" failonerror="true">
+            <arg value="package" />
+            <arg value="-Dmaven.test.skip=true" />
+            <arg value="-f" />
+            <arg value="${basedir}/pom.xml" />
+            <arg value="-N" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+    <target name="package-windows" if="osfamily-windows">
+        <exec executable="cmd" failonerror="true">
+            <arg value="/c" />
+            <arg value="mvn" />
+            <arg value="package" />
+            <arg value="-Dmaven.test.skip=true" />
+            <arg value="-f" />
+            <arg value="${basedir}/pom.xml" />
+            <arg value="-N" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+
+    <target name="install" depends="install-unix,install-windows"
+        description="Install" />
+    <target name="install-unix" if="osfamily-unix">
+        <exec executable="mvn" failonerror="true">
+            <arg value="install" />
+            <arg value="-Dmaven.test.skip=true" />
+            <arg value="-f" />
+            <arg value="${basedir}/pom.xml" />
+            <arg value="-N" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+    <target name="install-windows" if="osfamily-windows">
+        <exec executable="cmd" failonerror="true">
+            <arg value="/c" />
+            <arg value="mvn" />
+            <arg value="install" />
+            <arg value="-Dmaven.test.skip=true" />
+            <arg value="-f" />
+            <arg value="${basedir}/pom.xml" />
+            <arg value="-N" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+
+    <target name="clean" depends="clean-unix,clean-windows"
+        description="Delete target directories" >
+        <delete dir="${build}"/>
+    </target>
+    <target name="clean-unix" if="osfamily-unix">
+        <exec executable="mvn" failonerror="true">
+            <arg value="clean" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+    <target name="clean-windows" if="osfamily-windows">
+        <exec executable="cmd" failonerror="true">
+            <arg value="/c" />
+            <arg value="mvn" />
+            <arg value="clean" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+
+    <target name="test" depends="test-unix,test-windows" description="Run tests" />
+    <target name="test-unix" if="osfamily-unix">
+        <exec executable="mvn" failonerror="true">
+            <arg value="test" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+    <target name="test-windows" if="osfamily-windows">
+        <exec executable="cmd" failonerror="true">
+            <arg value="/c" />
+            <arg value="mvn" />
+            <arg value="test" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+
+    <target name="deploy" depends="install"
+        description="deploy uoc doctype in ${jee.server.nuxeo}">
+        <!-- This target is obsolete.  The Nuxeo artifacts are now created and deployed using the "csmake" tool
+        leaving this only for backwards compatibility reasons. -->  
+        <copy file="${basedir}/target/${nuxeo.uoc.legacy.jar}"
+            todir="${jee.deploy.nuxeo.plugins}"/>
+    </target>
+
+    <target name="undeploy"
+        description="undeploy uoc doctype from ${jee.server.nuxeo}">
+        <delete>
+            <!-- Undeploy doctype and schema artifacts -->
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.uoc.doctype.jars.all}"/>
+            </fileset>
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.uoc.schema.jars.all}"/>
+            </fileset>
+            <!-- Undeploy legacy artifacts -->
+            <fileset dir="${jee.deploy.nuxeo.plugins}">
+                <include name="${nuxeo.uoc.legacy.jars.all}"/>
+            </fileset>
+        </delete>
+        <!-- Undeploy legacy artifacts from old deployment location through release 0.6 -->
+        <delete quiet="true">
+            <fileset dir="${jee.deploy.nuxeo.system}">
+                <include name="${nuxeo.uoc.legacy.jars.all}"/>
+            </fileset>
+        </delete>
+    </target>
+
+    <target name="dist"
+        description="generate distribution for uoc doctype" depends="package">
+        <copy todir="${services.trunk}/${dist.deploy.nuxeo.plugins}">
+            <fileset file="${basedir}/target/${nuxeo.uoc.legacy.jar}"/>
+        </copy>
+    </target>
+
+</project>
+
diff --git a/services/uoc/3rdparty/nuxeo-platform-cs-loanin/pom.xml b/services/uoc/3rdparty/nuxeo-platform-cs-loanin/pom.xml
new file mode 100644 (file)
index 0000000..a037fc7
--- /dev/null
@@ -0,0 +1,55 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <parent>
+        <groupId>org.collectionspace.services</groupId>
+        <artifactId>org.collectionspace.services.uoc.3rdparty</artifactId>
+        <version>5.1-SNAPSHOT</version>
+    </parent>
+    
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.collectionspace.services</groupId>
+    <artifactId>org.collectionspace.services.uoc.3rdparty.nuxeo</artifactId>
+    <name>services.uoc.3rdparty.nuxeo</name>
+    <packaging>jar</packaging>
+    <description>
+        Use of Collections Nuxeo Document Type
+    </description>
+    
+    <properties>
+        <ServiceName>uoc</ServiceName>
+        <NuxeoDocTypeName>Uoc</NuxeoDocTypeName>
+        <CommonSchemaName>uoc_common</CommonSchemaName>
+               <Lifecycle>cs_default</Lifecycle>
+    </properties>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+            <resource>
+                <directory>../../../../3rdparty/nuxeo/nuxeo-doctype/src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
+                        <manifestEntries>
+                            <Bundle-Version>${eclipseVersion}</Bundle-Version>
+                            <Bundle-ManifestVersion>2</Bundle-ManifestVersion>
+                        </manifestEntries>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/services/uoc/3rdparty/nuxeo-platform-cs-loanin/src/main/resources/OSGI-INF/README.txt b/services/uoc/3rdparty/nuxeo-platform-cs-loanin/src/main/resources/OSGI-INF/README.txt
new file mode 100644 (file)
index 0000000..5f8c5a6
--- /dev/null
@@ -0,0 +1,16 @@
+Files formerly located in this directory are no longer needed
+-------------------------------------------------------------
+
+In CollectionSpace versions 4.0 and higher, changes were introduced
+which streamline and simplify the process through which you configure
+fields in CollectionSpace's main record types.
+
+In most cases now, you will typically change the behavior of existing fields,
+or create extension schemas to add new fields specific to your museum and/or
+community of practice, merely by editing simpler XML-based configuration
+files within CollectionSpace's Application layer.
+
+Services layer files that were formerly located in this directory and
+other, similar directories - which you previously needed to manually
+create or edit - are now generated automatically from your configuration
+in the Application layer.
\ No newline at end of file
diff --git a/services/uoc/3rdparty/nuxeo-platform-cs-loanin/src/main/resources/schemas/README.txt b/services/uoc/3rdparty/nuxeo-platform-cs-loanin/src/main/resources/schemas/README.txt
new file mode 100644 (file)
index 0000000..5f8c5a6
--- /dev/null
@@ -0,0 +1,16 @@
+Files formerly located in this directory are no longer needed
+-------------------------------------------------------------
+
+In CollectionSpace versions 4.0 and higher, changes were introduced
+which streamline and simplify the process through which you configure
+fields in CollectionSpace's main record types.
+
+In most cases now, you will typically change the behavior of existing fields,
+or create extension schemas to add new fields specific to your museum and/or
+community of practice, merely by editing simpler XML-based configuration
+files within CollectionSpace's Application layer.
+
+Services layer files that were formerly located in this directory and
+other, similar directories - which you previously needed to manually
+create or edit - are now generated automatically from your configuration
+in the Application layer.
\ No newline at end of file
diff --git a/services/uoc/3rdparty/pom.xml b/services/uoc/3rdparty/pom.xml
new file mode 100644 (file)
index 0000000..846f8ab
--- /dev/null
@@ -0,0 +1,24 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <artifactId>org.collectionspace.services.uoc</artifactId>
+        <groupId>org.collectionspace.services</groupId>
+        <version>5.1-SNAPSHOT</version>
+    </parent>
+    
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.collectionspace.services.uoc.3rdparty</artifactId>
+    <name>services.uoc.3rdparty</name>
+    <packaging>pom</packaging>
+    
+    <description>
+        3rd party build for uoc service
+    </description>
+
+    <modules>
+    <!-- This module is obsolete.  The Nuxeo artifacts are now created and deployed using the "csmake" tool
+        <module>nuxeo-platform-cs-uoc</module>
+        -->
+    </modules>
+</project>
diff --git a/services/uoc/build.xml b/services/uoc/build.xml
new file mode 100644 (file)
index 0000000..1975d1f
--- /dev/null
@@ -0,0 +1,124 @@
+
+<project name="uoc" default="package" basedir=".">
+    <description>
+        uoc service
+    </description>
+  <!-- set global properties for this build -->
+    <property name="services.trunk" value="../.."/>
+    <!-- enviornment should be declared before reading build.properties -->
+    <property environment="env" />
+    <property file="${services.trunk}/build.properties" />
+    <property name="mvn.opts" value="-V" />
+    <property name="src" location="src"/>
+
+    <condition property="osfamily-unix">
+        <os family="unix" />
+    </condition>
+    <condition property="osfamily-windows">
+        <os family="windows" />
+    </condition>
+
+    <target name="package" depends="package-unix,package-windows"
+  description="Package CollectionSpace Services" />
+  
+    <target name="package-unix" if="osfamily-unix">
+        <exec executable="mvn" failonerror="true">
+            <arg value="package" />
+            <arg value="-Dmaven.test.skip=true" />
+            <arg value="-f" />
+            <arg value="${basedir}/pom.xml" />
+            <arg value="-N" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+    
+    <target name="package-windows" if="osfamily-windows">
+        <exec executable="cmd" failonerror="true">
+            <arg value="/c" />
+            <arg value="mvn" />
+            <arg value="package" />
+            <arg value="-Dmaven.test.skip=true" />
+            <arg value="-f" />
+            <arg value="${basedir}/pom.xml" />
+            <arg value="-N" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+
+
+    <target name="install" depends="install-unix,install-windows"
+  description="Install" />
+    <target name="install-unix" if="osfamily-unix">
+        <exec executable="mvn" failonerror="true">
+            <arg value="install" />
+            <arg value="-Dmaven.test.skip=true" />
+            <arg value="-f" />
+            <arg value="${basedir}/pom.xml" />
+            <arg value="-N" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+    <target name="install-windows" if="osfamily-windows">
+        <exec executable="cmd" failonerror="true">
+            <arg value="/c" />
+            <arg value="mvn" />
+            <arg value="install" />
+            <arg value="-Dmaven.test.skip=true" />
+            <arg value="-f" />
+            <arg value="${basedir}/pom.xml" />
+            <arg value="-N" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+
+    <target name="clean" depends="clean-unix,clean-windows"
+  description="Delete target directories" >
+        <delete dir="${build}"/>
+    </target>
+    <target name="clean-unix" if="osfamily-unix">
+        <exec executable="mvn" failonerror="true">
+            <arg value="clean" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+    <target name="clean-windows" if="osfamily-windows">
+        <exec executable="cmd" failonerror="true">
+            <arg value="/c" />
+            <arg value="mvn" />
+            <arg value="clean" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+
+    <target name="test" depends="test-unix,test-windows" description="Run tests" />
+    <target name="test-unix" if="osfamily-unix">
+        <exec executable="mvn" failonerror="true">
+            <arg value="test" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+    <target name="test-windows" if="osfamily-windows">
+        <exec executable="cmd" failonerror="true">
+            <arg value="/c" />
+            <arg value="mvn" />
+            <arg value="test" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+
+    <target name="deploy" depends="install"
+    description="deploy uoc service">
+        <ant antfile="3rdparty/build.xml" target="deploy" inheritall="false"/>
+    </target>
+
+    <target name="undeploy"
+    description="undeploy uoc service">
+        <ant antfile="3rdparty/build.xml" target="undeploy" inheritall="false"/>
+    </target>
+
+    <target name="dist" depends="package"
+    description="distribute uoc service">
+        <ant antfile="3rdparty/build.xml" target="dist" inheritall="false"/>
+    </target>
+
+</project>
diff --git a/services/uoc/client/pom.xml b/services/uoc/client/pom.xml
new file mode 100644 (file)
index 0000000..06e60ac
--- /dev/null
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.collectionspace.services</groupId>
+        <artifactId>org.collectionspace.services.uoc</artifactId>
+        <version>5.1-SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.collectionspace.services.uoc.client</artifactId>
+    <name>services.uoc.client</name>
+    
+    <dependencies>
+        <!-- keep slf4j dependencies on the top -->
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <scope>test</scope>
+        </dependency>
+<!-- CollectionSpace dependencies -->
+        <dependency>
+            <groupId>org.collectionspace.services</groupId>
+            <artifactId>org.collectionspace.services.jaxb</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.collectionspace.services</groupId>
+            <artifactId>org.collectionspace.services.common</artifactId>
+            <optional>true</optional>
+            </dependency>
+        <dependency>
+            <groupId>org.collectionspace.services</groupId>
+            <artifactId>org.collectionspace.services.client</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+         <dependency>
+            <groupId>org.collectionspace.services</groupId>
+            <artifactId>org.collectionspace.services.uoc.jaxb</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.collectionspace.services</groupId>
+            <artifactId>org.collectionspace.services.person.client</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.collectionspace.services</groupId>
+            <artifactId>org.collectionspace.services.authority.jaxb</artifactId>
+            <version>${project.version}</version>
+        </dependency>    
+<!-- External dependencies -->        
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-jaxrs</artifactId>
+            <!-- filter out unwanted jars -->
+            <exclusions>
+                <exclusion>
+                    <groupId>tjws</groupId>
+                    <artifactId>webserver</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-jaxb-provider</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-multipart-provider</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-httpclient</groupId>
+            <artifactId>commons-httpclient</artifactId>
+            </dependency>
+    </dependencies>
+    
+    <build>
+        <finalName>collectionspace-services-uoc-client</finalName>
+    </build>
+</project>
diff --git a/services/uoc/client/src/main/java/org/collectionspace/services/client/UocClient.java b/services/uoc/client/src/main/java/org/collectionspace/services/client/UocClient.java
new file mode 100644 (file)
index 0000000..cc64963
--- /dev/null
@@ -0,0 +1,62 @@
+/**    
+ * This document is a part of the source code and related artifacts
+ * for CollectionSpace, an open source collections management system
+ * for museums and related institutions:
+ *
+ * http://www.collectionspace.org
+ * http://wiki.collectionspace.org
+ *
+ * Copyright (c) 2009 Regents of the University of California
+ *
+ * Licensed under the Educational Community License (ECL), Version 2.0.
+ * You may not use this file except in compliance with this License.
+ *
+ * You may obtain a copy of the ECL 2.0 License at
+ * https://source.collectionspace.org/collection-space/LICENSE.txt
+ */
+package org.collectionspace.services.client;
+
+import org.collectionspace.services.uoc.UocCommon;
+
+/**
+ * UocClient.java
+ *
+ * $LastChangedRevision$
+ * $LastChangedDate$
+ *
+ */
+public class UocClient extends AbstractCommonListPoxServiceClientImpl<UocProxy, UocCommon> {
+
+    public static final String SERVICE_NAME = "uoc";
+    public static final String SERVICE_PATH_COMPONENT = SERVICE_NAME;
+    public static final String SERVICE_PATH = "/" + SERVICE_PATH_COMPONENT;
+    public static final String SERVICE_PATH_PROXY = SERVICE_PATH + "/";
+    public static final String SERVICE_PAYLOAD_NAME = SERVICE_NAME;
+
+    public UocClient() throws Exception {
+               super();
+       }
+
+    public UocClient(String clientPropertiesFilename) throws Exception {
+               super(clientPropertiesFilename);
+       }
+
+       /* (non-Javadoc)
+     * @see org.collectionspace.services.client.AbstractServiceClientImpl#getServicePathComponent()
+     */
+    @Override
+    public String getServicePathComponent() {
+        return SERVICE_PATH_COMPONENT;
+    }
+
+    @Override
+    public String getServiceName() {
+        return SERVICE_NAME;
+    }
+
+    @Override
+    public Class<UocProxy> getProxyClass() {
+        return UocProxy.class;
+    }
+
+}
diff --git a/services/uoc/client/src/main/java/org/collectionspace/services/client/UocProxy.java b/services/uoc/client/src/main/java/org/collectionspace/services/client/UocProxy.java
new file mode 100644 (file)
index 0000000..6873b9c
--- /dev/null
@@ -0,0 +1,34 @@
+/**    
+ * This document is a part of the source code and related artifacts
+ * for CollectionSpace, an open source collections management system
+ * for museums and related institutions:
+ *
+ * http://www.collectionspace.org
+ * http://wiki.collectionspace.org
+ *
+ * Copyright (c) 2009 Regents of the University of California
+ *
+ * Licensed under the Educational Community License (ECL), Version 2.0.
+ * You may not use this file except in compliance with this License.
+ *
+ * You may obtain a copy of the ECL 2.0 License at
+ * https://source.collectionspace.org/collection-space/LICENSE.txt
+ */
+package org.collectionspace.services.client;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+
+/**
+ * UocProxy.java
+ *
+ * $LastChangedRevision$
+ * $LastChangedDate$
+ *
+ */
+@Path(UocClient.SERVICE_PATH_PROXY)
+@Produces({"application/xml"})
+@Consumes({"application/xml"})
+public interface UocProxy extends CollectionSpaceCommonListPoxProxy {
+}
diff --git a/services/uoc/client/src/test/java/org/collectionspace/services/client/test/UocAuthRefsTest.java b/services/uoc/client/src/test/java/org/collectionspace/services/client/test/UocAuthRefsTest.java
new file mode 100644 (file)
index 0000000..5eda18c
--- /dev/null
@@ -0,0 +1,430 @@
+/**
+ * This document is a part of the source code and related artifacts
+ * for CollectionSpace, an open source collections management system
+ * for museums and related institutions:
+ *
+ * http://www.collectionspace.org
+ * http://wiki.collectionspace.org
+ *
+ * Copyright Â© 2009 Regents of the University of California
+ *
+ * Licensed under the Educational Community License (ECL), Version 2.0.
+ * You may not use this file except in compliance with this License.
+ *
+ * You may obtain a copy of the ECL 2.0 License at
+ * https://source.collectionspace.org/collection-space/LICENSE.txt
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.collectionspace.services.client.test;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.ws.rs.core.Response;
+
+import org.collectionspace.services.PersonJAXBSchema;
+import org.collectionspace.services.client.CollectionSpaceClient;
+import org.collectionspace.services.client.UocClient;
+import org.collectionspace.services.client.PersonAuthorityClient;
+import org.collectionspace.services.client.PersonAuthorityClientUtils;
+import org.collectionspace.services.client.PayloadOutputPart;
+import org.collectionspace.services.client.PoxPayloadIn;
+import org.collectionspace.services.client.PoxPayloadOut;
+import org.collectionspace.services.common.api.GregorianCalendarDateTimeUtils;
+import org.collectionspace.services.common.authorityref.AuthorityRefList;
+import org.collectionspace.services.jaxb.AbstractCommonList;
+import org.collectionspace.services.person.PersonTermGroup;
+import org.collectionspace.services.uoc.UocCommon;
+import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * UocAuthRefsTest, carries out Authority References tests against a deployed
+ * and running uoc (aka Use of Collections) Service.
+ *
+ * $LastChangedRevision$ $LastChangedDate$
+ */
+public class UocAuthRefsTest extends BaseServiceTest<AbstractCommonList> {
+
+    private final String CLASS_NAME = UocAuthRefsTest.class.getName();
+    private final Logger logger = LoggerFactory.getLogger(CLASS_NAME);
+
+    // Instance variables specific to this test.
+    final String SERVICE_NAME = "uoc";
+    final String SERVICE_PATH_COMPONENT = "uoc";
+    final String PERSON_AUTHORITY_NAME = "TestPersonAuth";
+    private String knownResourceId = null;
+    private List<String> uocIdsCreated = new ArrayList<String>();
+    private List<String> personIdsCreated = new ArrayList<String>();
+    private String personAuthCSID = null;
+    private final int NUM_AUTH_REFS_EXPECTED = 0;
+    private final static String CURRENT_DATE_UTC = GregorianCalendarDateTimeUtils.currentDateUTC();
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see
+     * org.collectionspace.services.client.test.BaseServiceTest#getClientInstance()
+     */
+    @Override
+    protected CollectionSpaceClient getClientInstance() {
+        throw new UnsupportedOperationException(); // method not supported (or needed) in this test class
+    }
+
+    @Override
+    protected CollectionSpaceClient getClientInstance(String clientPropertiesFilename) {
+        throw new UnsupportedOperationException(); // method not supported (or needed) in this test class
+    }
+
+    /*
+     * (non-Javadoc)
+     * 
+     * @see org.collectionspace.services.client.test.BaseServiceTest#
+     * getAbstractCommonList(org.jboss.resteasy.client.ClientResponse)
+     */
+    @Override
+    protected AbstractCommonList getCommonList(Response response) {
+        throw new UnsupportedOperationException(); // method not supported (or needed) in this test class
+    }
+
+    // ---------------------------------------------------------------
+    // CRUD tests : CREATE tests
+    // ---------------------------------------------------------------
+    // Success outcomes
+    @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class)
+    public void createWithAuthRefs(String testName) throws Exception {
+        testSetup(STATUS_CREATED, ServiceRequestType.CREATE);
+
+        // Submit the request to the service and store the response.
+        String identifier = createIdentifier();
+
+        // Create all the person refs and entities
+        createPersonRefs();
+
+        // Create a new Use of Collections resource.
+        //
+        // One or more fields in this resource will be PersonAuthority
+        // references, and will refer to Person resources by their refNames.
+        UocClient uocClient = new UocClient();
+        PoxPayloadOut multipart = createUocInstance("referenceNumber-" + identifier, "title-" + identifier);
+        String newId = null;
+        Response response = uocClient.create(multipart);
+        try {
+            int statusCode = response.getStatus();
+            // Check the status code of the response: does it match
+            // the expected response(s)?
+            //
+            // Specifically:
+            // Does it fall within the set of valid status codes?
+            // Does it exactly match the expected status code?
+            if (logger.isDebugEnabled()) {
+                logger.debug(testName + ": status = " + statusCode);
+            }
+            Assert.assertTrue(testRequestType.isValidStatusCode(statusCode),
+                    invalidStatusCodeMessage(testRequestType, statusCode));
+            Assert.assertEquals(statusCode, testExpectedStatusCode);
+            newId = extractId(response);
+        } finally {
+            response.close();
+        }
+
+        // Store the ID returned from the first resource created
+        // for additional tests below.
+        if (knownResourceId == null) {
+            knownResourceId = newId;
+            if (logger.isDebugEnabled()) {
+                logger.debug(testName + ": knownResourceId=" + knownResourceId);
+            }
+        }
+
+        // Store the IDs from every resource created by tests,
+        // so they can be deleted after tests have been run.
+        uocIdsCreated.add(newId);
+    }
+
+    protected void createPersonRefs() throws Exception {
+
+        PersonAuthorityClient personAuthClient = new PersonAuthorityClient();
+        // Create a temporary PersonAuthority resource, and its corresponding
+        // refName by which it can be identified.
+        PoxPayloadOut multipart = PersonAuthorityClientUtils.createPersonAuthorityInstance(PERSON_AUTHORITY_NAME,
+                PERSON_AUTHORITY_NAME, personAuthClient.getCommonPartName());
+        Response res = personAuthClient.create(multipart);
+        try {
+            int statusCode = res.getStatus();
+
+            Assert.assertTrue(testRequestType.isValidStatusCode(statusCode),
+                    invalidStatusCodeMessage(testRequestType, statusCode));
+            Assert.assertEquals(statusCode, STATUS_CREATED);
+            personAuthCSID = extractId(res);
+        } finally {
+            res.close();
+        }
+
+        String authRefName = PersonAuthorityClientUtils.getAuthorityRefName(personAuthCSID, null);
+
+        // Create temporary Person resources, and their corresponding refNames
+        // by which they can be identified.
+        String csid = createPerson("Linus", "Lender", "linusLender", authRefName);
+        personIdsCreated.add(csid);
+        // lenderRefName = PersonAuthorityClientUtils.getPersonRefName(personAuthCSID,
+        // csid, null);
+        //
+        // csid = createPerson("Art", "Lendersauthorizor", "artLendersauthorizor",
+        // authRefName);
+        // personIdsCreated.add(csid);
+        // lendersAuthorizerRefName =
+        // PersonAuthorityClientUtils.getPersonRefName(personAuthCSID, csid, null);
+        //
+        // csid = createPerson("Larry", "Lenderscontact", "larryLenderscontact",
+        // authRefName);
+        // personIdsCreated.add(csid);
+        // lendersContactRefName =
+        // PersonAuthorityClientUtils.getPersonRefName(personAuthCSID, csid, null);
+        //
+        // csid = createPerson("Carrie", "Borrowerscontact", "carrieBorrowerscontact",
+        // authRefName);
+        // personIdsCreated.add(csid);
+        // uocReferenceNumber =
+        // PersonAuthorityClientUtils.getPersonRefName(personAuthCSID, csid, null);
+        //
+        // csid = createPerson("Bonnie", "Borrowersauthorizer",
+        // "bonnieBorrowersauthorizer", authRefName);
+        // personIdsCreated.add(csid);
+        // borrowersAuthorizerRefName =
+        // PersonAuthorityClientUtils.getPersonRefName(personAuthCSID, csid, null);
+
+        // FIXME: Add instance(s) of 'lenders' field when we can work with
+        // repeatable / multivalued authority reference fields. Be sure to
+    }
+
+    protected String createPerson(String firstName, String surName, String shortId, String authRefName)
+            throws Exception {
+        String result = null;
+
+        PersonAuthorityClient personAuthClient = new PersonAuthorityClient();
+        Map<String, String> personInfo = new HashMap<String, String>();
+        personInfo.put(PersonJAXBSchema.FORE_NAME, firstName);
+        personInfo.put(PersonJAXBSchema.SUR_NAME, surName);
+        personInfo.put(PersonJAXBSchema.SHORT_IDENTIFIER, shortId);
+        List<PersonTermGroup> personTerms = new ArrayList<PersonTermGroup>();
+        PersonTermGroup term = new PersonTermGroup();
+        String termName = firstName + " " + surName;
+        term.setTermDisplayName(termName);
+        term.setTermName(termName);
+        personTerms.add(term);
+        PoxPayloadOut multipart = PersonAuthorityClientUtils.createPersonInstance(personAuthCSID, authRefName,
+                personInfo, personTerms, personAuthClient.getItemCommonPartName());
+        Response res = personAuthClient.createItem(personAuthCSID, multipart);
+        try {
+            int statusCode = res.getStatus();
+
+            Assert.assertTrue(testRequestType.isValidStatusCode(statusCode),
+                    invalidStatusCodeMessage(testRequestType, statusCode));
+            Assert.assertEquals(statusCode, STATUS_CREATED);
+            result = extractId(res);
+        } finally {
+            res.close();
+        }
+
+        return result;
+    }
+
+    // Success outcomes
+    @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class, dependsOnMethods = {
+            "createWithAuthRefs" })
+    public void readAndCheckAuthRefs(String testName) throws Exception {
+        // Perform setup.
+        testSetup(STATUS_OK, ServiceRequestType.READ);
+
+        // Submit the request to the service and store the response.
+        UocClient uocClient = new UocClient();
+        Response res = uocClient.read(knownResourceId);
+        UocCommon uocCommon = null;
+        try {
+            assertStatusCode(res, testName);
+            // Extract the common part from the response.
+            PoxPayloadIn input = new PoxPayloadIn(res.readEntity(String.class));
+            uocCommon = (UocCommon) extractPart(input, uocClient.getCommonPartName(), UocCommon.class);
+            Assert.assertNotNull(uocCommon);
+            if (logger.isDebugEnabled()) {
+                logger.debug(objectAsXmlString(uocCommon, UocCommon.class));
+            }
+        } finally {
+            if (res != null) {
+                res.close();
+            }
+        }
+        //
+        // Check a couple of fields
+        // Assert.assertEquals(uocCommon.xyz(), lenderRefName);
+        // Assert.assertEquals(uocCommon.pdq(), lendersAuthorizerRefName);
+        // Assert.assertEquals(uocCommon.rem(), lendersContactRefName);
+        //
+
+        // Get the auth refs and check them
+        Response res2 = uocClient.getAuthorityRefs(knownResourceId);
+        AuthorityRefList list = null;
+        try {
+            assertStatusCode(res2, testName);
+            list = res2.readEntity(AuthorityRefList.class);
+            // Assert.assertNotNull(list);
+        } finally {
+            if (res2 != null) {
+                res2.close();
+            }
+        }
+
+        List<AuthorityRefList.AuthorityRefItem> items = list.getAuthorityRefItem();
+        int numAuthRefsFound = items.size();
+        if (logger.isDebugEnabled()) {
+            logger.debug("Expected " + NUM_AUTH_REFS_EXPECTED + " authority references, found " + numAuthRefsFound);
+        }
+
+        // Optionally output additional data about list members for debugging.
+        boolean iterateThroughList = true;
+        if (iterateThroughList && logger.isDebugEnabled()) {
+            int i = 0;
+            for (AuthorityRefList.AuthorityRefItem item : items) {
+                logger.debug(testName + ": list-item[" + i + "] Field:" + item.getSourceField() + "= "
+                        + item.getAuthDisplayName() + item.getItemDisplayName());
+                logger.debug(testName + ": list-item[" + i + "] refName=" + item.getRefName());
+                logger.debug(testName + ": list-item[" + i + "] URI=" + item.getUri());
+                i++;
+            }
+        }
+
+        Assert.assertEquals(numAuthRefsFound, NUM_AUTH_REFS_EXPECTED, "Did not find all expected authority references! "
+                + "Expected " + NUM_AUTH_REFS_EXPECTED + ", found " + numAuthRefsFound);
+
+    }
+
+    // ---------------------------------------------------------------
+    // Cleanup of resources created during testing
+    // ---------------------------------------------------------------
+
+    /**
+     * Deletes all resources created by tests, after all tests have been run.
+     *
+     * This cleanup method will always be run, even if one or more tests fail. For
+     * this reason, it attempts to remove all resources created at any point during
+     * testing, even if some of those resources may be expected to be deleted by
+     * certain tests.
+     * 
+     * @throws Exception
+     */
+    @Override
+    @AfterClass(alwaysRun = true)
+    public void cleanUp() throws Exception {
+        String noTest = System.getProperty("noTestCleanup");
+        if (Boolean.TRUE.toString().equalsIgnoreCase(noTest)) {
+            if (logger.isDebugEnabled()) {
+                logger.debug("Skipping Cleanup phase ...");
+            }
+            return;
+        }
+        if (logger.isDebugEnabled()) {
+            logger.debug("Cleaning up temporary resources created for testing ...");
+        }
+        //
+        // Delete the uoc records before the person items/terms
+        //
+        UocClient uocClient = new UocClient();
+        for (String csid : uocIdsCreated) {
+            Response res = null;
+            try {
+                res = uocClient.delete(csid);
+                if (res.getStatus() != Response.Status.OK.getStatusCode()) {
+                    throw new Exception(String.format("Could not delete uoc record with CSID=%s", csid));
+                }
+            } catch (Throwable t) {
+                if (res != null)
+                    res.close();
+                throw t;
+            }
+        }
+        //
+        // Delete Person resource(s) (before PersonAuthority resources).
+        //
+        PersonAuthorityClient personAuthClient = new PersonAuthorityClient();
+        for (String csid : personIdsCreated) {
+            Response res = null;
+            try {
+                res = personAuthClient.deleteItem(personAuthCSID, csid);
+                if (res.getStatus() != Response.Status.OK.getStatusCode()) {
+                    throw new Exception(String.format(
+                            "Could not delete person item/term record with CSID=%s inside person authority with CSID=%s",
+                            csid, personAuthCSID));
+                }
+            } catch (Throwable t) {
+                if (res != null)
+                    res.close();
+                throw t;
+            }
+        }
+        //
+        // Delete the PersonAuthority resource.
+        //
+        if (personAuthCSID != null) {
+            Response res = null;
+            try {
+                res = personAuthClient.delete(personAuthCSID);
+            } catch (Throwable t) {
+                if (res != null)
+                    res.close();
+                throw t;
+            }
+        }
+    }
+
+    // ---------------------------------------------------------------
+    // Utility methods used by tests above
+    // ---------------------------------------------------------------
+    @Override
+    public String getServiceName() {
+        return SERVICE_NAME;
+    }
+
+    @Override
+    public String getServicePathComponent() {
+        return SERVICE_PATH_COMPONENT;
+    }
+
+    private PoxPayloadOut createUocInstance(String referenceNumber, String title) throws Exception {
+        UocCommon uocCommon = new UocCommon();
+        uocCommon.setTitle(title);
+        uocCommon.setReferenceNumber(referenceNumber);
+        // LenderGroupList lenderGroupList = new LenderGroupList();
+        // LenderGroup lenderGroup = new LenderGroup();
+        // lenderGroup.setLender(lender);
+        // lenderGroup.setLendersAuthorizer(lendersAuthorizer);
+        // lenderGroup.setLendersContact(lendersContact);
+        // lenderGroupList.getLenderGroup().add(lenderGroup);
+        // uocCommon.setLenderGroupList(lenderGroupList);
+
+        PoxPayloadOut multipart = new PoxPayloadOut(this.getServicePathComponent());
+        PayloadOutputPart commonPart = multipart.addPart(new UocClient().getCommonPartName(), uocCommon);
+
+        if (logger.isDebugEnabled()) {
+            logger.debug("to be created, uoc common");
+            logger.debug(objectAsXmlString(uocCommon, UocCommon.class));
+        }
+
+        return multipart;
+    }
+
+    @Override
+    protected Class<AbstractCommonList> getCommonListType() {
+        return AbstractCommonList.class;
+    }
+}
diff --git a/services/uoc/client/src/test/java/org/collectionspace/services/client/test/UocServiceTest.java b/services/uoc/client/src/test/java/org/collectionspace/services/client/test/UocServiceTest.java
new file mode 100644 (file)
index 0000000..28d3f8c
--- /dev/null
@@ -0,0 +1,679 @@
+/**
+ * This document is a part of the source code and related artifacts
+ * for CollectionSpace, an open source collections management system
+ * for museums and related institutions:
+ *
+ * http://www.collectionspace.org
+ * http://wiki.collectionspace.org
+ *
+ * Copyright Â© 2009 Regents of the University of California
+ *
+ * Licensed under the Educational Community License (ECL), Version 2.0.
+ * You may not use this file except in compliance with this License.
+ *
+ * You may obtain a copy of the ECL 2.0 License at
+ * https://source.collectionspace.org/collection-space/LICENSE.txt
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.collectionspace.services.client.test;
+
+//import java.util.ArrayList;
+//import java.util.List;
+
+import javax.ws.rs.core.Response;
+
+import org.collectionspace.services.client.AbstractCommonListUtils;
+import org.collectionspace.services.client.CollectionSpaceClient;
+import org.collectionspace.services.client.UocClient;
+import org.collectionspace.services.client.PayloadInputPart;
+import org.collectionspace.services.client.PayloadOutputPart;
+import org.collectionspace.services.client.PoxPayloadIn;
+import org.collectionspace.services.client.PoxPayloadOut;
+import org.collectionspace.services.common.api.GregorianCalendarDateTimeUtils;
+import org.collectionspace.services.jaxb.AbstractCommonList;
+import org.collectionspace.services.uoc.UocCommon;
+import org.testng.Assert;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * UocServiceTest, carries out tests against a
+ * deployed and running uoc (aka Use of Collections) Service.
+ *
+ * $LastChangedRevision$
+ * $LastChangedDate$
+ */
+public class UocServiceTest extends AbstractPoxServiceTestImpl<AbstractCommonList, UocCommon> {
+
+    /** The logger. */
+    private final String CLASS_NAME = UocServiceTest.class.getName();
+    private final Logger logger = LoggerFactory.getLogger(CLASS_NAME);
+    // Instance variables specific to this test.
+    /** The service path component. */
+    final String SERVICE_NAME = "uoc";
+    final String SERVICE_PATH_COMPONENT = "uoc";
+    private String LENDER_REF_NAME =
+            "urn:cspace:org.collectionspace.demo:personauthorities:name(TestPersonAuth):item:name(HarryLender)'Harry Lender'";
+    private final static String CURRENT_DATE_UTC =
+            GregorianCalendarDateTimeUtils.currentDateUTC();
+
+    /* (non-Javadoc)
+     * @see org.collectionspace.services.client.test.BaseServiceTest#getClientInstance()
+     */
+    @Override
+    protected CollectionSpaceClient getClientInstance() throws Exception {
+        return new UocClient();
+    }
+
+       @Override
+       protected CollectionSpaceClient getClientInstance(String clientPropertiesFilename) throws Exception {
+        return new UocClient(clientPropertiesFilename);
+       }
+
+    /* (non-Javadoc)
+     * @see org.collectionspace.services.client.test.BaseServiceTest#getAbstractCommonList(org.jboss.resteasy.client.ClientResponse)
+     */
+    @Override
+    protected AbstractCommonList getCommonList(Response response) {
+        return response.readEntity(AbstractCommonList.class);
+    }
+
+    // ---------------------------------------------------------------
+    // CRUD tests : CREATE tests
+    // ---------------------------------------------------------------
+    
+    // Success outcomes
+    
+    /* (non-Javadoc)
+     * @see org.collectionspace.services.client.test.ServiceTest#create(java.lang.String)
+     */
+    @Override
+//    @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class)
+    public void create(String testName) throws Exception {
+        // Perform setup, such as initializing the type of service request
+        // (e.g. CREATE, DELETE), its valid and expected status codes, and
+        // its associated HTTP method name (e.g. POST, DELETE).
+        setupCreate();
+
+        // Submit the request to the service and store the response.
+        UocClient client = new UocClient();
+        String identifier = createIdentifier();
+        PoxPayloadOut multipart = createUocInstance(identifier);
+        String newID = null;
+        Response res = client.create(multipart);
+        try {
+            int statusCode = res.getStatus();
+
+            // Check the status code of the response: does it match
+            // the expected response(s)?
+            //
+            // Specifically:
+            // Does it fall within the set of valid status codes?
+            // Does it exactly match the expected status code?
+            if (logger.isDebugEnabled()) {
+                logger.debug(testName + ": status = " + statusCode);
+            }
+            Assert.assertTrue(testRequestType.isValidStatusCode(statusCode),
+                    invalidStatusCodeMessage(testRequestType, statusCode));
+            Assert.assertEquals(statusCode, testExpectedStatusCode);
+
+            newID = extractId(res);
+        } finally {
+               if (res != null) {
+                res.close();
+            }
+        }
+
+        // Store the ID returned from the first resource created
+        // for additional tests below.
+        if (knownResourceId == null) {
+            knownResourceId = newID;
+            if (logger.isDebugEnabled()) {
+                logger.debug(testName + ": knownResourceId=" + knownResourceId);
+            }
+        }
+
+        // Store the IDs from every resource created by tests,
+        // so they can be deleted after tests have been run.
+        allResourceIdsCreated.add(newID);
+    }
+
+    /* (non-Javadoc)
+     * @see org.collectionspace.services.client.test.AbstractServiceTestImpl#createList(java.lang.String)
+     */
+    @Override
+//    @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class,
+//    dependsOnMethods = {"create"})
+    public void createList(String testName) throws Exception {
+        for (int i = 0; i < 3; i++) {
+            create(testName);
+        }
+    }
+
+
+    /*
+    @Override
+    @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class,
+    dependsOnMethods = {"create", "testSubmitRequest"})
+    public void createWithEmptyEntityBody(String testName) throws Exception {
+    
+    if (logger.isDebugEnabled()) {
+    logger.debug(testBanner(testName, CLASS_NAME));
+    }
+    // Perform setup.
+    setupCreateWithEmptyEntityBody();
+    
+    // Submit the request to the service and store the response.
+    String method = REQUEST_TYPE.httpMethodName();
+    String url = getServiceRootURL();
+    String mediaType = MediaType.APPLICATION_XML;
+    final String entity = "";
+    int statusCode = submitRequest(method, url, mediaType, entity);
+    
+    // Check the status code of the response: does it match
+    // the expected response(s)?
+    if(logger.isDebugEnabled()){
+    logger.debug("createWithEmptyEntityBody url=" + url +
+    " status=" + statusCode);
+    }
+    Assert.assertTrue(REQUEST_TYPE.isValidStatusCode(statusCode),
+    invalidStatusCodeMessage(REQUEST_TYPE, statusCode));
+    Assert.assertEquals(statusCode, EXPECTED_STATUS_CODE);
+    }
+    
+    @Override
+    @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class,
+    dependsOnMethods = {"create", "testSubmitRequest"})
+    public void createWithMalformedXml(String testName) throws Exception {
+    
+    if (logger.isDebugEnabled()) {
+    logger.debug(testBanner(testName, CLASS_NAME));
+    }
+    // Perform setup.
+    setupCreateWithMalformedXml(testName, logger);
+    
+    // Submit the request to the service and store the response.
+    String method = REQUEST_TYPE.httpMethodName();
+    String url = getServiceRootURL();
+    String mediaType = MediaType.APPLICATION_XML;
+    final String entity = MALFORMED_XML_DATA; // Constant from base class.
+    int statusCode = submitRequest(method, url, mediaType, entity);
+    
+    // Check the status code of the response: does it match
+    // the expected response(s)?
+    if(logger.isDebugEnabled()){
+    logger.debug(testName + ": url=" + url +
+    " status=" + statusCode);
+    }
+    Assert.assertTrue(REQUEST_TYPE.isValidStatusCode(statusCode),
+    invalidStatusCodeMessage(REQUEST_TYPE, statusCode));
+    Assert.assertEquals(statusCode, EXPECTED_STATUS_CODE);
+    }
+    
+    @Override
+    @Test(dataProvider="testName", dataProviderClass=AbstractServiceTest.class,
+    dependsOnMethods = {"create", "testSubmitRequest"})
+    public void createWithWrongXmlSchema(String testName) throws Exception {
+    
+    if (logger.isDebugEnabled()) {
+    logger.debug(testBanner(testName, CLASS_NAME));
+    }
+    // Perform setup.
+    setupCreateWithWrongXmlSchema(testName, logger);
+    
+    // Submit the request to the service and store the response.
+    String method = REQUEST_TYPE.httpMethodName();
+    String url = getServiceRootURL();
+    String mediaType = MediaType.APPLICATION_XML;
+    final String entity = WRONG_XML_SCHEMA_DATA;
+    int statusCode = submitRequest(method, url, mediaType, entity);
+    
+    // Check the status code of the response: does it match
+    // the expected response(s)?
+    if(logger.isDebugEnabled()){
+    logger.debug(testName + ": url=" + url +
+    " status=" + statusCode);
+    }
+    Assert.assertTrue(REQUEST_TYPE.isValidStatusCode(statusCode),
+    invalidStatusCodeMessage(REQUEST_TYPE, statusCode));
+    Assert.assertEquals(statusCode, EXPECTED_STATUS_CODE);
+    }
+     */
+    
+    // ---------------------------------------------------------------
+    // CRUD tests : READ tests
+    // ---------------------------------------------------------------
+    
+    // Success outcomes
+    
+    /* (non-Javadoc)
+     * @see org.collectionspace.services.client.test.AbstractServiceTestImpl#read(java.lang.String)
+     */
+    @Override
+//    @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class,
+//    dependsOnMethods = {"create"})
+    public void read(String testName) throws Exception {
+        // Perform setup.
+        setupRead();
+
+        // Submit the request to the service and store the response.
+        UocClient client = new UocClient();
+        Response res = client.read(knownResourceId);
+        PoxPayloadIn input = null;
+        try {
+            assertStatusCode(res, testName);
+            input = new PoxPayloadIn(res.readEntity(String.class));
+        } finally {
+               if (res != null) {
+                res.close();
+            }
+        }
+
+        // Get the common part of the response and verify that it is not null.
+        PayloadInputPart payloadInputPart = input.getPart(client.getCommonPartName());
+        UocCommon uocCommon = null;
+        if (payloadInputPart != null) {
+            uocCommon = (UocCommon) payloadInputPart.getBody();
+        }
+        Assert.assertNotNull(uocCommon);
+        
+    }
+
+    // Failure outcomes
+    
+    /* (non-Javadoc)
+     * @see org.collectionspace.services.client.test.AbstractServiceTestImpl#readNonExistent(java.lang.String)
+     */
+    @Override
+//    @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class,
+//    dependsOnMethods = {"read"})
+    public void readNonExistent(String testName) throws Exception {
+        // Perform setup.
+        setupReadNonExistent();
+
+        // Submit the request to the service and store the response.
+        UocClient client = new UocClient();
+        Response res = client.read(NON_EXISTENT_ID);
+        try {
+            int statusCode = res.getStatus();
+
+            // Check the status code of the response: does it match
+            // the expected response(s)?
+            if (logger.isDebugEnabled()) {
+                logger.debug(testName + ": status = " + statusCode);
+            }
+            Assert.assertTrue(testRequestType.isValidStatusCode(statusCode),
+                    invalidStatusCodeMessage(testRequestType, statusCode));
+            Assert.assertEquals(statusCode, testExpectedStatusCode);
+        } finally {
+               if (res != null) {
+                res.close();
+            }
+        }
+    }
+
+    // ---------------------------------------------------------------
+    // CRUD tests : READ_LIST tests
+    // ---------------------------------------------------------------
+    
+    // Success outcomes
+    
+    /* (non-Javadoc)
+     * @see org.collectionspace.services.client.test.AbstractServiceTestImpl#readList(java.lang.String)
+     */
+    @Override
+//    @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class,
+//    dependsOnMethods = {"createList", "read"})
+    public void readList(String testName) throws Exception {
+        // Perform setup.
+        setupReadList();
+
+        // Submit the request to the service and store the response.
+        AbstractCommonList list = null;
+        UocClient client = new UocClient();
+        Response res = client.readList();
+        assertStatusCode(res, testName);
+        try {
+            int statusCode = res.getStatus();
+
+            // Check the status code of the response: does it match
+            // the expected response(s)?
+            if (logger.isDebugEnabled()) {
+                logger.debug(testName + ": status = " + statusCode);
+            }
+            Assert.assertTrue(testRequestType.isValidStatusCode(statusCode),
+                    invalidStatusCodeMessage(testRequestType, statusCode));
+            Assert.assertEquals(statusCode, testExpectedStatusCode);
+
+            list = res.readEntity(getCommonListType());
+        } finally {
+               if (res != null) {
+                res.close();
+            }
+        }
+
+        // Optionally output additional data about list members for debugging.
+        boolean iterateThroughList = true;
+        if(iterateThroughList && logger.isDebugEnabled()){
+               AbstractCommonListUtils.ListItemsInAbstractCommonList(list, logger, testName);
+        }
+
+    }
+
+    // Failure outcomes
+    // None at present.
+    
+    // ---------------------------------------------------------------
+    // CRUD tests : UPDATE tests
+    // ---------------------------------------------------------------
+    
+    // Success outcomes
+    
+    /* (non-Javadoc)
+     * @see org.collectionspace.services.client.test.AbstractServiceTestImpl#update(java.lang.String)
+     */
+    @Override
+//    @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class,
+//    dependsOnMethods = {"read"})
+    public void update(String testName) throws Exception {
+        // Perform setup.
+        setupRead();
+
+        // Retrieve the contents of a resource to update.
+        UocClient client = new UocClient();
+        Response res = client.read(knownResourceId);
+        PoxPayloadIn input = null;
+        try {
+               assertStatusCode(res, testName);
+            input = new PoxPayloadIn(res.readEntity(String.class));
+               if (logger.isDebugEnabled()) {
+                logger.debug("got object to update with ID: " + knownResourceId);
+            }
+        } finally {
+               if (res != null) {
+                res.close();
+            }
+        }
+
+        // Extract the common part from the response.
+        PayloadInputPart payloadInputPart = input.getPart(client.getCommonPartName());
+        UocCommon uocCommon = null;
+        if (payloadInputPart != null) {
+            uocCommon = (UocCommon) payloadInputPart.getBody();
+        }
+        Assert.assertNotNull(uocCommon);
+
+        // Update the content of this resource.
+        uocCommon.setReferenceNumber("updated-" + uocCommon.getReferenceNumber());
+        uocCommon.setTitle("updated-" + uocCommon.getTitle());
+        if (logger.isDebugEnabled()) {
+            logger.debug("to be updated object");
+            logger.debug(objectAsXmlString(uocCommon, UocCommon.class));
+        }
+
+        setupUpdate();
+        
+        // Submit the updated common part in an update request to the service
+        // and store the response.
+        PoxPayloadOut output = new PoxPayloadOut(this.getServicePathComponent());
+        PayloadOutputPart commonPart = output.addPart(client.getCommonPartName(), uocCommon);
+        res = client.update(knownResourceId, output);
+        try {
+               assertStatusCode(res, testName);
+            int statusCode = res.getStatus();
+            // Check the status code of the response: does it match the expected response(s)?
+            if (logger.isDebugEnabled()) {
+                logger.debug(testName + ": status = " + statusCode);
+            }
+            Assert.assertTrue(testRequestType.isValidStatusCode(statusCode),
+                    invalidStatusCodeMessage(testRequestType, statusCode));
+            Assert.assertEquals(statusCode, testExpectedStatusCode);
+            input = new PoxPayloadIn(res.readEntity(String.class));
+        } finally {
+               if (res != null) {
+                res.close();
+            }
+        }
+
+        // Extract the updated common part from the response.
+        payloadInputPart = input.getPart(client.getCommonPartName());
+        UocCommon updatedUocCommon = null;
+        if (payloadInputPart != null) {
+            updatedUocCommon = (UocCommon) payloadInputPart.getBody();
+        }
+        Assert.assertNotNull(updatedUocCommon);
+
+        // Check selected fields in the updated common part.
+        Assert.assertEquals(updatedUocCommon.getReferenceNumber(),
+                uocCommon.getReferenceNumber(),
+                "Data in updated object did not match submitted data.");
+
+        if (logger.isDebugEnabled()) {
+            logger.debug("UTF-8 data sent=" + uocCommon.getTitle() + "\n"
+                    + "UTF-8 data received=" + updatedUocCommon.getTitle());
+        }
+    }
+
+    @Override
+//    @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class,
+//    dependsOnMethods = {"update", "testSubmitRequest"})
+    public void updateNonExistent(String testName) throws Exception {
+        // Perform setup.
+        setupUpdateNonExistent();
+
+        // Submit the request to the service and store the response.
+        // Note: The ID used in this 'create' call may be arbitrary.
+        // The only relevant ID may be the one used in update(), below.
+        UocClient client = new UocClient();
+        PoxPayloadOut multipart = createUocInstance(NON_EXISTENT_ID);
+        Response res = client.update(NON_EXISTENT_ID, multipart);
+        try {
+            int statusCode = res.getStatus();
+
+            // Check the status code of the response: does it match
+            // the expected response(s)?
+            if (logger.isDebugEnabled()) {
+                logger.debug(testName + ": status = " + statusCode);
+            }
+            Assert.assertTrue(testRequestType.isValidStatusCode(statusCode),
+                    invalidStatusCodeMessage(testRequestType, statusCode));
+            Assert.assertEquals(statusCode, testExpectedStatusCode);
+        } finally {
+               if (res != null) {
+                res.close();
+            }
+        }
+    }
+
+    // ---------------------------------------------------------------
+    // CRUD tests : DELETE tests
+    // ---------------------------------------------------------------
+    
+    // Success outcomes
+    
+    /* (non-Javadoc)
+     * @see org.collectionspace.services.client.test.AbstractServiceTestImpl#delete(java.lang.String)
+     */
+    @Override
+//    @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class,
+//    dependsOnMethods = {"create", "readList", "testSubmitRequest", "update"})
+    public void delete(String testName) throws Exception {
+        // Perform setup.
+        setupDelete();
+
+        // Submit the request to the service and store the response.
+        UocClient client = new UocClient();
+        Response res = client.delete(knownResourceId);
+        try {
+            int statusCode = res.getStatus();
+
+            // Check the status code of the response: does it match
+            // the expected response(s)?
+            if (logger.isDebugEnabled()) {
+                logger.debug(testName + ": status = " + statusCode);
+            }
+            Assert.assertTrue(testRequestType.isValidStatusCode(statusCode),
+                    invalidStatusCodeMessage(testRequestType, statusCode));
+            Assert.assertEquals(statusCode, testExpectedStatusCode);
+        } finally {
+               if (res != null) {
+                res.close();
+            }
+        }
+    }
+
+    // Failure outcomes
+    
+    /* (non-Javadoc)
+     * @see org.collectionspace.services.client.test.AbstractServiceTestImpl#deleteNonExistent(java.lang.String)
+     */
+    @Override
+//    @Test(dataProvider = "testName", dataProviderClass = AbstractServiceTestImpl.class,
+//    dependsOnMethods = {"delete"})
+    public void deleteNonExistent(String testName) throws Exception {
+        // Perform setup.
+        setupDeleteNonExistent();
+
+        // Submit the request to the service and store the response.
+        UocClient client = new UocClient();
+        Response res = client.delete(NON_EXISTENT_ID);
+        try {
+            int statusCode = res.getStatus();
+
+            // Check the status code of the response: does it match
+            // the expected response(s)?
+            if (logger.isDebugEnabled()) {
+                logger.debug(testName + ": status = " + statusCode);
+            }
+            Assert.assertTrue(testRequestType.isValidStatusCode(statusCode),
+                    invalidStatusCodeMessage(testRequestType, statusCode));
+            Assert.assertEquals(statusCode, testExpectedStatusCode);
+        } finally {
+               if (res != null) {
+                res.close();
+            }
+        }
+    }
+
+    // ---------------------------------------------------------------
+    // Utility tests : tests of code used in tests above
+    // ---------------------------------------------------------------
+    
+    /**
+     * Tests the code for manually submitting data that is used by several
+     * of the methods above.
+     */
+//    @Test(dependsOnMethods = {"create", "read"})
+    public void testSubmitRequest() {
+
+        // Expected status code: 200 OK
+        final int EXPECTED_STATUS = Response.Status.OK.getStatusCode();
+
+        // Submit the request to the service and store the response.
+        String method = ServiceRequestType.READ.httpMethodName();
+        String url = getResourceURL(knownResourceId);
+        int statusCode = submitRequest(method, url);
+
+        // Check the status code of the response: does it match
+        // the expected response(s)?
+        if (logger.isDebugEnabled()) {
+            logger.debug("testSubmitRequest: url=" + url
+                    + " status=" + statusCode);
+        }
+        Assert.assertEquals(statusCode, EXPECTED_STATUS);
+
+    }
+
+    // ---------------------------------------------------------------
+    // Utility methods used by tests above
+    // ---------------------------------------------------------------
+    
+    @Override
+    public String getServiceName() {
+        return SERVICE_NAME;
+    }
+
+    /* (non-Javadoc)
+     * @see org.collectionspace.services.client.test.BaseServiceTest#getServicePathComponent()
+     */
+    @Override
+    public String getServicePathComponent() {
+        return SERVICE_PATH_COMPONENT;
+    }
+
+    @Override
+    protected PoxPayloadOut createInstance(String identifier) throws Exception {
+        return createUocInstance(identifier);
+    }
+
+    /**
+     * Creates the uoc instance.
+     *
+     * @param identifier the identifier
+     * @return the multipart output
+     * @throws Exception 
+     */
+    private PoxPayloadOut createUocInstance(String identifier) throws Exception {
+        return createUocInstance(
+                "referenceNumber-" + identifier,
+                "title-" + identifier);
+    }
+
+    /**
+     * Creates the uoc instance.
+     *
+     * @param referenceNumber the Use of Collections ref number
+     * @param title the title
+     * @return the multipart output
+     * @throws Exception 
+     */
+    private PoxPayloadOut createUocInstance(String referenceNumber,
+            String title) throws Exception {
+
+        UocCommon uocCommon = new UocCommon();
+        uocCommon.setReferenceNumber(referenceNumber);
+        uocCommon.setTitle(title);
+
+        PoxPayloadOut multipart = new PoxPayloadOut(this.getServicePathComponent());
+        PayloadOutputPart commonPart =
+                multipart.addPart(new UocClient().getCommonPartName(), uocCommon);
+
+        if (logger.isDebugEnabled()) {
+            logger.debug("to be created, uoc common");
+            logger.debug(objectAsXmlString(uocCommon, UocCommon.class));
+        }
+
+        return multipart;
+    }
+
+       @Override
+       public void CRUDTests(String testName) {
+               // TODO Auto-generated method stub
+               
+       }
+
+       @Override
+       protected PoxPayloadOut createInstance(String commonPartName,
+                       String identifier) throws Exception {
+        PoxPayloadOut result = createUocInstance(identifier);
+        return result;
+       }
+
+       @Override
+       protected UocCommon updateInstance(UocCommon commonPartObject) {
+               // TODO Auto-generated method stub
+               return null;
+       }
+
+       @Override
+       protected void compareUpdatedInstances(UocCommon original,
+                       UocCommon updated) throws Exception {
+               // TODO Auto-generated method stub
+               
+       }
+}
diff --git a/services/uoc/client/src/test/resources/log4j.properties b/services/uoc/client/src/test/resources/log4j.properties
new file mode 100644 (file)
index 0000000..148a3e8
--- /dev/null
@@ -0,0 +1,23 @@
+log4j.rootLogger=debug, stdout, R
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+
+# Pattern to output the caller's file name and line number.
+log4j.appender.stdout.layout.ConversionPattern=%d %-5p [%t] [%c:%L] %m%n
+
+log4j.appender.R=org.apache.log4j.RollingFileAppender
+log4j.appender.R.File=target/test-client.log
+
+log4j.appender.R.MaxFileSize=100KB
+# Keep one backup file
+log4j.appender.R.MaxBackupIndex=1
+
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.layout.ConversionPattern=%d %-5p [%t] [%c:%L] %m%n
+
+#packages
+log4j.logger.org.collectionspace=DEBUG
+log4j.logger.org.apache=INFO
+log4j.logger.httpclient=INFO
+log4j.logger.org.jboss.resteasy=INFO
diff --git a/services/uoc/jaxb/pom.xml b/services/uoc/jaxb/pom.xml
new file mode 100644 (file)
index 0000000..18ebbdd
--- /dev/null
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <artifactId>org.collectionspace.services.uoc</artifactId>
+        <groupId>org.collectionspace.services</groupId>
+        <version>5.1-SNAPSHOT</version>
+    </parent>
+    
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.collectionspace.services.uoc.jaxb</artifactId>
+    <name>services.uoc.jaxb</name>
+    
+    <dependencies>
+        <dependency>
+            <groupId>org.collectionspace.services</groupId>
+            <artifactId>org.collectionspace.services.jaxb</artifactId>
+            <version>${project.version}</version>
+        </dependency>        
+    </dependencies>
+    
+    <build>
+        <finalName>collectionspace-services-uoc-jaxb</finalName>
+        <defaultGoal>install</defaultGoal>
+        <plugins>
+            <plugin>
+                <groupId>org.jvnet.jaxb2.maven2</groupId>
+                <artifactId>maven-jaxb2-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>
+
diff --git a/services/uoc/jaxb/src/main/java/org/collectionspace/services/UocJAXBSchema.java b/services/uoc/jaxb/src/main/java/org/collectionspace/services/UocJAXBSchema.java
new file mode 100644 (file)
index 0000000..68f84d6
--- /dev/null
@@ -0,0 +1,9 @@
+/**
+ * 
+ */
+package org.collectionspace.services;
+
+public interface UocJAXBSchema {
+    final static String UOC_REFERENCE_NUMBER = "referenceNumber";
+    final static String UOC_TITLE = "title";
+}
\ No newline at end of file
diff --git a/services/uoc/jaxb/src/main/java/org/collectionspace/services/UocListItemJAXBSchema.java b/services/uoc/jaxb/src/main/java/org/collectionspace/services/UocListItemJAXBSchema.java
new file mode 100644 (file)
index 0000000..315436c
--- /dev/null
@@ -0,0 +1,6 @@
+package org.collectionspace.services;
+
+public interface UocListItemJAXBSchema {
+       final static String UOC_REFERENCE_NUMBER = "referenceNumber";
+       final static String UOC_TITLE = "title";
+}
diff --git a/services/uoc/jaxb/src/main/resources/uoc-common.xsd b/services/uoc/jaxb/src/main/resources/uoc-common.xsd
new file mode 100644 (file)
index 0000000..e824235
--- /dev/null
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<!--
+    UOC schema (XSD)
+    
+    Entity  : Use of Collections
+    Part    : Common
+    Used for: JAXB binding between XML and Java objects
+
+    $LastChangedRevision: 2316 $
+    $LastChangedDate: 2018-05-02 16:03:51 -0700 (Wed, 02 Jun 2010) $
+-->
+
+<xs:schema 
+  xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+  jaxb:version="1.0" elementFormDefault="unqualified"
+  xmlns:ns="http://collectionspace.org/services/uoc"
+  xmlns="http://collectionspace.org/services/uoc"
+  targetNamespace="http://collectionspace.org/services/uoc"
+  version="0.1"
+>
+
+<!--
+    Avoid XmlRootElement nightmare:
+    See http://weblogs.java.net/blog/kohsuke/archive/2006/03/why_does_jaxb_p.html
+-->
+    
+    <!-- UOC -->
+    <xs:element name="uoc_common">
+        <xs:complexType>
+            <xs:sequence>
+                <!--  UOC Information Group -->
+                <xs:element name="title" type="xs:string"/>
+                <xs:element name="referenceNumber" type="xs:string"/>
+                <xs:element name="methodList" type="methodList"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+
+    <xs:complexType name="methodList">
+        <xs:sequence>
+            <xs:element name="method" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
+</xs:schema>
+
diff --git a/services/uoc/pom.xml b/services/uoc/pom.xml
new file mode 100644 (file)
index 0000000..2bcacda
--- /dev/null
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- A comment. -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <groupId>org.collectionspace.services</groupId>
+        <artifactId>org.collectionspace.services.main</artifactId>
+        <version>5.1-SNAPSHOT</version>
+    </parent>
+    
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.collectionspace.services.uoc</artifactId>
+    <name>services.uoc</name>
+    <packaging>pom</packaging>
+
+    <dependencies>
+    </dependencies>
+
+    <modules>
+        <module>jaxb</module>
+        <module>service</module>
+        <module>3rdparty</module>
+        <module>client</module>
+    </modules>
+
+</project>
+
diff --git a/services/uoc/service/pom.xml b/services/uoc/service/pom.xml
new file mode 100644 (file)
index 0000000..ca14865
--- /dev/null
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <parent>
+        <groupId>org.collectionspace.services</groupId>
+        <artifactId>org.collectionspace.services.uoc</artifactId>        
+        <version>5.1-SNAPSHOT</version>
+    </parent>
+    
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>org.collectionspace.services.uoc.service</artifactId>
+    <name>services.uoc.service</name>
+    <packaging>jar</packaging>       
+
+    <dependencies>
+        <dependency>
+            <groupId>org.collectionspace.services</groupId>
+            <artifactId>org.collectionspace.services.common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.collectionspace.services</groupId>
+            <artifactId>org.collectionspace.services.uoc.jaxb</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.collectionspace.services</groupId>
+            <artifactId>org.collectionspace.services.uoc.client</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.collectionspace.services</groupId>
+            <artifactId>org.collectionspace.services.collectionobject.jaxb</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        
+        <!-- External dependencies -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+        </dependency>
+        
+      <!-- javax -->
+
+        <dependency>
+            <groupId>javax.security</groupId>
+            <artifactId>jaas</artifactId>
+            <version>1.0.01</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <!-- jboss -->
+
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-jaxrs</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>tjws</groupId>
+                    <artifactId>webserver</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-jaxb-provider</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-multipart-provider</artifactId>
+        </dependency>
+        
+        <!-- nuxeo -->
+
+        <dependency>
+            <groupId>org.nuxeo.ecm.core</groupId>
+            <artifactId>nuxeo-core-api</artifactId>
+            <exclusions>
+                <exclusion>
+                    <artifactId>jboss-remoting</artifactId>
+                    <groupId>jboss</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+    </dependencies>
+    
+    <build>
+        <finalName>collectionspace-services-uoc</finalName>
+    </build>
+</project>
+
diff --git a/services/uoc/service/src/main/java/org/collectionspace/services/uoc/UocResource.java b/services/uoc/service/src/main/java/org/collectionspace/services/uoc/UocResource.java
new file mode 100644 (file)
index 0000000..053b831
--- /dev/null
@@ -0,0 +1,63 @@
+/**
+ *  This document is a part of the source code and related artifacts
+ *  for CollectionSpace, an open source collections management system
+ *  for museums and related institutions:
+
+ *  http://www.collectionspace.org
+ *  http://wiki.collectionspace.org
+
+ *  Copyright 2009 University of California at Berkeley
+
+ *  Licensed under the Educational Community License (ECL), Version 2.0.
+ *  You may not use this file except in compliance with this License.
+
+ *  You may obtain a copy of the ECL 2.0 License at
+
+ *  https://source.collectionspace.org/collection-space/LICENSE.txt
+
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.collectionspace.services.uoc;
+
+import org.collectionspace.services.client.UocClient;
+import org.collectionspace.services.common.NuxeoBasedResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+
+@Path(UocClient.SERVICE_PATH)
+@Consumes("application/xml")
+@Produces("application/xml")
+public class UocResource extends NuxeoBasedResource {
+
+    final Logger logger = LoggerFactory.getLogger(UocResource.class);
+
+    @Override
+    protected String getVersionString() {
+       final String lastChangeRevision = "$LastChangedRevision$";
+       return lastChangeRevision;
+    }
+    
+    @Override
+    public String getServiceName() {
+        return UocClient.SERVICE_NAME;
+    }
+
+    @Override
+    public Class<UocCommon> getCommonPartClass() {
+       return UocCommon.class;
+    }
+}
+
+
+
+
+
+
diff --git a/services/uoc/service/src/main/java/org/collectionspace/services/uoc/nuxeo/UocConstants.java b/services/uoc/service/src/main/java/org/collectionspace/services/uoc/nuxeo/UocConstants.java
new file mode 100644 (file)
index 0000000..9891259
--- /dev/null
@@ -0,0 +1,35 @@
+/**
+ *  This document is a part of the source code and related artifacts
+ *  for CollectionSpace, an open source collections management system
+ *  for museums and related institutions:
+
+ *  http://www.collectionspace.org
+ *  http://wiki.collectionspace.org
+
+ *  Copyright 2009 University of California at Berkeley
+
+ *  Licensed under the Educational Community License (ECL), Version 2.0.
+ *  You may not use this file except in compliance with this License.
+
+ *  You may obtain a copy of the ECL 2.0 License at
+
+ *  https://source.collectionspace.org/collection-space/LICENSE.txt
+
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.collectionspace.services.uoc.nuxeo;
+
+/**
+ * UocConstants specifies constants for the Use of Collections service
+ *
+ */
+public class UocConstants {
+
+    public final static String NUXEO_DOCTYPE = "Uoc";
+    public final static String NUXEO_SCHEMA_NAME = "uoc";
+    public final static String NUXEO_DC_TITLE = "CollectionSpace-Uoc";
+}
diff --git a/services/uoc/service/src/main/java/org/collectionspace/services/uoc/nuxeo/UocDocumentModelHandler.java b/services/uoc/service/src/main/java/org/collectionspace/services/uoc/nuxeo/UocDocumentModelHandler.java
new file mode 100644 (file)
index 0000000..d316cae
--- /dev/null
@@ -0,0 +1,36 @@
+/**
+ *  This document is a part of the source code and related artifacts
+ *  for CollectionSpace, an open source collections management system
+ *  for museums and related institutions:
+
+ *  http://www.collectionspace.org
+ *  http://wiki.collectionspace.org
+
+ *  Copyright 2009 University of California at Berkeley
+
+ *  Licensed under the Educational Community License (ECL), Version 2.0.
+ *  You may not use this file except in compliance with this License.
+
+ *  You may obtain a copy of the ECL 2.0 License at
+
+ *  https://source.collectionspace.org/collection-space/LICENSE.txt
+
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.collectionspace.services.uoc.nuxeo;
+
+import org.collectionspace.services.uoc.UocCommon;
+import org.collectionspace.services.nuxeo.client.java.NuxeoDocumentModelHandler;
+
+/** UocDocumentModelHandler
+ *  $LastChangedRevision$
+ *  $LastChangedDate$
+ */
+public class UocDocumentModelHandler
+        extends NuxeoDocumentModelHandler<UocCommon> {
+}
+
diff --git a/services/uoc/service/src/main/java/org/collectionspace/services/uoc/nuxeo/UocValidatorHandler.java b/services/uoc/service/src/main/java/org/collectionspace/services/uoc/nuxeo/UocValidatorHandler.java
new file mode 100644 (file)
index 0000000..a287190
--- /dev/null
@@ -0,0 +1,18 @@
+package org.collectionspace.services.uoc.nuxeo;
+
+import org.collectionspace.services.common.context.ServiceContext;
+import org.collectionspace.services.common.document.InvalidDocumentException;
+import org.collectionspace.services.common.document.ValidatorHandler;
+import org.collectionspace.services.common.document.DocumentHandler.Action;
+
+public class UocValidatorHandler implements ValidatorHandler {
+
+       @Override
+       public void validate(Action action, ServiceContext ctx)
+                       throws InvalidDocumentException {
+               // TODO Auto-generated method stub
+               System.out.println("UocValidatorHandler executed.");
+
+       }
+
+}
diff --git a/services/uoc/service/src/test/java/org/collectionspace/services/test/UocServiceTest.java b/services/uoc/service/src/test/java/org/collectionspace/services/test/UocServiceTest.java
new file mode 100644 (file)
index 0000000..4d9f879
--- /dev/null
@@ -0,0 +1,10 @@
+package org.collectionspace.services.test;
+
+/**
+ * Placeholder for server-side testing of Use of Collections service code.
+ * 
+ * @version $Revision$
+ */
+public class UocServiceTest {
+       //empty
+}
diff --git a/services/uoc/service/src/test/resources/log4j.xml b/services/uoc/service/src/test/resources/log4j.xml
new file mode 100644 (file)
index 0000000..52121cb
--- /dev/null
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+       <appender name="console" class="org.apache.log4j.ConsoleAppender">
+               <param name="Target" value="System.out" />
+               <layout class="org.apache.log4j.TTCCLayout">
+                       <param name="DateFormat" value="ISO8601" />
+               </layout>
+       </appender>
+
+
+       <appender name="unit-tests"
+               class="org.apache.log4j.RollingFileAppender">
+               <param name="File" value="./target/unit-tests.log" />
+               <param name="MaxFileSize" value="10240KB" />
+               <param name="MaxBackupIndex" value="6" />
+               <layout class="org.apache.log4j.TTCCLayout">
+                       <param name="DateFormat" value="ISO8601" />
+               </layout>
+       </appender>
+
+       <logger name="org.apache.commons.httpclient" additivity="false">
+               <level value="warn" />
+               <appender-ref ref="console" />
+               <appender-ref ref="unit-tests" />
+       </logger>
+
+       <logger name="httpclient.wire" additivity="false">
+               <level value="info" />
+               <appender-ref ref="console" />
+               <appender-ref ref="unit-tests" />
+       </logger>
+
+       <root>
+               <priority value="debug" />
+               <appender-ref ref="console" />
+               <appender-ref ref="unit-tests" />
+       </root>
+
+</log4j:configuration>
+
+
+
+