ref #9327 , ref #9211 adapt some classpaths for webservice and BeanInitializer for...

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/initializer/TaxonNodeAutoInitializer.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/initializer/TaxonNodeAutoInitializer.java
index a17b05b454b4140b30bb394a1b97cde9fd01486a..d73d30c8e0528f8be3fdd3949adf04a8f6ae3780 100644 (file)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/initializer/TaxonNodeAutoInitializer.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/initializer/TaxonNodeAutoInitializer.java
@@ -29,7 +29,7 @@ public class TaxonNodeAutoInitializer extends AutoPropertyInitializer<TaxonNode>
     public Optional<String> hibernateFetchJoin(Class<?> clazz, String beanAlias){
 
         String result = "";
-        result += String.format(" LEFT JOIN FETCH %s.taxon taxon LEFT JOIN FETCH taxon.name LEFT JOIN FETCH taxon.sec", beanAlias);
+        result += String.format(" LEFT JOIN FETCH %s.taxon taxon LEFT JOIN FETCH taxon.name LEFT JOIN FETCH taxon.secSource ss LEFT JOIN FETCH ss.citation", beanAlias);
         return Optional.of(result);
     }
 

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ClassificationPortalListController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ClassificationPortalListController.java
index 7a8410d7f7733fc502198feff7aa248a4371ac76..f8b28232d05729215e7b92c87f71c49b7623f1f3 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ClassificationPortalListController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ClassificationPortalListController.java
@@ -60,7 +60,7 @@ public class ClassificationPortalListController extends AbstractIdentifiableList
 \r
     private static final List<String> NODE_INIT_STRATEGY = Arrays.asList(new String[]{\r
             "taxon.name.rank",\r
-            "taxon.sec"\r
+            "taxon.secSource.citation"\r
     });\r
 \r
     private ITaxonService taxonService;\r

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonController.java
index 40d098415084fc96595896e5139a703a9df4ed95..943875ad762058f580e57ada16ac4b4ad0f83b48 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonController.java
@@ -104,7 +104,7 @@ public class TaxonController extends AbstractIdentifiableController<TaxonBase, I
             "taxonNodes.classification",\r
             "taxonNodes.parent",\r
             "taxonNodes.taxon.name",\r
-            "taxonNodes.taxon.sec",\r
+            "taxonNodes.taxon.secSource.citation",\r
             "acceptedTaxon.taxonNodes.classification"\r
     }));\r
 \r

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonNodePrintAppController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonNodePrintAppController.java
index 82657eea6f82b66c7fc16784c78b7fef26158683..9be0cba68aef296b5bc523bd93be1ef991fd22b0 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonNodePrintAppController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonNodePrintAppController.java
@@ -44,7 +44,7 @@ public class TaxonNodePrintAppController extends AbstractController<TaxonNode, I
 
 
     private static final List<String> NODE_INIT_STRATEGY = Arrays.asList(new String[]{
-            "taxon.sec",
+            "taxon.secSource.citation",
             "taxon.name"
     });
 

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonPortalController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonPortalController.java
index b9def40c071d983d36a80d5f11d054bfaee96607..7891aa1e233e0b1b0504a8343682ee92fa6c6bc9 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonPortalController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonPortalController.java
@@ -231,7 +231,7 @@ public class TaxonPortalController extends TaxonController{
             "taxonNodes.parent",
             "taxonNodes.statusNote.*",
             "taxonNodes.taxon.name",
-            "taxonNodes.taxon.sec",
+            "taxonNodes.taxon.secSource.citation",
             "taxonNodes.source.citation.authorship",
             "taxonNodes.source.citation.inReference.authorship",
             "acceptedTaxon.taxonNodes.classification",

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/dto/NameCatalogueController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/dto/NameCatalogueController.java
index 22509fa7b4d7cf410e677120d4d7a39ba33b6036..3db48f77fdd9583caba234ef65422e12c5e07cf2 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/dto/NameCatalogueController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/dto/NameCatalogueController.java
@@ -222,7 +222,7 @@ public class NameCatalogueController extends AbstractController<TaxonName, IName
 
     /** Hibernate taxon node initialisation strategy */
     private static final List<String> TAXON_NODE_INIT_STRATEGY = Arrays.asList(new String[] {
-            "taxon.sec",
+            "taxon.secSource.citation",
             "taxon.name",
             "classification",
             "classification.source.citation.$",

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/ClassificationServiceDeepTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/ClassificationServiceDeepTest.java
index 191d70fe67ec41e6adc7c155b8b958641f69d5a9..025b34d500a12e996e998def2ad4fb20a7b5fda1 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/ClassificationServiceDeepTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/ClassificationServiceDeepTest.java
@@ -49,7 +49,7 @@ public class ClassificationServiceDeepTest extends CdmTransactionalIntegrationTe
             "childNodes",
             "childNodes.taxon",
             "childNodes.taxon.name",
-            "taxon.sec",
+            "taxon.secSource.citation",
             "taxon.name.*"
     });
 

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/ClassificationServiceImplTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/ClassificationServiceImplTest.java
index 22db93aad0b2534a0cdac7715891630a71c969d0..0ca1fca57a9045eefa803c92122a84a950422c6a 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/ClassificationServiceImplTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/ClassificationServiceImplTest.java
@@ -68,7 +68,7 @@ public class ClassificationServiceImplTest extends CdmTransactionalIntegrationTe
             "childNodes",
             "childNodes.taxon",
             "childNodes.taxon.name",
-            "taxon.sec",
+            "taxon.secSource.citation",
             "taxon.name.*"
             });