From 6936bbff8ff5e4a05adbbe6e161f46968f20d2db Mon Sep 17 00:00:00 2001 From: Aron Roberts Date: Sat, 7 May 2011 03:06:33 +0000 Subject: [PATCH] CSPACE-3865: More renaming to new name for Taxonomy items. --- .../services/taxonomy/TaxonomyAuthorityResource.java | 12 +++++++----- ...elHandler.java => TaxonDocumentModelHandler.java} | 0 ...idatorHandler.java => TaxonValidatorHandler.java} | 0 3 files changed, 7 insertions(+), 5 deletions(-) rename services/taxonomy/service/src/main/java/org/collectionspace/services/taxonomy/nuxeo/{TaxonomyDocumentModelHandler.java => TaxonDocumentModelHandler.java} (100%) rename services/taxonomy/service/src/main/java/org/collectionspace/services/taxonomy/nuxeo/{TaxonomyValidatorHandler.java => TaxonValidatorHandler.java} (100%) 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 ebcaaf75f..5c1b792a9 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 @@ -83,10 +83,12 @@ public class TaxonomyAuthorityResource TaxonCommon, TaxonomyDocumentModelHandler> { private final static String taxonomyAuthorityServiceName = "taxonomyauthorities"; - private final static String LOCATIONAUTHORITIES_COMMON = "taxonomyauthority_common"; + private final static String TAXONOMYAUTHORITY_COMMON = "taxonomyauthority_common"; - private final static String taxonomyServiceName = "taxonomy"; - private final static String LOCATIONS_COMMON = "taxonomy_common"; + // FIXME: May be desirable to change this to the plural form 'taxa', + // both here and in related config. + private final static String taxonomyItemServiceName = "taxon"; + private final static String TAXON_COMMON = "taxon_common"; /** The logger. */ final Logger logger = LoggerFactory.getLogger(TaxonomyAuthorityResource.class); @@ -99,7 +101,7 @@ public class TaxonomyAuthorityResource */ public TaxonomyAuthorityResource() { super(TaxonomyauthorityCommon.class, TaxonomyAuthorityResource.class, - LOCATIONAUTHORITIES_COMMON, LOCATIONS_COMMON); + TAXONOMYAUTHORITY_COMMON, TAXON_COMMON); } /* (non-Javadoc) @@ -116,7 +118,7 @@ public class TaxonomyAuthorityResource * @return the item service name */ public String getItemServiceName() { - return taxonomyServiceName; + return taxononomyItemServiceName; } @Override diff --git a/services/taxonomy/service/src/main/java/org/collectionspace/services/taxonomy/nuxeo/TaxonomyDocumentModelHandler.java b/services/taxonomy/service/src/main/java/org/collectionspace/services/taxonomy/nuxeo/TaxonDocumentModelHandler.java similarity index 100% rename from services/taxonomy/service/src/main/java/org/collectionspace/services/taxonomy/nuxeo/TaxonomyDocumentModelHandler.java rename to services/taxonomy/service/src/main/java/org/collectionspace/services/taxonomy/nuxeo/TaxonDocumentModelHandler.java diff --git a/services/taxonomy/service/src/main/java/org/collectionspace/services/taxonomy/nuxeo/TaxonomyValidatorHandler.java b/services/taxonomy/service/src/main/java/org/collectionspace/services/taxonomy/nuxeo/TaxonValidatorHandler.java similarity index 100% rename from services/taxonomy/service/src/main/java/org/collectionspace/services/taxonomy/nuxeo/TaxonomyValidatorHandler.java rename to services/taxonomy/service/src/main/java/org/collectionspace/services/taxonomy/nuxeo/TaxonValidatorHandler.java -- 2.47.3