Merge remote-tracking branch 'origin/valuationcontrol' into CSPACE-6235-plus-6310

Conflicts:
	services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
	services/build.xml
	services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
	services/pom.xml

diff --cc services/JaxRsServiceProvider/pom.xml
Simple merge

diff --cc services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
index df6dad718f3cdcb178c3604daed2da9f519beeff,6f99c6854db7e96088afd9c4c371b3f559f891cf..710359ed3cbc3de84575e2a767cac034cec71184
--- 1/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
--- 2/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
+++ b/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
@@@ -116,7 -116,7 +117,8 @@@ public class CollectionSpaceJaxRsApplic
          addResourceToMapAndSingletons(new RelationResource());
          addResourceToMapAndSingletons(new LoaninResource());
          addResourceToMapAndSingletons(new LoanoutResource());
 +        addResourceToMapAndSingletons(new ConditioncheckResource());
+         addResourceToMapAndSingletons(new ValuationcontrolResource());
          addResourceToMapAndSingletons(new ObjectExitResource());
          addResourceToMapAndSingletons(new BatchResource());
          addResourceToMapAndSingletons(new MediaResource());

diff --cc services/build.xml
index a15a962520ec0861d6e0bf98494c60b9ca347d30,f62382afd68dc593a0d2846896dec9a52cb651a7..e8f3befcb609983b9d2507250d17220b67ddea63
--- 1/services/build.xml
--- 2/services/build.xml
+++ b/services/build.xml
@@@ -170,7 -170,7 +170,8 @@@
          <ant antfile="imports/build.xml" target="deploy" inheritAll="false"/>\r
          <ant antfile="loanin/build.xml" target="deploy" inheritAll="false"/>\r
          <ant antfile="loanout/build.xml" target="deploy" inheritAll="false"/>\r
 +        <ant antfile="conditioncheck/build.xml" target="deploy" inheritAll="false"/>\r
+         <ant antfile="valuationcontrol/build.xml" target="deploy" inheritAll="false"/>\r
          <ant antfile="objectexit/build.xml" target="deploy" inheritAll="false"/>\r
          <ant antfile="batch/build.xml" target="deploy" inheritAll="false"/>\r
          <ant antfile="location/build.xml" target="deploy" inheritAll="false"/>\r
@@@ -209,8 -209,8 +210,9 @@@
          <ant antfile="work/build.xml" target="undeploy" inheritAll="false"/>\r
          <ant antfile="place/build.xml" target="undeploy" inheritAll="false"/>\r
          <ant antfile="location/build.xml" target="undeploy" inheritAll="false"/>\r
-         <ant antfile="conditioncheck/build.xml" target="undeploy" inheritAll="false"/>\r
 -        <ant antfile="valuationcontrol/build.xml" target="undeploy" inheritAll="false"/>\r
          <ant antfile="objectexit/build.xml" target="undeploy" inheritAll="false"/>\r
++        <ant antfile="valuationcontrol/build.xml" target="undeploy" inheritAll="false"/>\r
++        <ant antfile="conditioncheck/build.xml" target="undeploy" inheritAll="false"/>\r
          <ant antfile="batch/build.xml" target="undeploy" inheritAll="false"/>\r
          <ant antfile="report/build.xml" target="undeploy" inheritAll="false"/>\r
          <ant antfile="movement/build.xml" target="undeploy" inheritAll="false"/>\r
@@@ -265,7 -265,7 +267,8 @@@
          <ant antfile="work/build.xml" target="dist" inheritAll="false"/>\r
          <ant antfile="concept/build.xml" target="dist" inheritAll="false"/>\r
          <ant antfile="taxonomy/build.xml" target="dist" inheritAll="false"/>\r
 +        <ant antfile="conditioncheck/build.xml" target="dist" inheritAll="false"/>\r
+         <ant antfile="valuationcontrol/build.xml" target="dist" inheritAll="false"/>\r
          <ant antfile="objectexit/build.xml" target="dist" inheritAll="false"/>\r
          <ant antfile="batch/build.xml" target="dist" inheritAll="false"/>\r
          <ant antfile="media/build.xml" target="dist" inheritAll="false"/>\r

diff --cc services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
index 80189d28b54e926c8ad6e2549ee3b1378af76ed6,84f840a79c7ec730384c4f7a70a8d399eba8e837..322b11c32987d7304e8727518507c5e73f87198d
--- 1/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
--- 2/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
+++ b/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
@@@ -1017,94 -1017,75 +1017,164 @@@
          </tenant:serviceBindings>
          <!-- end loanout service meta-data -->
  
 +        <!-- begin conditioncheck service meta-data -->
 +        <tenant:serviceBindings id="Conditionchecks" name="Conditionchecks" type="procedure" version="0.1">
 +            <service:repositoryDomain xmlns:service="http://collectionspace.org/services/config/service">default-domain</service:repositoryDomain>
 +            <service:documentHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.conditioncheck.nuxeo.ConditioncheckDocumentModelHandler</service:documentHandler>
 +            <service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
 +                <service:params>
 +                    <service:ListResultsFields>
 +                        <service:ListResultField>
 +                            <service:element>conditionCheckRefNumber</service:element>
 +                            <service:xpath>conditionCheckRefNumber</service:xpath>
 +                        </service:ListResultField>
 +                        <service:ListResultField>
 +                            <service:element>condition</service:element>
 +                            <service:xpath>conditionCheckGroupList/[0]/condition</service:xpath>
 +                        </service:ListResultField>
 +                    </service:ListResultsFields>
 +                </service:params>
 +            </service:DocHandlerParams>
 +            <service:validatorHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.conditioncheck.nuxeo.ConditioncheckValidatorHandler</service:validatorHandler>
 +            <service:properties xmlns:service="http://collectionspace.org/services/config/service">
 +                <types:item xmlns:types="http://collectionspace.org/services/config/types">
 +                    <types:key>objectNameProperty</types:key>
 +                    <types:value>conditionCheckGroupList/[0]/condition</types:value>
 +                </types:item>
 +                <types:item xmlns:types="http://collectionspace.org/services/config/types">
 +                    <types:key>objectNumberProperty</types:key>
 +                    <types:value>conditionCheckRefNumber</types:value>
 +                </types:item>
 +            </service:properties>
 +            <service:object xmlns:service="http://collectionspace.org/services/config/service" name="Conditioncheck" version="0.1">
 +                <service:part id="0" control_group="Managed" versionable="true" auditable="false" label="conditionchecks-system" updated="" order="0">
 +                    <service:content contentType="application/xml">
 +                        <service:xmlContent namespaceURI="http://collectionspace.org/services/config/system" schemaLocation="http://collectionspace.org/services/config/system http://collectionspace.org/services/config/system/system-response.xsd" />
 +                    </service:content>
 +                </service:part>
 +                <service:part id="1" control_group="Managed" versionable="true" auditable="false" label="conditionchecks_common" updated="" order="1">
 +                    <service:properties>
 +                        <!-- Fields containing authority term references -->
 +                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
 +                            <types:key>authRef</types:key>
 +                            <types:value>conditionChecker</types:value>
 +                        </types:item>
 +                        <!-- Fields containing term list / controlled vocabulary references -->
 +                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
 +                            <types:key>termRef</types:key>
 +                            <types:value>objectAuditCategory</types:value>
 +                        </types:item>
 +                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
 +                            <types:key>termRef</types:key>
 +                            <types:value>completenessGroupList/*/completeness</types:value>
 +                        </types:item>
 +                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
 +                            <types:key>termRef</types:key>
 +                            <types:value>conditionCheckGroupList/*/condition</types:value>
 +                        </types:item>
 +                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
 +                            <types:key>termRef</types:key>
 +                            <types:value>conservationTreatmentPriority</types:value>
 +                        </types:item>
 +                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
 +                            <types:key>termRef</types:key>
 +                            <types:value>hazardGroupList/*/hazard</types:value>
 +                        </types:item>
 +                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
 +                            <types:key>termRef</types:key>
 +                            <types:value>conditionCheckMethod</types:value>
 +                        </types:item>
 +                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
 +                            <types:key>termRef</types:key>
 +                            <types:value>conditionCheckReason</types:value>
 +                        </types:item>
 +                        <types:item xmlns:types="http://collectionspace.org/services/config/types">
 +                            <types:key>termRef</types:key>
 +                            <types:value>salvagePriorityCodeGroupList/*/salvagePriorityCode</types:value>
 +                        </types:item>
 +                    </service:properties>
 +                    <service:content contentType="application/xml">
 +                        <service:xmlContent namespaceURI="http://collectionspace.org/services/conditioncheck" schemaLocation="http://collectionspace.org/services/conditioncheck http://services.collectionspace.org/conditioncheck/conditionchecks_common.xsd" />
 +                    </service:content>
 +                </service:part>
 +                <service:part id="2" control_group="Managed" versionable="true" auditable="false" label="collectionspace_core" updated="" order="2">
 +                    <service:content contentType="application/xml">
 +                        <service:xmlContent namespaceURI="http://collectionspace.org/collectionspace_core/" schemaLocation="http://collectionspace.org/collectionspace_core/ http://services.collectionspace.org/collectionspace_core.xsd" />
 +                    </service:content>
 +                </service:part>
 +            </service:object>
 +        </tenant:serviceBindings>
 +        <!-- end conditioncheck service meta-data -->
++        
+         <!-- begin valuationcontrol service meta-data -->
+         <tenant:serviceBindings id="Valuationcontrols" name="Valuationcontrols" type="procedure" version="0.1">
+             <!-- other URI paths through which this service could be accessed -->
+             <!--
+             <service:uriPath xmlns:service='http://collectionspace.org/services/config/service'>
+                 /valuationcontrols/*/authorityrefs/
+             </service:uriPath>
+             -->
+             <service:repositoryDomain xmlns:service="http://collectionspace.org/services/config/service">default-domain</service:repositoryDomain>
+             <service:documentHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.valuationcontrol.nuxeo.ValuationcontrolDocumentModelHandler</service:documentHandler>
+             <service:DocHandlerParams xmlns:service="http://collectionspace.org/services/config/service">
+                 <service:params>
+                     <service:ListResultsFields>
+                         <service:ListResultField>
+                             <service:element>valuationcontrolRefNumber</service:element>
+                             <service:xpath>valuationcontrolRefNumber</service:xpath>
+                         </service:ListResultField>
+                         <service:ListResultField>
+                             <service:element>valueType</service:element>
+                             <service:xpath>valueType</service:xpath>
+                         </service:ListResultField>
+                     </service:ListResultsFields>
+                 </service:params>
+             </service:DocHandlerParams>
+             <service:validatorHandler xmlns:service="http://collectionspace.org/services/config/service">org.collectionspace.services.valuationcontrol.nuxeo.ValuationcontrolValidatorHandler</service:validatorHandler>
+             <service:properties xmlns:service="http://collectionspace.org/services/config/service">
+                 <types:item xmlns:types="http://collectionspace.org/services/config/types">
+                     <types:key>objectNameProperty</types:key>
+                     <types:value>valueType</types:value>
+                 </types:item>
+                 <types:item xmlns:types="http://collectionspace.org/services/config/types">
+                     <types:key>objectNumberProperty</types:key>
+                     <types:value>valuationcontrolRefNumber</types:value>
+                 </types:item>
+             </service:properties>
+             <service:object xmlns:service="http://collectionspace.org/services/config/service" name="Valuationcontrol" version="0.1">
+                 <service:part id="0" control_group="Managed" versionable="true" auditable="false" label="valuationcontrols-system" updated="" order="0">
+                     <service:content contentType="application/xml">
+                         <service:xmlContent namespaceURI="http://collectionspace.org/services/config/system" schemaLocation="http://collectionspace.org/services/config/system http://collectionspace.org/services/config/system/system-response.xsd" />
+                     </service:content>
+                 </service:part>
+                 <service:part id="1" control_group="Managed" versionable="true" auditable="false" label="valuationcontrols_common" updated="" order="1">
+                     <service:properties>
+                         <!-- Fields containing term list / controlled vocabulary references -->
+                         <types:item xmlns:types="http://collectionspace.org/services/config/types">
+                             <types:key>authRef</types:key>
+                             <types:value>valueSource</types:value>
+                         </types:item>
+                         <types:item xmlns:types="http://collectionspace.org/services/config/types">
+                             <types:key>termRef</types:key>
+                             <types:value>valueType</types:value>
+                         </types:item>
+                         <types:item xmlns:types="http://collectionspace.org/services/config/types">
+                             <types:key>termRef</types:key>
+                             <types:value>valueTypesList/*/valueCurrency</types:value>
+                         </types:item>
+                     </service:properties>
+                     <service:content contentType="application/xml">
+                         <service:xmlContent namespaceURI="http://collectionspace.org/services/valuationcontrol" schemaLocation="http://collectionspace.org/services/valuationcontrol http://services.collectionspace.org/valuationcontrol/valuationcontrols_common.xsd" />
+                     </service:content>
+                 </service:part>
+                 <service:part id="2" control_group="Managed" versionable="true" auditable="false" label="collectionspace_core" updated="" order="2">
+                     <service:content contentType="application/xml">
+                         <service:xmlContent namespaceURI="http://collectionspace.org/collectionspace_core/" schemaLocation="http://collectionspace.org/collectionspace_core/ http://services.collectionspace.org/collectionspace_core.xsd" />
+                     </service:content>
+                 </service:part>
+             </service:object>
+         </tenant:serviceBindings>
+         <!-- end valuationcontrol service meta-data -->
      
          <!-- begin objectexit service meta-data -->
          <tenant:serviceBindings id="ObjectExit" name="ObjectExit" type="procedure" version="0.1">

diff --cc services/common/src/main/resources/db/postgresql/load_id_generators.sql
Simple merge

diff --cc services/pom.xml
index d03ff4bffbd229a9fbe791b2677e9bcd29c8506c,170fe9f046303ceed48ed0cf894a1ae889a948ef..179da855495a7ab8b30de9dd0763eb72210ec61a
--- 1/services/pom.xml
--- 2/services/pom.xml
+++ b/services/pom.xml
@@@ -61,7 -61,7 +61,8 @@@
          <module>intake</module>
          <module>loanin</module>
          <module>loanout</module>
 +        <module>conditioncheck</module>
+         <module>valuationcontrol</module>
          <module>objectexit</module>
          <module>batch</module>
          <module>imports</module>