From 85d311c9e00255e33861c08bd06ec6f3fd0fda10 Mon Sep 17 00:00:00 2001
From: Ray Lee <rhlee@berkeley.edu>
Date: Mon, 9 Apr 2012 19:41:21 -0700
Subject: [PATCH] CSPACE-4901: Change conceptType to recordType in a few more
 files.

---
 .../tenants/tenant-bindings-proto.xml         |  2 +-
 .../resources/OSGI-INF/layouts-contrib.xml    |  8 +++---
 .../test/ConceptAuthorityServiceTest.java     |  2 +-
 .../services/ConceptJAXBSchema.java           | 25 ++++++-------------
 4 files changed, 13 insertions(+), 24 deletions(-)

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 b9f2a060b..9d99add93 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
@@ -2700,7 +2700,7 @@
                         <!-- Fields containing term list / controlled vocabulary references -->
             <types:item xmlns:types="http://collectionspace.org/services/common/types">
               <types:key>termRef</types:key>
-                            <types:value>conceptType</types:value>
+                            <types:value>recordType</types:value>
             </types:item>
             <types:item xmlns:types="http://collectionspace.org/services/common/types">
               <types:key>termRef</types:key>
diff --git a/services/concept/3rdparty/nuxeo-platform-cs-concept/src/main/resources/OSGI-INF/layouts-contrib.xml b/services/concept/3rdparty/nuxeo-platform-cs-concept/src/main/resources/OSGI-INF/layouts-contrib.xml
index 1145b1e10..2f874103e 100644
--- a/services/concept/3rdparty/nuxeo-platform-cs-concept/src/main/resources/OSGI-INF/layouts-contrib.xml
+++ b/services/concept/3rdparty/nuxeo-platform-cs-concept/src/main/resources/OSGI-INF/layouts-contrib.xml
@@ -83,7 +83,7 @@
         <row><widget>refName</widget></row>
         <row><widget>displayName</widget></row>
         <row><widget>displayNameComputed</widget></row>
-        <row><widget>conceptType</widget></row>
+        <row><widget>recordType</widget></row>
         <row><widget>status</widget></row>
       </rows>
 
@@ -153,13 +153,13 @@
         </properties>
       </widget>
       
-      <widget name="conceptType" type="text">
+      <widget name="recordType" type="text">
         <labels>
-          <label mode="any">conceptType</label>
+          <label mode="any">recordType</label>
         </labels>
         <translated>true</translated>
         <fields>
-          <field schema="concepts_common">conceptType</field>
+          <field schema="concepts_common">recordType</field>
         </fields>
         <properties widgetMode="edit">
           <property name="styleClass">dataInputText</property>
diff --git a/services/concept/client/src/test/java/org/collectionspace/services/client/test/ConceptAuthorityServiceTest.java b/services/concept/client/src/test/java/org/collectionspace/services/client/test/ConceptAuthorityServiceTest.java
index 72962d01d..4241ce8d7 100644
--- a/services/concept/client/src/test/java/org/collectionspace/services/client/test/ConceptAuthorityServiceTest.java
+++ b/services/concept/client/src/test/java/org/collectionspace/services/client/test/ConceptAuthorityServiceTest.java
@@ -89,7 +89,7 @@ public class ConceptAuthorityServiceTest extends AbstractAuthorityServiceTest<Co
     // TODO Make status type be a controlled vocab term.
     final String TEST_STATUS = "Approved";
     
-    private String knownConceptTypeRefName = null;
+    private String knownRecordTypeRefName = null;
     
     /* (non-Javadoc)
      * @see org.collectionspace.services.client.test.BaseServiceTest#getClientInstance()
diff --git a/services/concept/jaxb/src/main/java/org/collectionspace/services/ConceptJAXBSchema.java b/services/concept/jaxb/src/main/java/org/collectionspace/services/ConceptJAXBSchema.java
index 3bb44db74..339016713 100644
--- a/services/concept/jaxb/src/main/java/org/collectionspace/services/ConceptJAXBSchema.java
+++ b/services/concept/jaxb/src/main/java/org/collectionspace/services/ConceptJAXBSchema.java
@@ -10,32 +10,21 @@ import org.collectionspace.services.common.vocabulary.AuthorityItemJAXBSchema;
  */
 public interface ConceptJAXBSchema extends AuthorityItemJAXBSchema {
 	final static String CONCEPTS_COMMON = "concepts_common";
-	final static String CONCEPT_TYPE = "conceptType";
+	final static String CONCEPT_RECORD_TYPE = "recordType";
 	final static String CONCEPT_SCOPE_NOTE = "scopeNote";
 	final static String CONCEPT_SCOPE_NOTE_SOURCE = "scopeNoteSource";
 	final static String CONCEPT_SCOPE_NOTE_SOURCE_DETAIL = "scopeNoteSourceDetail";
-	final static String CONCEPT_REMARKS = "remarks";
-	final static String CONCEPT_DISPLAY_TERM_FLAG = "displayTermFlag";
 
-	final static String CONCEPT_TERM_GROUP_LIST = "conceptTermGroupList";
 	final static String CONCEPT_CITATION_GROUP_LIST = "citationGroupList";
-	final static String CONCEPT_ADDL_TERM_SOURCE_GROUP_LIST = "additionalTermSourceGroupList";
+	final static String CONCEPT_ADDL_SOURCE_GROUP_LIST = "additionalSourceGroupList";
 	
-	final static String CONCEPT_TERM_GROUP_TERM = "term";
 	final static String CONCEPT_TERM_GROUP_TERM_TYPE = "termType";
-	final static String CONCEPT_TERM_GROUP_TERM_QUALIFIER = "termQualifier";
+	final static String CONCEPT_TERM_GROUP_TERM_QUALIFIER = "qualifier";
 	final static String CONCEPT_TERM_GROUP_TERM_LANGUAGE = "termLanguage";
-	final static String CONCEPT_TERM_GROUP_HISTORICAL_FLAG = "historicalFlag";
-	final static String CONCEPT_TERM_GROUP_SOURCE = "source";
-	final static String CONCEPT_TERM_GROUP_SOURCE_DETAIL = "sourceDetail";
-	final static String CONCEPT_TERM_GROUP_SOURCE_UID = "sourceUID";
-	final static String CONCEPT_TERM_GROUP_TERM_DATE = "termDate";
-	
-	final static String CONCEPT_CITATION_GROUP_SOURCE = "source";
-	final static String CONCEPT_CITATION_GROUP_SOURCE_DETAIL = "sourceDetail";
+	final static String CONCEPT_TERM_GROUP_HISTORIC_FLAG = "historicFlag";
 
-	final static String CONCEPT_ADDL_TERM_SOURCE_GROUP_SOURCE = "source";
-	final static String CONCEPT_ADDL_TERM_SOURCE_GROUP_DETAIL = "sourceDetail";
-	final static String CONCEPT_ADDL_TERM_SOURCE_GROUP_UID = "sourceUID";
+	final static String CONCEPT_ADDL_SOURCE_GROUP_SOURCE = "additionalSource";
+	final static String CONCEPT_ADDL_SOURCE_GROUP_DETAIL = "additionalSourceDetail";
+	final static String CONCEPT_ADDL_SOURCE_GROUP_UID = "additionalSourceUID";
 }
 
-- 
2.47.3