From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Thu, 17 Jun 2010 23:06:28 +0000 (+0000)
Subject: CSPACE-2138: Changed 'status' field to 'termStatus' in Organization services schema... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=d1c09e84ac5976b901bc7e6b7b148fff75d6caab;p=tmp%2Fjakarta-migration.git

CSPACE-2138: Changed 'status' field to 'termStatus' in Organization services schema, per latest changes to Limited for 0.8 Name Authority schemas on the wiki. Services schema and wiki schema are now aligned on use of foundingDate and foundingPlace, as well as on subBody, per updates to the wiki schema.
---

diff --git a/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/OSGI-INF/layouts-contrib.xml b/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/OSGI-INF/layouts-contrib.xml
index 5466979d1..746cea068 100644
--- a/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/OSGI-INF/layouts-contrib.xml
+++ b/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/OSGI-INF/layouts-contrib.xml
@@ -79,7 +79,7 @@
         <row><widget>function</widget></row>
         <row><widget>subBody</widget></row>
         <row><widget>history</widget></row>
-        <row><widget>status</widget></row>
+        <row><widget>termStatus</widget></row>
       </rows>
 
       <widget name="inAuthority" type="text">
@@ -277,13 +277,13 @@
         </properties>
       </widget>
 
-      <widget name="status" type="text">
+      <widget name="termStatus" type="text">
         <labels>
-          <label mode="any">status</label>
+          <label mode="any">termStatus</label>
         </labels>
         <translated>true</translated>
         <fields>
-          <field schema="organizations_common">status</field>
+          <field schema="organizations_common">termStatus</field>
         </fields>
         <properties widgetMode="edit">
           <property name="styleClass">dataInputText</property>
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 5f46e4413..8b01afa3f 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
@@ -38,7 +38,7 @@
     <xs:element name="function" type="xs:string"/>
     <xs:element name="subBody" type="xs:string"/>
     <xs:element name="history" type="xs:string"/>
-    <xs:element name="status" type="xs:string"/>
+    <xs:element name="termStatus" type="xs:string"/>
 
 </xs:schema>
 
diff --git a/services/organization/client/src/main/java/org/collectionspace/services/client/OrgAuthorityClientUtils.java b/services/organization/client/src/main/java/org/collectionspace/services/client/OrgAuthorityClientUtils.java
index caccb3523..c08152880 100644
--- a/services/organization/client/src/main/java/org/collectionspace/services/client/OrgAuthorityClientUtils.java
+++ b/services/organization/client/src/main/java/org/collectionspace/services/client/OrgAuthorityClientUtils.java
@@ -179,8 +179,8 @@ public class OrgAuthorityClientUtils {
         	organization.setSubBody(value);
         if((value = (String)orgInfo.get(OrganizationJAXBSchema.HISTORY))!=null)
         	organization.setHistory(value);
-        if((value = (String)orgInfo.get(OrganizationJAXBSchema.STATUS))!=null)
-        	organization.setStatus(value);
+        if((value = (String)orgInfo.get(OrganizationJAXBSchema.TERM_STATUS))!=null)
+        	organization.setTermStatus(value);
         MultipartOutput multipart = new MultipartOutput();
         OutputPart commonPart = multipart.addPart(organization,
             MediaType.APPLICATION_XML_TYPE);
diff --git a/services/organization/jaxb/src/main/java/org/collectionspace/services/OrganizationJAXBSchema.java b/services/organization/jaxb/src/main/java/org/collectionspace/services/OrganizationJAXBSchema.java
index c01ecd926..bb9b16b99 100644
--- a/services/organization/jaxb/src/main/java/org/collectionspace/services/OrganizationJAXBSchema.java
+++ b/services/organization/jaxb/src/main/java/org/collectionspace/services/OrganizationJAXBSchema.java
@@ -11,7 +11,7 @@ public interface OrganizationJAXBSchema {
 	final static String ORGANIZATIONS_COMMON="organizations_common";	
 	final static String CSID = "csid";
 	final static String IN_AUTHORITY = "inAuthority";
-        final static String REF_NAME = "refName";
+    final static String REF_NAME = "refName";
 	final static String DISPLAY_NAME = "displayName";
 	final static String DISPLAY_NAME_COMPUTED = "displayNameComputed";
 	final static String SHORT_NAME = "shortName";
@@ -21,11 +21,11 @@ public interface OrganizationJAXBSchema {
 	final static String FOUNDING_DATE = "foundingDate";
 	final static String DISSOLUTION_DATE = "dissolutionDate";
 	final static String FOUNDING_PLACE = "foundingPlace";
-        final static String GROUP = "group";
+    final static String GROUP = "group";
 	final static String FUNCTION = "function";
-        final static String SUB_BODY = "subBody";
+    final static String SUB_BODY = "subBody";
 	final static String HISTORY = "history";
-        final static String STATUS = "status";
+    final static String TERM_STATUS = "termStatus";
 }
 
 
diff --git a/services/organization/jaxb/src/main/resources/organization_common.xsd b/services/organization/jaxb/src/main/resources/organization_common.xsd
index 82caef84c..12ae91440 100644
--- a/services/organization/jaxb/src/main/resources/organization_common.xsd
+++ b/services/organization/jaxb/src/main/resources/organization_common.xsd
@@ -35,7 +35,7 @@
                 <xs:element name="function" type="xs:string"/>
                 <xs:element name="subBody" type="xs:string"/>
                 <xs:element name="history" type="xs:string"/>
-                <xs:element name="status" type="xs:string"/>
+                <xs:element name="termStatus" type="xs:string"/>
             </xs:sequence>
         </xs:complexType>
     </xs:element>