CSPACE-2126 Added shortIdentifier to the list results item schema, for vocab+authorit...

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 fe6ce9091e68ab41e5377a86ab7b2a6fc77a7bc2..3e301e484ffeefa7941780944afe10e4da0bad56 100644 (file)
--- 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 {\r
        final static String DISPLAY_NAME = "displayName";\r
        final static String REF_NAME = "refName";\r
+       final static String SHORT_IDENTIFIER = "shortIdentifier";\r
        final static String VOCAB_TYPE = "vocabType";\r
        final static String CSID = "csid";\r
        final static String URI = "url";\r

diff --git a/services/location/jaxb/src/main/resources/locationauthority_common.xsd b/services/location/jaxb/src/main/resources/locationauthority_common.xsd
index b14a584bc9909b0f8e0f7000c1171402c29eb61b..b9e4929fc64aa134a7060f8c90e2963f38408f33 100644 (file)
--- 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" />
                                     <xs:element name="refName" type="xs:string"
                                         minOccurs="1" />
+                                    <xs:element name="shortIdentifier" type="xs:string"
+                                        minOccurs="1" />
                                     <xs:element name="vocabType" type="xs:string"
                                         minOccurs="1" />
                                     <!-- uri to retrieve locationauthority details -->

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 9a8b46c43e702a50ae8b1a1f65bd5e989285a9ab..8990eb7ab1ca1914e99ebfa493c8710d80c4d129 100644 (file)
--- 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 d326dc9ff1fa3407d7e32129230a16d89e4f0507..800acbd8ac0e6c190d5c1add76208485aa05ac92 100644 (file)
--- 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 {\r
        final static String DISPLAY_NAME = "displayName";\r
        final static String REF_NAME = "refName";\r
+       final static String SHORT_IDENTIFIER = "shortIdentifier";\r
        final static String VOCAB_TYPE = "vocabType";\r
        final static String CSID = "csid";\r
        final static String URI = "url";\r

diff --git a/services/organization/jaxb/src/main/resources/orgauthority_common.xsd b/services/organization/jaxb/src/main/resources/orgauthority_common.xsd
index a9e129be1fc4c1d139c01ae0e526e19e40f7633e..7077ed9cf21e9e54a4b90dc533a36b76f0ed0b04 100644 (file)
--- 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" />
                                     <xs:element name="refName" type="xs:string"
                                         minOccurs="1" />
+                                    <xs:element name="shortIdentifier" type="xs:string"
+                                        minOccurs="1" />
                                     <xs:element name="vocabType" type="xs:string"
                                         minOccurs="1" />
                                     <!-- uri to retrieve orgauthority details -->

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 4e6dbabd00de4c182784225deb856139a37e175c..341440b8b2740b38e5196a7bf0e232ce104a97ac 100644 (file)
--- 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 b36ba9170b20ca217f78c1125ffa844e1650d653..d64c58081b576ef9c7bec4647752bd802ee76e19 100644 (file)
--- 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 {\r
        final static String DISPLAY_NAME = "displayName";\r
        final static String REF_NAME = "refName";\r
+       final static String SHORT_IDENTIFIER = "shortIdentifier";\r
        final static String VOCAB_TYPE = "vocabType";\r
        final static String CSID = "csid";\r
        final static String URI = "url";\r

diff --git a/services/person/jaxb/src/main/resources/personauthority_common.xsd b/services/person/jaxb/src/main/resources/personauthority_common.xsd
index 3d6f0ba03809628231043fd9fcd767ccabebf1da..cbd5b1359690915adad9e33b08b1ca6cd062d4fd 100644 (file)
--- 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" />
                                     <xs:element name="refName" type="xs:string"
                                         minOccurs="1" />
+                                    <xs:element name="shortIdentifier" type="xs:string"
+                                        minOccurs="1" />
                                     <xs:element name="vocabType" type="xs:string"
                                         minOccurs="1" />
                                     <!-- uri to retrieve personauthority details -->

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 533f38e32daea59d4479a3dee5786b699e1a4f4d..887f46e1f96148d69baf98a119b247165ceec275 100644 (file)
--- 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 de04bc5331e8bb005214da92a7af88401425d027..38dbf4821ba94ef9eec03b30af6e2627641864a7 100644 (file)
--- 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 {\r
        final static String DISPLAY_NAME = "displayName";\r
        final static String REF_NAME = "refName";\r
+       final static String SHORT_IDENTIFIER = "shortIdentifier";\r
        final static String VOCAB_TYPE = "vocabType";\r
        final static String CSID = "csid";\r
        final static String URI = "url";\r

diff --git a/services/vocabulary/jaxb/src/main/resources/vocabulary_common.xsd b/services/vocabulary/jaxb/src/main/resources/vocabulary_common.xsd
index 314171239cb0a8832fcb8de6caef519dbe6c5672..ce0b52d58678985aef2ff9f1758ca580b04f4fd9 100644 (file)
--- 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" />
                                     <xs:element name="refName" type="xs:string"
                                         minOccurs="1" />
+                                    <xs:element name="shortIdentifier" type="xs:string"
+                                        minOccurs="1" />
                                     <xs:element name="vocabType" type="xs:string"
                                         minOccurs="1" />
                                     <!-- uri to retrieve vocabulary details -->

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 2b22d6bdec7693f05c74a740211d39ace40ff051..1e5a605d43fdf1d6e3cef05da753520462b50e18 100644 (file)
--- 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());