From 69ec703e6b660543d956b3d5af2c9665979a7334 Mon Sep 17 00:00:00 2001 From: Patrick Schmitz Date: Wed, 23 Jun 2010 07:45:32 +0000 Subject: [PATCH] CSPACE-2126 Added shortIdentifier to the list results item schema, for vocab+authority services. --- .../services/LocationAuthorityListItemJAXBSchema.java | 1 + .../jaxb/src/main/resources/locationauthority_common.xsd | 2 ++ .../location/nuxeo/LocationAuthorityDocumentModelHandler.java | 2 ++ .../services/OrgAuthorityListItemJAXBSchema.java | 1 + .../jaxb/src/main/resources/orgauthority_common.xsd | 2 ++ .../organization/nuxeo/OrgAuthorityDocumentModelHandler.java | 2 ++ .../services/PersonAuthorityListItemJAXBSchema.java | 1 + .../person/jaxb/src/main/resources/personauthority_common.xsd | 2 ++ .../person/nuxeo/PersonAuthorityDocumentModelHandler.java | 2 ++ .../collectionspace/services/VocabularyListItemJAXBSchema.java | 1 + .../vocabulary/jaxb/src/main/resources/vocabulary_common.xsd | 2 ++ .../vocabulary/nuxeo/VocabularyDocumentModelHandler.java | 2 ++ 12 files changed, 20 insertions(+) diff --git a/services/location/jaxb/src/main/java/org/collectionspace/services/LocationAuthorityListItemJAXBSchema.java b/services/location/jaxb/src/main/java/org/collectionspace/services/LocationAuthorityListItemJAXBSchema.java index fe6ce9091..3e301e484 100644 --- a/services/location/jaxb/src/main/java/org/collectionspace/services/LocationAuthorityListItemJAXBSchema.java +++ b/services/location/jaxb/src/main/java/org/collectionspace/services/LocationAuthorityListItemJAXBSchema.java @@ -3,6 +3,7 @@ package org.collectionspace.services; public interface LocationAuthorityListItemJAXBSchema { final static String DISPLAY_NAME = "displayName"; final static String REF_NAME = "refName"; + final static String SHORT_IDENTIFIER = "shortIdentifier"; final static String VOCAB_TYPE = "vocabType"; final static String CSID = "csid"; final static String URI = "url"; diff --git a/services/location/jaxb/src/main/resources/locationauthority_common.xsd b/services/location/jaxb/src/main/resources/locationauthority_common.xsd index b14a584bc..b9e4929fc 100644 --- a/services/location/jaxb/src/main/resources/locationauthority_common.xsd +++ b/services/location/jaxb/src/main/resources/locationauthority_common.xsd @@ -67,6 +67,8 @@ minOccurs="1" /> + diff --git a/services/location/service/src/main/java/org/collectionspace/services/location/nuxeo/LocationAuthorityDocumentModelHandler.java b/services/location/service/src/main/java/org/collectionspace/services/location/nuxeo/LocationAuthorityDocumentModelHandler.java index 9a8b46c43..8990eb7ab 100644 --- a/services/location/service/src/main/java/org/collectionspace/services/location/nuxeo/LocationAuthorityDocumentModelHandler.java +++ b/services/location/service/src/main/java/org/collectionspace/services/location/nuxeo/LocationAuthorityDocumentModelHandler.java @@ -122,6 +122,8 @@ public class LocationAuthorityDocumentModelHandler LocationAuthorityJAXBSchema.DISPLAY_NAME)); ilistItem.setRefName((String) docModel.getProperty(getServiceContext().getCommonPartLabel(), LocationAuthorityJAXBSchema.REF_NAME)); + ilistItem.setShortIdentifier((String) docModel.getProperty(getServiceContext().getCommonPartLabel(), + LocationAuthorityJAXBSchema.SHORT_IDENTIFIER)); ilistItem.setVocabType((String) docModel.getProperty(getServiceContext().getCommonPartLabel(), LocationAuthorityJAXBSchema.VOCAB_TYPE)); String id = NuxeoUtils.extractId(docModel.getPathAsString()); diff --git a/services/organization/jaxb/src/main/java/org/collectionspace/services/OrgAuthorityListItemJAXBSchema.java b/services/organization/jaxb/src/main/java/org/collectionspace/services/OrgAuthorityListItemJAXBSchema.java index d326dc9ff..800acbd8a 100644 --- a/services/organization/jaxb/src/main/java/org/collectionspace/services/OrgAuthorityListItemJAXBSchema.java +++ b/services/organization/jaxb/src/main/java/org/collectionspace/services/OrgAuthorityListItemJAXBSchema.java @@ -3,6 +3,7 @@ package org.collectionspace.services; public interface OrgAuthorityListItemJAXBSchema { final static String DISPLAY_NAME = "displayName"; final static String REF_NAME = "refName"; + final static String SHORT_IDENTIFIER = "shortIdentifier"; final static String VOCAB_TYPE = "vocabType"; final static String CSID = "csid"; final static String URI = "url"; diff --git a/services/organization/jaxb/src/main/resources/orgauthority_common.xsd b/services/organization/jaxb/src/main/resources/orgauthority_common.xsd index a9e129be1..7077ed9cf 100644 --- a/services/organization/jaxb/src/main/resources/orgauthority_common.xsd +++ b/services/organization/jaxb/src/main/resources/orgauthority_common.xsd @@ -64,6 +64,8 @@ minOccurs="1" /> + diff --git a/services/organization/service/src/main/java/org/collectionspace/services/organization/nuxeo/OrgAuthorityDocumentModelHandler.java b/services/organization/service/src/main/java/org/collectionspace/services/organization/nuxeo/OrgAuthorityDocumentModelHandler.java index 4e6dbabd0..341440b8b 100644 --- a/services/organization/service/src/main/java/org/collectionspace/services/organization/nuxeo/OrgAuthorityDocumentModelHandler.java +++ b/services/organization/service/src/main/java/org/collectionspace/services/organization/nuxeo/OrgAuthorityDocumentModelHandler.java @@ -132,6 +132,8 @@ public class OrgAuthorityDocumentModelHandler OrgAuthorityJAXBSchema.DISPLAY_NAME)); ilistItem.setRefName((String) docModel.getProperty(getServiceContext().getCommonPartLabel(), OrgAuthorityJAXBSchema.REF_NAME)); + ilistItem.setShortIdentifier((String) docModel.getProperty(getServiceContext().getCommonPartLabel(), + OrgAuthorityJAXBSchema.SHORT_IDENTIFIER)); ilistItem.setVocabType((String) docModel.getProperty(getServiceContext().getCommonPartLabel(), OrgAuthorityJAXBSchema.VOCAB_TYPE)); String id = NuxeoUtils.extractId(docModel.getPathAsString()); diff --git a/services/person/jaxb/src/main/java/org/collectionspace/services/PersonAuthorityListItemJAXBSchema.java b/services/person/jaxb/src/main/java/org/collectionspace/services/PersonAuthorityListItemJAXBSchema.java index b36ba9170..d64c58081 100644 --- a/services/person/jaxb/src/main/java/org/collectionspace/services/PersonAuthorityListItemJAXBSchema.java +++ b/services/person/jaxb/src/main/java/org/collectionspace/services/PersonAuthorityListItemJAXBSchema.java @@ -3,6 +3,7 @@ package org.collectionspace.services; public interface PersonAuthorityListItemJAXBSchema { final static String DISPLAY_NAME = "displayName"; final static String REF_NAME = "refName"; + final static String SHORT_IDENTIFIER = "shortIdentifier"; final static String VOCAB_TYPE = "vocabType"; final static String CSID = "csid"; final static String URI = "url"; diff --git a/services/person/jaxb/src/main/resources/personauthority_common.xsd b/services/person/jaxb/src/main/resources/personauthority_common.xsd index 3d6f0ba03..cbd5b1359 100644 --- a/services/person/jaxb/src/main/resources/personauthority_common.xsd +++ b/services/person/jaxb/src/main/resources/personauthority_common.xsd @@ -67,6 +67,8 @@ minOccurs="1" /> + diff --git a/services/person/service/src/main/java/org/collectionspace/services/person/nuxeo/PersonAuthorityDocumentModelHandler.java b/services/person/service/src/main/java/org/collectionspace/services/person/nuxeo/PersonAuthorityDocumentModelHandler.java index 533f38e32..887f46e1f 100644 --- a/services/person/service/src/main/java/org/collectionspace/services/person/nuxeo/PersonAuthorityDocumentModelHandler.java +++ b/services/person/service/src/main/java/org/collectionspace/services/person/nuxeo/PersonAuthorityDocumentModelHandler.java @@ -122,6 +122,8 @@ public class PersonAuthorityDocumentModelHandler PersonAuthorityJAXBSchema.DISPLAY_NAME)); ilistItem.setRefName((String) docModel.getProperty(getServiceContext().getCommonPartLabel(), PersonAuthorityJAXBSchema.REF_NAME)); + ilistItem.setShortIdentifier((String) docModel.getProperty(getServiceContext().getCommonPartLabel(), + PersonAuthorityJAXBSchema.SHORT_IDENTIFIER)); ilistItem.setVocabType((String) docModel.getProperty(getServiceContext().getCommonPartLabel(), PersonAuthorityJAXBSchema.VOCAB_TYPE)); String id = NuxeoUtils.extractId(docModel.getPathAsString()); diff --git a/services/vocabulary/jaxb/src/main/java/org/collectionspace/services/VocabularyListItemJAXBSchema.java b/services/vocabulary/jaxb/src/main/java/org/collectionspace/services/VocabularyListItemJAXBSchema.java index de04bc533..38dbf4821 100644 --- a/services/vocabulary/jaxb/src/main/java/org/collectionspace/services/VocabularyListItemJAXBSchema.java +++ b/services/vocabulary/jaxb/src/main/java/org/collectionspace/services/VocabularyListItemJAXBSchema.java @@ -3,6 +3,7 @@ package org.collectionspace.services; public interface VocabularyListItemJAXBSchema { final static String DISPLAY_NAME = "displayName"; final static String REF_NAME = "refName"; + final static String SHORT_IDENTIFIER = "shortIdentifier"; final static String VOCAB_TYPE = "vocabType"; final static String CSID = "csid"; final static String URI = "url"; diff --git a/services/vocabulary/jaxb/src/main/resources/vocabulary_common.xsd b/services/vocabulary/jaxb/src/main/resources/vocabulary_common.xsd index 314171239..ce0b52d58 100644 --- a/services/vocabulary/jaxb/src/main/resources/vocabulary_common.xsd +++ b/services/vocabulary/jaxb/src/main/resources/vocabulary_common.xsd @@ -65,6 +65,8 @@ minOccurs="1" /> + diff --git a/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyDocumentModelHandler.java b/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyDocumentModelHandler.java index 2b22d6bde..1e5a605d4 100644 --- a/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyDocumentModelHandler.java +++ b/services/vocabulary/service/src/main/java/org/collectionspace/services/vocabulary/nuxeo/VocabularyDocumentModelHandler.java @@ -132,6 +132,8 @@ public class VocabularyDocumentModelHandler VocabularyJAXBSchema.DISPLAY_NAME)); ilistItem.setRefName((String) docModel.getProperty(getServiceContext().getCommonPartLabel(), VocabularyJAXBSchema.REF_NAME)); + ilistItem.setShortIdentifier((String) docModel.getProperty(getServiceContext().getCommonPartLabel(), + VocabularyJAXBSchema.SHORT_IDENTIFIER)); ilistItem.setVocabType((String) docModel.getProperty(getServiceContext().getCommonPartLabel(), VocabularyJAXBSchema.VOCAB_TYPE)); String id = NuxeoUtils.extractId(docModel.getPathAsString()); -- 2.47.3