Merge branch 'master' into concept

Conflicts:
	services/JaxRsServiceProvider/pom.xml
	services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
	services/build.xml
	services/pom.xml
	services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java

diff --cc services/JaxRsServiceProvider/pom.xml
index e857fcf364f1c2086ddfd06516b21adb284401c1,1f0ee588820ab2676fe39c113f463ad369587e55..93f0b18e2b5175a2d545f969a585976e63b28e35
--- 1/services/JaxRsServiceProvider/pom.xml
--- 2/services/JaxRsServiceProvider/pom.xml
+++ b/services/JaxRsServiceProvider/pom.xml
@@@ -172,11 -172,11 +172,16 @@@
              <artifactId>org.collectionspace.services.location.service</artifactId>\r
              <version>${project.version}</version>\r
          </dependency>\r
+         <dependency>\r
+             <groupId>org.collectionspace.services</groupId>\r
+             <artifactId>org.collectionspace.services.place.service</artifactId>\r
+             <version>${project.version}</version>\r
+         </dependency>\r
 +        <dependency>\r
 +            <groupId>org.collectionspace.services</groupId>\r
 +            <artifactId>org.collectionspace.services.concept.service</artifactId>\r
 +            <version>${project.version}</version>\r
 +        </dependency>\r
          <dependency>\r
              <groupId>org.collectionspace.services</groupId>\r
              <artifactId>org.collectionspace.services.taxonomy.service</artifactId>\r

diff --cc services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
index 9c9a929377c40d7608fa6914d244b4e4d8965dcb,75c9713bb28a60d3b4aee5e0cec9923449b7e2e8..76194865a5384c3b56c2be91d9b3cdd82a6647b3
--- 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
@@@ -36,7 -36,7 +36,8 @@@ import org.collectionspace.services.obj
  import org.collectionspace.services.batch.BatchResource;
  import org.collectionspace.services.imports.ImportsResource;
  import org.collectionspace.services.location.LocationAuthorityResource;
+ import org.collectionspace.services.place.PlaceAuthorityResource;
 +import org.collectionspace.services.concept.ConceptAuthorityResource;
  import org.collectionspace.services.taxonomy.TaxonomyAuthorityResource;
  import org.collectionspace.services.movement.MovementResource;
  import org.collectionspace.services.relation.RelationResource;
@@@ -105,8 -105,8 +106,9 @@@ public class CollectionSpaceJaxRsApplic
          addResourceToMapAndSingletons(new PersonAuthorityResource());
          addResourceToMapAndSingletons(new OrgAuthorityResource());
          addResourceToMapAndSingletons(new LocationAuthorityResource());
 +        addResourceToMapAndSingletons(new ConceptAuthorityResource());
          addResourceToMapAndSingletons(new TaxonomyAuthorityResource());
+         addResourceToMapAndSingletons(new PlaceAuthorityResource());
          addResourceToMapAndSingletons(new AcquisitionResource());
          addResourceToMapAndSingletons(new ContactResource());
          addResourceToMapAndSingletons(new CollectionObjectResource());

diff --cc services/build.xml
index 7f7cd7dbff7b94690887de82c482e0163dc88877,0abb9c54cc6e606c51f230fb2dcba0090fe91e4e..c3b2d71db54dd364c6331a07ff934db467999fa7
--- 1/services/build.xml
--- 2/services/build.xml
+++ b/services/build.xml
@@@ -167,7 -167,7 +167,8 @@@
          <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
+         <ant antfile="place/build.xml" target="deploy" inheritAll="false"/>\r
 +        <ant antfile="concept/build.xml" target="deploy" inheritAll="false"/>\r
          <ant antfile="taxonomy/build.xml" target="deploy" inheritAll="false"/>\r
          <ant antfile="media/build.xml" target="deploy" inheritAll="false"/>\r
          <ant antfile="movement/build.xml" target="deploy" inheritAll="false"/>\r
@@@ -192,7 -192,7 +193,8 @@@
          <ant antfile="dimension/build.xml" target="undeploy" inheritAll="false"/>\r
          <ant antfile="acquisition/build.xml" target="undeploy" inheritAll="false"/>\r
          <ant antfile="taxonomy/build.xml" target="undeploy" inheritAll="false"/>\r
 +        <ant antfile="concept/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="objectexit/build.xml" target="undeploy" inheritAll="false"/>\r
          <ant antfile="batch/build.xml" target="undeploy" inheritAll="false"/>\r
@@@ -243,7 -243,7 +245,8 @@@
          <ant antfile="loanin/build.xml" target="dist" inheritAll="false"/>\r
          <ant antfile="loanout/build.xml" target="dist" inheritAll="false"/>\r
          <ant antfile="location/build.xml" target="dist" inheritAll="false"/>\r
+         <ant antfile="place/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="objectexit/build.xml" target="dist" inheritAll="false"/>\r
          <ant antfile="batch/build.xml" target="dist" inheritAll="false"/>\r

diff --cc services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
Simple merge

diff --cc services/pom.xml
index d0ead7dde40bbf14c7456ef59ad1fefffeb4c1a1,fee7fedbe57b3fb7061df13449893572580723e8..b4b7f8b3130e3ad27b2d0b1bc0745ec22d3a0e18
--- 1/services/pom.xml
--- 2/services/pom.xml
+++ b/services/pom.xml
@@@ -59,7 -59,7 +59,8 @@@
          <module>batch</module>
          <module>imports</module>
          <module>location</module>
-                               <module>concept</module>
+         <module>place</module>
++        <module>concept</module>
          <module>taxonomy</module>
          <module>movement</module>
          <module>report</module>

diff --cc services/relation/service/pom.xml
Simple merge

diff --cc services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java
index 9a5c0a6671271fb312694b2f238d9a3525e1d77f,ebd2323fcf8cdab4a5582906b5a35f25944afff4..ee2f6ff3c547ea7656813ecfba72f953f35a6241
--- 1/services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java
--- 2/services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java
+++ b/services/relation/service/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java
@@@ -53,7 -53,7 +53,8 @@@ import org.collectionspace.services.cli
  import org.collectionspace.services.client.OrgAuthorityClient;
  import org.collectionspace.services.client.LocationAuthorityClient;
  import org.collectionspace.services.client.TaxonomyAuthorityClient;
+ import org.collectionspace.services.client.PlaceAuthorityClient;
 +import org.collectionspace.services.client.ConceptAuthorityClient;
  
  import org.collectionspace.services.common.document.DocumentWrapper;
  import org.collectionspace.services.jaxb.AbstractCommonList;
@@@ -408,8 -408,8 +409,10 @@@ public class RelationDocumentModelHandl
                        common_schema = LocationAuthorityClient.SERVICE_ITEM_COMMON_PART_NAME;
                else if(docType.startsWith("Taxon"))
                        common_schema = TaxonomyAuthorityClient.SERVICE_ITEM_COMMON_PART_NAME;
+               else if(docType.startsWith("Placeitem"))
+                       common_schema = PlaceAuthorityClient.SERVICE_ITEM_COMMON_PART_NAME;
 +              else if(docType.startsWith("Conceptitem"))
 +                      common_schema = ConceptAuthorityClient.SERVICE_ITEM_COMMON_PART_NAME;
                //else leave it null.
        }
        return common_schema;