CSPACE-4081: Switched tenant 1 to core.collectionspace.org, from collectionspace...

diff --git a/services/client/src/main/resources/collectionspace-client.properties b/services/client/src/main/resources/collectionspace-client.properties
index 4adcd000af0b4156d936a66c83cafdbefa474646..272ccde42d061acc7b3c24b302432bcce6bbdb74 100644 (file)
--- a/services/client/src/main/resources/collectionspace-client.properties
+++ b/services/client/src/main/resources/collectionspace-client.properties
@@ -7,10 +7,10 @@ cspace.url=http://localhost:8180/cspace-services/
 cspace.ssl=false\r
 cspace.auth=true\r
 # default user\r
-cspace.user=admin@collectionspace.org\r
-#cspace.user=test-pahma\r
+cspace.user=admin@core.collectionspace.org\r
+#cspace.user=admin@lifesci.collectionspace.org\r
 cspace.password=Administrator\r
 # default tenant\r
 cspace.tenant=1\r
 # the tenantID of the numbered tenant:\r
-cspace.tenantID=collectionspace.org\r
+cspace.tenantID=core.collectionspace.org\r

diff --git a/services/common/src/main/cspace/config/services/tenants/collectionspace/tenant-bindings.delta.xml b/services/common/src/main/cspace/config/services/tenants/core/tenant-bindings.delta.xml
similarity index 64%
rename from services/common/src/main/cspace/config/services/tenants/collectionspace/tenant-bindings.delta.xml
rename to services/common/src/main/cspace/config/services/tenants/core/tenant-bindings.delta.xml
index 81f6e9869ae18b89b0b7be3fc69201af520ebf2d..ca6021a13fc96e4513f301a1f8138fa110047a0a 100644 (file)
--- a/services/common/src/main/cspace/config/services/tenants/collectionspace/tenant-bindings.delta.xml
+++ b/services/common/src/main/cspace/config/services/tenants/core/tenant-bindings.delta.xml
@@ -3,8 +3,8 @@
        xmlns:merge='http://xmlmerge.el4j.elca.ch'
        xmlns:tenant='http://collectionspace.org/services/common/tenant'>
                 
-    <tenant:tenantBinding id="1" name="collectionspace.org" displayName="CollectionSpace Demo" version="0.1">
-        <tenant:repositoryDomain name="default-domain" storageName="default-domain" repositoryClient="nuxeo-java" />
+    <tenant:tenantBinding id="1" 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>
                       

diff --git a/services/common/src/main/cspace/config/services/tenants/hearstmuseum/tenant-bindings.delta.xml b/services/common/src/main/cspace/config/services/tenants/lifesci/tenant-bindings.delta.xml
similarity index 85%
rename from services/common/src/main/cspace/config/services/tenants/hearstmuseum/tenant-bindings.delta.xml
rename to services/common/src/main/cspace/config/services/tenants/lifesci/tenant-bindings.delta.xml
index 0bb7dd538e961ac83f09bc06c4476e0856c8c57a..92491df6dad2cace646b0b7bee0587f447b0ce81 100644 (file)
--- a/services/common/src/main/cspace/config/services/tenants/hearstmuseum/tenant-bindings.delta.xml
+++ b/services/common/src/main/cspace/config/services/tenants/lifesci/tenant-bindings.delta.xml
@@ -3,9 +3,9 @@
        xmlns:merge='http://xmlmerge.el4j.elca.ch'
        xmlns:tenant='http://collectionspace.org/services/common/tenant'>
                 
-  <tenant:tenantBinding id="2" name="hearstmuseum.berkeley.edu" displayName="Phoebe A. Hearst Museum of Anthropology" version="0.1">
+  <tenant:tenantBinding id="2" name="lifesci.collectionspace.org" displayName="Life Sciences/Natural History Demo Tenant" version="0.1">
 
-    <tenant:repositoryDomain name="default-domain" storageName="hearst-domain" repositoryClient="nuxeo-java" />
+    <tenant:repositoryDomain name="default-domain" storageName="lifesci-domain" repositoryClient="nuxeo-java" />
        
        <tenant:serviceBindings merge:matcher="id" id="CollectionObjects">
                <service:object xmlns:service="http://collectionspace.org/services/common/service" >