ref #10441: some more propertypath adaptions

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionElementListController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionElementListController.java
index 21fedeb7e32a4a4846e047717d466ed4a69eae65..b09ed652b57a004511802c21d4b05b51a7da87ad 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionElementListController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionElementListController.java
@@ -81,8 +81,8 @@ public class DescriptionElementListController {
             "stateData.modifyingText",
             "stateData.categoricalData.$",
             "annotations.$",
-            "annotations.type.$",
-            "annotations.type.includes.$"
+            "annotations.annotationType.$",
+            "annotations.annotationType.includes.$"
     });
 
     protected List<String> getInitializationStrategy() {

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonListController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonListController.java
index c6f757589e34002e9cc266b0558ff2997c8b1f51..2138edc93c693d405e846467c76079284e119beb 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonListController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonListController.java
@@ -98,7 +98,8 @@ public class TaxonListController extends AbstractIdentifiableListController<Taxo
         setInitializationStrategy(Arrays.asList(new String[]{
                 "$",
                 "annotations.$",
-                "annotations.type.includes.$",
+                "annotations.annotationType.$",
+                "annotations.annotationType.includes.$",
                 "name.nomenclaturalSource.citation"
                 }));
     }

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 de772b6f59b797ab8722c4fd250bb15c9debc7c7..c224aa53be02f6823c896b3f5fa224993960bdd2 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
@@ -149,7 +149,8 @@ public class TaxonPortalController extends TaxonController{
             "secSource.citation.authorship.$",
             "secSource.citation.inReference.authorship.$",
             "annotations.$",
-            "annotations.type.includes.$"
+            "annotations.annotationType.$",
+            "annotations.annotationType.includes.$"
 //            "descriptions" // TODO remove
 
             }));
@@ -194,6 +195,10 @@ public class TaxonPortalController extends TaxonController{
             "name.homotypicalGroup.typifiedNames.$",
             "name.homotypicalGroup.typifiedNames.nomenclaturalSource.citation.authorship",
             "name.homotypicalGroup.typifiedNames.nomenclaturalSource.citation.inReference.authorship",
+            "synonyms.annotations.$",
+            "synonyms.annotations.annotationType.$",
+            "synonyms.annotations.annotationType.includes.$"
+
 //            "name.homotypicalGroup.typifiedNames.taxonBases.$"
     }));
 

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonPortalListController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonPortalListController.java
index b51a33ef60c1dd6cc220f4fd34b061412a1cf106..8396a7a95e6c2eec98e2e7a9c38944a061b823c9 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonPortalListController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonPortalListController.java
@@ -30,9 +30,13 @@ public class TaxonPortalListController extends TaxonListController {
             null,
             Arrays.asList(
             "annotations.$",
-            "annotations.type.includes.$",
-            "synonym.name.nomenclaturalSource.citation.authorship",
-            "synonym.name.nomenclaturalSource.citation.inReference.authorship",
+            "annotations.annotationType.$",
+            "annotations.annotationType.includes.$",
+            "synonyms.annotations.$",
+            "synonyms.annotations.annotationType.$",
+            "synonyms.annotations.annotationType.includes.$",
+            "synonyms.name.nomenclaturalSource.citation.authorship",
+            "synonyms.name.nomenclaturalSource.citation.inReference.authorship",
             "relationsFromThisTaxon.toTaxon.taxonNodes" // needed for misapplications, see Taxon.isMisapplicationOnly()
             ),
             false