From: Patrick Schmitz Date: Tue, 19 Jul 2011 17:31:06 +0000 (+0000) Subject: CSPACE-4244. Added description and source fields to schema for Vocabulary, PersonAuth... X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=9bfafac18960bb02c10b5d46687005fed9148dcf;p=tmp%2Fjakarta-migration.git CSPACE-4244. Added description and source fields to schema for Vocabulary, PersonAuthority, OrgAuthority, LocationAuthority, and TaxonomicAuthority. Added description, source and sourcePage fields to schemas for each of the items for these respective authorities. Added simple tests for the various payloads. --- diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/hierarchy/1-authority.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/hierarchy/1-authority.xml index e59d787d3..e35643175 100644 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/hierarchy/1-authority.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/hierarchy/1-authority.xml @@ -5,6 +5,8 @@ ${shortIdentifier} urn:cspace:org.collectionspace.demo:locationauthority:name(${shortIdentifier})'${displayName}' LocationAuthority + This is a test authority + Some mythical book diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/hierarchy/2-item.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/hierarchy/2-item.xml index b30f6ed68..2432caa2f 100644 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/hierarchy/2-item.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/location/hierarchy/2-item.xml @@ -17,6 +17,9 @@ Only right-thinkers may see
123 Main Street, Anytown USA
Shelf + This is a test Authority item + Some mythical book + Let's say page 39 diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/organization/organizations_common.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/organization/organizations_common.xml index addcdeb4d..1e12090bc 100755 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/organization/organizations_common.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/organization/organizations_common.xml @@ -25,6 +25,9 @@ xmlns:ns3="http://collectionspace.org/services/jaxb"> My second group My third group + This is a test Authority item + Some mythical book + Let's say page 39 diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/organization/organizations_ucb.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/organization/organizations_ucb.xml index 15d1ea6c3..df7ba5f88 100644 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/organization/organizations_ucb.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/organization/organizations_ucb.xml @@ -11,6 +11,9 @@ urn:cspace:org.collectionspace.demo:orgauthority:name(testorgauth):organization:name(ucberkeleyist)'UCB IST' + This is a test Authority item + Some mythical book + Let's say page 39 diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/organization/orgauthorities_common.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/organization/orgauthorities_common.xml index fb559baca..eebc48d9f 100755 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/organization/orgauthorities_common.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/organization/orgauthorities_common.xml @@ -6,5 +6,7 @@ xmlns:ns3="http://collectionspace.org/services/jaxb"> TestOrgAuth-1288047801161 urn:cspace:org.collectionspace.demo:orgauthority:name(1288047801161)'TestOrgAuth-1288047801161' OrgAuthority + This is a test authority + Some mythical book diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/organization/orgauthorities_testorgauth.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/organization/orgauthorities_testorgauth.xml index 864e8a81b..6cdaf95be 100644 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/organization/orgauthorities_testorgauth.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/organization/orgauthorities_testorgauth.xml @@ -6,5 +6,7 @@ xmlns:ns3="http://collectionspace.org/services/jaxb"> Test Org Authority urn:cspace:org.collectionspace.demo:orgauthority:name(testorgauth)'Test Org Authority' OrgAuthority + This is a test authority + Some mythical book diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/person_pschmitz.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/person_pschmitz.xml index e0f75dcff..585a15d30 100644 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/person_pschmitz.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/person_pschmitz.xml @@ -8,5 +8,8 @@ Patrick Schmitz Patrick Schmitz, Berkeley Technical Lead for CollectionSpace + This is a test PersonAuthority item + Some mythical book + Let's say page 39 diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/personauthorities_common.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/personauthorities_common.xml index ad7de6efa..8a108d6f3 100755 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/personauthorities_common.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/personauthorities_common.xml @@ -5,6 +5,8 @@ ${authShortIdentifier} urn:cspace:org.collectionspace.demo:personauthority:name(${authShortIdentifier})'${authShortIdentifier}' PersonAuthority + This is a test authority + Some mythical book diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/personauthorities_testpersonauth.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/personauthorities_testpersonauth.xml index 5fe43215b..e3792f9bf 100644 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/personauthorities_testpersonauth.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/personauthorities_testpersonauth.xml @@ -5,6 +5,8 @@ Test Person Authority urn:cspace:org.collectionspace.demo:personauthority:name(testpersonauth)'Test Person Authority' PersonAuthority + This is a test authority + Some mythical book diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common.xml index bd2834b78..f68b396ab 100755 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/person/persons_common.xml @@ -20,7 +20,10 @@ male born Marion Robert Morrison and betterknown by his stage name John Wayne, was an American film actor, director and producer. He epitomized rugged masculinity and has become an enduring American icon. He is famous for his distinctive voice, walk and height. He was also known for his conservative political views and his support in the 1950s for anti-communist positions. - + This is a test Authority item + Some mythical book + Let's say page 39 + diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/vocabulary/1-vocab.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/vocabulary/1-vocab.xml index a53be47d1..01d878d63 100644 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/vocabulary/1-vocab.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/vocabulary/1-vocab.xml @@ -7,6 +7,8 @@ urn:cspace:org.collectionspace.demo:vocabulary:name(TestOrderVocab)'TestOrder Vocabulary' enum - + This is a test vocabulary + Some mythical book + diff --git a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/vocabulary/2-item.xml b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/vocabulary/2-item.xml index e1a48f860..2d61b5003 100644 --- a/services/IntegrationTests/src/test/resources/test-data/xmlreplay/vocabulary/2-item.xml +++ b/services/IntegrationTests/src/test/resources/test-data/xmlreplay/vocabulary/2-item.xml @@ -6,6 +6,9 @@ ${itemID} urn:cspace:org.collectionspace.demo:vocabulary:name(TestOrderVocab):item:name(${itemID})'${displayName}' ${order} + This is a test vocabulary item + Some mythical book + The page should match the order:${order} diff --git a/services/location/3rdparty/nuxeo-platform-cs-location/src/main/resources/schemas/locationauthorities_common.xsd b/services/location/3rdparty/nuxeo-platform-cs-location/src/main/resources/schemas/locationauthorities_common.xsd index a307bf88f..ab5c28898 100644 --- a/services/location/3rdparty/nuxeo-platform-cs-location/src/main/resources/schemas/locationauthorities_common.xsd +++ b/services/location/3rdparty/nuxeo-platform-cs-location/src/main/resources/schemas/locationauthorities_common.xsd @@ -27,6 +27,8 @@ + + diff --git a/services/location/3rdparty/nuxeo-platform-cs-location/src/main/resources/schemas/locations_common.xsd b/services/location/3rdparty/nuxeo-platform-cs-location/src/main/resources/schemas/locations_common.xsd index 6028c10ec..738bf80ab 100644 --- a/services/location/3rdparty/nuxeo-platform-cs-location/src/main/resources/schemas/locations_common.xsd +++ b/services/location/3rdparty/nuxeo-platform-cs-location/src/main/resources/schemas/locations_common.xsd @@ -31,11 +31,14 @@ - + + + + diff --git a/services/location/jaxb/src/main/resources/location_common.xsd b/services/location/jaxb/src/main/resources/location_common.xsd index a21d01fa1..3131b7102 100644 --- a/services/location/jaxb/src/main/resources/location_common.xsd +++ b/services/location/jaxb/src/main/resources/location_common.xsd @@ -21,20 +21,23 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --git a/services/location/jaxb/src/main/resources/locationauthority_common.xsd b/services/location/jaxb/src/main/resources/locationauthority_common.xsd index b9e4929fc..107df3e0c 100644 --- a/services/location/jaxb/src/main/resources/locationauthority_common.xsd +++ b/services/location/jaxb/src/main/resources/locationauthority_common.xsd @@ -39,7 +39,8 @@ - + + diff --git a/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/schemas/organizations_common.xsd b/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/schemas/organizations_common.xsd index 741fe42ce..b02a17675 100644 --- a/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/schemas/organizations_common.xsd +++ b/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/schemas/organizations_common.xsd @@ -32,6 +32,9 @@ + + + diff --git a/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/schemas/orgauthorities_common.xsd b/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/schemas/orgauthorities_common.xsd index d8e3cbda9..d81ef2603 100644 --- a/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/schemas/orgauthorities_common.xsd +++ b/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/schemas/orgauthorities_common.xsd @@ -27,6 +27,8 @@ + + diff --git a/services/organization/jaxb/src/main/resources/organization_common.xsd b/services/organization/jaxb/src/main/resources/organization_common.xsd index ccc8c865c..60d378431 100644 --- a/services/organization/jaxb/src/main/resources/organization_common.xsd +++ b/services/organization/jaxb/src/main/resources/organization_common.xsd @@ -28,6 +28,9 @@ + + + diff --git a/services/organization/jaxb/src/main/resources/orgauthority_common.xsd b/services/organization/jaxb/src/main/resources/orgauthority_common.xsd index d727e8f60..edc7a21cc 100644 --- a/services/organization/jaxb/src/main/resources/orgauthority_common.xsd +++ b/services/organization/jaxb/src/main/resources/orgauthority_common.xsd @@ -38,6 +38,8 @@ + + diff --git a/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/schemas/personauthorities_common.xsd b/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/schemas/personauthorities_common.xsd index d146c213d..9428c6e88 100644 --- a/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/schemas/personauthorities_common.xsd +++ b/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/schemas/personauthorities_common.xsd @@ -27,6 +27,8 @@ + + diff --git a/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/schemas/persons_common.xsd b/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/schemas/persons_common.xsd index 802d28bec..dbca58f84 100644 --- a/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/schemas/persons_common.xsd +++ b/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/schemas/persons_common.xsd @@ -30,6 +30,9 @@ + + + diff --git a/services/person/jaxb/src/main/resources/person_common.xsd b/services/person/jaxb/src/main/resources/person_common.xsd index 3902d7f0c..5a932a812 100644 --- a/services/person/jaxb/src/main/resources/person_common.xsd +++ b/services/person/jaxb/src/main/resources/person_common.xsd @@ -40,6 +40,9 @@ + + + diff --git a/services/person/jaxb/src/main/resources/personauthority_common.xsd b/services/person/jaxb/src/main/resources/personauthority_common.xsd index cbd5b1359..7e942a027 100644 --- a/services/person/jaxb/src/main/resources/personauthority_common.xsd +++ b/services/person/jaxb/src/main/resources/personauthority_common.xsd @@ -39,7 +39,8 @@ - + + diff --git a/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/src/main/resources/schemas/taxon_common.xsd b/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/src/main/resources/schemas/taxon_common.xsd index 905c74b53..6fb5f1bb8 100644 --- a/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/src/main/resources/schemas/taxon_common.xsd +++ b/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/src/main/resources/schemas/taxon_common.xsd @@ -30,6 +30,10 @@ + + + + diff --git a/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/src/main/resources/schemas/taxonomyauthority_common.xsd b/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/src/main/resources/schemas/taxonomyauthority_common.xsd index 0a9b6fa9a..01033f7e2 100644 --- a/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/src/main/resources/schemas/taxonomyauthority_common.xsd +++ b/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/src/main/resources/schemas/taxonomyauthority_common.xsd @@ -27,6 +27,8 @@ + + diff --git a/services/taxonomy/jaxb/src/main/resources/taxon_common.xsd b/services/taxonomy/jaxb/src/main/resources/taxon_common.xsd index 03c4ae4f2..e435812c8 100644 --- a/services/taxonomy/jaxb/src/main/resources/taxon_common.xsd +++ b/services/taxonomy/jaxb/src/main/resources/taxon_common.xsd @@ -29,6 +29,9 @@ + + + diff --git a/services/taxonomy/jaxb/src/main/resources/taxonomyauthority_common.xsd b/services/taxonomy/jaxb/src/main/resources/taxonomyauthority_common.xsd index eedbdefb8..36d879813 100644 --- a/services/taxonomy/jaxb/src/main/resources/taxonomyauthority_common.xsd +++ b/services/taxonomy/jaxb/src/main/resources/taxonomyauthority_common.xsd @@ -39,7 +39,8 @@ - + + diff --git a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/schemas/vocabularies_common.xsd b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/schemas/vocabularies_common.xsd index 75d0dd21d..f6e24bf42 100644 --- a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/schemas/vocabularies_common.xsd +++ b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/schemas/vocabularies_common.xsd @@ -27,6 +27,8 @@ + + diff --git a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/schemas/vocabularyitems_common.xsd b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/schemas/vocabularyitems_common.xsd index a38f369e9..9fd13e680 100644 --- a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/schemas/vocabularyitems_common.xsd +++ b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/schemas/vocabularyitems_common.xsd @@ -20,13 +20,16 @@ > - - - - - - - - + + + + + + + + + + + diff --git a/services/vocabulary/jaxb/src/main/resources/vocabulary_common.xsd b/services/vocabulary/jaxb/src/main/resources/vocabulary_common.xsd index b9afa8aa0..4e17b1c0e 100644 --- a/services/vocabulary/jaxb/src/main/resources/vocabulary_common.xsd +++ b/services/vocabulary/jaxb/src/main/resources/vocabulary_common.xsd @@ -39,6 +39,8 @@ + + diff --git a/services/vocabulary/jaxb/src/main/resources/vocabularyitem_common.xsd b/services/vocabulary/jaxb/src/main/resources/vocabularyitem_common.xsd index dca9978f2..27727365f 100644 --- a/services/vocabulary/jaxb/src/main/resources/vocabularyitem_common.xsd +++ b/services/vocabulary/jaxb/src/main/resources/vocabularyitem_common.xsd @@ -27,6 +27,9 @@ + + +