CSPACE-2138: Changed 'status' field to 'termStatus' in Organization services 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 5466979d11d5d51b2f87acb00dc96ec624b5ba7b..746cea068af0d92349f67a9a609bc227a884175e 100644 (file)
--- 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 5f46e4413cd89c6e5227e3277131d6b89bedc6d4..8b01afa3fa15051bcae5e90b7e1c0455e817e1ff 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
@@ -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 caccb3523eb7ff59c095bc4ad8387206f658081a..c0815288010222234fac6c89909ccef78812b0ae 100644 (file)
--- 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);\r
         if((value = (String)orgInfo.get(OrganizationJAXBSchema.HISTORY))!=null)\r
                organization.setHistory(value);\r
-        if((value = (String)orgInfo.get(OrganizationJAXBSchema.STATUS))!=null)\r
-               organization.setStatus(value);\r
+        if((value = (String)orgInfo.get(OrganizationJAXBSchema.TERM_STATUS))!=null)\r
+               organization.setTermStatus(value);\r
         MultipartOutput multipart = new MultipartOutput();\r
         OutputPart commonPart = multipart.addPart(organization,\r
             MediaType.APPLICATION_XML_TYPE);\r

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 c01ecd92657cf3b43f6417ca25a2fca34b243686..bb9b16b9977e34b9962fb2fa789940616c5e88b9 100644 (file)
--- 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";        \r
        final static String CSID = "csid";\r
        final static String IN_AUTHORITY = "inAuthority";\r
-        final static String REF_NAME = "refName";\r
+    final static String REF_NAME = "refName";\r
        final static String DISPLAY_NAME = "displayName";\r
        final static String DISPLAY_NAME_COMPUTED = "displayNameComputed";\r
        final static String SHORT_NAME = "shortName";\r
@@ -21,11 +21,11 @@ public interface OrganizationJAXBSchema {
        final static String FOUNDING_DATE = "foundingDate";\r
        final static String DISSOLUTION_DATE = "dissolutionDate";\r
        final static String FOUNDING_PLACE = "foundingPlace";\r
-        final static String GROUP = "group";\r
+    final static String GROUP = "group";\r
        final static String FUNCTION = "function";\r
-        final static String SUB_BODY = "subBody";\r
+    final static String SUB_BODY = "subBody";\r
        final static String HISTORY = "history";\r
-        final static String STATUS = "status";\r
+    final static String TERM_STATUS = "termStatus";\r
 }\r
 \r
 \r

diff --git a/services/organization/jaxb/src/main/resources/organization_common.xsd b/services/organization/jaxb/src/main/resources/organization_common.xsd
index 82caef84c550ab6eb730fab3f4c2845e1cac18ff..12ae914404272b68c87b7134771cb7128debdb70 100644 (file)
--- 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>