featuretree initialization strategy changed, description node has now children

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DerivedUnitFacadeController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DerivedUnitFacadeController.java
index 0cf41e70f736935e2e288344bb469799a305d888..beb1f9016dd70970f8df7f6bd4da36fbbd3056ea 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DerivedUnitFacadeController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DerivedUnitFacadeController.java
@@ -67,7 +67,10 @@ public class DerivedUnitFacadeController extends AbstractController{
        }\r
        \r
 // TODO        \r
-       @RequestMapping(method = RequestMethod.GET, value = "{uuid}/collectingareas")\r
+       //@RequestMapping(method = RequestMethod.GET, value = "{uuid}/collectingareas")\r
+               @RequestMapping(\r
+                       value = {"collectingareas"},\r
+                       method = RequestMethod.GET)\r
        public Object doGetCollectingAreas(\r
                        @PathVariable("uuid") UUID uuid,\r
                        HttpServletRequest request,\r
@@ -80,7 +83,7 @@ public class DerivedUnitFacadeController extends AbstractController{
                return duf.getCollectingAreas();\r
        }\r
        \r
-       @RequestMapping(method = RequestMethod.GET, value = "{uuid}/collection")\r
+       @RequestMapping(method = RequestMethod.GET, value = "collection")\r
        public Object doGetCollection(\r
                        @PathVariable("uuid") UUID uuid,\r
                        HttpServletRequest request,\r

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionController.java
index c92378b7090c7b8e942baadf20e812d8143e9cf4..1ee13fb8af3b8e85790337bfcb02d60757b8ccba 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionController.java
@@ -67,6 +67,7 @@ public class DescriptionController extends AnnotatableController<DescriptionBase
                                "representations",
                                "root.feature.representations",
                                "root.children.feature.representations",
+                               "root.children.children.feature.representations",
                        });
        
        @InitBinder