From: Ray Lee <rhlee@berkeley.edu>
Date: Tue, 20 Mar 2012 20:50:15 +0000 (-0700)
Subject: Merge branch 'master' into concept
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=5169b06ecaa33fc0665b75bdd082339e0dcb9e97;p=tmp%2Fjakarta-migration.git

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
---

5169b06ecaa33fc0665b75bdd082339e0dcb9e97
diff --cc services/JaxRsServiceProvider/pom.xml
index e857fcf36,1f0ee5888..93f0b18e2
--- a/services/JaxRsServiceProvider/pom.xml
+++ b/services/JaxRsServiceProvider/pom.xml
@@@ -172,11 -172,11 +172,16 @@@
              <artifactId>org.collectionspace.services.location.service</artifactId>
              <version>${project.version}</version>
          </dependency>
+         <dependency>
+             <groupId>org.collectionspace.services</groupId>
+             <artifactId>org.collectionspace.services.place.service</artifactId>
+             <version>${project.version}</version>
+         </dependency>
 +        <dependency>
 +            <groupId>org.collectionspace.services</groupId>
 +            <artifactId>org.collectionspace.services.concept.service</artifactId>
 +            <version>${project.version}</version>
 +        </dependency>
          <dependency>
              <groupId>org.collectionspace.services</groupId>
              <artifactId>org.collectionspace.services.taxonomy.service</artifactId>
diff --cc services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
index 9c9a92937,75c9713bb..76194865a
--- a/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 7f7cd7dbf,0abb9c54c..c3b2d71db
--- a/services/build.xml
+++ b/services/build.xml
@@@ -167,7 -167,7 +167,8 @@@
          <ant antfile="objectexit/build.xml" target="deploy" inheritAll="false"/>
          <ant antfile="batch/build.xml" target="deploy" inheritAll="false"/>
          <ant antfile="location/build.xml" target="deploy" inheritAll="false"/>
+         <ant antfile="place/build.xml" target="deploy" inheritAll="false"/>
 +        <ant antfile="concept/build.xml" target="deploy" inheritAll="false"/>
          <ant antfile="taxonomy/build.xml" target="deploy" inheritAll="false"/>
          <ant antfile="media/build.xml" target="deploy" inheritAll="false"/>
          <ant antfile="movement/build.xml" target="deploy" inheritAll="false"/>
@@@ -192,7 -192,7 +193,8 @@@
          <ant antfile="dimension/build.xml" target="undeploy" inheritAll="false"/>
          <ant antfile="acquisition/build.xml" target="undeploy" inheritAll="false"/>
          <ant antfile="taxonomy/build.xml" target="undeploy" inheritAll="false"/>
 +        <ant antfile="concept/build.xml" target="undeploy" inheritAll="false"/>
+         <ant antfile="place/build.xml" target="undeploy" inheritAll="false"/>
          <ant antfile="location/build.xml" target="undeploy" inheritAll="false"/>
          <ant antfile="objectexit/build.xml" target="undeploy" inheritAll="false"/>
          <ant antfile="batch/build.xml" target="undeploy" inheritAll="false"/>
@@@ -243,7 -243,7 +245,8 @@@
          <ant antfile="loanin/build.xml" target="dist" inheritAll="false"/>
          <ant antfile="loanout/build.xml" target="dist" inheritAll="false"/>
          <ant antfile="location/build.xml" target="dist" inheritAll="false"/>
+         <ant antfile="place/build.xml" target="dist" inheritAll="false"/>
 +        <ant antfile="concept/build.xml" target="dist" inheritAll="false"/>
          <ant antfile="taxonomy/build.xml" target="dist" inheritAll="false"/>
          <ant antfile="objectexit/build.xml" target="dist" inheritAll="false"/>
          <ant antfile="batch/build.xml" target="dist" inheritAll="false"/>
diff --cc services/pom.xml
index d0ead7dde,fee7fedbe..b4b7f8b31
--- a/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/src/main/java/org/collectionspace/services/relation/nuxeo/RelationDocumentModelHandler.java
index 9a5c0a667,ebd2323fc..ee2f6ff3c
--- a/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;