From: Aron Roberts Date: Thu, 16 Jun 2011 02:33:20 +0000 (+0000) Subject: CSPACE-4081: Switched tenant 1 to core.collectionspace.org, from collectionspace... X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=095e41736e8ed97fcc9479db4975c79aca52f490;p=tmp%2Fjakarta-migration.git CSPACE-4081: Switched tenant 1 to core.collectionspace.org, from collectionspace.org; switched tenant 2 to lifesci.colletionspace.org, from hearstmuseum.berkeley.edu, to match changes in the App and UI layers. lifesci tenant retains an extra collectionobjects_naturalhistory extension schema part for Cataloging / CollectionObject records, from its previous incarnation as the hearstmuseum tenant. --- diff --git a/services/client/src/main/resources/collectionspace-client.properties b/services/client/src/main/resources/collectionspace-client.properties index 4adcd000a..272ccde42 100644 --- 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 cspace.auth=true # default user -cspace.user=admin@collectionspace.org -#cspace.user=test-pahma +cspace.user=admin@core.collectionspace.org +#cspace.user=admin@lifesci.collectionspace.org cspace.password=Administrator # default tenant cspace.tenant=1 # the tenantID of the numbered tenant: -cspace.tenantID=collectionspace.org +cspace.tenantID=core.collectionspace.org 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 81f6e9869..ca6021a13 100644 --- 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'> - - + + 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 0bb7dd538..92491df6d 100644 --- 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'> - + - +