CSPACE-4901: Change conceptType to recordType, for clarity.

diff --git a/services/concept/3rdparty/nuxeo-platform-cs-concept/src/main/resources/schemas/concepts_common.xsd b/services/concept/3rdparty/nuxeo-platform-cs-concept/src/main/resources/schemas/concepts_common.xsd
index dee792e4cd5cf9aae9816da3d0ad06fe4363e2ba..8325b07d8abb4bc2ec14eb8b830cd9bb0d967b4f 100644 (file)
--- a/services/concept/3rdparty/nuxeo-platform-cs-concept/src/main/resources/schemas/concepts_common.xsd
+++ b/services/concept/3rdparty/nuxeo-platform-cs-concept/src/main/resources/schemas/concepts_common.xsd
@@ -34,14 +34,14 @@
        <!--  Common Concept Information Group -->
        <!--  Based on UCB Version 2.3: http://wiki.collectionspace.org/display/deploy/Concept+Authority+Schema+and+Mockup+-+UCB+Version -->
        <!--  This will be refactored for 2.4. -->
-       <xs:element name="conceptType" type="xs:string"/>
-       <xs:element name="sourceTermID" type="xs:string"/>
+       <xs:element name="termType" type="xs:string"/>
+       <xs:element name="qualifier" type="xs:string"/>
        <xs:element name="termLanguage" type="xs:string"/>
        <xs:element name="preferred" type="xs:boolean"/>
        <xs:element name="preferredForLang" type="xs:string"/>
        <xs:element name="historicFlag" type="xs:string"/>
-       <xs:element name="termType" type="xs:string"/>
-       <xs:element name="qualifier" type="xs:string"/>
+       <xs:element name="sourceTermID" type="xs:string"/>
+       <xs:element name="recordType" type="xs:string"/>
        <xs:element name="scopeNote" type="xs:string"/>
        <xs:element name="scopeNoteSource" type="xs:string"/>
        <xs:element name="scopeNoteSourceDetail" type="xs:string"/>

diff --git a/services/concept/jaxb/src/main/resources/concept_common.xsd b/services/concept/jaxb/src/main/resources/concept_common.xsd
index 0b5fd29ec84fb0ddbaf304189739f40f071f848a..be910222d60becb5a13d1fb1585b2c30b4915555 100644 (file)
--- a/services/concept/jaxb/src/main/resources/concept_common.xsd
+++ b/services/concept/jaxb/src/main/resources/concept_common.xsd
@@ -36,14 +36,14 @@
                                <!--  Common Concept Information Group -->
                                <!--  Based on UCB Version 2.3: http://wiki.collectionspace.org/display/deploy/Concept+Authority+Schema+and+Mockup+-+UCB+Version -->
                                <!--  This will be refactored for 2.4. -->
-                               <xs:element name="conceptType" type="xs:string"/>
-                               <xs:element name="sourceTermID" type="xs:string"/>
+                               <xs:element name="termType" type="xs:string"/>
+                               <xs:element name="qualifier" type="xs:string"/>
                                <xs:element name="termLanguage" type="xs:string"/>
                                <xs:element name="preferred" type="xs:boolean"/>
                                <xs:element name="preferredForLang" type="xs:string"/>
                                <xs:element name="historicFlag" type="xs:string"/>
-                               <xs:element name="termType" type="xs:string"/>
-                               <xs:element name="qualifier" type="xs:string"/>
+                               <xs:element name="sourceTermID" type="xs:string"/>
+                               <xs:element name="recordType" type="xs:string"/>
                                <xs:element name="scopeNote" type="xs:string"/>
                                <xs:element name="scopeNoteSource" type="xs:string"/>
                                <xs:element name="scopeNoteSourceDetail" type="xs:string"/>