From: Ray Lee <rhlee@berkeley.edu>
Date: Tue, 10 Apr 2012 01:55:31 +0000 (-0700)
Subject: CSPACE-4901: Change conceptType to recordType, for clarity.
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=42a685c04355498abd5474bc2149e19cc31384df;p=tmp%2Fjakarta-migration.git

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 dee792e4c..8325b07d8 100644
--- 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 0b5fd29ec..be910222d 100644
--- 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"/>