From: Aron Roberts Date: Wed, 24 Feb 2010 21:31:24 +0000 (+0000) Subject: CSPACE-1055,CSPACE-1056: Conformed Organization schema in services layer to 'Limited... X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=b0be5049c78b049862ccabbb1f399aad7e830bd4;p=tmp%2Fjakarta-migration.git CSPACE-1055,CSPACE-1056: Conformed Organization schema in services layer to 'Limited for 0.5' schema on the wiki. Added group, subBody, status fields; renamed description field to history, per Megan. Changes Nuxeo document type and requires an 'ant deploy'. --- 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 7c7c37c0c..5466979d1 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 @@ -17,7 +17,7 @@ - + true @@ -30,7 +30,7 @@ - + true @@ -43,7 +43,7 @@ - + true @@ -59,91 +59,94 @@ - + + inAuthority + refName displayName shortName - refName - inAuthority longName nameAdditions contactName foundingDate dissolutionDate foundingPlace + group function - description + subBody + history + status - + - + true - displayName + inAuthority dataInputText - - - - + + + - + true - shortName + displayName dataInputText - + - + - + true - inAuthority + shortName dataInputText - + @@ -221,6 +224,19 @@ dataInputText + + + + + + true + + group + + + dataInputText + + @@ -234,20 +250,46 @@ dataInputText - - + + - + true - description + subBody dataInputText + + + + + true + + history + + + dataInputText + + + + + + + + true + + status + + + 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 ab4cf14ca..5f46e4413 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 @@ -18,23 +18,27 @@ targetNamespace="http://collectionspace.org/services/organization" version="0.1" > + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/services/organization/client/src/main/java/org/collectionspace/services/client/OrgAuthorityClientUtils.java b/services/organization/client/src/main/java/org/collectionspace/services/client/OrgAuthorityClientUtils.java index d08f14886..ad235b9a3 100644 --- a/services/organization/client/src/main/java/org/collectionspace/services/client/OrgAuthorityClientUtils.java +++ b/services/organization/client/src/main/java/org/collectionspace/services/client/OrgAuthorityClientUtils.java @@ -1,7 +1,6 @@ package org.collectionspace.services.client; import java.util.ArrayList; -import java.util.List; import java.util.Map; import javax.ws.rs.core.MediaType; @@ -109,10 +108,16 @@ public class OrgAuthorityClientUtils { organization.setDissolutionDate(value); if((value = (String)orgInfo.get(OrganizationJAXBSchema.FOUNDING_PLACE))!=null) organization.setFoundingPlace(value); + if((value = (String)orgInfo.get(OrganizationJAXBSchema.GROUP))!=null) + organization.setGroup(value); if((value = (String)orgInfo.get(OrganizationJAXBSchema.FUNCTION))!=null) organization.setFunction(value); - if((value = (String)orgInfo.get(OrganizationJAXBSchema.DESCRIPTION))!=null) - organization.setDescription(value); + if((value = (String)orgInfo.get(OrganizationJAXBSchema.SUB_BODY))!=null) + organization.setSubBody(value); + if((value = (String)orgInfo.get(OrganizationJAXBSchema.HISTORY))!=null) + organization.setHistory(value); + if((value = (String)orgInfo.get(OrganizationJAXBSchema.STATUS))!=null) + organization.setStatus(value); MultipartOutput multipart = new MultipartOutput(); OutputPart commonPart = multipart.addPart(organization, MediaType.APPLICATION_XML_TYPE); diff --git a/services/organization/client/src/test/java/org/collectionspace/services/client/test/OrgAuthorityServiceTest.java b/services/organization/client/src/test/java/org/collectionspace/services/client/test/OrgAuthorityServiceTest.java index 28fd8551b..823820475 100644 --- a/services/organization/client/src/test/java/org/collectionspace/services/client/test/OrgAuthorityServiceTest.java +++ b/services/organization/client/src/test/java/org/collectionspace/services/client/test/OrgAuthorityServiceTest.java @@ -172,9 +172,6 @@ public class OrgAuthorityServiceTest extends AbstractServiceTestImpl { // Store the IDs from any item resources created // by tests, along with the IDs of their parents, so these items // can be deleted after all tests have been run. - // - // Item resource IDs are unique, so these are used as keys; - // the non-unique IDs of their parents are stored as associated values. allResourceItemIdsCreated.put(newID, vcsid); return newID; 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 edea07553..c01ecd926 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 @@ -11,18 +11,21 @@ public interface OrganizationJAXBSchema { final static String ORGANIZATIONS_COMMON="organizations_common"; final static String CSID = "csid"; final static String IN_AUTHORITY = "inAuthority"; + final static String REF_NAME = "refName"; final static String DISPLAY_NAME = "displayName"; final static String DISPLAY_NAME_COMPUTED = "displayNameComputed"; final static String SHORT_NAME = "shortName"; - final static String REF_NAME = "refName"; final static String LONG_NAME = "longName"; final static String NAME_ADDITIONS = "nameAdditions"; final static String CONTACT_NAME = "contactName"; final static String FOUNDING_DATE = "foundingDate"; final static String DISSOLUTION_DATE = "dissolutionDate"; final static String FOUNDING_PLACE = "foundingPlace"; + final static String GROUP = "group"; final static String FUNCTION = "function"; - final static String DESCRIPTION = "description"; + final static String SUB_BODY = "subBody"; + final static String HISTORY = "history"; + final static String STATUS = "status"; } diff --git a/services/organization/jaxb/src/main/resources/organization_common.xsd b/services/organization/jaxb/src/main/resources/organization_common.xsd index 51398b24d..9fd20e108 100644 --- a/services/organization/jaxb/src/main/resources/organization_common.xsd +++ b/services/organization/jaxb/src/main/resources/organization_common.xsd @@ -8,8 +8,10 @@ > - - + + + + @@ -20,7 +22,7 @@ - + @@ -28,8 +30,11 @@ + - + + + @@ -38,10 +43,10 @@ - - - - + + + +