From: Aron Roberts Date: Thu, 4 Feb 2010 06:34:47 +0000 (+0000) Subject: CSPACE-737: Added fields to Contact serice, conforming to current 0.5 wireframe and... X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=230c3363a2ffd7c738c1c577af09367ae25e3441;p=tmp%2Fjakarta-migration.git CSPACE-737: Added fields to Contact serice, conforming to current 0.5 wireframe and representing a subset of complete contact schema. Use numbered elements ending in 1..3 to simulate repeatable fields, per team decision for 0.5; will revisit in subsequent releases. --- diff --git a/services/contact/3rdparty/nuxeo-platform-cs-contact/src/main/resources/OSGI-INF/layouts-contrib.xml b/services/contact/3rdparty/nuxeo-platform-cs-contact/src/main/resources/OSGI-INF/layouts-contrib.xml index b5e35d5ee..ae32eb0e5 100644 --- a/services/contact/3rdparty/nuxeo-platform-cs-contact/src/main/resources/OSGI-INF/layouts-contrib.xml +++ b/services/contact/3rdparty/nuxeo-platform-cs-contact/src/main/resources/OSGI-INF/layouts-contrib.xml @@ -10,18 +10,18 @@ - addressText + addressType1 + addressText1 postcode - addressType - + - + true - addressText + addressText1 dataInputText @@ -41,13 +41,13 @@ - + - + true - addressType + addressType1 dataInputText diff --git a/services/contact/3rdparty/nuxeo-platform-cs-contact/src/main/resources/schemas/contacts_common.xsd b/services/contact/3rdparty/nuxeo-platform-cs-contact/src/main/resources/schemas/contacts_common.xsd index fe852862c..891aecf4b 100644 --- a/services/contact/3rdparty/nuxeo-platform-cs-contact/src/main/resources/schemas/contacts_common.xsd +++ b/services/contact/3rdparty/nuxeo-platform-cs-contact/src/main/resources/schemas/contacts_common.xsd @@ -1,4 +1,4 @@ - + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/services/contact/client/src/test/java/org/collectionspace/services/client/test/ContactServiceTest.java b/services/contact/client/src/test/java/org/collectionspace/services/client/test/ContactServiceTest.java index 55db0250e..04d661b69 100644 --- a/services/contact/client/src/test/java/org/collectionspace/services/client/test/ContactServiceTest.java +++ b/services/contact/client/src/test/java/org/collectionspace/services/client/test/ContactServiceTest.java @@ -303,7 +303,7 @@ public class ContactServiceTest extends AbstractServiceTest { logger.debug(testName + ": list-item[" + i + "] csid=" + item.getCsid()); logger.debug(testName + ": list-item[" + i + "] objectNumber=" + - item.getAddressText()); + item.getAddressText1()); logger.debug(testName + ": list-item[" + i + "] URI=" + item.getUri()); i++; @@ -342,8 +342,8 @@ public class ContactServiceTest extends AbstractServiceTest { Assert.assertNotNull(contact); // Update the content of this resource. - contact.setAddressText("updated-" + contact.getAddressText()); - contact.setPostcode("updated-" + contact.getPostcode()); + contact.setAddressText1("updated-" + contact.getAddressText1()); + contact.setPostcode1("updated-" + contact.getPostcode1()); if(logger.isDebugEnabled()){ logger.debug("to be updated object"); logger.debug(objectAsXmlString(contact, ContactsCommon.class)); @@ -370,8 +370,8 @@ public class ContactServiceTest extends AbstractServiceTest { client.getCommonPartName(), ContactsCommon.class); Assert.assertNotNull(updatedContact); - Assert.assertEquals(updatedContact.getPostcode(), - contact.getPostcode(), + Assert.assertEquals(updatedContact.getPostcode1(), + contact.getPostcode1(), "Data in updated object did not match submitted data."); } @@ -607,17 +607,17 @@ public class ContactServiceTest extends AbstractServiceTest { private MultipartOutput createContactInstance(String identifier) { return createContactInstance( - "addressText-" + identifier, + "addressText1-" + identifier, "postcode-" + identifier, - "addressType-" + identifier); + "addressType1-" + identifier); } - private MultipartOutput createContactInstance(String addressText, - String postcode, String addressType) { + private MultipartOutput createContactInstance(String addressText1, + String postcode, String addressType1) { ContactsCommon contact = new ContactsCommon(); - contact.setAddressText(addressText); - contact.setPostcode(postcode); - contact.setAddressType(addressType); + contact.setAddressText1(addressText1); + contact.setPostcode1(postcode); + contact.setAddressType1(addressType1); MultipartOutput multipart = new MultipartOutput(); OutputPart commonPart = multipart.addPart(contact, MediaType.APPLICATION_XML_TYPE); diff --git a/services/contact/jaxb/src/main/java/org/collectionspace/services/contact/ContactJAXBSchema.java b/services/contact/jaxb/src/main/java/org/collectionspace/services/contact/ContactJAXBSchema.java index b6beefa2e..9e2d4c68a 100644 --- a/services/contact/jaxb/src/main/java/org/collectionspace/services/contact/ContactJAXBSchema.java +++ b/services/contact/jaxb/src/main/java/org/collectionspace/services/contact/ContactJAXBSchema.java @@ -7,9 +7,25 @@ package org.collectionspace.services.contact; * */ public interface ContactJAXBSchema { - final static String ADDRESS_TEXT = "addressText"; - final static String POSTCODE = "postcode"; - final static String ADDRESS_TYPE = "addressType"; + final static String ADDRESS_TYPE1 = "addressType1"; + final static String ADDRESS_TYPE2 = "addressType2"; + final static String ADDRESS_TYPE3 = "addressType3"; + final static String ADDRESS_TEXT1 = "addressText1"; + final static String ADDRESS_TEXT2 = "addressText2"; + final static String ADDRESS_TEXT3 = "addressText3"; + final static String POSTCODE1 = "postcode1"; + final static String POSTCODE2 = "postcode2"; + final static String POSTCODE3 = "postcode3"; + final static String EMAIL1 = "email1"; + final static String EMAIL2 = "email2"; + final static String EMAIL3 = "email3"; + final static String TELEPHONE_NUMBER1 = "telephoneNumber1"; + final static String TELEPHONE_NUMBER2 = "telephoneNumber2"; + final static String TELEPHONE_NUMBER3 = "telephoneNumber3"; + final static String FAX_NUMBER1 = "faxNumber1"; + final static String FAX_NUMBER2 = "faxNumber2"; + final static String FAX_NUMBER3 = "faxNumber3"; + final static String NOTES = "notes"; } diff --git a/services/contact/jaxb/src/main/java/org/collectionspace/services/contact/ContactListItemJAXBSchema.java b/services/contact/jaxb/src/main/java/org/collectionspace/services/contact/ContactListItemJAXBSchema.java index ff5699f13..5b29dc035 100644 --- a/services/contact/jaxb/src/main/java/org/collectionspace/services/contact/ContactListItemJAXBSchema.java +++ b/services/contact/jaxb/src/main/java/org/collectionspace/services/contact/ContactListItemJAXBSchema.java @@ -4,7 +4,7 @@ public interface ContactListItemJAXBSchema { // TODO Revisit which information unit(s) should be returned // in each entry, in a list of contact information. // Should this be addressText or some other unit(s)? - final static String ADDRESS_TEXT = "addressText"; + final static String ADDRESS_TEXT1 = "addressText1"; final static String CSID = "csid"; final static String URI = "url"; } diff --git a/services/contact/jaxb/src/main/resources/contacts-common.xsd b/services/contact/jaxb/src/main/resources/contacts-common.xsd index 32cc81929..e3003be5d 100644 --- a/services/contact/jaxb/src/main/resources/contacts-common.xsd +++ b/services/contact/jaxb/src/main/resources/contacts-common.xsd @@ -30,14 +30,39 @@ - + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + @@ -49,7 +74,7 @@ -