From: Richard Millet Date: Fri, 9 Oct 2009 07:08:05 +0000 (+0000) Subject: CSPACE-504: Exchanged "_" for "-" in all Nuxeo-related entity services. Updated... X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=cfa85b0bee05857f24fb637f06a39e74ee9dc9a9;p=tmp%2Fjakarta-migration.git CSPACE-504: Exchanged "_" for "-" in all Nuxeo-related entity services. Updated tests, service bindings, Nuxeo web layouts, etc. Ran and passed ALL tests. --- diff --git a/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionServiceTest.java b/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionServiceTest.java index 053ac6f08..6c029f690 100644 --- a/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionServiceTest.java +++ b/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionServiceTest.java @@ -52,11 +52,6 @@ public class AcquisitionServiceTest extends AbstractServiceTest { final String SERVICE_PATH_COMPONENT = "acquisitions"; private String knownResourceId = null; - //FIXME: Remove this method once ALL the services use "_common" instead of "-common" - public String getCommonPartName() { - return getServicePathComponent() + "_common"; - } - // --------------------------------------------------------------- // CRUD tests : CREATE tests // --------------------------------------------------------------- @@ -243,7 +238,7 @@ public class AcquisitionServiceTest extends AbstractServiceTest { verbose("readList: list-item[" + i + "] csid=" + item.getCsid()); verbose("readList: list-item[" + i + "] objectNumber=" + - item.getAccessiondate()); + item.getAccessionDate()); verbose("readList: list-item[" + i + "] URI=" + item.getUri()); i++; 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 6b36e4853..6e4946461 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"; + final static String ACCESSIONDATE = "accessionDate"; } diff --git a/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd index 0542493f7..d15fc2f23 100644 --- a/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd +++ b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd @@ -48,7 +48,7 @@ - services.client + + org.collectionspace.services + org.collectionspace.services.common + 1.0 + org.slf4j slf4j-api diff --git a/services/client/src/main/java/org/collectionspace/services/client/test/AbstractServiceTest.java b/services/client/src/main/java/org/collectionspace/services/client/test/AbstractServiceTest.java index 0391baf5e..efeb736ec 100644 --- a/services/client/src/main/java/org/collectionspace/services/client/test/AbstractServiceTest.java +++ b/services/client/src/main/java/org/collectionspace/services/client/test/AbstractServiceTest.java @@ -33,6 +33,7 @@ import javax.xml.bind.Marshaller; import javax.xml.bind.Unmarshaller; import org.collectionspace.services.client.TestServiceClient; +import org.collectionspace.services.common.context.ServiceContext; import org.jboss.resteasy.client.ClientRequest; import org.jboss.resteasy.client.ClientResponse; @@ -266,7 +267,8 @@ public abstract class AbstractServiceTest implements ServiceTest { @Override public String getCommonPartName() { - return getServicePathComponent() + "-common"; + return getServicePathComponent() + ServiceContext.PART_LABEL_SEPERATOR + + ServiceContext.PART_COMMON_LABEL; } // --------------------------------------------------------------- diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/OSGI-INF/core-types-contrib.xml b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/OSGI-INF/core-types-contrib.xml index 8ab4cb2e0..9b58b6ea7 100644 --- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/OSGI-INF/core-types-contrib.xml +++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/OSGI-INF/core-types-contrib.xml @@ -1,15 +1,15 @@ - - + + - - + + diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/OSGI-INF/layouts-contrib.xml b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/OSGI-INF/layouts-contrib.xml index ee35a77d4..a27ee1ff7 100644 --- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/OSGI-INF/layouts-contrib.xml +++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/OSGI-INF/layouts-contrib.xml @@ -12,12 +12,24 @@ objectNumber otherNumber + otherNumberType briefDescription comments distFeatures + numberOfObjects + objectName + objectNameCurrency + objectNameNote + objectNameSystem + objectNameType + objectNameLanguage + responsibleDept title + objectTitleLanguage + titleTranslation + titleType @@ -26,7 +38,7 @@ true - objectNumber + objectNumber dataInputText @@ -39,7 +51,20 @@ true - otherNumber + otherNumber + + + dataInputText + + + + + + + + true + + otherNumberType dataInputText @@ -52,7 +77,7 @@ true - briefDescription + briefDescription dataInputText @@ -65,7 +90,7 @@ true - comments + comments dataInputText @@ -78,7 +103,7 @@ true - distFeatures + distFeatures dataInputText @@ -91,7 +116,7 @@ true - objectName + objectName dataInputText @@ -104,7 +129,7 @@ true - responsibleDept + responsibleDept dataInputText @@ -117,7 +142,7 @@ true - title + title dataInputText diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects-common.xsd b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects-common.xsd deleted file mode 100644 index d37b63e13..000000000 --- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects-common.xsd +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects_common.xsd b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects_common.xsd new file mode 100644 index 000000000..78f6e9f01 --- /dev/null +++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects_common.xsd @@ -0,0 +1,119 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects-naturalhistory.xsd b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects_naturalhistory.xsd similarity index 100% rename from services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects-naturalhistory.xsd rename to services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects_naturalhistory.xsd diff --git a/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectServiceTest.java b/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectServiceTest.java index a8e499905..60b43b6f4 100644 --- a/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectServiceTest.java +++ b/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectServiceTest.java @@ -53,6 +53,11 @@ public class CollectionObjectServiceTest extends AbstractServiceTest { final String SERVICE_PATH_COMPONENT = "collectionobjects"; private String knownResourceId = null; + //FIXME: Remove this method once ALL the services use "_common" instead of "-common" + public String getCommonPartName() { + return getServicePathComponent() + "_common"; + } + // --------------------------------------------------------------- // CRUD tests : CREATE tests // --------------------------------------------------------------- diff --git a/services/collectionobject/jaxb/src/main/resources/collectionobjects-common.xsd b/services/collectionobject/jaxb/src/main/resources/collectionobjects-common.xsd deleted file mode 100644 index e34e35ce9..000000000 --- a/services/collectionobject/jaxb/src/main/resources/collectionobjects-common.xsd +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd new file mode 100644 index 000000000..e0995e740 --- /dev/null +++ b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd @@ -0,0 +1,155 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/services/collectionobject/jaxb/src/main/resources/collectionobjects-naturalhistory.xsd b/services/collectionobject/jaxb/src/main/resources/collectionobjects_naturalhistory.xsd similarity index 100% rename from services/collectionobject/jaxb/src/main/resources/collectionobjects-naturalhistory.xsd rename to services/collectionobject/jaxb/src/main/resources/collectionobjects_naturalhistory.xsd diff --git a/services/common/src/main/config/tenant-bindings.xml b/services/common/src/main/config/tenant-bindings.xml index 9355c744a..05e8caf71 100644 --- a/services/common/src/main/config/tenant-bindings.xml +++ b/services/common/src/main/config/tenant-bindings.xml @@ -30,21 +30,21 @@ + label="collectionobjects_common" updated="" order="1"> + schemaLocation="http://collectionspace.org/services/collectionobject http://services.collectionspace.org/collectionobject/collectionobjects_common.xsd"> + label="collectionobjects_naturalhistory" updated="" order="2"> + schemaLocation="http://collectionspace.org/services/collectionobject/domain/naturalhistory http://collectionspace.org/services/collectionobject/domain/collectionobjects_naturalhistory.xsd"> @@ -68,11 +68,11 @@ + label="intakes_common" updated="" order="1"> + schemaLocation="http://collectionspace.org/services/intake http://services.collectionspace.org/intake/intakes_common.xsd"> @@ -96,11 +96,11 @@ + label="vocabularies_common" updated="" order="1"> + schemaLocation="http://collectionspace.org/services/vocabulary http://services.collectionspace.org/vocabulary/vocabularies_common.xsd"> @@ -152,11 +152,11 @@ + label="relations_common" updated="" order="1"> + schemaLocation="http://collectionspace.org/services/relation http://services.collectionspace.org/relation/relations_common.xsd"> diff --git a/services/common/src/main/java/org/collectionspace/services/common/context/AbstractServiceContext.java b/services/common/src/main/java/org/collectionspace/services/common/context/AbstractServiceContext.java index fdebfe5d4..333a5502b 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/context/AbstractServiceContext.java +++ b/services/common/src/main/java/org/collectionspace/services/common/context/AbstractServiceContext.java @@ -49,7 +49,7 @@ public abstract class AbstractServiceContext Map objectPartMap = new HashMap(); private ServiceBindingType serviceBinding; private TenantBindingType tenantBinding; - + public AbstractServiceContext(String serviceName) { TenantBindingConfigReader tReader = ServiceMain.getInstance().getTenantBindingConfigReader(); @@ -82,7 +82,7 @@ public abstract class AbstractServiceContext */ @Override public String getCommonPartLabel() { - return getServiceName().toLowerCase() + "-common"; + return getServiceName().toLowerCase() + PART_LABEL_SEPERATOR + PART_COMMON_LABEL; } @Override diff --git a/services/common/src/main/java/org/collectionspace/services/common/context/ServiceContext.java b/services/common/src/main/java/org/collectionspace/services/common/context/ServiceContext.java index ab63c0e11..f3587cc57 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/context/ServiceContext.java +++ b/services/common/src/main/java/org/collectionspace/services/common/context/ServiceContext.java @@ -36,6 +36,12 @@ import org.collectionspace.services.common.service.ServiceBindingType; */ public interface ServiceContext { + /** + * The charactor used to separtate the words in a part label + */ + public static final String PART_LABEL_SEPERATOR = "_"; + public static final String PART_COMMON_LABEL = "common"; + /** * getTenantId get tenant id * @return tenant id diff --git a/services/common/src/main/java/org/collectionspace/services/common/repository/AbstractDocumentHandler.java b/services/common/src/main/java/org/collectionspace/services/common/repository/AbstractDocumentHandler.java index 367def58f..03a6d3d44 100644 --- a/services/common/src/main/java/org/collectionspace/services/common/repository/AbstractDocumentHandler.java +++ b/services/common/src/main/java/org/collectionspace/services/common/repository/AbstractDocumentHandler.java @@ -173,7 +173,7 @@ public abstract class AbstractDocumentHandler StringTokenizer tkz = new StringTokenizer(qProp, ":"); if(tkz.countTokens() != 2){ String msg = "Property must be in the form xxx:yyy, " + - "e.g. collectionobjects-common:objectNumber"; + "e.g. collectionobjects_common:objectNumber"; logger.error(msg); throw new IllegalArgumentException(msg); } diff --git a/services/common/src/main/resources/relations-common.xsd b/services/common/src/main/resources/relations_common.xsd similarity index 96% rename from services/common/src/main/resources/relations-common.xsd rename to services/common/src/main/resources/relations_common.xsd index 8bbc6587c..bf3db87af 100644 --- a/services/common/src/main/resources/relations-common.xsd +++ b/services/common/src/main/resources/relations_common.xsd @@ -21,7 +21,7 @@ > - + diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/OSGI-INF/core-types-contrib.xml b/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/OSGI-INF/core-types-contrib.xml index 2fa6e50a6..98b355bb6 100644 --- a/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/OSGI-INF/core-types-contrib.xml +++ b/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/OSGI-INF/core-types-contrib.xml @@ -1,13 +1,13 @@ - + - + diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/OSGI-INF/layouts-contrib.xml b/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/OSGI-INF/layouts-contrib.xml index a651ba18d..63d04b048 100644 --- a/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/OSGI-INF/layouts-contrib.xml +++ b/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/OSGI-INF/layouts-contrib.xml @@ -28,7 +28,7 @@ true - currentOwner + currentOwner dataInputText @@ -41,7 +41,7 @@ true - depositor + depositor dataInputText @@ -54,7 +54,7 @@ true - depositorsRequirements + depositorsRequirements dataInputText @@ -67,7 +67,7 @@ true - entryDate + entryDate dataInputText @@ -80,7 +80,7 @@ true - entryMethod + entryMethod dataInputText @@ -93,7 +93,7 @@ true - entryNote + entryNote dataInputText @@ -106,7 +106,7 @@ true - entryNumber + entryNumber dataInputText @@ -119,7 +119,7 @@ true - entryReason + entryReason dataInputText @@ -132,7 +132,7 @@ true - packingNote + packingNote dataInputText @@ -145,7 +145,7 @@ true - returnDate + returnDate dataInputText diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/schemas/intakes-common.xsd b/services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/schemas/intakes_common.xsd similarity index 100% rename from services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/schemas/intakes-common.xsd rename to services/intake/3rdparty/nuxeo-platform-cs-intake/src/main/resources/schemas/intakes_common.xsd diff --git a/services/intake/jaxb/src/main/resources/intakes-common.xsd b/services/intake/jaxb/src/main/resources/intakes-common.xsd index 485eafa75..8f01f1f0b 100644 --- a/services/intake/jaxb/src/main/resources/intakes-common.xsd +++ b/services/intake/jaxb/src/main/resources/intakes-common.xsd @@ -12,7 +12,7 @@ - + diff --git a/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/OSGI-INF/core-types-contrib.xml b/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/OSGI-INF/core-types-contrib.xml index 151b2c157..b01746649 100644 --- a/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/OSGI-INF/core-types-contrib.xml +++ b/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/OSGI-INF/core-types-contrib.xml @@ -16,13 +16,13 @@ --> - + - + diff --git a/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/OSGI-INF/layouts-contrib.xml b/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/OSGI-INF/layouts-contrib.xml index e9e3b748d..ff58c8e36 100644 --- a/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/OSGI-INF/layouts-contrib.xml +++ b/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/OSGI-INF/layouts-contrib.xml @@ -22,81 +22,80 @@ - - + - - relationtype - + relationshipType + documentId1 + documentType1 + documentId2 + documentType2 - + + + + + true - rel:relationtype + relationshipType - - - /widgets/complex_widget_template.xhtml - + + dataInputText + + + + + + + + true + + documentId1 + + + dataInputText + + + + + + + + true + + documentType1 + + + dataInputText - - - - - - - - true - - documentId1 - - - dataInputText - - - - - - - - true - - documentType1 - - - dataInputText - - - - - - - - true - - documentId2 - - - dataInputText - - - - - - - - true - - documentType2 - - - dataInputText - - - - + + + + + true + + documentId2 + + + dataInputText + + + + + + + + true + + documentType2 + + + dataInputText + + + diff --git a/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/schemas/relations-common.xsd b/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/schemas/relations_common.xsd similarity index 100% rename from services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/schemas/relations-common.xsd rename to services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/schemas/relations_common.xsd diff --git a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/OSGI-INF/core-types-contrib.xml b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/OSGI-INF/core-types-contrib.xml index 7521aa8f4..fd3f4448b 100644 --- a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/OSGI-INF/core-types-contrib.xml +++ b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/OSGI-INF/core-types-contrib.xml @@ -1,23 +1,23 @@ - + - + - + - + diff --git a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/OSGI-INF/layouts-contrib.xml b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/OSGI-INF/layouts-contrib.xml index 166b39d35..87fa5ccb5 100644 --- a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/OSGI-INF/layouts-contrib.xml +++ b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/OSGI-INF/layouts-contrib.xml @@ -20,7 +20,7 @@ true - displayName + displayName dataInputText @@ -33,7 +33,7 @@ true - vocabType + vocabType dataInputText @@ -60,7 +60,7 @@ true - displayName + displayName dataInputText @@ -73,7 +73,7 @@ true - inVocabulary + inVocabulary dataInputText diff --git a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/schemas/vocabularies-common.xsd b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/schemas/vocabularies_common.xsd similarity index 100% rename from services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/schemas/vocabularies-common.xsd rename to services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/schemas/vocabularies_common.xsd diff --git a/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/schemas/vocabularyitems-common.xsd b/services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/schemas/vocabularyitems_common.xsd similarity index 100% rename from services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/schemas/vocabularyitems-common.xsd rename to services/vocabulary/3rdparty/nuxeo-platform-cs-vocabulary/src/main/resources/schemas/vocabularyitems_common.xsd diff --git a/services/vocabulary/jaxb/src/main/resources/vocabulary-common.xsd b/services/vocabulary/jaxb/src/main/resources/vocabulary_common.xsd similarity index 97% rename from services/vocabulary/jaxb/src/main/resources/vocabulary-common.xsd rename to services/vocabulary/jaxb/src/main/resources/vocabulary_common.xsd index 0af81ee58..721babad8 100644 --- a/services/vocabulary/jaxb/src/main/resources/vocabulary-common.xsd +++ b/services/vocabulary/jaxb/src/main/resources/vocabulary_common.xsd @@ -12,7 +12,7 @@ - +