CSPACE-3865: Final naming tweaks for new Scientific Taxonomy service. Integrating...

diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml
index 5124913a0f701f4e0e5918154a4968c882de7ccc..107906e63a42ce1d61511d4a68276f5b9449902a 100644 (file)
--- a/services/JaxRsServiceProvider/pom.xml
+++ b/services/JaxRsServiceProvider/pom.xml
@@ -136,6 +136,11 @@
             <artifactId>org.collectionspace.services.location.service</artifactId>\r
             <version>${project.version}</version>\r
         </dependency>\r
+        <dependency>\r
+            <groupId>org.collectionspace.services</groupId>\r
+            <artifactId>org.collectionspace.services.taxonomy.service</artifactId>\r
+            <version>${project.version}</version>\r
+        </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.movement.service</artifactId>\r

diff --git a/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java b/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
index a51060abc96dbaad3022495f4a2f32be3691ede4..580ce929e78574fbfa2d1c61ba4b74694ee1f7ff 100644 (file)
--- a/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
+++ b/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
@@ -35,6 +35,7 @@ import org.collectionspace.services.loanout.LoanoutResource;
 import org.collectionspace.services.objectexit.ObjectExitResource;
 import org.collectionspace.services.imports.ImportsResource;
 import org.collectionspace.services.location.LocationAuthorityResource;
+import org.collectionspace.services.taxonomy.TaxonomyAuthorityResource;
 import org.collectionspace.services.movement.MovementResource;
 import org.collectionspace.services.relation.RelationResource;
 import org.collectionspace.services.report.ReportResource;
@@ -101,6 +102,7 @@ public class CollectionSpaceJaxRsApplication extends Application {
         singletons.add(new MovementResource());
         singletons.add(new ReportResource());
         singletons.add(new LocationAuthorityResource());
+        singletons.add(new TaxonomyAuthorityResource());
         singletons.add(new IDResource());
         /*
         singletons.add(new WorkflowResource());

diff --git a/services/build.xml b/services/build.xml
index 97b59a3fcb2d2798e5c814702e204c0a2c879c01..8e1b360fafbfe0fef50299893340c45a975cf421 100644 (file)
--- a/services/build.xml
+++ b/services/build.xml
@@ -165,6 +165,7 @@
         <ant antfile="loanout/build.xml" target="deploy" inheritAll="false"/>\r
         <ant antfile="objectexit/build.xml" target="deploy" inheritAll="false"/>\r
         <ant antfile="location/build.xml" target="deploy" inheritAll="false"/>\r
+        <ant antfile="taxonomy/build.xml" target="deploy" inheritAll="false"/>\r
         <ant antfile="media/build.xml" target="deploy" inheritAll="false"/>\r
         <ant antfile="movement/build.xml" target="deploy" inheritAll="false"/>\r
         <ant antfile="report/build.xml" target="deploy" inheritAll="false"/>\r
@@ -187,6 +188,7 @@
         <ant antfile="contact/build.xml" target="undeploy" inheritAll="false"/>\r
         <ant antfile="dimension/build.xml" target="undeploy" inheritAll="false"/>\r
         <ant antfile="acquisition/build.xml" target="undeploy" inheritAll="false"/>\r
+        <ant antfile="taxonomy/build.xml" target="undeploy" inheritAll="false"/>\r
         <ant antfile="location/build.xml" target="undeploy" inheritAll="false"/>\r
         <ant antfile="objectexit/build.xml" target="undeploy" inheritAll="false"/>\r
         <ant antfile="report/build.xml" target="undeploy" inheritAll="false"/>\r
@@ -233,6 +235,7 @@
         <ant antfile="loanin/build.xml" target="dist" inheritAll="false"/>\r
         <ant antfile="loanout/build.xml" target="dist" inheritAll="false"/>\r
         <ant antfile="location/build.xml" target="dist" inheritAll="false"/>\r
+        <ant antfile="taxonomy/build.xml" target="dist" inheritAll="false"/>\r
         <ant antfile="objectexit/build.xml" target="dist" inheritAll="false"/>\r
         <ant antfile="media/build.xml" target="dist" inheritAll="false"/>\r
         <ant antfile="movement/build.xml" target="dist" inheritAll="false"/>\r

diff --git a/services/common/src/main/cspace/config/services/tenants/collectionspace/tenant-bindings.xml b/services/common/src/main/cspace/config/services/tenants/collectionspace/tenant-bindings.xml
index 8e5027587ac50a067812d95c58ac53cc7ae97a42..48c4b2008ee3edbd33b410075ec272ee3b104427 100644 (file)
--- a/services/common/src/main/cspace/config/services/tenants/collectionspace/tenant-bindings.xml
+++ b/services/common/src/main/cspace/config/services/tenants/collectionspace/tenant-bindings.xml
@@ -11,7 +11,7 @@
     xmlns:types='http://collectionspace.org/services/common/types'
     xsi:schemaLocation='http://collectionspace.org/services/common/tenant http://collectionspace.org/services/common/tenant.xsd'
     >
-        
+
     <!-- begin movingimages.us tenant meta-data -->
     <tenant:tenantBinding
         id="1" name="collectionspace.org" displayName="CollectionSpace Demo" version="0.1">
@@ -166,7 +166,7 @@
 
         <!-- begin blob service meta-data -->
         <tenant:serviceBindings name="Blobs" type="procedure" version="0.1">
-                   <service:uriPath xmlns:service='http://collectionspace.org/services/common/service'>
+            <service:uriPath xmlns:service='http://collectionspace.org/services/common/service'>
                 /blobs/*/workflow/
             </service:uriPath>
             <service:repositoryDomain xmlns:service='http://collectionspace.org/services/common/service'>
@@ -178,21 +178,21 @@
             <service:DocHandlerParams xmlns:service='http://collectionspace.org/services/common/service'>
                 <service:classname>org.collectionspace.services.blob.nuxeo.BlobDocumentModelHandler</service:classname>
                 <service:params>
-                     <service:SchemaName>blobs</service:SchemaName>
-                     <service:DublinCoreTitle>blobs</service:DublinCoreTitle>
-                     <service:SummaryFields>name|mimeType|encoding|length|uri|csid</service:SummaryFields>
-                     <service:AbstractCommonListClassname></service:AbstractCommonListClassname>
-                     <service:CommonListItemClassname></service:CommonListItemClassname>
-                     <service:ListResultsItemMethodName>getBlobListItem</service:ListResultsItemMethodName>
-                     <service:ListResultsFields>
-                         <service:ListResultField>
-                             <service:element>name</service:element>
-                             <service:xpath>name</service:xpath>
-                         </service:ListResultField>
+                    <service:SchemaName>blobs</service:SchemaName>
+                    <service:DublinCoreTitle>blobs</service:DublinCoreTitle>
+                    <service:SummaryFields>name|mimeType|encoding|length|uri|csid</service:SummaryFields>
+                    <service:AbstractCommonListClassname></service:AbstractCommonListClassname>
+                    <service:CommonListItemClassname></service:CommonListItemClassname>
+                    <service:ListResultsItemMethodName>getBlobListItem</service:ListResultsItemMethodName>
+                    <service:ListResultsFields>
+                        <service:ListResultField>
+                            <service:element>name</service:element>
+                            <service:xpath>name</service:xpath>
+                        </service:ListResultField>
 
                         <service:ListResultField>
                             <service:element>mimeType</service:element>
-                                                       <service:xpath>mimeType</service:xpath>
+                            <service:xpath>mimeType</service:xpath>
                         </service:ListResultField>
 
                         <service:ListResultField>
@@ -200,11 +200,11 @@
                             <service:xpath>encoding</service:xpath>
                         </service:ListResultField>
 
-                         <service:ListResultField>
-                             <service:element>length</service:element>
-                             <service:xpath>length</service:xpath>
-                         </service:ListResultField>
-                     </service:ListResultsFields>
+                        <service:ListResultField>
+                            <service:element>length</service:element>
+                            <service:xpath>length</service:xpath>
+                        </service:ListResultField>
+                    </service:ListResultsFields>
                 </service:params>
             </service:DocHandlerParams>
             <service:validatorHandler xmlns:service='http://collectionspace.org/services/common/service'>
@@ -241,7 +241,7 @@
                             schemaLocation="http://collectionspace.org/collectionspace_core/ http://services.collectionspace.org/collectionspace_core.xsd">
                         </service:xmlContent>
                     </service:content>
-                </service:part>                
+                </service:part>
                 <service:part id="3" control_group="Managed"
                               versionable="true" auditable="false"
                               label="image_metadata" updated="" order="3">
@@ -251,7 +251,7 @@
                             schemaLocation="http://collectionspace.org/image_metadata/ http://services.collectionspace.org/image_metadata.xsd">
                         </service:xmlContent>
                     </service:content>
-                </service:part>                
+                </service:part>
                 <service:part id="4" control_group="Managed"
                               versionable="true" auditable="false"
                               label="iptc" updated="" order="4">
@@ -261,7 +261,7 @@
                             schemaLocation="http://collectionspace.org/iptc/ http://services.collectionspace.org/iptc.xsd">
                         </service:xmlContent>
                     </service:content>
-                </service:part>                
+                </service:part>
             </service:object>
         </tenant:serviceBindings>
         <!-- end blob service meta-data -->
@@ -312,7 +312,7 @@
                         <types:item><types:key>authRef</types:key><types:value>valuer</types:value></types:item>
                         <types:item><types:key>authRef</types:key><types:value>insurers|insurer</types:value></types:item>
                         <types:item><types:key>authRef</types:key><types:value>conditionCheckersOrAssessors|conditionCheckerOrAssessor</types:value></types:item>
-                   </service:properties>
+                    </service:properties>
                     <service:content contentType="application/xml">
                         <service:xmlContent
                             namespaceURI="http://collectionspace.org/services/intake"
@@ -354,20 +354,20 @@
             <service:DocHandlerParams xmlns:service='http://collectionspace.org/services/common/service'>
                 <service:classname>org.collectionspace.services.loanin.nuxeo.LoaninDocumentModelHandler</service:classname>
                 <service:params>
-                     <service:SchemaName>loansin</service:SchemaName>
-                     <service:DublinCoreTitle>loansin</service:DublinCoreTitle>
-                     <service:SummaryFields>loanInNumber|lenderList|loanReturnDate|uri|csid</service:SummaryFields>
-                     <service:AbstractCommonListClassname></service:AbstractCommonListClassname>
-                     <service:CommonListItemClassname></service:CommonListItemClassname>
-                     <service:ListResultsItemMethodName>getLoaninListItem</service:ListResultsItemMethodName>
-                     <service:ListResultsFields>
-                         <service:ListResultField>
-                             <service:element>loanInNumber</service:element>
-                             <service:xpath>loanInNumber</service:xpath>
-                         </service:ListResultField>
+                    <service:SchemaName>loansin</service:SchemaName>
+                    <service:DublinCoreTitle>loansin</service:DublinCoreTitle>
+                    <service:SummaryFields>loanInNumber|lenderList|loanReturnDate|uri|csid</service:SummaryFields>
+                    <service:AbstractCommonListClassname></service:AbstractCommonListClassname>
+                    <service:CommonListItemClassname></service:CommonListItemClassname>
+                    <service:ListResultsItemMethodName>getLoaninListItem</service:ListResultsItemMethodName>
+                    <service:ListResultsFields>
+                        <service:ListResultField>
+                            <service:element>loanInNumber</service:element>
+                            <service:xpath>loanInNumber</service:xpath>
+                        </service:ListResultField>
                         <service:ListResultField>
                             <service:element>lender</service:element>
-                                                   <service:xpath>lenderGroupList/[0]/lender</service:xpath>
+                            <service:xpath>lenderGroupList/[0]/lender</service:xpath>
                         </service:ListResultField>
                         <service:ListResultField>
                             <service:element>loanReturnDate</service:element>
@@ -403,12 +403,12 @@
                 </s:params>
             </s:initHandler>
             <tenant:properties>
-            <types:item><types:key>datePattern</types:key><types:value>MMM dd, yyyy</types:value></types:item>
-            <types:item><types:key>datePattern</types:key><types:value>dd.MM.yyyy</types:value></types:item>
-            <!-- <types:item><types:key>datePattern</types:key><types:value>dd/MM/yyyy</types:value></types:item> -->
-            <types:item><types:key>localeLanguage</types:key><types:value>en</types:value></types:item>
-            <!-- <types:item><types:key>localeLanguage</types:key><types:value>da</types:value></types:item> -->
-        </tenant:properties>
+                <types:item><types:key>datePattern</types:key><types:value>MMM dd, yyyy</types:value></types:item>
+                <types:item><types:key>datePattern</types:key><types:value>dd.MM.yyyy</types:value></types:item>
+                <!-- <types:item><types:key>datePattern</types:key><types:value>dd/MM/yyyy</types:value></types:item> -->
+                <types:item><types:key>localeLanguage</types:key><types:value>en</types:value></types:item>
+                <!-- <types:item><types:key>localeLanguage</types:key><types:value>da</types:value></types:item> -->
+            </tenant:properties>
 
 
             <service:properties xmlns:service='http://collectionspace.org/services/common/service'>
@@ -576,8 +576,8 @@
                               label="objectexit-system" updated="" order="0">
                     <service:content contentType="application/xml">
                         <service:xmlContent
-                                namespaceURI="http://collectionspace.org/services/common/system"
-                                schemaLocation="http://collectionspace.org/services/common/system http://collectionspace.org/services/common/system/system-response.xsd">
+                            namespaceURI="http://collectionspace.org/services/common/system"
+                            schemaLocation="http://collectionspace.org/services/common/system http://collectionspace.org/services/common/system/system-response.xsd">
                         </service:xmlContent>
                     </service:content>
                 </service:part>
@@ -596,8 +596,8 @@
                     </service:properties>
                     <service:content contentType="application/xml">
                         <service:xmlContent
-                                namespaceURI="http://collectionspace.org/services/objectexit"
-                                schemaLocation="http://collectionspace.org/services/objectexit http://services.collectionspace.org/objectexit/objectexit_common.xsd">
+                            namespaceURI="http://collectionspace.org/services/objectexit"
+                            schemaLocation="http://collectionspace.org/services/objectexit http://services.collectionspace.org/objectexit/objectexit_common.xsd">
                         </service:xmlContent>
                     </service:content>
                 </service:part>
@@ -606,8 +606,8 @@
                               label="collectionspace_core" updated="" order="2">
                     <service:content contentType="application/xml">
                         <service:xmlContent
-                                namespaceURI="http://collectionspace.org/collectionspace_core/"
-                                schemaLocation="http://collectionspace.org/collectionspace_core/ http://services.collectionspace.org/collectionspace_core.xsd">
+                            namespaceURI="http://collectionspace.org/collectionspace_core/"
+                            schemaLocation="http://collectionspace.org/collectionspace_core/ http://services.collectionspace.org/collectionspace_core.xsd">
                         </service:xmlContent>
                     </service:content>
                 </service:part>
@@ -629,18 +629,18 @@
             <service:DocHandlerParams xmlns:service='http://collectionspace.org/services/common/service'>
                 <service:classname>org.collectionspace.services.group.nuxeo.GroupDocumentModelHandler</service:classname>
                 <service:params>
-                     <service:SchemaName>groups</service:SchemaName>
-                     <service:DublinCoreTitle>groups</service:DublinCoreTitle>
-                     <service:SummaryFields>title|uri|csid</service:SummaryFields>
-                     <service:AbstractCommonListClassname></service:AbstractCommonListClassname>
-                     <service:CommonListItemClassname></service:CommonListItemClassname>
-                     <service:ListResultsItemMethodName>getGroupListItem</service:ListResultsItemMethodName>
-                     <service:ListResultsFields>
-                         <service:ListResultField>
-                             <service:element>title</service:element>
-                             <service:xpath>title</service:xpath>
-                         </service:ListResultField>
-                                               </service:ListResultsFields>
+                    <service:SchemaName>groups</service:SchemaName>
+                    <service:DublinCoreTitle>groups</service:DublinCoreTitle>
+                    <service:SummaryFields>title|uri|csid</service:SummaryFields>
+                    <service:AbstractCommonListClassname></service:AbstractCommonListClassname>
+                    <service:CommonListItemClassname></service:CommonListItemClassname>
+                    <service:ListResultsItemMethodName>getGroupListItem</service:ListResultsItemMethodName>
+                    <service:ListResultsFields>
+                        <service:ListResultField>
+                            <service:element>title</service:element>
+                            <service:xpath>title</service:xpath>
+                        </service:ListResultField>
+                    </service:ListResultsFields>
                 </service:params>
             </service:DocHandlerParams>
             <service:validatorHandler xmlns:service='http://collectionspace.org/services/common/service'>
@@ -666,7 +666,7 @@
                               label="groups_common" updated="" order="1">
                     <service:properties>
                         <types:item><types:key>authRef</types:key><types:value>owner</types:value></types:item>
-                   </service:properties>
+                    </service:properties>
                     <service:content contentType="application/xml">
                         <service:xmlContent
                             namespaceURI="http://collectionspace.org/services/group"
@@ -690,7 +690,7 @@
 
         <!-- begin imports service meta-data -->
         <tenant:serviceBindings name="Imports" type="procedure" version="0.1">
-                       <service:uriPath xmlns:service='http://collectionspace.org/services/common/service'>
+            <service:uriPath xmlns:service='http://collectionspace.org/services/common/service'>
                 /imports/*/workflow/
             </service:uriPath>
             <service:repositoryDomain xmlns:service='http://collectionspace.org/services/common/service'>
@@ -724,8 +724,8 @@
                               label="imports-system" updated="" order="0">
                     <service:content contentType="application/xml">
                         <service:xmlContent
-                                namespaceURI="http://collectionspace.org/services/common/system"
-                                schemaLocation="http://collectionspace.org/services/common/system http://collectionspace.org/services/common/system/system-response.xsd">
+                            namespaceURI="http://collectionspace.org/services/common/system"
+                            schemaLocation="http://collectionspace.org/services/common/system http://collectionspace.org/services/common/system/system-response.xsd">
                         </service:xmlContent>
                     </service:content>
                 </service:part>
@@ -734,8 +734,8 @@
                               label="imports_common" updated="" order="1">
                     <service:content contentType="application/xml">
                         <service:xmlContent
-                                namespaceURI="http://collectionspace.org/services/imports"
-                                schemaLocation="http://collectionspace.org/services/imports http://services.collectionspace.org/imports/imports_common.xsd">
+                            namespaceURI="http://collectionspace.org/services/imports"
+                            schemaLocation="http://collectionspace.org/services/imports http://services.collectionspace.org/imports/imports_common.xsd">
                         </service:xmlContent>
                     </service:content>
                 </service:part>
@@ -744,8 +744,8 @@
                               label="collectionspace_core" updated="" order="2">
                     <service:content contentType="application/xml">
                         <service:xmlContent
-                                namespaceURI="http://collectionspace.org/collectionspace_core/"
-                                schemaLocation="http://collectionspace.org/collectionspace_core/ http://services.collectionspace.org/collectionspace_core.xsd">
+                            namespaceURI="http://collectionspace.org/collectionspace_core/"
+                            schemaLocation="http://collectionspace.org/collectionspace_core/ http://services.collectionspace.org/collectionspace_core.xsd">
                         </service:xmlContent>
                     </service:content>
                 </service:part>
@@ -767,20 +767,20 @@
             <service:DocHandlerParams xmlns:service='http://collectionspace.org/services/common/service'>
                 <service:classname>org.collectionspace.services.media.nuxeo.MediaDocumentModelHandler</service:classname>
                 <service:params>
-                     <service:SchemaName>media</service:SchemaName>
-                     <service:DublinCoreTitle>media</service:DublinCoreTitle>
-                     <service:SummaryFields>title|source|filename|identificationNumber|uri|csid</service:SummaryFields>
-                     <service:AbstractCommonListClassname></service:AbstractCommonListClassname>
-                     <service:CommonListItemClassname></service:CommonListItemClassname>
-                     <service:ListResultsItemMethodName>getMediaListItem</service:ListResultsItemMethodName>
-                     <service:ListResultsFields>
-                         <service:ListResultField>
-                             <service:element>title</service:element>
-                             <service:xpath>title</service:xpath>
-                         </service:ListResultField>
+                    <service:SchemaName>media</service:SchemaName>
+                    <service:DublinCoreTitle>media</service:DublinCoreTitle>
+                    <service:SummaryFields>title|source|filename|identificationNumber|uri|csid</service:SummaryFields>
+                    <service:AbstractCommonListClassname></service:AbstractCommonListClassname>
+                    <service:CommonListItemClassname></service:CommonListItemClassname>
+                    <service:ListResultsItemMethodName>getMediaListItem</service:ListResultsItemMethodName>
+                    <service:ListResultsFields>
+                        <service:ListResultField>
+                            <service:element>title</service:element>
+                            <service:xpath>title</service:xpath>
+                        </service:ListResultField>
                         <service:ListResultField>
                             <service:element>source</service:element>
-                                                       <service:xpath>source</service:xpath>
+                            <service:xpath>source</service:xpath>
                         </service:ListResultField>
                         <service:ListResultField>
                             <service:element>filename</service:element>
@@ -790,7 +790,7 @@
                             <service:element>identificationNumber</service:element>
                             <service:xpath>identificationNumber</service:xpath>
                         </service:ListResultField>
-                     </service:ListResultsFields>
+                    </service:ListResultsFields>
                 </service:params>
             </service:DocHandlerParams>
             <service:validatorHandler xmlns:service='http://collectionspace.org/services/common/service'>
@@ -818,7 +818,7 @@
                         <types:item><types:key>authRef</types:key><types:value>publisher</types:value></types:item>
                         <types:item><types:key>authRef</types:key><types:value>rightsHolder</types:value></types:item>
                         <types:item><types:key>authRef</types:key><types:value>subjectList|subject</types:value></types:item>
-                   </service:properties>
+                    </service:properties>
                     <service:content contentType="application/xml">
                         <service:xmlContent
                             namespaceURI="http://collectionspace.org/services/media"
@@ -993,8 +993,8 @@
             <service:uriPath xmlns:service='http://collectionspace.org/services/common/service'>
                 /vocabularies/*/workflow/
             </service:uriPath>
-                       <service:uriPath xmlns:service='http://collectionspace.org/services/common/service'>
-                               /vocabularies/*/items/*/workflow/
+            <service:uriPath xmlns:service='http://collectionspace.org/services/common/service'>
+                /vocabularies/*/items/*/workflow/
             </service:uriPath>
             <!-- other URI paths using which this service could be accessed -->
             <service:repositoryDomain xmlns:service='http://collectionspace.org/services/common/service'>
@@ -1060,18 +1060,18 @@
             Repository workspace so we have to configure that.
         -->
         <tenant:serviceBindings name="Vocabularyitems" version="0.1">
-                       <service:uriPath xmlns:service='http://collectionspace.org/services/common/service'>
-                               /vocabularyitems/*/workflow/
+            <service:uriPath xmlns:service='http://collectionspace.org/services/common/service'>
+                /vocabularyitems/*/workflow/
             </service:uriPath>
             <!-- other URI paths using which this service could be accessed -->
-                       <!--            
-                       <service:uriPath xmlns:service='http://collectionspace.org/services/common/service'>
+                        <!--
+                        <service:uriPath xmlns:service='http://collectionspace.org/services/common/service'>
                 /vocabularies/*/items/
             </service:uriPath>
             <service:uriPath xmlns:service='http://collectionspace.org/services/common/service'>
                 /vocabularies/*/items/*/refObjs
             </service:uriPath>
-                       -->
+                        -->
             <service:repositoryDomain xmlns:service='http://collectionspace.org/services/common/service'>
                 default-domain
             </service:repositoryDomain>
@@ -1139,8 +1139,8 @@
             <service:uriPath xmlns:service='http://collectionspace.org/services/common/service'>
                 /orgauthorities/*/workflow/
             </service:uriPath>
-                       <service:uriPath xmlns:service='http://collectionspace.org/services/common/service'>
-                               /orgauthorities/*/items/*/workflow/
+            <service:uriPath xmlns:service='http://collectionspace.org/services/common/service'>
+                /orgauthorities/*/items/*/workflow/
             </service:uriPath>
             <!-- other URI paths using which this service could be accessed -->
 <!--            <service:uriPath xmlns:service='http://collectionspace.org/services/common/service'>
@@ -1241,7 +1241,7 @@
                         <service:col>shortidentifier</service:col>
                     </service:field>
                 </service:params>
-            </service:initHandler>                                             
+            </service:initHandler>
             <service:object id="1" name="Organization" version="0.1"
                             xmlns:service='http://collectionspace.org/services/common/service'>
                 <service:part id="0" control_group="Managed"
@@ -1287,8 +1287,8 @@
             <service:uriPath xmlns:service='http://collectionspace.org/services/common/service'>
                 /personauthorities/*/workflow/
             </service:uriPath>
-                       <service:uriPath xmlns:service='http://collectionspace.org/services/common/service'>
-                               /personauthorities/*/items/*/workflow/
+            <service:uriPath xmlns:service='http://collectionspace.org/services/common/service'>
+                /personauthorities/*/items/*/workflow/
             </service:uriPath>
             <!-- other URI paths using which this service could be accessed -->
 <!--            <service:uriPath xmlns:service='http://collectionspace.org/services/common/service'>
@@ -1394,7 +1394,7 @@
             <service:properties xmlns:service='http://collectionspace.org/services/common/service'>
                 <types:item><types:key>objectNameProperty</types:key><types:value>displayName</types:value></types:item>
                 <!-- there is no objectNumberProperty for persons -->
-                     <types:item><types:key>objectNumberProperty</types:key><types:value>shortIdentifier</types:value></types:item>
+                <types:item><types:key>objectNumberProperty</types:key><types:value>shortIdentifier</types:value></types:item>
 
             </service:properties>
 
@@ -1439,8 +1439,8 @@
             <service:uriPath xmlns:service='http://collectionspace.org/services/common/service'>
                 /locationauthorities/*/workflow/
             </service:uriPath>
-                       <service:uriPath xmlns:service='http://collectionspace.org/services/common/service'>
-                               /locationauthorities/*/items/*/workflow/
+            <service:uriPath xmlns:service='http://collectionspace.org/services/common/service'>
+                /locationauthorities/*/items/*/workflow/
             </service:uriPath>
             <!-- other URI paths using which this service could be accessed -->
 <!--            <service:uriPath xmlns:service='http://collectionspace.org/services/common/service'>
@@ -1531,7 +1531,7 @@
                         <service:col>shortidentifier</service:col>
                     </service:field>
                 </service:params>
-            </service:initHandler>                                             
+            </service:initHandler>
             <service:object id="1" name="Locationitem" version="0.1"
                             xmlns:service='http://collectionspace.org/services/common/service'>
                 <service:part id="0" control_group="Managed"
@@ -1568,6 +1568,140 @@
         </tenant:serviceBindings>
         <!-- end location service meta-data -->
 
+       <!-- begin taxonomyauthority service meta-data -->
+        <tenant:serviceBindings name="Taxonomyauthorities" version="0.1">
+            <service:uriPath xmlns:service='http://collectionspace.org/services/common/service'>
+                /taxonomyauthorities/*/workflow/
+            </service:uriPath>
+            <service:uriPath xmlns:service='http://collectionspace.org/services/common/service'>
+                /taxonomyauthorities/*/taxon/*/workflow/
+            </service:uriPath>
+            <!-- other URI paths using which this service could be accessed -->
+<!--            <service:uriPath xmlns:service='http://collectionspace.org/services/common/service'>
+                /taxonomyauthorities/*/items/
+            </service:uriPath>-->
+            <service:repositoryDomain xmlns:service='http://collectionspace.org/services/common/service'>
+                default-domain
+            </service:repositoryDomain>
+            <service:documentHandler xmlns:service='http://collectionspace.org/services/common/service'>
+                org.collectionspace.services.taxonomy.nuxeo.TaxonomyAuthorityDocumentModelHandler
+            </service:documentHandler>
+            <service:initHandler xmlns:service='http://collectionspace.org/services/common/service'>
+                <service:classname>org.collectionspace.services.common.init.AddIndices</service:classname>
+                <service:params>
+                    <service:field>
+                        <service:table>nuxeo.taxonomyauthority_common</service:table>
+                        <service:col>displayname</service:col>
+                    </service:field>
+                    <service:field>
+                        <service:table>nuxeo.taxonomyauthority_common</service:table>
+                        <service:col>shortidentifier</service:col>
+                    </service:field>
+                </service:params>
+            </service:initHandler>
+            <service:object id="1" name="Taxonomyauthority" version="0.1"
+                            xmlns:service='http://collectionspace.org/services/common/service'>
+                <service:part id="0" control_group="Managed"
+                              versionable="true" auditable="false"
+                              label="taxonomyauthority-system" updated="" order="0">
+                    <service:content contentType="application/xml">
+                        <service:xmlContent
+                            namespaceURI="http://collectionspace.org/services/common/system"
+                            schemaLocation="http://collectionspace.org/services/common/system http://collectionspace.org/services/common/system/system-response.xsd">
+                        </service:xmlContent>
+                    </service:content>
+                </service:part>
+                <service:part id="1" control_group="Managed"
+                              versionable="true" auditable="false"
+                              label="taxonomyauthority_common" updated="" order="1">
+                    <service:content contentType="application/xml">
+                        <service:xmlContent
+                            namespaceURI="http://collectionspace.org/services/taxonomy"
+                            schemaLocation="http://collectionspace.org/services/taxonomy http://services.collectionspace.org/location/taxonomyauthority_common.xsd">
+                        </service:xmlContent>
+                    </service:content>
+                </service:part>
+                <service:part id="2" control_group="Managed"
+                              versionable="true" auditable="false"
+                              label="collectionspace_core" updated="" order="2">
+                    <service:content contentType="application/xml">
+                        <service:xmlContent
+                            namespaceURI="http://collectionspace.org/collectionspace_core/"
+                            schemaLocation="http://collectionspace.org/collectionspace_core/ http://services.collectionspace.org/collectionspace_core.xsd">
+                        </service:xmlContent>
+                    </service:content>
+                </service:part>
+            </service:object>
+        </tenant:serviceBindings>
+        <!-- end taxonomyauthority service meta-data -->
+
+        <!-- begin Taxon (the 'item' child of TaxonomyAuthority) service meta-data.
+             Note there is no Taxon service, but there is a
+             Repository workspace so we have to configure that.
+        -->
+        <tenant:serviceBindings name="Taxon" version="0.1">
+            <service:repositoryDomain xmlns:service='http://collectionspace.org/services/common/service'>
+                default-domain
+            </service:repositoryDomain>
+            <service:documentHandler xmlns:service='http://collectionspace.org/services/common/service'>
+                org.collectionspace.services.taxonomy.nuxeo.TaxonDocumentModelHandler
+            </service:documentHandler>
+            <service:validatorHandler xmlns:service='http://collectionspace.org/services/common/service'>
+                org.collectionspace.services.taxonomy.nuxeo.TaxonValidatorHandler
+            </service:validatorHandler>
+            <service:initHandler xmlns:service='http://collectionspace.org/services/common/service'>
+                <service:classname>org.collectionspace.services.common.init.AddIndices</service:classname>
+                <service:params>
+                    <service:field>
+                        <service:table>nuxeo.taxon_common</service:table>
+                        <service:col>inauthority</service:col>
+                    </service:field>
+                    <service:field>
+                        <service:table>nuxeo.taxon_common</service:table>
+                        <service:col>displayname</service:col>
+                    </service:field>
+                    <service:field>
+                        <service:table>nuxeo.taxon_common</service:table>
+                        <service:col>shortidentifier</service:col>
+                    </service:field>
+                </service:params>
+            </service:initHandler>
+            <service:object id="1" name="Taxon" version="0.1"
+                            xmlns:service='http://collectionspace.org/services/common/service'>
+                <service:part id="0" control_group="Managed"
+                              versionable="true" auditable="false"
+                              label="taxon-system" updated="" order="0">
+                    <service:content contentType="application/xml">
+                        <service:xmlContent
+                            namespaceURI="http://collectionspace.org/services/common/system"
+                            schemaLocation="http://collectionspace.org/services/common/system http://collectionspace.org/services/common/system/system-response.xsd">
+                        </service:xmlContent>
+                    </service:content>
+                </service:part>
+                <service:part id="1" control_group="Managed"
+                              versionable="true" auditable="false"
+                              label="taxon_common" updated="" order="1">
+                    <service:content contentType="application/xml">
+                        <service:xmlContent
+                            namespaceURI="http://collectionspace.org/services/taxonomy"
+                            schemaLocation="http://collectionspace.org/services/taxonomy http://services.collectionspace.org/taxonomy/taxon_common.xsd">
+                        </service:xmlContent>
+                    </service:content>
+                </service:part>
+                <service:part id="2" control_group="Managed"
+                              versionable="true" auditable="false"
+                              label="collectionspace_core" updated="" order="2">
+                    <service:content contentType="application/xml">
+                        <service:xmlContent
+                            namespaceURI="http://collectionspace.org/collectionspace_core/"
+                            schemaLocation="http://collectionspace.org/collectionspace_core/ http://services.collectionspace.org/collectionspace_core.xsd">
+                        </service:xmlContent>
+                    </service:content>
+                </service:part>
+            </service:object>
+        </tenant:serviceBindings>
+        <!-- end taxon service meta-data -->
+
         <!-- begin acquisition service meta-data -->
         <tenant:serviceBindings name="Acquisitions" type="procedure" version="0.1">
             <service:uriPath xmlns:service='http://collectionspace.org/services/common/service'>
@@ -1586,20 +1720,20 @@
             <service:DocHandlerParams xmlns:service='http://collectionspace.org/services/common/service'>
                 <service:classname>org.collectionspace.services.loanin.nuxeo.AcquisitionDocumentModelHandler</service:classname>
                 <service:params>
-                     <service:SchemaName>acquisition</service:SchemaName>
-                     <service:DublinCoreTitle>acquisition</service:DublinCoreTitle>
-                     <service:SummaryFields>acquisitionReferenceNumber|acquisitionSources|owners|uri|csid</service:SummaryFields>
-                     <service:AbstractCommonListClassname></service:AbstractCommonListClassname>
-                     <service:CommonListItemClassname></service:CommonListItemClassname>
-                     <service:ListResultsItemMethodName>getAcquisitionListItem</service:ListResultsItemMethodName>
-                     <service:ListResultsFields>
-                         <service:ListResultField>
-                             <service:element>acquisitionReferenceNumber</service:element>
-                             <service:xpath>acquisitionReferenceNumber</service:xpath>
-                         </service:ListResultField>
+                    <service:SchemaName>acquisition</service:SchemaName>
+                    <service:DublinCoreTitle>acquisition</service:DublinCoreTitle>
+                    <service:SummaryFields>acquisitionReferenceNumber|acquisitionSources|owners|uri|csid</service:SummaryFields>
+                    <service:AbstractCommonListClassname></service:AbstractCommonListClassname>
+                    <service:CommonListItemClassname></service:CommonListItemClassname>
+                    <service:ListResultsItemMethodName>getAcquisitionListItem</service:ListResultsItemMethodName>
+                    <service:ListResultsFields>
+                        <service:ListResultField>
+                            <service:element>acquisitionReferenceNumber</service:element>
+                            <service:xpath>acquisitionReferenceNumber</service:xpath>
+                        </service:ListResultField>
                         <service:ListResultField>
                             <service:element>acquisitionSource</service:element>
-                                                       <service:xpath>acquisitionSources/[0]</service:xpath>
+                            <service:xpath>acquisitionSources/[0]</service:xpath>
                         </service:ListResultField>
                         <service:ListResultField>
                             <service:element>owner</service:element>
@@ -2090,7 +2224,7 @@
             </service:object>
         </tenant:serviceBindings>
         <!-- end role-permission service meta-data -->
-        
+
         <!-- begin role-account service meta-data -->
         <!-- the following service is same as account/accountroles service -->
         <!-- except that it is available as a sub resource of the role service -->
@@ -2129,7 +2263,7 @@
                 </service:part>
             </service:object>
         </tenant:serviceBindings>
-        
+
     </tenant:tenantBinding>
     <!-- end collectionspace.org tenant meta-data -->
 

diff --git a/services/pom.xml b/services/pom.xml
index 148485c477bd701b9f308c818736f0050a87706f..d07a2fb9635c47822d0a9da3f0bed7c2362770d8 100644 (file)
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -49,6 +49,7 @@
         <module>objectexit</module>
         <module>imports</module>
         <module>location</module>
+        <module>taxonomy</module>
         <module>movement</module>
         <module>report</module>
         <module>dimension</module>

diff --git a/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/src/main/resources/schemas/taxon_common.xsd b/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/src/main/resources/schemas/taxon_common.xsd
index b477c790aedb9bb52eac8d1de5aa8a63175980c3..9acc0f7035c9a0c3f0debf2a5852fc68528c214b 100644 (file)
--- a/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/src/main/resources/schemas/taxon_common.xsd
+++ b/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/src/main/resources/schemas/taxon_common.xsd
@@ -13,9 +13,9 @@
 
 <xs:schema 
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:ns="http://collectionspace.org/services/taxon"
-  xmlns="http://collectionspace.org/services/taxon"
-  targetNamespace="http://collectionspace.org/services/taxon"
+  xmlns:ns="http://collectionspace.org/services/taxonomy"
+  xmlns="http://collectionspace.org/services/taxonomy"
+  targetNamespace="http://collectionspace.org/services/taxonomy"
   version="0.1"
 >
 <!-- See http://wiki.collectionspace.org/display/collectionspace/Taxonomy+Service+Home -->