CSPACE-5128: cleanup commented out pieces of code

diff --git a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/OSGI-INF/layouts-contrib.xml b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/OSGI-INF/layouts-contrib.xml
index c4d1cd6e89d319cbae6702d4a9b079a0125ec63b..eebe0f3ea05a800a84e5028a88b5dcb7d1721486 100644 (file)
--- a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/OSGI-INF/layouts-contrib.xml
+++ b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/OSGI-INF/layouts-contrib.xml
@@ -10,10 +10,8 @@
         <template mode="any">/layouts/layout_default_template.xhtml</template>
       </templates>
       <rows>
-        <!-- <row><widget>accessionDate</widget></row> -->
         <row><widget>acquisitionAuthorizer</widget></row>
         <row><widget>acquisitionAuthorizerDate</widget></row>
-        <row><widget>acquisitionDate</widget></row>
         <row><widget>acquisitionFundingCurrency</widget></row>
         <row><widget>acquisitionFundingValue</widget></row>
         <row><widget>acquisitionFundingSource</widget></row>
@@ -38,19 +36,6 @@
         <row><widget>transferOfTitleNumber</widget></row>
         <row><widget>fieldCollectionEventName</widget></row>
       </rows>
-
-      <!-- <widget name="accessionDate" type="text">
-        <labels>
-          <label mode="any">accessionDate</label>
-        </labels>
-        <translated>true</translated>
-        <fields>
-          <field>acquisitions_common:accessionDate</field>
-        </fields>
-        <properties widgetMode="edit">
-          <property name="styleClass">dataInputText</property>
-        </properties>
-      </widget> -->
       
       <widget name="acquisitionAuthorizer" type="text">
         <labels>
@@ -77,20 +62,7 @@
           <property name="styleClass">dataInputText</property>
         </properties>
       </widget>
-      
-      <widget name="acquisitionDate" type="text">
-        <labels>
-          <label mode="any">acquisitionDate</label>
-        </labels>
-        <translated>true</translated>
-        <fields>
-          <field>acquisitions_common:acquisitionDate</field>
-        </fields>
-        <properties widgetMode="edit">
-          <property name="styleClass">dataInputText</property>
-        </properties>
-      </widget>
-      
+            
       <widget name="acquisitionFundingCurrency" type="text">
         <labels>
           <label mode="any">acquisitionFundingCurrency</label>

diff --git a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/schemas/acquisitions_common.xsd b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/schemas/acquisitions_common.xsd
index f84d61e7d7ecf1b7f20dcd2c40254fd98312c5a4..efa493f54f165d12801927945129dbe2e70f0a51 100644 (file)
--- a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/schemas/acquisitions_common.xsd
+++ b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/schemas/acquisitions_common.xsd
@@ -32,15 +32,6 @@
         </xs:complexType>\r
     </xs:element>\r
     \r
-    <!-- <xs:element name="acquisitionDateGroupList" type="acquisitionDateGroupList"/>\r
-    \r
-    <xs:complexType name="acquisitionDateGroupList">\r
-        <xs:sequence>\r
-            <xs:element name="acquisitionDateGroup" type="structuredDateGroup" minOccurs="0"\r
-                maxOccurs="unbounded"/>\r
-        </xs:sequence>\r
-    </xs:complexType> -->\r
-    \r
     <xs:element name="acquisitionFundingList" type="acquisitionFundingList"/>\r
     <xs:element name="acquisitionMethod" type="xs:string"/>\r
     <xs:element name="acquisitionNote" type="xs:string"/>\r

diff --git a/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionAuthRefsTest.java b/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionAuthRefsTest.java
index 25c89456ffb6b03f54acf6f724a49e247f531fdd..73a2b0599a47796a61f374eaafb36b487ad3e27a 100644 (file)
--- a/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionAuthRefsTest.java
+++ b/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionAuthRefsTest.java
@@ -371,10 +371,8 @@ public class AcquisitionAuthRefsTest extends BaseServiceTest<AbstractCommonList>
                        List<String> acquisitionFundingSources,
                        List<String> acqOwners,
                        List<String> acquisitionSources) {
-                            // String accessionDate,
 
                AcquisitionsCommon acquisition = new AcquisitionsCommon();
-        // acquisition.setAccessionDate(accessionDate);
                acquisition.setAcquisitionAuthorizer(acquisitionAuthorizer);
 
                // AcquisitionFunding-related authrefs fields are *not* currently

diff --git a/services/acquisition/jaxb/src/main/java/org/collectionspace/services/AcquisitionJAXBSchema.java b/services/acquisition/jaxb/src/main/java/org/collectionspace/services/AcquisitionJAXBSchema.java
index 2fc54257c568bffcdf67f5289b0a80c9e1fe5939..c6de59ff1470f874591edb9fc3ac7c8af7aff4ea 100644 (file)
--- a/services/acquisition/jaxb/src/main/java/org/collectionspace/services/AcquisitionJAXBSchema.java
+++ b/services/acquisition/jaxb/src/main/java/org/collectionspace/services/AcquisitionJAXBSchema.java
@@ -8,7 +8,7 @@ package org.collectionspace.services;
  *\r
  */\r
 public interface AcquisitionJAXBSchema {\r
-    // final static String ACCESSIONDATE = "accessionDate";\r
+\r
 }\r
 \r
 \r

diff --git a/services/objectexit/client/src/test/java/org/collectionspace/services/client/test/ObjectExitAuthRefsTest.java b/services/objectexit/client/src/test/java/org/collectionspace/services/client/test/ObjectExitAuthRefsTest.java
index ce8db240332eef11a037d59849746f8746bd6672..25fafddb89a6a9c490cf83715964900dc842ebb4 100644 (file)
--- a/services/objectexit/client/src/test/java/org/collectionspace/services/client/test/ObjectExitAuthRefsTest.java
+++ b/services/objectexit/client/src/test/java/org/collectionspace/services/client/test/ObjectExitAuthRefsTest.java
@@ -66,7 +66,6 @@ public class ObjectExitAuthRefsTest extends BaseServiceTest<AbstractCommonList>
     private List<String> personIdsCreated = new ArrayList<String>();
     private String personAuthCSID = null;
     private String depositorRefName = null;
-    // private String exitDate = null;
     private String exitNumber = null;
     private final static String CURRENT_DATE_UTC =
             GregorianCalendarDateTimeUtils.currentDateUTC();
@@ -92,14 +91,11 @@ public class ObjectExitAuthRefsTest extends BaseServiceTest<AbstractCommonList>
     }
 
     private PoxPayloadOut createObjectExitInstance(String depositorRefName, String exitNumber) {
-        // , String exitDate
-        // this.exitDate = exitDate;
         this.exitNumber = exitNumber;
         this.depositorRefName = depositorRefName;
         ObjectexitCommon objectexit = new ObjectexitCommon();
         objectexit.setDepositor(depositorRefName);
         objectexit.setExitNumber(exitNumber);
-        // objectexit.setExitDate(exitDate);
 
         PoxPayloadOut multipart = new PoxPayloadOut(ObjectExitClient.SERVICE_PAYLOAD_NAME);
         PayloadOutputPart commonPart = multipart.addPart(new ObjectExitClient().getCommonPartName(),

diff --git a/services/objectexit/jaxb/src/main/java/org/collectionspace/services/ObjectexitJAXBSchema.java b/services/objectexit/jaxb/src/main/java/org/collectionspace/services/ObjectexitJAXBSchema.java
index 572a574f9e1227a764888acfb804531316113cee..ed2862ac6825601b81d3e58452d122a61679a5a2 100644 (file)
--- a/services/objectexit/jaxb/src/main/java/org/collectionspace/services/ObjectexitJAXBSchema.java
+++ b/services/objectexit/jaxb/src/main/java/org/collectionspace/services/ObjectexitJAXBSchema.java
@@ -6,7 +6,6 @@ package org.collectionspace.services;
 public interface ObjectexitJAXBSchema {
     final static String OBJECT_EXIT_CURRENT_OWNER = "currentOwner";
     final static String OBJECT_EXIT_DEPOSITOR = "depositor";
-    // final static String OBJECT_EXIT_DATE = "exitDate";
     final static String OBJECT_EXIT_METHODS = "exitMethods";
     final static String OBJECT_EXIT_METHOD = "exitMethod";
     final static String OBJECT_EXIT_NOTE = "exitNote";

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 499c800417e1da00feea7b851c6c86aeca01a143..bf292a1ebef9f9636a814c7118e29a2a3d124bf6 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
@@ -88,9 +88,7 @@
         <row><widget>nameAdditions</widget></row>
         <!-- Repeatable fields are commented out for now until we -->
         <!-- identify how to represent these complex types in layouts. -->
-<!--        <row><widget>contactName</widget></row>-->
-        <!-- <row><widget>foundingDate</widget></row>
-        <row><widget>dissolutionDate</widget></row> -->
+<!--        <row><widget>contactName</widget></row> -->
         <row><widget>foundingPlace</widget></row>
 <!--        <row><widget>group</widget></row> -->
 <!--        <row><widget>function</widget></row> -->
@@ -217,32 +215,6 @@
           <property name="styleClass">dataInputText</property>
         </properties>
       </widget>
-      
-      <widget name="foundingDate" type="text">
-        <labels>
-          <label mode="any">foundingDate</label>
-        </labels>
-        <translated>true</translated>
-        <fields>
-          <field schema="organizations_common">foundingDate</field>
-        </fields>
-        <properties widgetMode="edit">
-          <property name="styleClass">dataInputText</property>
-        </properties>
-      </widget>
-      
-      <widget name="dissolutionDate" type="text">
-        <labels>
-          <label mode="any">dissolutionDate</label>
-        </labels>
-        <translated>true</translated>
-        <fields>
-          <field schema="organizations_common">dissolutionDate</field>
-        </fields>
-        <properties widgetMode="edit">
-          <property name="styleClass">dataInputText</property>
-        </properties>
-      </widget>
 -->      
       <widget name="foundingPlace" type="text">
         <labels>

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 34d78752a1695cf17372cf56c005949daadb0d8b..e7e3ab31108824fe96aec54a9083818b95a2da79 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
@@ -44,9 +44,7 @@
         </xs:complexType>
     </xs:element>
     <xs:element name="foundingDate" type="structuredDateGroup"/>
-    <!-- <xs:element name="foundingDate" type="xs:string"/> -->
     <xs:element name="dissolutionDate" type="structuredDateGroup"/>
-    <!-- <xs:element name="dissolutionDate" type="xs:string"/> -->
     <xs:element name="foundingPlace" type="xs:string"/>
     <xs:element name="groups">
         <xs:complexType>

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 a5e63655ad887a6b1c80cc1b79adc6b158975079..a912c2a55ccc8dc13338cd61ca88a7f825bb4317 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
@@ -17,8 +17,6 @@ public interface OrganizationJAXBSchema extends AuthorityItemJAXBSchema {
     final static String SHORT_NAME = "shortName";\r
     final static String NAME_ADDITIONS = "nameAdditions";\r
     final static String CONTACT_NAMES = "contactNames";\r
-    // final static String FOUNDING_DATE = "foundingDate";\r
-    // final static String DISSOLUTION_DATE = "dissolutionDate";\r
     final static String FOUNDING_PLACE = "foundingPlace";\r
     final static String GROUPS = "groups";\r
     final static String FUNCTIONS = "functions";\r

diff --git a/services/organization/jaxb/src/main/resources/organization_common.xsd b/services/organization/jaxb/src/main/resources/organization_common.xsd
index 37602d94d087151c2e816482f474b07e8b16c1a9..ef1591551d5edca55a965339fe8f53d5863508a9 100644 (file)
--- a/services/organization/jaxb/src/main/resources/organization_common.xsd
+++ b/services/organization/jaxb/src/main/resources/organization_common.xsd
@@ -35,8 +35,6 @@
                 <xs:element name="contactNames" type="contactNameList"/>
                 <xs:element name="foundingDate" type="structuredDateGroup"/>
                 <xs:element name="dissolutionDate" type="structuredDateGroup"/>
-                <!-- <xs:element name="foundingDate" type="xs:string"/>
-                <xs:element name="dissolutionDate" type="xs:string"/> -->
                 <xs:element name="foundingPlace" type="xs:string"/>
                 <xs:element name="groups" type="groupList"/>
                 <xs:element name="functions" type="functionList"/>