From 3f7808eacf1f09886a7096942eca264dc4055b77 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Andreas=20M=C3=BCller?= <a.mueller@bgbm.org>
Date: Fri, 22 Jan 2021 11:33:42 +0100
Subject: [PATCH] try to fix TaxoNodeByNameComparator issue in application
 context files.

---
 .../src/main/webapp/WEB-INF/applicationContext.views.xml        | 2 +-
 .../src/main/resources/eu/etaxonomy/cdm/services_base.xml       | 2 +-
 .../src/main/resources/eu/etaxonomy/cdm/services_security.xml   | 2 +-
 .../src/main/resources/eu/etaxonomy/cdm/services_base_test.xml  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cdmlib-remote-webapp/src/main/webapp/WEB-INF/applicationContext.views.xml b/cdmlib-remote-webapp/src/main/webapp/WEB-INF/applicationContext.views.xml
index 8a09a88f9e..c25f48b591 100644
--- a/cdmlib-remote-webapp/src/main/webapp/WEB-INF/applicationContext.views.xml
+++ b/cdmlib-remote-webapp/src/main/webapp/WEB-INF/applicationContext.views.xml
@@ -14,7 +14,7 @@
     A TaxonNodeComparator with substitutionRules to allow correct sorted
     taxon nodes e.g. in a taxonomic tree browser
   -->
-    <bean  name="taxonNodeByNameComparator" class="eu.etaxonomy.cdm.model.taxon.TaxonNodeByNameComparator">
+    <bean  name="taxonNodeByNameComparator" class="eu.etaxonomy.cdm.compare.taxon.TaxonNodeByNameComparator">
       <property name="substitutionRules">
         <map>
           <entry key=".*?( sp\.| ssp\.| spp\.| n\.|Nomina dubia|Incertae sedis|Nomina excludenda).*" value="_" />
diff --git a/cdmlib-services/src/main/resources/eu/etaxonomy/cdm/services_base.xml b/cdmlib-services/src/main/resources/eu/etaxonomy/cdm/services_base.xml
index ee2a7f44ef..3eacfd95bf 100644
--- a/cdmlib-services/src/main/resources/eu/etaxonomy/cdm/services_base.xml
+++ b/cdmlib-services/src/main/resources/eu/etaxonomy/cdm/services_base.xml
@@ -20,7 +20,7 @@
     <context:component-scan base-package="eu/etaxonomy/cdm/database"/>
 
     <!-- also find the implementation of ITaxonNodeComparator (otherwise it is not found by a component scan)  -->
-    <bean name="taxonNodeByNameComparator" class="eu.etaxonomy.cdm.model.taxon.TaxonNodeByNameComparator"/>
+    <bean name="taxonNodeByNameComparator" class="eu.etaxonomy.cdm.compare.taxon.TaxonNodeByNameComparator"/>
     <!-- find the implementation of UserHelper which is not covered by a component scan  -->
     <bean name="cdmUserHelper" class="eu.etaxonomy.cdm.api.utility.CdmUserHelper"/>
    
diff --git a/cdmlib-services/src/main/resources/eu/etaxonomy/cdm/services_security.xml b/cdmlib-services/src/main/resources/eu/etaxonomy/cdm/services_security.xml
index 44fae8b2e3..f58855fc5b 100644
--- a/cdmlib-services/src/main/resources/eu/etaxonomy/cdm/services_security.xml
+++ b/cdmlib-services/src/main/resources/eu/etaxonomy/cdm/services_security.xml
@@ -26,7 +26,7 @@
     <context:component-scan base-package="eu/etaxonomy/cdm/database"/>
 
     <!-- also find the implementation of ITaxonNodeComparator (otherwise it is not found by a component scan)  -->
-    <bean name="taxonNodeByNameComparator" class="eu.etaxonomy.cdm.model.taxon.TaxonNodeByNameComparator"/>
+    <bean name="taxonNodeByNameComparator" class="eu.etaxonomy.cdm.compare.taxon.TaxonNodeByNameComparator"/>
     <!-- find the implementation of UserHelper which is not covered by a component scan  -->
     <bean name="cdmUserHelper" class="eu.etaxonomy.cdm.api.utility.CdmUserHelper"/>
 
diff --git a/cdmlib-test/src/main/resources/eu/etaxonomy/cdm/services_base_test.xml b/cdmlib-test/src/main/resources/eu/etaxonomy/cdm/services_base_test.xml
index c3338c3cb1..0e78467c56 100644
--- a/cdmlib-test/src/main/resources/eu/etaxonomy/cdm/services_base_test.xml
+++ b/cdmlib-test/src/main/resources/eu/etaxonomy/cdm/services_base_test.xml
@@ -24,7 +24,7 @@
     </context:component-scan>
 
     <!-- also find the implementation of ITaxonNodeComparator (otherwise it is not found by a component scan)  -->
-    <bean name="taxonNodeByNameComparator" class="eu.etaxonomy.cdm.model.taxon.TaxonNodeByNameComparator"/>
+    <bean name="taxonNodeByNameComparator" class="eu.etaxonomy.cdm.compare.taxon.TaxonNodeByNameComparator"/>
     <!-- find the implementation of UserHelper which is not covered by a component scan  -->
     <bean name="cdmUserHelper" class="eu.etaxonomy.cdm.api.utility.CdmUserHelper"/>
 
-- 
2.34.1