From eccf60ca4e96d907507cf85f9ba05651f263de29 Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Sat, 7 May 2011 03:43:30 +0000
Subject: [PATCH] CSPACE-3865: More naming tweaks; part of create test now
 passes in local testing. (Taxonomy service not yet activated in checked-in
 services layer.)

---
 .../src/main/resources/OSGI-INF/ecm-types-contrib.xml  | 10 +++++-----
 .../src/main/resources/OSGI-INF/layouts-contrib.xml    |  2 +-
 .../src/main/resources/OSGI-INF/life-cycle-contrib.xml |  2 +-
 services/taxonomy/build.xml                            |  5 ++---
 .../services/client/TaxonomyAuthorityClient.java       |  2 +-
 .../collectionspace/services/TaxonomyJAXBSchema.java   |  6 +-----
 .../services/taxonomy/TaxonomyAuthorityResource.java   |  6 +++---
 .../taxonomy/nuxeo/TaxonDocumentModelHandler.java      |  6 +++---
 .../services/taxonomy/nuxeo/TaxonValidatorHandler.java |  4 ++--
 9 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/src/main/resources/OSGI-INF/ecm-types-contrib.xml b/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/src/main/resources/OSGI-INF/ecm-types-contrib.xml
index 2c6ca5c92..a305cbb94 100644
--- a/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/src/main/resources/OSGI-INF/ecm-types-contrib.xml
+++ b/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/src/main/resources/OSGI-INF/ecm-types-contrib.xml
@@ -26,26 +26,26 @@
 
   </extension>
   <extension target="org.nuxeo.ecm.platform.types.TypeService" point="types">
-    <type id="Taxonomyitem" coretype="Taxonomyitem">
-      <label>org.collectionspace.taxonomy</label>
+    <type id="Taxon" coretype="Taxon">
+      <label>org.collectionspace.taxon</label>
       <!--icon>/icons/file.gif</icon-->
       <default-view>view_documents</default-view>
 
       <layouts mode="any">
         <layout>heading</layout>
-        <layout>taxonomy</layout>
+        <layout>taxon</layout>
       </layouts>        
     </type>
 
     <type id="Folder" coretype="Folder">
       <subtypes>
-        <type>Taxonomy</type>
+        <type>Taxon</type>
       </subtypes>
     </type>
     
     <type id="Workspace" coretype="Workspace">
       <subtypes>
-        <type>Taxonomy</type>
+        <type>Taxon</type>
       </subtypes>
     </type>
 
diff --git a/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/src/main/resources/OSGI-INF/layouts-contrib.xml b/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/src/main/resources/OSGI-INF/layouts-contrib.xml
index e0e97f04f..c286fa530 100644
--- a/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/src/main/resources/OSGI-INF/layouts-contrib.xml
+++ b/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/src/main/resources/OSGI-INF/layouts-contrib.xml
@@ -73,7 +73,7 @@
   <extension target="org.nuxeo.ecm.platform.forms.layout.WebLayoutManager"
     point="layouts">
 
-    <layout name="taxonomy">
+    <layout name="taxon">
       <templates>
         <template mode="any">/layouts/layout_default_template.xhtml</template>
       </templates>
diff --git a/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/src/main/resources/OSGI-INF/life-cycle-contrib.xml b/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/src/main/resources/OSGI-INF/life-cycle-contrib.xml
index fd1293b81..829162528 100644
--- a/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/src/main/resources/OSGI-INF/life-cycle-contrib.xml
+++ b/services/taxonomy/3rdparty/nuxeo-platform-cs-taxonomy/src/main/resources/OSGI-INF/life-cycle-contrib.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<component name="org.collectionspace.ecm.platform.location.LifeCycleManagerExtensions">
+<component name="org.collectionspace.ecm.platform.taxonomy.LifeCycleManagerExtensions">
 
   <extension target="org.nuxeo.ecm.core.lifecycle.LifeCycleService"
              point="types">
diff --git a/services/taxonomy/build.xml b/services/taxonomy/build.xml
index dba523a4f..fe67dbd19 100644
--- a/services/taxonomy/build.xml
+++ b/services/taxonomy/build.xml
@@ -1,11 +1,10 @@
-
 <project name="taxonomy" default="package" basedir=".">
     <description>
         Taxonomy Authority service
     </description>
-  <!-- set global properties for this build -->
+    <!-- set global properties for this build -->
     <property name="services.trunk" value="../.."/>
-        <!-- enviornment should be declared before reading build.properties -->
+    <!-- environment should be declared before reading build.properties -->
     <property environment="env" />
     <property file="${services.trunk}/build.properties" />
     <property name="mvn.opts" value="" />
diff --git a/services/taxonomy/client/src/main/java/org/collectionspace/services/client/TaxonomyAuthorityClient.java b/services/taxonomy/client/src/main/java/org/collectionspace/services/client/TaxonomyAuthorityClient.java
index 4915ca1c0..7200c3da3 100644
--- a/services/taxonomy/client/src/main/java/org/collectionspace/services/client/TaxonomyAuthorityClient.java
+++ b/services/taxonomy/client/src/main/java/org/collectionspace/services/client/TaxonomyAuthorityClient.java
@@ -46,7 +46,7 @@ import org.jboss.resteasy.spi.ResteasyProviderFactory;
  * The Class TaxonomyAuthorityClient.
  */
 public class TaxonomyAuthorityClient extends AuthorityClientImpl<TaxonomyauthorityCommonList, TaxonCommonList, TaxonomyAuthorityProxy> {
-	public static final String SERVICE_NAME = "Taxonomyauthority";
+	public static final String SERVICE_NAME = "taxonomyauthorities";
 	public static final String SERVICE_PATH_COMPONENT = SERVICE_NAME;	
 	public static final String SERVICE_PATH = "/" + SERVICE_PATH_COMPONENT;
 	public static final String SERVICE_PAYLOAD_NAME = SERVICE_NAME;
diff --git a/services/taxonomy/jaxb/src/main/java/org/collectionspace/services/TaxonomyJAXBSchema.java b/services/taxonomy/jaxb/src/main/java/org/collectionspace/services/TaxonomyJAXBSchema.java
index 4bf6824af..c1aa4a368 100644
--- a/services/taxonomy/jaxb/src/main/java/org/collectionspace/services/TaxonomyJAXBSchema.java
+++ b/services/taxonomy/jaxb/src/main/java/org/collectionspace/services/TaxonomyJAXBSchema.java
@@ -4,13 +4,9 @@
 package org.collectionspace.services;
 import org.collectionspace.services.common.vocabulary.AuthorityItemJAXBSchema;
 
-/**
- * @author pschmitz
- *
- */
 public interface TaxonomyJAXBSchema extends AuthorityItemJAXBSchema {
 	final static String TAXONOMY_COMMON = "taxonomy_common";
-	final static String NAME = "fullName";
+	final static String NAME = "taxonFullName";
 	final static String RANK = "taxonRank";
 
 }
diff --git a/services/taxonomy/service/src/main/java/org/collectionspace/services/taxonomy/TaxonomyAuthorityResource.java b/services/taxonomy/service/src/main/java/org/collectionspace/services/taxonomy/TaxonomyAuthorityResource.java
index 5c1b792a9..ea1bb16ef 100644
--- a/services/taxonomy/service/src/main/java/org/collectionspace/services/taxonomy/TaxonomyAuthorityResource.java
+++ b/services/taxonomy/service/src/main/java/org/collectionspace/services/taxonomy/TaxonomyAuthorityResource.java
@@ -66,7 +66,7 @@ import org.collectionspace.services.common.vocabulary.AuthorityResource;
 import org.collectionspace.services.common.vocabulary.RefNameServiceUtils;
 import org.collectionspace.services.common.vocabulary.RefNameUtils;
 import org.collectionspace.services.nuxeo.client.java.RemoteDocumentModelHandlerImpl;
-import org.collectionspace.services.taxonomy.nuxeo.TaxonomyDocumentModelHandler;
+import org.collectionspace.services.taxonomy.nuxeo.TaxonDocumentModelHandler;
 import org.jboss.resteasy.util.HttpResponseCodes;
 import org.nuxeo.ecm.core.api.DocumentModel;
 import org.slf4j.Logger;
@@ -80,7 +80,7 @@ import org.slf4j.LoggerFactory;
 @Produces("application/xml")
 public class TaxonomyAuthorityResource 
 	extends AuthorityResource<TaxonomyauthorityCommon, TaxonomyauthorityCommonList, 
-							TaxonCommon, TaxonomyDocumentModelHandler> {
+							TaxonCommon, TaxonDocumentModelHandler> {
 
     private final static String taxonomyAuthorityServiceName = "taxonomyauthorities";
 	private final static String TAXONOMYAUTHORITY_COMMON = "taxonomyauthority_common";
@@ -118,7 +118,7 @@ public class TaxonomyAuthorityResource
      * @return the item service name
      */
     public String getItemServiceName() {
-        return taxononomyItemServiceName;
+        return taxonomyItemServiceName;
     }
 
     @Override
diff --git a/services/taxonomy/service/src/main/java/org/collectionspace/services/taxonomy/nuxeo/TaxonDocumentModelHandler.java b/services/taxonomy/service/src/main/java/org/collectionspace/services/taxonomy/nuxeo/TaxonDocumentModelHandler.java
index f39cdab34..d83adf87f 100644
--- a/services/taxonomy/service/src/main/java/org/collectionspace/services/taxonomy/nuxeo/TaxonDocumentModelHandler.java
+++ b/services/taxonomy/service/src/main/java/org/collectionspace/services/taxonomy/nuxeo/TaxonDocumentModelHandler.java
@@ -56,17 +56,17 @@ import org.slf4j.LoggerFactory;
  * @author pschmitz
  *
  */
-public class TaxonomyDocumentModelHandler
+public class TaxonDocumentModelHandler
         extends AuthorityItemDocumentModelHandler<TaxonCommon, TaxonCommonList> {
 
     /** The logger. */
-    private final Logger logger = LoggerFactory.getLogger(TaxonomyDocumentModelHandler.class);
+    private final Logger logger = LoggerFactory.getLogger(TaxonDocumentModelHandler.class);
     /**
      * Common part schema label
      */
     private static final String COMMON_PART_LABEL = "taxonomy_common";
     
-    public TaxonomyDocumentModelHandler() {
+    public TaxonDocumentModelHandler() {
     	super(COMMON_PART_LABEL);
     }
 	
diff --git a/services/taxonomy/service/src/main/java/org/collectionspace/services/taxonomy/nuxeo/TaxonValidatorHandler.java b/services/taxonomy/service/src/main/java/org/collectionspace/services/taxonomy/nuxeo/TaxonValidatorHandler.java
index 8216ee411..6fa78a93e 100644
--- a/services/taxonomy/service/src/main/java/org/collectionspace/services/taxonomy/nuxeo/TaxonValidatorHandler.java
+++ b/services/taxonomy/service/src/main/java/org/collectionspace/services/taxonomy/nuxeo/TaxonValidatorHandler.java
@@ -36,9 +36,9 @@ import org.slf4j.LoggerFactory;
  *
  * @author 
  */
-public class TaxonomyValidatorHandler implements ValidatorHandler {
+public class TaxonValidatorHandler implements ValidatorHandler {
 
-    final Logger logger = LoggerFactory.getLogger(TaxonomyValidatorHandler.class);
+    final Logger logger = LoggerFactory.getLogger(TaxonValidatorHandler.class);
 
     @Override
     public void validate(Action action, ServiceContext ctx)
-- 
2.47.3