From 9ffcf7a3b989c0328ece480b8eac321a059705e1 Mon Sep 17 00:00:00 2001 From: Amy Wieliczka Date: Thu, 3 May 2012 17:03:31 -0700 Subject: [PATCH] CSPACE-5128: cleanup commented out pieces of code --- .../resources/OSGI-INF/layouts-contrib.xml | 30 +------------------ .../resources/schemas/acquisitions_common.xsd | 9 ------ .../client/test/AcquisitionAuthRefsTest.java | 2 -- .../services/AcquisitionJAXBSchema.java | 2 +- .../client/test/ObjectExitAuthRefsTest.java | 4 --- .../services/ObjectexitJAXBSchema.java | 1 - .../resources/OSGI-INF/layouts-contrib.xml | 30 +------------------ .../schemas/organizations_common.xsd | 2 -- .../services/OrganizationJAXBSchema.java | 2 -- .../main/resources/organization_common.xsd | 2 -- 10 files changed, 3 insertions(+), 81 deletions(-) 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 c4d1cd6e8..eebe0f3ea 100644 --- 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 @@ - acquisitionAuthorizer acquisitionAuthorizerDate - acquisitionDate acquisitionFundingCurrency acquisitionFundingValue acquisitionFundingSource @@ -38,19 +36,6 @@ transferOfTitleNumber fieldCollectionEventName - - @@ -77,20 +62,7 @@ dataInputText - - - - - - true - - acquisitions_common:acquisitionDate - - - dataInputText - - - + 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 f84d61e7d..efa493f54 100644 --- 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 @@ - - 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 25c89456f..73a2b0599 100644 --- 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 List acquisitionFundingSources, List acqOwners, List 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 2fc54257c..c6de59ff1 100644 --- 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; * */ public interface AcquisitionJAXBSchema { - // final static String ACCESSIONDATE = "accessionDate"; + } 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 ce8db2403..25fafddb8 100644 --- 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 private List personIdsCreated = new ArrayList(); 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 } 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 572a574f9..ed2862ac6 100644 --- 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 499c80041..bf292a1eb 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 @@ -88,9 +88,7 @@ nameAdditions - - + foundingPlace @@ -217,32 +215,6 @@ dataInputText - - - - - - true - - foundingDate - - - dataInputText - - - - - - - - true - - dissolutionDate - - - dataInputText - - --> 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 34d78752a..e7e3ab311 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 @@ -44,9 +44,7 @@ - - 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 a5e63655a..a912c2a55 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 @@ -17,8 +17,6 @@ public interface OrganizationJAXBSchema extends AuthorityItemJAXBSchema { final static String SHORT_NAME = "shortName"; final static String NAME_ADDITIONS = "nameAdditions"; final static String CONTACT_NAMES = "contactNames"; - // final static String FOUNDING_DATE = "foundingDate"; - // final static String DISSOLUTION_DATE = "dissolutionDate"; final static String FOUNDING_PLACE = "foundingPlace"; final static String GROUPS = "groups"; final static String FUNCTIONS = "functions"; diff --git a/services/organization/jaxb/src/main/resources/organization_common.xsd b/services/organization/jaxb/src/main/resources/organization_common.xsd index 37602d94d..ef1591551 100644 --- a/services/organization/jaxb/src/main/resources/organization_common.xsd +++ b/services/organization/jaxb/src/main/resources/organization_common.xsd @@ -35,8 +35,6 @@ - -- 2.47.3