CSPACE-3865: More naming consistency for Taxonomy item name ('taxon').

diff --git a/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/src/main/resources/OSGI-INF/core-types-contrib.xml b/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/src/main/resources/OSGI-INF/core-types-contrib.xml
index bff57688166efaab107e8e7bfef2397529647aac..80651d22fe470c88a6c02218c3c335b1a6c901f3 100644 (file)
--- a/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/src/main/resources/OSGI-INF/core-types-contrib.xml
+++ b/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/src/main/resources/OSGI-INF/core-types-contrib.xml
@@ -4,7 +4,7 @@
     <schema name="taxonomyauthority_common" prefix="taxonomyauthority_common" src="schemas/taxonomyauthority_common.xsd"/>
   </extension>
   <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
-    <schema name="taxonomy_common" prefix="taxonomy_common" src="schemas/taxonomy_common.xsd"/>
+    <schema name="taxon_common" prefix="taxon_common" src="schemas/taxon_common.xsd"/>
   </extension>
   <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
     <doctype name="Taxonomyauthority" extends="Document">
@@ -15,11 +15,11 @@
     </doctype>
   </extension>
   <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
-    <doctype name="Taxonomyitem" extends="Document">
+    <doctype name="Taxon" extends="Document">
       <schema name="common"/>
       <schema name="collectionspace_core"/>
       <schema name="dublincore"/>
-      <schema name="taxonomy_common"/>
+      <schema name="taxon_common"/>
     </doctype>
   </extension>
 </component>

diff --git a/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/src/main/resources/OSGI-INF/layouts-contrib.xml b/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/src/main/resources/OSGI-INF/layouts-contrib.xml
index 1d4665ae61dd9ae95962428c2bb828bed64ad4fa..e0e97f04fdc4031f530bff21ecc08e071a53d892 100644 (file)
--- a/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/src/main/resources/OSGI-INF/layouts-contrib.xml
+++ b/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/src/main/resources/OSGI-INF/layouts-contrib.xml
@@ -93,7 +93,7 @@
         </labels>
         <translated>true</translated>
         <fields>
-          <field schema="taxonomy_common">inAuthority</field>
+          <field schema="taxon_common">inAuthority</field>
         </fields>
         <properties widgetMode="edit">
           <property name="styleClass">dataInputText</property>
@@ -106,7 +106,7 @@
         </labels>
         <translated>true</translated>
         <fields>
-          <field schema="taxonomy_common">shortIdentifier</field>
+          <field schema="taxon_common">shortIdentifier</field>
         </fields>
         <properties widgetMode="edit">
           <property name="styleClass">dataInputText</property>
@@ -119,7 +119,7 @@
         </labels>
         <translated>true</translated>
         <fields>
-          <field schema="taxonomy_common">refName</field>
+          <field schema="taxon_common">refName</field>
         </fields>
         <properties widgetMode="edit">
           <property name="styleClass">dataInputText</property>
@@ -159,7 +159,7 @@
         </labels>
         <translated>true</translated>
         <fields>
-          <field schema="taxonomy_common">taxonFullName</field>
+          <field schema="taxon_common">taxonFullName</field>
         </fields>
         <properties widgetMode="edit">
           <property name="styleClass">dataInputText</property>
@@ -172,7 +172,7 @@
         </labels>
         <translated>true</translated>
         <fields>
-          <field schema="taxonomy_common">taxonRank</field>
+          <field schema="taxon_common">taxonRank</field>
         </fields>
         <properties widgetMode="edit">
           <property name="styleClass">dataInputText</property>

diff --git a/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/src/main/resources/OSGI-INF/life-cycle-contrib.xml b/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/src/main/resources/OSGI-INF/life-cycle-contrib.xml
index 1b202499a1c6d32e320ec133557cd825b0a3f062..fd1293b817a3bbb6dc046f4e9fbda1838aeb24a4 100644 (file)
--- a/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/src/main/resources/OSGI-INF/life-cycle-contrib.xml
+++ b/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/src/main/resources/OSGI-INF/life-cycle-contrib.xml
@@ -5,7 +5,7 @@
              point="types">
     <types>
       <type name="Taxonomyauthority">default</type>
-      <type name="Taxonomyitem">default</type>
+      <type name="Taxon">default</type>
     </types>
   </extension>