CSPACE-4244. Added description and source fields to schema for Vocabulary, PersonAuth...

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 e59d787d37640fad2840a3305937f377fad5b7b2..e356431751e56a2250d520037bcb39067d8baf04 100644 (file)
--- 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>${shortIdentifier}</shortIdentifier>
     <refName>urn:cspace:org.collectionspace.demo:locationauthority:name(${shortIdentifier})'${displayName}'</refName>
     <vocabType>LocationAuthority</vocabType>
+    <description>This is a test authority</description>
+    <source>Some mythical book</source>
   </ns2:locationauthorities_common>
 </document>
 

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 b30f6ed68cae6d03d6ba3238347f40b961d5831b..2432caa2fe3d54af3d6178338281fd7f179e97e8 100644 (file)
--- 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 @@
     <accessNote>Only right-thinkers may see</accessNote>
     <address>123 Main Street, Anytown USA</address>
     <locationType>Shelf</locationType>
+    <description>This is a test Authority item</description>
+    <source>Some mythical book</source>
+               <sourcePage>Let's say page 39</sourcePage>
   </ns2:locations_common>
 </document>
 

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 addcdeb4d3528c597858964d91d1016c0781937e..1e12090bc735cfd0d3047b28b7d08363f80fd3e3 100755 (executable)
--- 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">
       <group>My second group</group>\r
       <group>My third group</group>\r
   </groups>\r
+    <description>This is a test Authority item</description>\r
+    <source>Some mythical book</source>\r
+               <sourcePage>Let's say page 39</sourcePage>\r
   \r
 </ns2:organizations_common>\r
 \r

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 15d1ea6c307350fceba8d3f6764ac8f4fd6fed68..df7ba5f885fb1319ecbf39ecca759c48f36ec16b 100644 (file)
--- 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 @@
        <subBodies>\r
                <subBody>urn:cspace:org.collectionspace.demo:orgauthority:name(testorgauth):organization:name(ucberkeleyist)'UCB IST'</subBody>\r
        </subBodies>\r
+    <description>This is a test Authority item</description>\r
+    <source>Some mythical book</source>\r
+               <sourcePage>Let's say page 39</sourcePage>\r
 </ns2:organizations_common>\r
 </document>\r
        \r

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 fb559bacaded1b39a281e681f6c3d7537d297042..eebc48d9f17837041ae493feab6d4b93118d6a03 100755 (executable)
--- 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">
   <displayName>TestOrgAuth-1288047801161</displayName>\r
   <refName>urn:cspace:org.collectionspace.demo:orgauthority:name(1288047801161)'TestOrgAuth-1288047801161'</refName>\r
   <vocabType>OrgAuthority</vocabType>\r
+    <description>This is a test authority</description>\r
+    <source>Some mythical book</source>\r
 </ns2:orgauthorities_common>\r
 \r

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 864e8a81bfaf6c929c45ebe37e26c3be328b4a23..6cdaf95befd10465d251368953426d7cde852fc3 100644 (file)
--- 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">
   <displayName>Test Org Authority</displayName>\r
   <refName>urn:cspace:org.collectionspace.demo:orgauthority:name(testorgauth)'Test Org Authority'</refName>\r
   <vocabType>OrgAuthority</vocabType>\r
+    <description>This is a test authority</description>\r
+    <source>Some mythical book</source>\r
 </ns2:orgauthorities_common>\r
 \r

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 e0f75dcff57b241103af6f75078bfa13790f8239..585a15d30a27c809da28c795db06864257d810cf 100644 (file)
--- 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 @@
        <shortDisplayName>Patrick Schmitz</shortDisplayName>\r
        <displayName>Patrick Schmitz, Berkeley</displayName>\r
        <bioNote>Technical Lead for CollectionSpace</bioNote>\r
+    <description>This is a test PersonAuthority item</description>\r
+    <source>Some mythical book</source>\r
+    <sourcePage>Let's say page 39</sourcePage>\r
   </ns2:persons_common>\r
 </document>\r

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 ad7de6efa83d5902e4ee7e577e1cc67262693f25..8a108d6f35e480b024002a37d0d8d2c05b69ce68 100755 (executable)
--- 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 @@
 <shortIdentifier>${authShortIdentifier}</shortIdentifier>\r
 <refName>urn:cspace:org.collectionspace.demo:personauthority:name(${authShortIdentifier})'${authShortIdentifier}'</refName>\r
 <vocabType>PersonAuthority</vocabType>\r
+    <description>This is a test authority</description>\r
+    <source>Some mythical book</source>\r
 </ns2:personauthorities_common>\r
 </document>\r
 \r

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 5fe43215b673aff3b00556b379833968806aed5c..e3792f9bf52c8e45d6b0e77f7e16f23e38a4dce9 100644 (file)
--- 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 @@
   <displayName>Test Person Authority</displayName>\r
   <refName>urn:cspace:org.collectionspace.demo:personauthority:name(testpersonauth)'Test Person Authority'</refName>\r
   <vocabType>PersonAuthority</vocabType>\r
+    <description>This is a test authority</description>\r
+    <source>Some mythical book</source>\r
 </ns2:personauthorities_common>\r
 </document>\r
 \r

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 bd2834b786121aa0f1b141fc88d2379c9a148aab..f68b396ab544b0fa308346f1a9a00c69d3722813 100755 (executable)
--- 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 @@
     <gender>male</gender>\r
     <bioNote>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\r
     voice, walk and height. He was also known for his conservative political views and his support in the 1950s for anti-communist positions.</bioNote>\r
-  </ns2:persons_common>\r
+    <description>This is a test Authority item</description>\r
+    <source>Some mythical book</source>\r
+               <sourcePage>Let's say page 39</sourcePage>\r
+       </ns2:persons_common>\r
 </document>\r
 \r
 \r

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 a53be47d1b448bb754a7b0662230c70340ec3399..01d878d632fe2a2fd77b7fe396202ad1ee4a76e1 100644 (file)
--- 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 @@
     <refName>
     urn:cspace:org.collectionspace.demo:vocabulary:name(TestOrderVocab)'TestOrder Vocabulary'</refName>
     <vocabType>enum</vocabType>
-  </ns3:vocabularies_common>
+    <description>This is a test vocabulary</description>
+    <source>Some mythical book</source>
+ </ns3:vocabularies_common>
 </document>
 

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 e1a48f860126ed5acff55f8beabd20b0baa95b18..2d61b5003f0c387e395aaa15e1382ec7739bafc9 100644 (file)
--- 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 @@
     <shortIdentifier>${itemID}</shortIdentifier>
     <refName>urn:cspace:org.collectionspace.demo:vocabulary:name(TestOrderVocab):item:name(${itemID})'${displayName}'</refName>
     <order>${order}</order>
+    <description>This is a test vocabulary item</description>
+    <source>Some mythical book</source>
+    <sourcePage>The page should match the order:${order}</sourcePage>
   </ns3:vocabularyitems_common>
 </document>
 

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 a307bf88fdc461270d54f62e0b7b3e33790f9247..ab5c28898353547a06c347aaf5f844964cec69c4 100644 (file)
--- 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 @@
                <xs:element name="shortIdentifier" type="xs:string"/>
                <xs:element name="refName" type="xs:string"/>
                <xs:element name="vocabType" type="xs:string"/>
+               <xs:element name="source" type="xs:string"/>
+               <xs:element name="description" type="xs:string"/>
 
 </xs:schema>
 

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 6028c10ecb0d89170934d84ebfc33345c33836d4..738bf80abe1ad858e587361e9c239782321cfcf1 100644 (file)
--- 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 @@
     <xs:element name="shortDisplayName" type="xs:string"/>
     <xs:element name="shortDisplayNameComputed" type="xs:boolean"/>
     <xs:element name="name" type="xs:string"/>
-               <xs:element name="conditionGroupList" type="conditionGroupList"/>
+    <xs:element name="conditionGroupList" type="conditionGroupList"/>
     <xs:element name="securityNote" type="xs:string"/>
     <xs:element name="accessNote" type="xs:string"/>
     <xs:element name="address" type="xs:string"/>
     <xs:element name="locationType" type="xs:string"/>
+    <xs:element name="source" type="xs:string"/>
+    <xs:element name="sourcePage" type="xs:string"/>
+    <xs:element name="description" type="xs:string"/>
 
     <xs:complexType name="conditionGroupList">
         <xs:sequence>

diff --git a/services/location/jaxb/src/main/resources/location_common.xsd b/services/location/jaxb/src/main/resources/location_common.xsd
index a21d01fa1a22c4b049226bc7f6f90dc4ef32e044..3131b71024375e6ddc4b6adbf2cd1e28eef26c0e 100644 (file)
--- a/services/location/jaxb/src/main/resources/location_common.xsd
+++ b/services/location/jaxb/src/main/resources/location_common.xsd
@@ -21,20 +21,23 @@
                 <xs:element name="csid" type="xs:string" />
                 
                 <!--  Location Information Group -->
-                                                               <xs:element name="inAuthority" type="xs:string" />
-                                                               <xs:element name="shortIdentifier" type="xs:string"/>
-                                                               <xs:element name="refName" type="xs:string"/>
-                                                               <xs:element name="termStatus" type="xs:string"/>
-                                                               <xs:element name="displayName" type="xs:string"/>
-                                                               <xs:element name="displayNameComputed" type="xs:boolean"/>
-                                                           <xs:element name="shortDisplayName" type="xs:string"/>
-                                                           <xs:element name="shortDisplayNameComputed" type="xs:boolean"/>
-                                                               <xs:element name="name" type="xs:string"/>
-                                                               <xs:element name="conditionGroupList" type="conditionGroupList"/>
-                                                               <xs:element name="securityNote" type="xs:string"/>
-                                                               <xs:element name="accessNote" type="xs:string"/>
-                                                               <xs:element name="address" type="xs:string"/>
-                                                               <xs:element name="locationType" type="xs:string"/>
+                <xs:element name="inAuthority" type="xs:string" />
+                <xs:element name="shortIdentifier" type="xs:string"/>
+                <xs:element name="refName" type="xs:string"/>
+                <xs:element name="termStatus" type="xs:string"/>
+                <xs:element name="displayName" type="xs:string"/>
+                <xs:element name="displayNameComputed" type="xs:boolean"/>
+                <xs:element name="shortDisplayName" type="xs:string"/>
+                <xs:element name="shortDisplayNameComputed" type="xs:boolean"/>
+                <xs:element name="source" type="xs:string"/>
+                <xs:element name="sourcePage" type="xs:string"/>
+                <xs:element name="description" type="xs:string"/>
+                <xs:element name="name" type="xs:string"/>
+                <xs:element name="conditionGroupList" type="conditionGroupList"/>
+                <xs:element name="securityNote" type="xs:string"/>
+                <xs:element name="accessNote" type="xs:string"/>
+                <xs:element name="address" type="xs:string"/>
+                <xs:element name="locationType" type="xs:string"/>
             </xs:sequence>
         </xs:complexType>
     </xs:element>

diff --git a/services/location/jaxb/src/main/resources/locationauthority_common.xsd b/services/location/jaxb/src/main/resources/locationauthority_common.xsd
index b9e4929fc64aa134a7060f8c90e2963f38408f33..107df3e0cf898e07754822f4c407eacd359a55b2 100644 (file)
--- a/services/location/jaxb/src/main/resources/locationauthority_common.xsd
+++ b/services/location/jaxb/src/main/resources/locationauthority_common.xsd
@@ -39,7 +39,8 @@
                                                                <xs:element name="shortIdentifier" type="xs:string"/>
                 <xs:element name="refName" type="xs:string"/>
                 <xs:element name="vocabType" type="xs:string"/>
-                
+                <xs:element name="source" type="xs:string"/>
+                <xs:element name="description" type="xs:string"/>
             </xs:sequence>
         </xs:complexType>
     </xs:element>

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 741fe42ceca25dc7b671e72b23a3462a173020b5..b02a176754978e03061d337c6e2c6207bca7df71 100644 (file)
--- 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 @@
     <xs:element name="shortDisplayName" type="xs:string"/>
     <xs:element name="shortDisplayNameComputed" type="xs:boolean"/>
     <xs:element name="mainBodyGroupList" type="mainBodyGroupList"/>
+    <xs:element name="source" type="xs:string"/>
+    <xs:element name="sourcePage" type="xs:string"/>
+    <xs:element name="description" type="xs:string"/>
 
     <xs:element name="contactNames">
         <xs:complexType>

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 d8e3cbda9fbc1974e739dd9c80f002d8e1829d8c..d81ef26039b6143796ff688ceb85307cea6b4cc2 100644 (file)
--- 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 @@
                <xs:element name="shortIdentifier" type="xs:string"/>
                <xs:element name="refName" type="xs:string"/>
                <xs:element name="vocabType" type="xs:string"/>
+               <xs:element name="source" type="xs:string"/>
+               <xs:element name="description" type="xs:string"/>
 
 </xs:schema>
 

diff --git a/services/organization/jaxb/src/main/resources/organization_common.xsd b/services/organization/jaxb/src/main/resources/organization_common.xsd
index ccc8c865cddfdbd2b685f23d43e4034e306ac715..60d3784319ae01f469963f0a28c735d11c837a25 100644 (file)
--- a/services/organization/jaxb/src/main/resources/organization_common.xsd
+++ b/services/organization/jaxb/src/main/resources/organization_common.xsd
@@ -28,6 +28,9 @@
                 <xs:element name="displayNameComputed" type="xs:boolean"/>
                 <xs:element name="shortDisplayName" type="xs:string"/>
                 <xs:element name="shortDisplayNameComputed" type="xs:boolean"/>
+                <xs:element name="source" type="xs:string"/>
+                <xs:element name="sourcePage" type="xs:string"/>
+                <xs:element name="description" type="xs:string"/>
                 <xs:element name="mainBodyGroupList" type="mainBodyGroupList"/>
                 <xs:element name="contactNames" type="contactNameList"/>
                 <xs:element name="foundingDate" type="xs:string"/>

diff --git a/services/organization/jaxb/src/main/resources/orgauthority_common.xsd b/services/organization/jaxb/src/main/resources/orgauthority_common.xsd
index d727e8f60626f8aeb0669da1a80a1ea3ffdff133..edc7a21cc3584f416d61ecc2d59df223bb0a541c 100644 (file)
--- a/services/organization/jaxb/src/main/resources/orgauthority_common.xsd
+++ b/services/organization/jaxb/src/main/resources/orgauthority_common.xsd
@@ -38,6 +38,8 @@
                 <xs:element name="displayName" type="xs:string"/>
                 <xs:element name="refName" type="xs:string"/>
                 <xs:element name="vocabType" type="xs:string"/>                
+                <xs:element name="source" type="xs:string"/>
+                <xs:element name="description" type="xs:string"/>
             </xs:sequence>
         </xs:complexType>
     </xs:element>

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 d146c213d57a509d088ce465ef29fa776e5afdc4..9428c6e8880c376b26f7feb4c3286ba1553849f6 100644 (file)
--- 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 @@
                <xs:element name="shortIdentifier" type="xs:string"/>
                <xs:element name="refName" type="xs:string"/>
                <xs:element name="vocabType" type="xs:string"/>
+               <xs:element name="source" type="xs:string"/>
+               <xs:element name="description" type="xs:string"/>
 
 </xs:schema>
 

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 802d28becc62cbee99f40751383cebdf8adc5eba..dbca58f8446657f59574f1261d5d2bee4d2a5260 100644 (file)
--- 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 @@
     <xs:element name="displayNameComputed" type="xs:boolean"/>
     <xs:element name="shortDisplayName" type="xs:string"/>
     <xs:element name="shortDisplayNameComputed" type="xs:boolean"/>
+    <xs:element name="source" type="xs:string"/>
+    <xs:element name="sourcePage" type="xs:string"/>
+    <xs:element name="description" type="xs:string"/>
 
     <!-- FIXME: Currently marked in repeatability spreadsheet as a -->
     <!-- repeatable group.  However, multiple personal names for the -->

diff --git a/services/person/jaxb/src/main/resources/person_common.xsd b/services/person/jaxb/src/main/resources/person_common.xsd
index 3902d7f0cc90aec37cdf537d53a7ce417e6740fc..5a932a812d36fd91ad3c4139bf48a625913cfa9b 100644 (file)
--- a/services/person/jaxb/src/main/resources/person_common.xsd
+++ b/services/person/jaxb/src/main/resources/person_common.xsd
@@ -40,6 +40,9 @@
                 <xs:element name="displayNameComputed" type="xs:boolean"/>
                 <xs:element name="shortDisplayName" type="xs:string"/>
                 <xs:element name="shortDisplayNameComputed" type="xs:boolean"/>
+                <xs:element name="source" type="xs:string"/>
+                <xs:element name="sourcePage" type="xs:string"/>
+                <xs:element name="description" type="xs:string"/>
                 <xs:element name="foreName" type="xs:string"/>
                 <xs:element name="middleName" type="xs:string"/>
                 <xs:element name="surName" type="xs:string"/>

diff --git a/services/person/jaxb/src/main/resources/personauthority_common.xsd b/services/person/jaxb/src/main/resources/personauthority_common.xsd
index cbd5b1359690915adad9e33b08b1ca6cd062d4fd..7e942a0270b765034129dc9dcb198a1337186ed5 100644 (file)
--- a/services/person/jaxb/src/main/resources/personauthority_common.xsd
+++ b/services/person/jaxb/src/main/resources/personauthority_common.xsd
@@ -39,7 +39,8 @@
                                                                <xs:element name="shortIdentifier" type="xs:string"/>
                 <xs:element name="refName" type="xs:string"/>
                 <xs:element name="vocabType" type="xs:string"/>
-                
+                <xs:element name="source" type="xs:string"/>
+                <xs:element name="description" type="xs:string"/>
             </xs:sequence>
         </xs:complexType>
     </xs:element>

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 905c74b53808ca25e2272e43decc77bfb26d7bb6..6fb5f1bb81f3d81b1e4b75ffb56ad5c0e9baddc9 100644 (file)
--- 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 @@
     <xs:element name="displayNameComputed" type="xs:boolean"/>
     <xs:element name="shortDisplayName" type="xs:string"/>
     <xs:element name="shortDisplayNameComputed" type="xs:boolean"/>
+    <xs:element name="source" type="xs:string"/>
+    <xs:element name="sourcePage" type="xs:string"/>
+    <xs:element name="description" type="xs:string"/>
+    
     <xs:element name="taxonFullName" type="xs:string"/>
     <xs:element name="taxonRank" type="xs:string"/>
     <xs:element name="taxonCurrency" type="xs:string"/>

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 0a9b6fa9afa204eadfe281e12aa9fe270db7ccb6..01033f7e2cec74c7b3b06c037b31afd8159c860c 100644 (file)
--- 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 @@
                <xs:element name="shortIdentifier" type="xs:string"/>
                <xs:element name="refName" type="xs:string"/>
                <xs:element name="vocabType" type="xs:string"/>
+               <xs:element name="source" type="xs:string"/>
+               <xs:element name="description" type="xs:string"/>
 
 </xs:schema>
 

diff --git a/services/taxonomy/jaxb/src/main/resources/taxon_common.xsd b/services/taxonomy/jaxb/src/main/resources/taxon_common.xsd
index 03c4ae4f294d796fa5ae3fcf1d7ae6eda1113d4b..e435812c8c934967fb17a272b0d5b9d9f97f8f38 100644 (file)
--- a/services/taxonomy/jaxb/src/main/resources/taxon_common.xsd
+++ b/services/taxonomy/jaxb/src/main/resources/taxon_common.xsd
@@ -29,6 +29,9 @@
                 <xs:element name="displayNameComputed" type="xs:boolean"/>
                 <xs:element name="shortDisplayName" type="xs:string"/>
                 <xs:element name="shortDisplayNameComputed" type="xs:boolean"/>
+                <xs:element name="source" type="xs:string"/>
+                <xs:element name="sourcePage" type="xs:string"/>
+                <xs:element name="description" type="xs:string"/>
                 <xs:element name="taxonFullName" type="xs:string"/>
                 <xs:element name="taxonRank" type="xs:string"/>
                 <xs:element name="taxonCurrency" type="xs:string"/>

diff --git a/services/taxonomy/jaxb/src/main/resources/taxonomyauthority_common.xsd b/services/taxonomy/jaxb/src/main/resources/taxonomyauthority_common.xsd
index eedbdefb8030d3e79c15986665ea3e01d368b7b2..36d8798131140651d416ce3b62181f663898f34f 100644 (file)
--- a/services/taxonomy/jaxb/src/main/resources/taxonomyauthority_common.xsd
+++ b/services/taxonomy/jaxb/src/main/resources/taxonomyauthority_common.xsd
@@ -39,7 +39,8 @@
                 <xs:element name="shortIdentifier" type="xs:string"/>
                 <xs:element name="refName" type="xs:string"/>
                 <xs:element name="vocabType" type="xs:string"/>
-                
+                <xs:element name="source" type="xs:string"/>
+                <xs:element name="description" type="xs:string"/>
             </xs:sequence>
         </xs:complexType>
     </xs:element>

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 75d0dd21d59c62027e11d078e22b44e03a3a2bee..f6e24bf4269e320c4651fc08cd5d6bb07f7f8aad 100644 (file)
--- 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 @@
                <xs:element name="refName" type="xs:string"/>
                <xs:element name="shortIdentifier" type="xs:string"/>
                <xs:element name="vocabType" type="xs:string"/>
+               <xs:element name="source" type="xs:string"/>
+               <xs:element name="description" type="xs:string"/>
 
 </xs:schema>
 

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 a38f369e94b3259c39a331bce30dd90d02f16045..9fd13e680e40c6635faf76b8892253677fc04528 100644 (file)
--- 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 @@
 >
 <!-- See http://wiki.collectionspace.org/display/collectionspace/Vocabulary+Schema -->    
 
-               <!--  VocabularyItem Information Group -->
-               <!--  inVocabulary is the csid of the owning Vocabulary -->
-               <xs:element name="inAuthority" type="xs:string" />
-               <xs:element name="refName" type="xs:string"/>
-               <xs:element name="shortIdentifier" type="xs:string"/>
-               <xs:element name="termStatus" type="xs:string"/>
-               <xs:element name="displayName" type="xs:string"/>
-               <xs:element name="order" type="xs:string"/>
+    <!--  VocabularyItem Information Group -->
+    <!--  inVocabulary is the csid of the owning Vocabulary -->
+    <xs:element name="inAuthority" type="xs:string" />
+    <xs:element name="refName" type="xs:string"/>
+    <xs:element name="shortIdentifier" type="xs:string"/>
+    <xs:element name="termStatus" type="xs:string"/>
+    <xs:element name="displayName" type="xs:string"/>
+    <xs:element name="order" type="xs:string"/>
+    <xs:element name="source" type="xs:string"/>
+    <xs:element name="sourcePage" type="xs:string"/>
+    <xs:element name="description" type="xs:string"/>
 </xs:schema>
 

diff --git a/services/vocabulary/jaxb/src/main/resources/vocabulary_common.xsd b/services/vocabulary/jaxb/src/main/resources/vocabulary_common.xsd
index b9afa8aa0162aa86012c6d77ffc928b28fc2ba85..4e17b1c0e5d3710ed3c6b0a1e3dc2fc5734022df 100644 (file)
--- a/services/vocabulary/jaxb/src/main/resources/vocabulary_common.xsd
+++ b/services/vocabulary/jaxb/src/main/resources/vocabulary_common.xsd
@@ -39,6 +39,8 @@
                                <xs:element name="shortIdentifier" type="xs:string"/>
                 <xs:element name="refName" type="xs:string"/>
                 <xs:element name="vocabType" type="xs:string"/>                
+                <xs:element name="source" type="xs:string"/>
+                <xs:element name="description" type="xs:string"/>
             </xs:sequence>
         </xs:complexType>
     </xs:element>

diff --git a/services/vocabulary/jaxb/src/main/resources/vocabularyitem_common.xsd b/services/vocabulary/jaxb/src/main/resources/vocabularyitem_common.xsd
index dca9978f27956967b8b91e20703718b52fe07adc..27727365fea060b0d1ff438daf08b673067f83d1 100644 (file)
--- a/services/vocabulary/jaxb/src/main/resources/vocabularyitem_common.xsd
+++ b/services/vocabulary/jaxb/src/main/resources/vocabularyitem_common.xsd
@@ -27,6 +27,9 @@
                 <xs:element name="refName" type="xs:string"/>
                 <xs:element name="termStatus" type="xs:string"/>
                 <xs:element name="order" type="xs:string"/>
+                <xs:element name="source" type="xs:string"/>
+                <xs:element name="sourcePage" type="xs:string"/>
+                <xs:element name="description" type="xs:string"/>
             </xs:sequence>
         </xs:complexType>
     </xs:element>