CSPACE-504: Changes to get Acquisition service working with the Nuxeo webapp again.

diff --git a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/OSGI-INF/core-types-contrib.xml b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/OSGI-INF/core-types-contrib.xml
index 4a8a87cc78c9754678fab0e393fd26ca840751b7..e3b2a71d9a2c5c0174d3e69ac06be6aca547fa28 100644 (file)
--- a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/OSGI-INF/core-types-contrib.xml
+++ b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/OSGI-INF/core-types-contrib.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0"?>
 <component name="org.collectionspace.acquisition.coreTypes">
   <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">
-    <schema name="acquisitions-common" prefix="acquisitions-common" src="schemas/acquisitions-common.xsd"/>
+    <schema name="acquisitions_common" prefix="acq" src="schemas/acquisitions_common.xsd"/>
   </extension>
   <extension target="org.nuxeo.ecm.core.schema.TypeService" point="doctype">
     <doctype name="Acquisition" extends="Document">
       <schema name="common"/>
       <schema name="dublincore"/>
-      <schema name="acquisitions-common"/>
+      <schema name="acquisitions_common"/>
     </doctype>
   </extension>
 </component>

diff --git a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/OSGI-INF/layouts-contrib.xml b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/OSGI-INF/layouts-contrib.xml
index 82738e962af3488280c6efc690243c4ecebf91fd..511186e16fced0774d6188deec437f0416a38c1e 100644 (file)
--- a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/OSGI-INF/layouts-contrib.xml
+++ b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/OSGI-INF/layouts-contrib.xml
@@ -10,16 +10,282 @@
         <template mode="any">/layouts/layout_default_template.xhtml</template>
       </templates>
       <rows>
-        <row><widget>accessiondate</widget></row>
+        <row><widget>accessionDate</widget></row>
+        <row><widget>acquisitionAuthorizer</widget></row>
+        <row><widget>AcquisitionAuthorizerDate</widget></row>
+        <row><widget>AcquisitionDate</widget></row>
+        <row><widget>AcquisitionFunding</widget></row>
+        <row><widget>AcquisitionFundingSource</widget></row>
+        <row><widget>AcquisitionFundingSourceProvisos</widget></row>
+        <row><widget>AcquisitionMethod</widget></row>
+        <row><widget>AcquisitionNote</widget></row>
+        <row><widget>AcquisitionProvisos</widget></row>
+        <row><widget>AcquisitionReason</widget></row>
+        <row><widget>AcquisitionReferenceNumber</widget></row>
+        <row><widget>AcquisitionSource</widget></row>
+        <row><widget>GroupPurchasePrice</widget></row>
+        <row><widget>ObjectOfferPrice</widget></row>
+        <row><widget>ObjectPurchaseOfferPrice</widget></row>
+        <row><widget>ObjectPurchasePrice</widget></row>
+        <row><widget>OriginalObjectPurchasePrice</widget></row>
+        <row><widget>OriginalObjectPurchasePriceDenomination</widget></row>
+        <row><widget>TransferOfTitleNumber</widget></row>
       </rows>
 
-      <widget name="accessiondate" type="text">
+      <widget name="accessionDate" type="text">
         <labels>
-          <label mode="any">accessiondate</label>
+          <label mode="any">accessionDate</label>
         </labels>
         <translated>true</translated>
         <fields>
-          <field schema="acquisition">accessiondate</field>
+          <field>acq:accessionDate</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+      
+      <widget name="acquisitionAuthorizer" type="text">
+        <labels>
+          <label mode="any">acquisitionAuthorizer</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field>acq:acquisitionAuthorizer</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+      
+      <widget name="AcquisitionAuthorizerDate" type="text">
+        <labels>
+          <label mode="any">AcquisitionAuthorizerDate</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field>acq:AcquisitionAuthorizerDate</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+      
+      <widget name="AcquisitionDate" type="text">
+        <labels>
+          <label mode="any">AcquisitionDate</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field>acq:AcquisitionDate</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+      
+      <widget name="AcquisitionFunding" type="text">
+        <labels>
+          <label mode="any">AcquisitionFunding</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field>acq:AcquisitionFunding</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+      
+      <widget name="AcquisitionFundingSource" type="text">
+        <labels>
+          <label mode="any">AcquisitionFundingSource</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field>acq:AcquisitionFundingSource</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+      
+      <widget name="AcquisitionFundingSourceProvisos" type="text">
+        <labels>
+          <label mode="any">AcquisitionFundingSourceProvisos</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field>acq:AcquisitionFundingSourceProvisos</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+      
+      <widget name="AcquisitionMethod" type="text">
+        <labels>
+          <label mode="any">AcquisitionMethod</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field>acq:AcquisitionMethod</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+      
+      <widget name="AcquisitionNote" type="text">
+        <labels>
+          <label mode="any">AcquisitionNote</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field>acq:AcquisitionNote</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+      
+      <widget name="AcquisitionProvisos" type="text">
+        <labels>
+          <label mode="any">AcquisitionProvisos</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field>acq:AcquisitionProvisos</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+      
+      <widget name="AcquisitionReason" type="text">
+        <labels>
+          <label mode="any">AcquisitionReason</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field>acq:AcquisitionReason</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+      
+      <widget name="AcquisitionReferenceNumber" type="text">
+        <labels>
+          <label mode="any">AcquisitionReferenceNumber</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field>acq:AcquisitionReferenceNumber</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+      
+      <widget name="AcquisitionSource" type="text">
+        <labels>
+          <label mode="any">AcquisitionSource</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field>acq:AcquisitionSource</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+      
+      <widget name="GroupPurchasePrice" type="text">
+        <labels>
+          <label mode="any">GroupPurchasePrice</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field>acq:GroupPurchasePrice</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+      
+      <widget name="ObjectOfferPrice" type="text">
+        <labels>
+          <label mode="any">ObjectOfferPrice</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field>acq:ObjectOfferPrice</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+      
+      <widget name="ObjectPurchaseOfferPrice" type="text">
+        <labels>
+          <label mode="any">ObjectPurchaseOfferPrice</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field>acq:ObjectPurchaseOfferPrice</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+      
+      <widget name="ObjectPurchasePrice" type="text">
+        <labels>
+          <label mode="any">ObjectPurchasePrice</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field>acq:ObjectPurchasePrice</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+      
+      <widget name="OriginalObjectPurchasePrice" type="text">
+        <labels>
+          <label mode="any">OriginalObjectPurchasePrice</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field>acq:OriginalObjectPurchasePrice</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+      
+      <widget name="OriginalObjectPurchasePriceDenomination" type="text">
+        <labels>
+          <label mode="any">OriginalObjectPurchasePriceDenomination</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field>acq:OriginalObjectPurchasePriceDenomination</field>
+        </fields>
+        <properties widgetMode="edit">
+          <property name="styleClass">dataInputText</property>
+        </properties>
+      </widget>
+      
+      <widget name="TransferOfTitleNumber" type="text">
+        <labels>
+          <label mode="any">TransferOfTitleNumber</label>
+        </labels>
+        <translated>true</translated>
+        <fields>
+          <field>acq:TransferOfTitleNumber</field>
         </fields>
         <properties widgetMode="edit">
           <property name="styleClass">dataInputText</property>

diff --git a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/schemas/acquisitions-common.xsd b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/schemas/acquisitions-common.xsd
deleted file mode 100644 (file)
index c8442d1..0000000
--- a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/schemas/acquisitions-common.xsd
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\r
-<xs:schema \r
-    xmlns:xs="http://www.w3.org/2001/XMLSchema"\r
-    xmlns:ns="http://collectionspace.org/acquisition/"\r
-    xmlns="http://collectionspace.org/acquisition/"\r
-    targetNamespace="http://collectionspace.org/acquisition/"\r
-    version="0.1">\r
-    \r
-    <!-- See http://wiki.collectionspace.org/display/collectionspace/Acquisition+Schema -->\r
-\r
-<!--  Object Entry Information Group -->\r
-    <xs:element name="accessiondate" type="xs:string"/>\r
-    \r
-</xs:schema>\r

diff --git a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/schemas/acquisitions_common.xsd b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/schemas/acquisitions_common.xsd
new file mode 100644 (file)
index 0000000..f975172
--- /dev/null
+++ b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/schemas/acquisitions_common.xsd
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\r
+<xs:schema \r
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"\r
+    xmlns:ns="http://collectionspace.org/acquisition/"\r
+    xmlns="http://collectionspace.org/acquisition/"\r
+    targetNamespace="http://collectionspace.org/acquisition/"\r
+    version="0.1">\r
+    \r
+    <!-- See http://wiki.collectionspace.org/display/collectionspace/Acquisition+Schema -->\r
+\r
+<!--  Object Entry Information Group -->\r
+    <xs:element name="accessionDate" type="xs:string"/>\r
+    <xs:element name="acquisitionAuthorizer" type="xs:string"/>\r
+    <xs:element name="AcquisitionAuthorizerDate" type="xs:string"/>\r
+    <xs:element name="AcquisitionDate" type="xs:string"/>\r
+    <xs:element name="AcquisitionFunding" type="xs:string"/>\r
+    <xs:element name="AcquisitionFundingSource" type="xs:string"/>\r
+    <xs:element name="AcquisitionFundingSourceProvisos" type="xs:string"/>\r
+    <xs:element name="AcquisitionMethod" type="xs:string"/>\r
+    <xs:element name="AcquisitionNote" type="xs:string"/>\r
+    <xs:element name="AcquisitionProvisos" type="xs:string"/>\r
+    <xs:element name="AcquisitionReason" type="xs:string"/>\r
+    <xs:element name="AcquisitionReferenceNumber" type="xs:string"/>\r
+    <xs:element name="AcquisitionSource" type="xs:string"/>\r
+    <xs:element name="GroupPurchasePrice" type="xs:string"/>\r
+    <xs:element name="ObjectOfferPrice" type="xs:string"/>\r
+    <xs:element name="ObjectPurchaseOfferPrice" type="xs:string"/>\r
+    <xs:element name="ObjectPurchasePrice" type="xs:string"/>\r
+    <xs:element name="OriginalObjectPurchasePrice" type="xs:string"/>\r
+    <xs:element name="OriginalObjectPurchasePriceDenomination" type="xs:string"/>\r
+    <xs:element name="TransferOfTitleNumber" type="xs:string"/>                \r
+    \r
+</xs:schema>\r

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 dcf8126f3e9320384f6f6c1e0c53bfaffc996a8e..053ac6f08730184ac06790cf392dd1e13d4474aa 100644 (file)
--- 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,6 +52,11 @@ 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
     // ---------------------------------------------------------------
@@ -273,7 +278,7 @@ public class AcquisitionServiceTest extends AbstractServiceTest {
             Assert.assertNotNull(acquisition);
 
             // Update the content of this resource.
-            acquisition.setAccessiondate("updated-" + acquisition.getAccessiondate());
+            acquisition.setAccessionDate("updated-" + acquisition.getAccessionDate());
             verbose("updated object", acquisition, AcquisitionsCommon.class);
             // Submit the request to the service and store the response.
             MultipartOutput output = new MultipartOutput();
@@ -295,8 +300,8 @@ public class AcquisitionServiceTest extends AbstractServiceTest {
                     getCommonPartName(), AcquisitionsCommon.class);
             Assert.assertNotNull(updatedAcquisition);
 
-            Assert.assertEquals(updatedAcquisition.getAccessiondate(),
-                    acquisition.getAccessiondate(),
+            Assert.assertEquals(updatedAcquisition.getAccessionDate(),
+                    acquisition.getAccessionDate(),
                     "Data in updated object did not match submitted data.");
         }catch(Exception e){
             e.printStackTrace();
@@ -504,7 +509,7 @@ public class AcquisitionServiceTest extends AbstractServiceTest {
 
     private MultipartOutput createAcquisitionInstance(String identifier) {
         AcquisitionsCommon acquisition = new AcquisitionsCommon();
-        acquisition.setAccessiondate("accessionDate-"  + identifier);
+        acquisition.setAccessionDate("accessionDate-"  + identifier);
         MultipartOutput multipart = new MultipartOutput();
         OutputPart commonPart = multipart.addPart(acquisition, MediaType.APPLICATION_XML_TYPE);
         commonPart.getHeaders().add("label", getCommonPartName());

diff --git a/services/acquisition/jaxb/src/main/resources/acquisitions-common.xsd b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
similarity index 52%
rename from services/acquisition/jaxb/src/main/resources/acquisitions-common.xsd
rename to services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
index 46f45f47464f3bfe9d0b04aee69f994b6630c55e..0542493f7c54daf090cffef777a27e81a816cb8a 100644 (file)
--- a/services/acquisition/jaxb/src/main/resources/acquisitions-common.xsd
+++ b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
@@ -12,12 +12,31 @@
     <!-- See http://wiki.collectionspace.org/display/collectionspace/Acquisition+Schema -->    
     
     <!-- acquisition  -->
-    <xs:element name="acquisitions-common">
+    <xs:element name="acquisitions_common">
         <xs:complexType>
             <xs:sequence>
                 <xs:element name="csid" type="xs:string" />
                 <!--  Object Entry Information Group -->
-                <xs:element name="accessiondate" type="xs:string"/>
+                <xs:element name="accessionDate" type="xs:string"/>
+                <xs:element name="acquisitionAuthorizer" type="xs:string"/>
+                <xs:element name="AcquisitionAuthorizerDate" type="xs:string"/>
+                <xs:element name="AcquisitionDate" type="xs:string"/>
+                <xs:element name="AcquisitionFunding" type="xs:string"/>
+                <xs:element name="AcquisitionFundingSource" type="xs:string"/>
+                <xs:element name="AcquisitionFundingSourceProvisos" type="xs:string"/>
+                <xs:element name="AcquisitionMethod" type="xs:string"/>
+                <xs:element name="AcquisitionNote" type="xs:string"/>
+                <xs:element name="AcquisitionProvisos" type="xs:string"/>
+                <xs:element name="AcquisitionReason" type="xs:string"/>
+                <xs:element name="AcquisitionReferenceNumber" type="xs:string"/>
+                <xs:element name="AcquisitionSource" type="xs:string"/>
+                <xs:element name="GroupPurchasePrice" type="xs:string"/>
+                <xs:element name="ObjectOfferPrice" type="xs:string"/>
+                <xs:element name="ObjectPurchaseOfferPrice" type="xs:string"/>
+                <xs:element name="ObjectPurchasePrice" type="xs:string"/>
+                <xs:element name="OriginalObjectPurchasePrice" type="xs:string"/>
+                <xs:element name="OriginalObjectPurchasePriceDenomination" type="xs:string"/>
+                <xs:element name="TransferOfTitleNumber" type="xs:string"/>                
             </xs:sequence>
         </xs:complexType>
     </xs:element>

diff --git a/services/common/src/main/config/tenant-bindings.xml b/services/common/src/main/config/tenant-bindings.xml
index 66c7c7177741a96c5e2cc1a6ec509a7b3967bb6e..2e3d3e86150c0e7c4da1e4a07bb011a03154ce8f 100644 (file)
--- a/services/common/src/main/config/tenant-bindings.xml
+++ b/services/common/src/main/config/tenant-bindings.xml
@@ -96,11 +96,11 @@
                 </service:part>
                 <service:part id="1" control_group="Managed"
                             versionable="true" auditable="false"
-                            label="acquisitions-common" updated="" order="1">
+                            label="acquisitions_common" updated="" order="1">
                     <service:content contentType="application/xml">
                         <service:xmlContent
                         namespaceURI="http://collectionspace.org/services/acquisition"
-                        schemaLocation="http://collectionspace.org/services/acquisition http://services.collectionspace.org/acquisition/acquisitions-common.xsd">
+                        schemaLocation="http://collectionspace.org/services/acquisition http://services.collectionspace.org/acquisition/acquisitions_common.xsd">
                         </service:xmlContent>
                     </service:content>
                 </service:part>