From: Richard Millet <remillet@berkeley.edu>
Date: Wed, 10 Jul 2013 05:28:55 +0000 (-0700)
Subject: CSPACE-5678-D: Removed Note service.  Added XMLMerge delta file for App-Unified confi... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=29e26f31946c34bd707f28b718f2d66517541d54;p=tmp%2Fjakarta-migration.git

CSPACE-5678-D: Removed Note service.  Added XMLMerge delta file for App-Unified config work.  Updated some dependency versions.
---

diff --git a/pom.xml b/pom.xml
index fdd641de3..a6391e985 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,14 +30,14 @@
 
 	<distributionManagement>
 		<repository>
-			<id>libs-releases-local</id>
-			<name>libs-releases-local</name>
-			<url>http://source.collectionspace.org:8081/artifactory/libs-releases-local</url>
+			<id>libs-release-local</id>
+			<name>libs-release-local</name>
+			<url>http://source.collectionspace.org:8081/artifactory/libs-release-local</url>
 		</repository>
 		<snapshotRepository>
-			<id>libs-snapshots-local</id>
-			<name>libs-snapshots-local</name>
-			<url>http://source.collectionspace.org:8081/artifactory/libs-snapshots-local</url>
+			<id>libs-snapshot-local</id>
+			<name>libs-snapshot-local</name>
+			<url>http://source.collectionspace.org:8081/artifactory/libs-snapshot-local</url>
 		</snapshotRepository>
 	</distributionManagement>
 
@@ -56,9 +56,9 @@
 			</snapshots>
 		</repository>
 		<repository>
-			<id>libs-releases-local</id>
-			<name>libs-releases-local</name>
-			<url>http://source.collectionspace.org:8081/artifactory/libs-releases-local</url>
+			<id>libs-release-local</id>
+			<name>libs-release-local</name>
+			<url>http://source.collectionspace.org:8081/artifactory/libs-release-local</url>
 			<snapshots>
 				<enabled>false</enabled>
 			</snapshots>
diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml
index 4e0f90ee6..ad0ce694f 100644
--- a/services/JaxRsServiceProvider/pom.xml
+++ b/services/JaxRsServiceProvider/pom.xml
@@ -114,11 +114,6 @@
             <artifactId>org.collectionspace.services.collectionobject.service</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.collectionspace.services</groupId>
-            <artifactId>org.collectionspace.services.note.service</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.id.service</artifactId>
diff --git a/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java b/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
index f2e3aca03..f1070d7da 100644
--- a/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
+++ b/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
@@ -28,7 +28,6 @@ import org.collectionspace.services.blob.BlobResource;
 import org.collectionspace.services.collectionobject.CollectionObjectResource;
 import org.collectionspace.services.id.IDResource;
 import org.collectionspace.services.media.MediaResource;
-import org.collectionspace.services.note.NoteResource;
 import org.collectionspace.services.group.GroupResource;
 import org.collectionspace.services.intake.IntakeResource;
 import org.collectionspace.services.loanin.LoaninResource;
@@ -121,7 +120,6 @@ public class CollectionSpaceJaxRsApplication extends Application
         addResourceToMapAndSingletons(new IntakeResource());
         addResourceToMapAndSingletons(new DimensionResource());
         addResourceToMapAndSingletons(new RelationResource());
-        addResourceToMapAndSingletons(new NoteResource());
         addResourceToMapAndSingletons(new LoaninResource());
         addResourceToMapAndSingletons(new LoanoutResource());
         addResourceToMapAndSingletons(new ObjectExitResource());
diff --git a/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto-unified.xml b/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto-unified.xml
new file mode 100644
index 000000000..cac352b90
--- /dev/null
+++ b/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto-unified.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<tenant:TenantBindingConfig
+	xmlns:merge='http://xmlmerge.el4j.elca.ch'
+	xmlns:tenant='http://collectionspace.org/services/config/tenant'>
+	    	 
+    <tenant:tenantBinding id="100" name="core.collectionspace.org" displayName="CollectionSpace Core Demo Tenant" version="0.1">
+        <tenant:repositoryDomain name="default-domain" storageName="core-domain" repositoryClient="nuxeo-java" />
+    </tenant:tenantBinding>
+	    	       
+</tenant:TenantBindingConfig>
diff --git a/services/concept/service/pom.xml b/services/concept/service/pom.xml
index d2a2348cd..1e989abdd 100644
--- a/services/concept/service/pom.xml
+++ b/services/concept/service/pom.xml
@@ -57,7 +57,6 @@
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
-            <version>5.6</version>
         </dependency>
         
         <!-- apache -->
diff --git a/services/id/service/pom.xml b/services/id/service/pom.xml
index 40eb15a22..002b92919 100644
--- a/services/id/service/pom.xml
+++ b/services/id/service/pom.xml
@@ -66,7 +66,7 @@
     <dependency>
       <groupId>com.thoughtworks.xstream</groupId>
       <artifactId>xstream</artifactId>
-      <version>1.3.1</version>
+      <version>1.4.2</version>
     </dependency>
 
   </dependencies>
diff --git a/services/place/service/pom.xml b/services/place/service/pom.xml
index bd71def29..4d38d277a 100644
--- a/services/place/service/pom.xml
+++ b/services/place/service/pom.xml
@@ -53,7 +53,6 @@
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
-            <version>5.6</version>
         </dependency>
         
         <!-- apache -->