From 719ccbc689c4ddd7772afe0298c2840c77003d2e Mon Sep 17 00:00:00 2001 From: Aron Roberts Date: Wed, 4 Jan 2012 02:02:19 +0000 Subject: [PATCH] CSPACE-3931,CSPACE-4490: Cleaned up / removed vestigial top-level otherNumber, otherNumberType fields in services schema for Cataloging / CollectionObject. (These were long ago replaced by a repeatable otherNumberList repeatable group, but were retained until now for backwards compatibility.) Also removed the vestigial remNumber field in that same record type. --- .../config/default-repository-config.xml | 6 ----- .../config/default-repository-config.xml | 6 ----- .../5.5-RC1/config/default-repo-config.xml | 7 ----- .../test-data/xmlreplay/batch/collObj1.xml | 2 -- .../collectionobject/nh-collectionobject.xml | 5 ---- .../collectionobject/repfield_whitesp2.xml | 2 -- .../collectionobject/repfield_whitesp3.xml | 2 -- .../collectionobject/repfield_whitesp4.xml | 2 -- .../collectionobject/testCambridge-update.xml | 2 -- .../collectionobject/testCambridge.xml | 2 -- .../resources/OSGI-INF/layouts-contrib.xml | 27 ------------------- .../schemas/collectionobjects_common.xsd | 9 +------ .../test/CollectionObjectServiceTest.java | 12 +-------- .../resources/test-data/repfield_whitesp1.xml | 2 -- .../resources/test-data/repfield_whitesp2.xml | 2 -- .../resources/test-data/repfield_whitesp3.xml | 2 -- .../resources/test-data/repfield_whitesp4.xml | 2 -- .../services/CollectionObjectJAXBSchema.java | 1 - .../resources/collectionobjects_common.xsd | 7 ----- .../tenants/tenant-bindings-proto.xml | 6 ++--- .../services/common/XmlSaxFragmenter.java | 11 +++----- .../common/document/DocumentUtils.java | 9 ++++--- .../test-data/XmlSaxFragmenter-sample.xml | 5 +--- .../src/main/resources/permissions.xsd | 2 +- .../services/id/IDServiceNuxeoImpl.java | 2 -- .../requests/collectionobject-request.xml | 6 ----- 26 files changed, 15 insertions(+), 126 deletions(-) diff --git a/3rdparty/nuxeo/nuxeo-database-templates/mysql/collectionspace_mysql/config/default-repository-config.xml b/3rdparty/nuxeo/nuxeo-database-templates/mysql/collectionspace_mysql/config/default-repository-config.xml index 094358a94..a5895d3c8 100644 --- a/3rdparty/nuxeo/nuxeo-database-templates/mysql/collectionspace_mysql/config/default-repository-config.xml +++ b/3rdparty/nuxeo/nuxeo-database-templates/mysql/collectionspace_mysql/config/default-repository-config.xml @@ -42,10 +42,6 @@ - - - - collectionobjects_common:otherNumber numberValue @@ -173,8 +169,6 @@ --> collectionobjects_common:objectNumber - collectionobjects_common:otherNumber - collectionobjects_common:otherNumberType collectionobjects_common:numberOfObjects collectionobjects_common:collection collectionobjects_common:recordStatus diff --git a/3rdparty/nuxeo/nuxeo-database-templates/postgresql/collectionspace_postgresql/config/default-repository-config.xml b/3rdparty/nuxeo/nuxeo-database-templates/postgresql/collectionspace_postgresql/config/default-repository-config.xml index 86848ad64..cfb6da7ee 100644 --- a/3rdparty/nuxeo/nuxeo-database-templates/postgresql/collectionspace_postgresql/config/default-repository-config.xml +++ b/3rdparty/nuxeo/nuxeo-database-templates/postgresql/collectionspace_postgresql/config/default-repository-config.xml @@ -42,10 +42,6 @@ - - - - collectionobjects_common:otherNumber numberValue @@ -173,8 +169,6 @@ --> collectionobjects_common:objectNumber - collectionobjects_common:otherNumber - collectionobjects_common:otherNumberType collectionobjects_common:numberOfObjects collectionobjects_common:collection collectionobjects_common:recordStatus diff --git a/3rdparty/nuxeo/nuxeo-server/5.5-RC1/config/default-repo-config.xml b/3rdparty/nuxeo/nuxeo-server/5.5-RC1/config/default-repo-config.xml index 76a962945..82eaf4c3c 100644 --- a/3rdparty/nuxeo/nuxeo-server/5.5-RC1/config/default-repo-config.xml +++ b/3rdparty/nuxeo/nuxeo-server/5.5-RC1/config/default-repo-config.xml @@ -53,11 +53,6 @@ - - - collectionobjects_common:otherNumber - numberValue @@ -200,8 +195,6 @@ require verification to match actual values. --> collectionobjects_common:objectNumber - collectionobjects_common:otherNumber - collectionobjects_common:otherNumberType collectionobjects_common:numberOfObjects collectionobjects_common:collection collectionobjects_common:recordStatus diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/batch/collObj1.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/batch/collObj1.xml index 3d16f56d5..b3e87411c 100644 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/batch/collObj1.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/batch/collObj1.xml @@ -2,8 +2,6 @@ objectNumber - XXX - otherNumberType diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/nh-collectionobject.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/nh-collectionobject.xml index c8342a85a..e11b3e34b 100755 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/nh-collectionobject.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/nh-collectionobject.xml @@ -1,9 +1,5 @@ - -2271966-1285644709415 -remNumber - objectNumber-1285644709375 @@ -15,7 +11,6 @@ ipaddress -urn:org.walkerart.id:123 Papier mache bird cow mask with horns, painted red with black and yellow spots. Puerto Rico. ca. 8" high, 6" wide, projects 10" (with horns). Acrylic rabbit mask with wings, painted red with green and aquamarine spots. Puerto Rico. ca. 8" high, 6" wide, projects 10" (with wings). diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp2.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp2.xml index 12397ced9..8a24b2e07 100755 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp2.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp2.xml @@ -2,8 +2,6 @@ objectNumber -XXX -otherNumberType briefDescription1 briefDescription2 diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp3.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp3.xml index af570d7ff..1d6d30e5d 100755 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp3.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp3.xml @@ -2,8 +2,6 @@ objectNumber -XXX -otherNumberType briefDescription1 diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp4.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp4.xml index f7385f084..b692b2ca5 100755 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp4.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp4.xml @@ -2,8 +2,6 @@ objectNumber -XXX -otherNumberType briefDescription1 briefDescription2 diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/testCambridge-update.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/testCambridge-update.xml index 905ae0428..475c91499 100755 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/testCambridge-update.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/testCambridge-update.xml @@ -1,8 +1,6 @@ objectNumber - XXX - otherNumberType This is an UPDATEd distFeatures NEW TITLE UPDATED diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/testCambridge.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/testCambridge.xml index b20aa9b9a..6eea3b41c 100755 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/testCambridge.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/testCambridge.xml @@ -1,8 +1,6 @@ objectNumber - XXX - otherNumberType comments distFeatures diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/OSGI-INF/layouts-contrib.xml b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/OSGI-INF/layouts-contrib.xml index 752774a60..dae563686 100644 --- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/OSGI-INF/layouts-contrib.xml +++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/OSGI-INF/layouts-contrib.xml @@ -10,8 +10,6 @@ objectNumber - otherNumber - otherNumberType @@ -48,31 +46,6 @@ - - - - - true - - otherNumber - - - dataInputText - - - - - - - - true - - otherNumberType - - - dataInputText - - - - - - - @@ -507,7 +500,7 @@ - + objectNumber -XXX -otherNumberType briefDescription distFeatures numberOfObjects diff --git a/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp2.xml b/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp2.xml index 1a2186437..3dc3a28dd 100644 --- a/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp2.xml +++ b/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp2.xml @@ -2,8 +2,6 @@ objectNumber -XXX -otherNumberType briefDescription1 briefDescription2 diff --git a/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp3.xml b/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp3.xml index 5c8a81b8c..8529c5897 100644 --- a/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp3.xml +++ b/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp3.xml @@ -2,8 +2,6 @@ objectNumber -XXX -otherNumberType briefDescription1 diff --git a/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp4.xml b/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp4.xml index a83be2855..58b5b169b 100644 --- a/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp4.xml +++ b/services/collectionobject/client/src/test/resources/test-data/repfield_whitesp4.xml @@ -2,8 +2,6 @@ objectNumber -XXX -otherNumberType briefDescription1 briefDescription2 diff --git a/services/collectionobject/jaxb/src/main/java/org/collectionspace/services/CollectionObjectJAXBSchema.java b/services/collectionobject/jaxb/src/main/java/org/collectionspace/services/CollectionObjectJAXBSchema.java index b964dff0e..56774f27a 100644 --- a/services/collectionobject/jaxb/src/main/java/org/collectionspace/services/CollectionObjectJAXBSchema.java +++ b/services/collectionobject/jaxb/src/main/java/org/collectionspace/services/CollectionObjectJAXBSchema.java @@ -9,7 +9,6 @@ package org.collectionspace.services; */ public interface CollectionObjectJAXBSchema { final static String OBJECT_NUMBER = "objectNumber"; - final static String OTHER_NUMBER = "otherNumber"; final static String BRIEF_DESCRIPTION = "briefDescription"; final static String COMMENTS = "comments"; final static String DISTINGUISHING_FEATURES = "distinguishingFeatures"; diff --git a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd index c27cd2af6..7457d5e77 100644 --- a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd +++ b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd @@ -32,18 +32,11 @@ - - - - - - - diff --git a/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml b/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml index dda317c0f..982de8651 100644 --- a/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml +++ b/services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml @@ -4,6 +4,7 @@ Description: Prototype tenant bindings, specifying the default services layer configuration for a generic, out-of-the-box tenant. These prototype bindings are merged with 'delta' bindings + specifying the differences from the prototype configuration for each actual tenant, resulting in 'merged' bindings for that tenant. $LastChangedRevision$ @@ -321,9 +322,8 @@ authRef measuredPartGroupList/*/dimensionSubGroupList/*/measuredBy - - - + +