CSPACE-5678-D: Removed Note service. Added XMLMerge delta file for App-Unified confi...

diff --git a/pom.xml b/pom.xml
index fdd641de368fb75c401aeffa7399897d015113a8..a6391e985eb1435452941542af5b17056c43d453 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -30,14 +30,14 @@
 \r
        <distributionManagement>\r
                <repository>\r
-                       <id>libs-releases-local</id>\r
-                       <name>libs-releases-local</name>\r
-                       <url>http://source.collectionspace.org:8081/artifactory/libs-releases-local</url>\r
+                       <id>libs-release-local</id>\r
+                       <name>libs-release-local</name>\r
+                       <url>http://source.collectionspace.org:8081/artifactory/libs-release-local</url>\r
                </repository>\r
                <snapshotRepository>\r
-                       <id>libs-snapshots-local</id>\r
-                       <name>libs-snapshots-local</name>\r
-                       <url>http://source.collectionspace.org:8081/artifactory/libs-snapshots-local</url>\r
+                       <id>libs-snapshot-local</id>\r
+                       <name>libs-snapshot-local</name>\r
+                       <url>http://source.collectionspace.org:8081/artifactory/libs-snapshot-local</url>\r
                </snapshotRepository>\r
        </distributionManagement>\r
 \r
@@ -56,9 +56,9 @@
                        </snapshots>\r
                </repository>\r
                <repository>\r
-                       <id>libs-releases-local</id>\r
-                       <name>libs-releases-local</name>\r
-                       <url>http://source.collectionspace.org:8081/artifactory/libs-releases-local</url>\r
+                       <id>libs-release-local</id>\r
+                       <name>libs-release-local</name>\r
+                       <url>http://source.collectionspace.org:8081/artifactory/libs-release-local</url>\r
                        <snapshots>\r
                                <enabled>false</enabled>\r
                        </snapshots>\r

diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml
index 4e0f90ee61863004b8d2a5b6886f8f8650b80cef..ad0ce694fa1a70c21ff63b7e6c1709f587e4f65b 100644 (file)
--- a/services/JaxRsServiceProvider/pom.xml
+++ b/services/JaxRsServiceProvider/pom.xml
@@ -114,11 +114,6 @@
             <artifactId>org.collectionspace.services.collectionobject.service</artifactId>\r
             <version>${project.version}</version>\r
         </dependency>\r
-        <dependency>\r
-            <groupId>org.collectionspace.services</groupId>\r
-            <artifactId>org.collectionspace.services.note.service</artifactId>\r
-            <version>${project.version}</version>\r
-        </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.id.service</artifactId>\r

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 f2e3aca030ec4b7b9752ae5998368425913923d7..f1070d7dab2ad796dd73ebfed751f2b20224fa50 100644 (file)
--- 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 (file)
index 0000000..cac352b
--- /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 d2a2348cd122b5283bf88f42186e91a30da12612..1e989abdd0f05c47c2a044b701ffb6cf39ffc991 100644 (file)
--- 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 40eb15a22bc3cb33d02a82772d2db35f1e85d06d..002b92919fff5228ba0c837887d8d33b101a2ff3 100644 (file)
--- 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 bd71def29ac32b23e01d8dbf6b2cd111bdba3fa7..4d38d277a1a9a51576a97f65fe6644a40e54ebf5 100644 (file)
--- 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 -->