]> git.aero2k.de Git - tmp/jakarta-migration.git/commitdiff
CSPACE-3931,CSPACE-4490: Cleaned up / removed vestigial top-level otherNumber, otherN...
authorAron Roberts <aron@socrates.berkeley.edu>
Wed, 4 Jan 2012 02:02:19 +0000 (02:02 +0000)
committerAron Roberts <aron@socrates.berkeley.edu>
Wed, 4 Jan 2012 02:02:19 +0000 (02:02 +0000)
26 files changed:
3rdparty/nuxeo/nuxeo-database-templates/mysql/collectionspace_mysql/config/default-repository-config.xml
3rdparty/nuxeo/nuxeo-database-templates/postgresql/collectionspace_postgresql/config/default-repository-config.xml
3rdparty/nuxeo/nuxeo-server/5.5-RC1/config/default-repo-config.xml
services/IntegrationTests/src/test/resources/test-data/xmlreplay/batch/collObj1.xml
services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/nh-collectionobject.xml
services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp2.xml
services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp3.xml
services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/repfield_whitesp4.xml
services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/testCambridge-update.xml
services/IntegrationTests/src/test/resources/test-data/xmlreplay/collectionobject/testCambridge.xml
services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/OSGI-INF/layouts-contrib.xml
services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects_common.xsd
services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectServiceTest.java
services/collectionobject/client/src/test/resources/test-data/repfield_whitesp1.xml
services/collectionobject/client/src/test/resources/test-data/repfield_whitesp2.xml
services/collectionobject/client/src/test/resources/test-data/repfield_whitesp3.xml
services/collectionobject/client/src/test/resources/test-data/repfield_whitesp4.xml
services/collectionobject/jaxb/src/main/java/org/collectionspace/services/CollectionObjectJAXBSchema.java
services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
services/common/src/main/cspace/config/services/tenants/tenant-bindings-proto.xml
services/common/src/main/java/org/collectionspace/services/common/XmlSaxFragmenter.java
services/common/src/main/java/org/collectionspace/services/common/document/DocumentUtils.java
services/common/src/test/resources/test-data/XmlSaxFragmenter-sample.xml
services/hyperjaxb/src/main/resources/permissions.xsd
services/id/service/src/main/java/org/collectionspace/services/id/IDServiceNuxeoImpl.java
services/imports/service/src/test/resources/requests/collectionobject-request.xml

index 094358a94b58434f85e07cfe759b62bc357ecc16..a5895d3c8975c77a6dda8260c3f91630c69f53d8 100644 (file)
           
           <!-- Object Identification Information -->
           <!-- ================================= -->
-          
-          <!-- FIXME: The following field may be removed from this configuration when it is confirmed -->
-          <!-- that the App/UI layers are using a repeatable other number group. -->
-          <field type="largetext">collectionobjects_common:otherNumber</field> <!-- * -->
 
           <!-- FIXME: Change this to otherNumberValue if and when the field name itself is so changed. -->
           <field type="largetext">numberValue</field> <!-- * -->
           -->
   
           <field type="largetext">collectionobjects_common:objectNumber</field>
-          <field type="largetext">collectionobjects_common:otherNumber</field>
-          <field type="largetext">collectionobjects_common:otherNumberType</field>
           <field type="largetext">collectionobjects_common:numberOfObjects</field>
           <field type="largetext">collectionobjects_common:collection</field>
           <field type="largetext">collectionobjects_common:recordStatus</field>
index 86848ad6437d9a564d23942420c013b2de2ba733..cfb6da7ee3697daeca0923c1e8452e835c463b83 100644 (file)
           \r
           <!-- Object Identification Information -->\r
           <!-- ================================= -->\r
-          \r
-          <!-- FIXME: The following field may be removed from this configuration when it is confirmed -->\r
-          <!-- that the App/UI layers are using a repeatable other number group. -->\r
-          <field type="largetext">collectionobjects_common:otherNumber</field> <!-- * -->\r
 \r
           <!-- FIXME: Change this to otherNumberValue if and when the field name itself is so changed. -->\r
           <field type="largetext">numberValue</field> <!-- * -->\r
           -->\r
   \r
           <field type="largetext">collectionobjects_common:objectNumber</field>\r
-          <field type="largetext">collectionobjects_common:otherNumber</field>\r
-          <field type="largetext">collectionobjects_common:otherNumberType</field>\r
           <field type="largetext">collectionobjects_common:numberOfObjects</field>\r
           <field type="largetext">collectionobjects_common:collection</field>\r
           <field type="largetext">collectionobjects_common:recordStatus</field>\r
index 76a96294566cc2cc165eaf1fbcfc352b12ebdc5d..82eaf4c3ccbf2b5cba21611f0df4d1663a1e7e15 100644 (file)
                                        <!-- Object Identification Information -->
                                        <!-- ================================= -->
 
-                                       <!-- FIXME: The following field may be removed from this configuration 
-                                               when it is confirmed -->
-                                       <!-- that the App/UI layers are using a repeatable other number group. -->
-                                       <field type="largetext">collectionobjects_common:otherNumber</field> <!-- * -->
-
                                        <!-- FIXME: Change this to otherNumberValue if and when the field name 
                                                itself is so changed. -->
                                        <field type="largetext">numberValue</field> <!-- * -->
                                                require verification to match actual values. -->
 
                                        <field type="largetext">collectionobjects_common:objectNumber</field>
-                                       <field type="largetext">collectionobjects_common:otherNumber</field>
-                                       <field type="largetext">collectionobjects_common:otherNumberType</field>
                                        <field type="largetext">collectionobjects_common:numberOfObjects</field>
                                        <field type="largetext">collectionobjects_common:collection</field>
                                        <field type="largetext">collectionobjects_common:recordStatus</field>
index 3d16f56d50ccecabb23808bd710549a29219ff58..b3e87411c48824fb207e7d10405c47323e5768e8 100644 (file)
@@ -2,8 +2,6 @@
 <document name="collectionobjects">
 <ns2:collectionobjects_common xmlns:ns2="http://collectionspace.org/services/collectionobject">
   <objectNumber>objectNumber</objectNumber>
-  <otherNumber>XXX</otherNumber>
-  <otherNumberType>otherNumberType</otherNumberType>
 </ns2:collectionobjects_common> 
 </document>
 
index c8342a85a9625cf38c686ba38620517f93dcb055..e11b3e34bdcbc9ae7143cace45753f80100522b6 100755 (executable)
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>\r
 <ns3:collectionobjects_common xmlns:ns2="http://collectionspace.org/services/jaxb" xmlns:ns3="http://collectionspace.org/services/collectionobject">\r
-<remNumber>\r
-<numberValue>2271966-1285644709415</numberValue>\r
-<numberType>remNumber</numberType>\r
-</remNumber>\r
 <objectNumber>objectNumber-1285644709375</objectNumber>\r
 <otherNumberList>\r
 <otherNumber>\r
@@ -15,7 +11,6 @@
 <numberType>ipaddress</numberType>\r
 </otherNumber>\r
 </otherNumberList>\r
-<otherNumber>urn:org.walkerart.id:123</otherNumber>\r
 <briefDescriptions>\r
 <briefDescription>Papier mache bird cow mask with horns, painted red with black and yellow spots. Puerto Rico. ca. 8&amp;quot; high, 6&amp;quot; wide, projects 10&amp;quot; (with horns).</briefDescription>\r
 <briefDescription>Acrylic rabbit mask with wings, painted red with green and aquamarine spots. Puerto Rico. ca. 8&amp;quot; high, 6&amp;quot; wide, projects 10&amp;quot; (with wings).</briefDescription>\r
index 12397ced93bd8954008ea3b63bcb66588a61b9eb..8a24b2e0739d748c825a0a2b7137059ca17ec877 100755 (executable)
@@ -2,8 +2,6 @@
 <ns2:collectionobjects_common xmlns:ns2="http://collectionspace.org/services/collectionobject">
 <objectNumber>objectNumber</objectNumber>
 
-<otherNumber>XXX</otherNumber>
-<otherNumberType>otherNumberType</otherNumberType>
 <briefDescriptions>
 <briefDescription>briefDescription1</briefDescription>
 <briefDescription>briefDescription2</briefDescription>
index af570d7ff46ed3e0dc9d0aea811beab8996bfa89..1d6d30e5d0fb83657087b7b2ea854edf9d7cdc48 100755 (executable)
@@ -2,8 +2,6 @@
 <ns2:collectionobjects_common xmlns:ns2="http://collectionspace.org/services/collectionobject">
 <objectNumber>objectNumber</objectNumber>
 
-<otherNumber>XXX</otherNumber>
-<otherNumberType>otherNumberType</otherNumberType>
 <briefDescriptions>
 <!-- test childnode as whitespace -->
 <briefDescription> briefDescription1</briefDescription>
index f7385f0847f364ee0ebf13c5137c24ef1a6fa220..b692b2ca5cd5a7cf31623a240a3f4195c6a32f3a 100755 (executable)
@@ -2,8 +2,6 @@
 <ns2:collectionobjects_common xmlns:ns2="http://collectionspace.org/services/collectionobject">
 <objectNumber>objectNumber</objectNumber>
 
-<otherNumber>XXX</otherNumber>
-<otherNumberType>otherNumberType</otherNumberType>
 <briefDescriptions>
     <briefDescription>briefDescription1</briefDescription>
     <briefDescription>briefDescription2</briefDescription>
index 905ae0428e691e64cb6557fbda410d10d5ded06e..475c914994cdb6c5a3dd6284878f33135fa0d22f 100755 (executable)
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ns2:collectionobjects_common xmlns:ns2="http://collectionspace.org/services/collectionobject">
   <objectNumber>objectNumber</objectNumber>
-  <otherNumber>XXX</otherNumber>
-  <otherNumberType>otherNumberType</otherNumberType>
   <distinguishingFeatures>This is an UPDATEd distFeatures</distinguishingFeatures>
   <titleGroupList><titleGroup><title>NEW TITLE UPDATED</title></titleGroup></titleGroupList>
 </ns2:collectionobjects_common>
index b20aa9b9a19511b7e373c92db42686129a7427c9..6eea3b41cd2f18eee87d63f63225adf012c83170 100755 (executable)
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ns2:collectionobjects_common xmlns:ns2="http://collectionspace.org/services/collectionobject">
   <objectNumber>objectNumber</objectNumber>
-  <otherNumber>XXX</otherNumber>
-  <otherNumberType>otherNumberType</otherNumberType>
   <!-- briefDescription>briefDescription</briefDescription -->
   <comments>comments</comments>
   <distinguishingFeatures>distFeatures</distinguishingFeatures>
index 752774a609846a59989fadb7b81831d0d7ef4726..dae563686b15a13ff8fc871ec8792db8e02f5e1e 100644 (file)
@@ -10,8 +10,6 @@
       </templates>
       <rows>
         <row><widget>objectNumber</widget></row>
-        <row><widget>otherNumber</widget></row>
-        <row><widget>otherNumberType</widget></row>
         <!-- Repeatable fields are commented out for now until we -->
         <!-- identify how to represent these complex types in layouts. -->
         <!-- <row><widget>entryMethod</widget></row> -->
         </properties>
       </widget>
       
-      <widget name="otherNumber" type="text">
-        <labels>
-          <label mode="any">otherNumber</label>
-        </labels>
-        <translated>true</translated>
-        <fields>
-          <field schema="${CommonSchemaName}">otherNumber</field>
-        </fields>
-        <properties widgetMode="edit">
-          <property name="styleClass">dataInputText</property>
-        </properties>
-      </widget>
-      
-      <widget name="otherNumberType" type="text">
-        <labels>
-          <label mode="any">otherNumberType</label>
-        </labels>
-        <translated>true</translated>
-        <fields>
-          <field schema="${CommonSchemaName}">otherNumberType</field>
-        </fields>
-        <properties widgetMode="edit">
-          <property name="styleClass">dataInputText</property>
-        </properties>
-      </widget>
 <!--
       <widget name="briefDescription" type="text">
         <labels>
index 074ee17c4371bcda37948d40c8db4c76e834c26b..ef91a6c0f5b49ee4309092769c0ef8ded4dd86a8 100644 (file)
     xmlns="http://collectionspace.org/collectionobject/"\r
     targetNamespace="http://collectionspace.org/collectionobject/" version="0.1">\r
 \r
-    <xs:element name="remNumber" type="ns:otherNumber"/>\r
-\r
     <!-- Object identification information -->\r
 \r
     <xs:element name="objectNumber" type="xs:string"/>\r
     <xs:element name="otherNumberList" type="ns:otherNumberList"/>\r
-    <!-- Remove these two elements when the App/UI layer is using -->\r
-    <!-- the new repeatable 'otherNumbers' field: -->\r
-    <xs:element name="otherNumber" type="xs:string"/>\r
-    <xs:element name="otherNumberType" type="xs:string"/>\r
-    <!-- end of two elements to be removed -->\r
     <xs:element name="briefDescriptions">\r
         <xs:complexType>\r
             <xs:sequence>\r
             <xs:element name="valueQualifier" type="xs:string"/>\r
         </xs:sequence>\r
     </xs:complexType>\r
-\r
+    \r
     <xs:complexType name="materialGroupList">\r
         <xs:sequence>\r
             <xs:element name="materialGroup" type="materialGroup" minOccurs="0"\r
index 55e802adc66c7cb808d0f42ed37d3d607ec9d93d..e7713f6fb5cd9acb009ad22d3c8381a92740d432 100644 (file)
@@ -45,8 +45,8 @@ import org.collectionspace.services.collectionobject.MeasuredPartGroup;
 import org.collectionspace.services.collectionobject.MeasuredPartGroupList;
 import org.collectionspace.services.collectionobject.ObjectNameGroup;
 import org.collectionspace.services.collectionobject.ObjectNameList;
-import org.collectionspace.services.collectionobject.OtherNumber;
 import org.collectionspace.services.collectionobject.OtherNumberList;
+import org.collectionspace.services.collectionobject.OtherNumber;
 import org.collectionspace.services.collectionobject.ResponsibleDepartmentList;
 import org.collectionspace.services.collectionobject.TitleGroup;
 import org.collectionspace.services.collectionobject.TitleGroupList;
@@ -1246,20 +1246,10 @@ public class CollectionObjectServiceTest extends AbstractServiceTestImpl {
     private PoxPayloadOut createCollectionObjectInstance(String commonPartName,
             String objectNumber, String objectName) {
         CollectionobjectsCommon collectionObject = new CollectionobjectsCommon();
-
-        //REM
-        OtherNumber remNumber = new OtherNumber();
-        remNumber.setNumberType("remNumber");
-        remNumber.setNumberValue("2271966-" + System.currentTimeMillis());
-        collectionObject.setRemNumber(remNumber);
         
         // Scalar fields
         collectionObject.setObjectNumber(objectNumber);
         collectionObject.setAge(AGE_VALUE); //test for null string
-        
-        // FIXME this can be removed when the repeatable other number list
-        // is supported by the application layers
-        collectionObject.setOtherNumber("urn:org.walkerart.id:123");
 
         // Repeatable structured groups
 
index f94f3f3b3c625c8e432bad7a03c5fba14a31cd97..5e0e0eda15ad32acaa1d441381966fd93f13d139 100644 (file)
@@ -2,8 +2,6 @@
 <ns2:collectionobjects_common xmlns:ns2="http://collectionspace.org/services/collectionobject">
 <objectNumber>objectNumber</objectNumber>
 
-<otherNumber>XXX</otherNumber>
-<otherNumberType>otherNumberType</otherNumberType>
 <briefDescriptions> <briefDescription> briefDescription</briefDescription></briefDescriptions>
 <distinguishingFeatures>distFeatures</distinguishingFeatures>
 <numberOfObjects>numberOfObjects</numberOfObjects>
index 1a2186437246901b54fba50555a399fe3d819d63..3dc3a28ddd2b6248b3d34faa8652ca3e25dd3ee6 100644 (file)
@@ -2,8 +2,6 @@
 <ns2:collectionobjects_common xmlns:ns2="http://collectionspace.org/services/collectionobject">
 <objectNumber>objectNumber</objectNumber>
 
-<otherNumber>XXX</otherNumber>
-<otherNumberType>otherNumberType</otherNumberType>
 <briefDescriptions>
 <briefDescription>briefDescription1</briefDescription>
 <briefDescription>briefDescription2</briefDescription>
index 5c8a81b8c2383d24f631edefb79d7dc426cd31eb..8529c5897ae4b184c4881874da61d449fca99fc4 100644 (file)
@@ -2,8 +2,6 @@
 <ns2:collectionobjects_common xmlns:ns2="http://collectionspace.org/services/collectionobject">
 <objectNumber>objectNumber</objectNumber>
 
-<otherNumber>XXX</otherNumber>
-<otherNumberType>otherNumberType</otherNumberType>
 <briefDescriptions>
 <!-- test childnode as whitespace -->
 <briefDescription> briefDescription1</briefDescription>
index a83be2855881e2edc5614b16c64af0df4701b062..58b5b169b0c978c502595988423705dd0ef3e9e7 100644 (file)
@@ -2,8 +2,6 @@
 <ns2:collectionobjects_common xmlns:ns2="http://collectionspace.org/services/collectionobject">
 <objectNumber>objectNumber</objectNumber>
 
-<otherNumber>XXX</otherNumber>
-<otherNumberType>otherNumberType</otherNumberType>
 <briefDescriptions>
     <briefDescription>briefDescription1</briefDescription>
     <briefDescription>briefDescription2</briefDescription>
index b964dff0e2ba67b4d19ad7aece77535cf6517787..56774f27a83176dcaa0b61521265cb6a57d0ad49 100644 (file)
@@ -9,7 +9,6 @@ package org.collectionspace.services;
  */\r
 public interface CollectionObjectJAXBSchema {\r
        final static String OBJECT_NUMBER = "objectNumber";\r
-       final static String OTHER_NUMBER = "otherNumber";\r
        final static String BRIEF_DESCRIPTION = "briefDescription";\r
        final static String COMMENTS = "comments";\r
        final static String DISTINGUISHING_FEATURES = "distinguishingFeatures";\r
index c27cd2af643e3b797c67ce418a6d6047944484d5..7457d5e7754fc18235a18fe50c37bf982b7c5765 100644 (file)
             <xs:sequence>
                 <xs:element name="csid" type="xs:string"/>
                 
-                <xs:element name="remNumber" type="ns:otherNumber"/>
-
                 <!-- Object Identification Information -->
 
                 <xs:element name="objectNumber" type="xs:string"/>
                 <xs:element name="otherNumberList" type="otherNumberList"/>
 
-                <!-- Remove these two elements when the App/UI layer is -->
-                <!-- using the new repeatable 'otherNumbers' field: -->
-                <xs:element name="otherNumber" type="xs:string"/>
-                <xs:element name="otherNumberType" type="xs:string"/>
-
                 <xs:element name="briefDescriptions" type="briefDescriptionList"/>
                 <xs:element name="comments" type="commentList"/>
                 <xs:element name="distinguishingFeatures" type="xs:string"/>
index dda317c0f5bad56c6f014109d28bb9570d4a3ad7..982de8651043fd6f994c942dbb64d1a01b673b3f 100644 (file)
@@ -4,6 +4,7 @@
     Description: Prototype tenant bindings, specifying the default services
                  layer configuration for a generic, out-of-the-box tenant.
                  These prototype bindings are merged with 'delta' bindings
+                 specifying the differences from the prototype configuration
                  for each actual tenant, resulting in 'merged' bindings
                  for that tenant.
     $LastChangedRevision$
                             <types:key>authRef</types:key>
                             <types:value>measuredPartGroupList/*/dimensionSubGroupList/*/measuredBy</types:value>
                         </types:item>
-                        <!-- The following fields may become part of a repeatable sub-group, per JIRA(s) -->
-                        <!-- spawned from CSPACE-4490. -->
-                        <!-- As a result, they will fall into complexType structures. -->
+                        <!-- The following fields may become part of repeatable sub-groups for -->
+                        <!-- associatedEvent and for owner, respectively, per JIRA(s) spawned from CSPACE-4490. -->
                         <!-- The names of ancestor elements below are anticipated, arbitrary and subject to change. -->
                         <!--
                         <types:item xmlns:types="http://collectionspace.org/services/common/types">
index 02e7702fffd2919c4bdcd789cd54fafd354c0a44..b7973c1cc2967d27c4c3f65a15509d76b2495d3a 100755 (executable)
@@ -57,10 +57,7 @@ import java.io.StringWriter;
  *           &lt;nh-note/>\r
  *         &lt;/schema>\r
  *         &lt;schema name="collectionobjects_common">\r
- *           &lt;remNumber>\r
- *             &lt;numberValue/>\r
- *             &lt;numberType/>\r
- *           &lt;/remNumber>\r
+ *            &lt;distinguishingFeatures/>\r
  *         &lt;/schema>\r
  *       &lt;/document>\r
  *\r
@@ -68,10 +65,8 @@ import java.io.StringWriter;
  *        &lt;schema name="collectionobjects_naturalhistory">            &lt;nh-int/>\r
  *        &lt;nh-note/>\r
  *    plus some context information, and the second will pass String fragment =\r
- *        &lt;remNumber>\r
- *          &lt;numberValue/>\r
- *          &lt;numberType/>\r
- *        &lt;/remNumber>\r
+ *        &lt;distinguishingFeatures/>\r
+ *\r
  *\r
  * @author Laramie Crocker\r
  */\r
index a1c5cc54bb71f588a0b3f31e61c227a96b97f987..25ae8361456ba3b13fcc95bd627a0c25cfec4da4 100644 (file)
@@ -445,9 +445,10 @@ public class DocumentUtils {
        }
 
        /**
-        * isQualified check if the given dateVal is already qualified with given property name
-        * e.g.  otherNumber|urn:org.collectionspace.id:24082390 is qualified with otherNumber
-        * but urn:org.walkerart.id:123 is not qualified
+        * isQualified check if the given dateVal is already qualified with given
+     * property name e.g. (in the example of a former 'otherNumber' field in
+     * CollectionObject) otherNumber|urn:org.collectionspace.id:24082390 is
+     * qualified with otherNumber but urn:org.walkerart.id:123 is not qualified
         * @param name of the property, e.g. otherNumber
         * @param dateVal of the property e.g. otherNumber
         * @return
@@ -1254,4 +1255,4 @@ public class DocumentUtils {
                }               
                return result;
        }       
-}
\ No newline at end of file
+}
index c652b72119acfd56ddcc33dfdc17ab0569c1397e..5b774d78dff4d73bfd714c6314bd9d01d374c8cd 100755 (executable)
@@ -5,10 +5,7 @@
     <collectionobjects_naturalhistory:nh-note>In test-data</collectionobjects_naturalhistory:nh-note>\r
   </schema>\r
   <schema xmlns:collectionobjects_common="http://collectionspace.org/collectionobject/" name="collectionobjects_common">\r
-    <collectionobjects_common:remNumber>\r
-      <numberValue/>\r
-      <numberType/>\r
-    </collectionobjects_common:remNumber>\r
+    <collectionobjects_common:distinguishingFeatures/>\r
     <collectionobjects_common:sex>Male</collectionobjects_common:sex>\r
   </schema>\r
 </document>\r
index 3a2dc17d273a0a533290626171a8636362713d6a..35161ad4685e5f3f171b1f7d1b77e91642d4f62f 100644 (file)
@@ -25,7 +25,7 @@
                                intakes
                                no need to give slash at the beginning or end
                                - attributeName could be an attribute of the service schema
-                               e.g. otherNumber from collectionobjects_common
+                               e.g. distinguishingFeatures from collectionobjects_common
                                - actionGroup is label that can be used by a client to "group" sets
                                of actions for operations
                                like searching for permissions by a specific actionGroup label.
index 0d59e78e4718dfc44ed29ce30311f8d485ce2e3c..458d81b39442cd703f3b435c1c3a5bd2840a2bd4 100644 (file)
@@ -122,8 +122,6 @@ public class IDServiceNuxeoImpl {      // implements IDService {
                queryParams.put(CO_NUXEO_SCHEMA_NAME + ":"
                                + CollectionObjectJAXBSchema.OBJECT_NUMBER, co
                                .getObjectNumber());
-               queryParams.put(CO_NUXEO_SCHEMA_NAME + ":"
-                               + CollectionObjectJAXBSchema.OTHER_NUMBER, co.getOtherNumber());
                queryParams.put(CO_NUXEO_SCHEMA_NAME + ":"
                                + CollectionObjectJAXBSchema.BRIEF_DESCRIPTION, co
                                .getBriefDescription());
index 197fde81e50bc8b4f993249787d6b0bf5b3ec46f..f336e91ac63794a88025a61c84acf51d5c0465db 100755 (executable)
             <collectionobjects_common:dimensionValue/>\r
             <collectionobjects_common:fieldCollectionNumber></collectionobjects_common:fieldCollectionNumber>\r
             <collectionobjects_common:ageUnit>years</collectionobjects_common:ageUnit>\r
-            <collectionobjects_common:otherNumber/>\r
             <collectionobjects_common:dimension/>\r
             <collectionobjects_common:dateLatestQualifier/>\r
             <collectionobjects_common:contentEventNameGroupList>\r
             <collectionobjects_common:assocPersonGroupList/>\r
             <collectionobjects_common:assocOrganizationGroupList/>\r
             <collectionobjects_common:viewersPersonalExperience>Probably a horrible one, considering how uninteresting this object is</collectionobjects_common:viewersPersonalExperience>\r
-            <collectionobjects_common:remNumber>\r
-              <numberValue/>\r
-              <numberType/>\r
-            </collectionobjects_common:remNumber>\r
             <collectionobjects_common:comments>\r
               <comment>Seriously guys, it's just a piece of rock</comment>\r
             </collectionobjects_common:comments>\r
                 <materialComponentNote></materialComponentNote>\r
               </materialGroup>\r
             </collectionobjects_common:materialGroupList>\r
-            <collectionobjects_common:otherNumberType/>\r
             <collectionobjects_common:responsibleDepartments>\r
               <responsibleDepartment>antiquities</responsibleDepartment>\r
               <responsibleDepartment>decorative-arts</responsibleDepartment>\r