harmonizing webservice paths

diff --git a/.gitattributes b/.gitattributes
index 6f8a307ada21b32a1bd74a385f599fe5998a92a0..edf41814b9344b8c5ac487b5be7ab2391a1b91d8 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -2762,7 +2762,6 @@ cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonNam
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonNodeBeanProcessor.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonNodeDaoBeanProcessor.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonRelationshipBeanProcessor.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonomyNodeBeanProcessor.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TermBaseBeanProcessor.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TextDataBeanProcessor.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TypeDesignationBaseBeanProcessor.java -text

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/AgentListController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/AgentListController.java
index a1d78516b4bf6f6a649587b5818fd4738fa0a389..da1579e0d510d231efb3caa4f137182fb3466a2b 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/AgentListController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/AgentListController.java
@@ -70,7 +70,7 @@ import eu.etaxonomy.cdm.model.common.Annotation;
  * @date 24.03.2009\r
  */\r
 @Controller\r
-@RequestMapping(value = {"/agent/"})\r
+@RequestMapping(value = {"/agent"})\r
 public class AgentListController extends BaseListController<AgentBase, IAgentService> {\r
 \r
        /* (non-Javadoc)\r

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ClassificationListController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ClassificationListController.java
index 6a621ebb551581954995a68c076d236e22aa5cb3..2ae19737cb2864a4befc82ec14121668d5dcbc62 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ClassificationListController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ClassificationListController.java
@@ -27,7 +27,7 @@ import eu.etaxonomy.cdm.model.taxon.TaxonomicTree;
  * @version 1.0
  */
 @Controller
-@RequestMapping(value = {"/classification/"})
+@RequestMapping(value = {"/classification"})
 public class ClassificationListController extends BaseListController<TaxonomicTree,ITaxonTreeService> {
        
        private static final Logger logger = Logger

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 78e26eebcf9e4e0356c8356a0ffdfcf81422422f..0cf41e70f736935e2e288344bb469799a305d888 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
@@ -13,8 +13,6 @@ import java.io.IOException;
 import java.util.ArrayList;\r
 import java.util.Arrays;\r
 import java.util.List;\r
-import java.util.Map;\r
-import java.util.Set;\r
 import java.util.UUID;\r
 \r
 import javax.servlet.http.HttpServletRequest;\r
@@ -31,22 +29,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;\r
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeNotSupportedException;\r
 import eu.etaxonomy.cdm.api.service.IOccurrenceService;\r
-import eu.etaxonomy.cdm.model.agent.AgentBase;\r
-import eu.etaxonomy.cdm.model.common.IdentifiableSource;\r
-import eu.etaxonomy.cdm.model.common.Language;\r
-import eu.etaxonomy.cdm.model.common.LanguageString;\r
-import eu.etaxonomy.cdm.model.location.NamedArea;\r
-import eu.etaxonomy.cdm.model.location.Point;\r
-import eu.etaxonomy.cdm.model.media.Media;\r
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
-import eu.etaxonomy.cdm.model.occurrence.Collection;\r
-import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;\r
 import eu.etaxonomy.cdm.model.occurrence.DerivedUnitBase;\r
-import eu.etaxonomy.cdm.model.occurrence.DeterminationEvent;\r
-import eu.etaxonomy.cdm.model.occurrence.FieldObservation;\r
-import eu.etaxonomy.cdm.model.occurrence.GatheringEvent;\r
-import eu.etaxonomy.cdm.model.occurrence.PreservationMethod;\r
-import eu.etaxonomy.cdm.model.occurrence.Specimen;\r
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;\r
 import eu.etaxonomy.cdm.remote.editor.UUIDPropertyEditor;\r
 \r
@@ -56,7 +39,7 @@ import eu.etaxonomy.cdm.remote.editor.UUIDPropertyEditor;
  *\r
  */\r
 @Controller\r
-@RequestMapping(value = {"/derivedunitfacade/{uuid}"})\r
+@RequestMapping(value = {"/derivedUnitFacade/{uuid}"})\r
 public class DerivedUnitFacadeController extends AbstractController{\r
 \r
        \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 959933b2288610bfda7e34b85b0aded885849b7b..c92378b7090c7b8e942baadf20e812d8143e9cf4 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
@@ -91,7 +91,7 @@ public class DescriptionController extends AnnotatableController<DescriptionBase
         * @return
         * @throws IOException
         */
-       @RequestMapping(value = {"/featuretree/{uuid}"}, method = RequestMethod.GET)
+       @RequestMapping(value = {"/featureTree/{uuid}"}, method = RequestMethod.GET)
        public FeatureTree doGetFeatureTree(
                        @PathVariable("uuid") UUID uuid,
                        HttpServletRequest request, 
@@ -101,7 +101,7 @@ public class DescriptionController extends AnnotatableController<DescriptionBase
        }
        
        
-       @RequestMapping(value = "/descriptionelement/{descriptionelement_uuid}/annotation", method = RequestMethod.GET)
+       @RequestMapping(value = "/descriptionElement/{descriptionelement_uuid}/annotation", method = RequestMethod.GET)
        public Pager<Annotation> getAnnotations(
                        @PathVariable("descriptionelement_uuid") UUID uuid,
                        HttpServletRequest request,
@@ -131,7 +131,7 @@ public class DescriptionController extends AnnotatableController<DescriptionBase
        }
        */
 
-       @RequestMapping(value = "/description/{uuid}/naturallanguagedescription/{featuretree_uuid}", method = RequestMethod.GET)
+       @RequestMapping(value = "/description/{uuid}/naturalLanguageDescription/{featuretree_uuid}", method = RequestMethod.GET)
        public ModelAndView doGenerateNaturalLanguageDescription(
                        @PathVariable("uuid") UUID uuid,
                        @PathVariable("featuretree_uuid") UUID featureTreeUuid,
@@ -167,7 +167,7 @@ public class DescriptionController extends AnnotatableController<DescriptionBase
        }
        
 
-       @RequestMapping(value = "/description/{uuid}/hasstructureddata", method = RequestMethod.GET)
+       @RequestMapping(value = "/description/{uuid}/hasStructuredData", method = RequestMethod.GET)
        public ModelAndView doHasStructuredData(
                        @PathVariable("uuid") UUID uuid,
                        HttpServletRequest request,

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionListController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionListController.java
index d8f69804818df965ef61650fdaa6e63cf68c6dcb..7eeeed2b66daa3d0299b8e235ff961ff64836b27 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionListController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionListController.java
@@ -55,7 +55,7 @@ public class DescriptionListController extends BaseListController<DescriptionBas
                this.service = service;\r
        }\r
        \r
-       @RequestMapping(method = RequestMethod.GET, value="/featuretree")\r
+       @RequestMapping(method = RequestMethod.GET, value="/featureTree")\r
        public List<FeatureTree> doGetFeatureTrees(HttpServletRequest request, HttpServletResponse response) throws IOException {\r
                \r
                List<FeatureTree> obj = featureTreeService.list(null,null,null,null,FEATURETREE_INIT_STRATEGY);\r

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionPortalController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionPortalController.java
index f1b7ce8ccd17641fdeda163cc128994093e0ab0f..1f61bbd4eee2b29839518b16d93f08f09fffbfa8 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionPortalController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionPortalController.java
@@ -58,7 +58,7 @@ import eu.etaxonomy.cdm.remote.editor.UuidList;
  */\r
 \r
 @Controller\r
-@RequestMapping(value = {"/portal/description/{uuid}", "/portal/description/{uuid_list}", "/portal/descriptionelement/{descriptionelement_uuid}", "/portal/featuretree/{featuretree_uuid}"})\r
+@RequestMapping(value = {"/portal/description/{uuid}", "/portal/description/{uuid_list}", "/portal/descriptionElement/{descriptionelement_uuid}", "/portal/featureTree/{featuretree_uuid}"})\r
 public class DescriptionPortalController extends AnnotatableController<DescriptionBase, IDescriptionService>\r
 {\r
        @Autowired\r
@@ -118,7 +118,7 @@ public class DescriptionPortalController extends AnnotatableController<Descripti
         * @throws IOException\r
         */\r
        \r
-       @RequestMapping(value = {"/portal/featuretree/{featuretree_uuid}"}, method = RequestMethod.GET)\r
+       @RequestMapping(value = {"/portal/featureTree/{featuretree_uuid}"}, method = RequestMethod.GET)\r
        public FeatureTree doGetFeatureTree(\r
                        @PathVariable("featuretree_uuid") UUID featureUuid,\r
                        HttpServletRequest request, \r
@@ -131,7 +131,7 @@ public class DescriptionPortalController extends AnnotatableController<Descripti
                return featureTree;\r
        }\r
        \r
-       @RequestMapping(value = "/portal/descriptionelement/{descriptionelement_uuid}/annotation", method = RequestMethod.GET)\r
+       @RequestMapping(value = "/portal/descriptionElement/{descriptionelement_uuid}/annotation", method = RequestMethod.GET)\r
        public Pager<Annotation> getAnnotations(\r
                        @PathVariable("descriptionelement_uuid") UUID uuid,\r
                        HttpServletRequest request,\r

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/FeatureListController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/FeatureListController.java
index ba85c1799c5e9d754476bf0896db286719607103..63a04dd8e05bb5745966037a8ebe0d002182f406 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/FeatureListController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/FeatureListController.java
@@ -35,7 +35,7 @@ import eu.etaxonomy.cdm.model.description.Feature;
  */\r
 \r
 @Controller\r
-@RequestMapping(value = {"/feature/", "/feature/{uuid}"}) //FIXME refactor type mappings\r
+@RequestMapping(value = {"/feature", "/feature/{uuid}"}) //FIXME refactor type mappings\r
 public class FeatureListController extends BaseController<DescriptionBase, IDescriptionService>\r
 {\r
        @Autowired\r

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/MediaListController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/MediaListController.java
index e85f6db1a0460c1e2f872813313e87f1ef16da9f..08da2a89b3f5a5727a5c322fa1e36986301820f2 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/MediaListController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/MediaListController.java
@@ -23,7 +23,7 @@ import eu.etaxonomy.cdm.model.media.Media;
  * @date 24.03.2009\r
  */\r
 @Controller\r
-@RequestMapping(value = {"/media/"})\r
+@RequestMapping(value = {"/media"})\r
 public class MediaListController extends BaseListController<Media, IMediaService> {\r
 \r
        /* (non-Javadoc)\r

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/NameListController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/NameListController.java
index 35d547365161becf98b6dee76803646e423f429c..b4a87d96af28c925083ba46109d0861d710529d8 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/NameListController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/NameListController.java
@@ -23,7 +23,7 @@ import eu.etaxonomy.cdm.model.name.TaxonNameBase;
  * @date 24.03.2009\r
  */\r
 @Controller\r
-@RequestMapping(value = {"/name/"})\r
+@RequestMapping(value = {"/name"})\r
 public class NameListController extends BaseListController<TaxonNameBase, INameService> {\r
 \r
        /* (non-Javadoc)\r

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/OccurrenceListController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/OccurrenceListController.java
index b5cb3a0a43acda3917e80a6e780450059b633781..a0f00d23cc7a7a884ed4f6e6fd393207cfb0a61e 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/OccurrenceListController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/OccurrenceListController.java
@@ -23,7 +23,7 @@ import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
  * @date 24.03.2009\r
  */\r
 @Controller\r
-@RequestMapping(value = {"/occurrence/"})\r
+@RequestMapping(value = {"/occurrence"})\r
 public class OccurrenceListController extends BaseListController<SpecimenOrObservationBase, IOccurrenceService> {\r
 \r
        /* (non-Javadoc)\r

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ReferenceListController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ReferenceListController.java
index 88d9ed533cc08221fd2b978ffbfd1150c23d0cdd..97759030c5ed14cbdb743d64ca13cf8324ea6579 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ReferenceListController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ReferenceListController.java
@@ -23,7 +23,7 @@ import eu.etaxonomy.cdm.model.reference.ReferenceBase;
  * @date 24.03.2009\r
  */\r
 @Controller\r
-@RequestMapping(value = {"/reference/"})\r
+@RequestMapping(value = {"/reference"})\r
 public class ReferenceListController extends BaseListController<ReferenceBase, IReferenceService> {\r
 \r
        /* (non-Javadoc)\r

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonNodeListController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonNodeListController.java
index f1cc74728e8808f0339629d0ac0a3dd6c1e73893..fa509f498ef9117663d9f8d11f539458409c1923 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonNodeListController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonNodeListController.java
@@ -71,7 +71,7 @@ public class TaxonNodeListController extends BaseListController<TaxonNode, ITaxo
         * @throws IOException
         */
        @RequestMapping(
-                       value = {"/taxonNode/{taxonNodeUuid}/childNodes/"},
+                       value = {"/taxonNode/{taxonNodeUuid}/childNodes"},
                        method = RequestMethod.GET)
        public List<TaxonNode> getChildNodes(
                        @PathVariable("taxonNodeUuid") UUID taxonNodeUuid,

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonomicTreePortalController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonomicTreePortalController.java
index a3f043a516b40352c48b59a6c9e939e77b7640af..3568842982c7836db04e66c0189d9ff23ef8b9df 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonomicTreePortalController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonomicTreePortalController.java
@@ -9,17 +9,8 @@
 \r
 package eu.etaxonomy.cdm.remote.controller;\r
 \r
-import java.io.IOException;\r
-import java.net.URI;\r
-import java.net.URISyntaxException;\r
 import java.util.Arrays;\r
 import java.util.List;\r
-import java.util.UUID;\r
-import java.util.regex.Matcher;\r
-import java.util.regex.Pattern;\r
-\r
-import javax.servlet.http.HttpServletRequest;\r
-import javax.servlet.http.HttpServletResponse;\r
 \r
 import org.apache.log4j.Logger;\r
 import org.springframework.beans.factory.annotation.Autowired;\r
@@ -27,21 +18,11 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.WebDataBinder;\r
 import org.springframework.web.bind.annotation.InitBinder;\r
 import org.springframework.web.bind.annotation.RequestMapping;\r
-import org.springframework.web.bind.annotation.RequestMethod;\r
 \r
-import eu.etaxonomy.cdm.api.service.ITaxonService;\r
 import eu.etaxonomy.cdm.api.service.ITaxonTreeService;\r
-import eu.etaxonomy.cdm.api.service.ITermService;\r
-import eu.etaxonomy.cdm.database.UpdatableRoutingDataSource;\r
-import eu.etaxonomy.cdm.model.common.DefinedTermBase;\r
 import eu.etaxonomy.cdm.model.name.Rank;\r
-import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r
-import eu.etaxonomy.cdm.model.taxon.TaxonNode;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonomicTree;\r
 import eu.etaxonomy.cdm.remote.editor.RankPropertyEditor;\r
-import eu.etaxonomy.cdm.remote.editor.UUIDPropertyEditor;\r
-import eu.etaxonomy.cdm.strategy.exceptions.UnknownCdmTypeException;\r
 \r
 /**\r
  * The TaxonomicTreeController class is a Spring MVC Controller.\r
@@ -58,7 +39,7 @@ import eu.etaxonomy.cdm.strategy.exceptions.UnknownCdmTypeException;
  * TODO this controller should be a portal controller!!\r
  */\r
 @Controller\r
-@RequestMapping(value = {"/portal/taxontree/{uuid}"})\r
+@RequestMapping(value = {"/portal/taxonTree/{uuid}"})\r
 public class TaxonomicTreePortalController extends AnnotatableController<TaxonomicTree,ITaxonTreeService> {\r
        \r
        \r

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonomicTreePortalListController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonomicTreePortalListController.java
index 5a3a3509ad4d675244862685b3f3b8db145b196a..8b3f4d320ac935bd2bee70dab5aaa5c07d10aec6 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonomicTreePortalListController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonomicTreePortalListController.java
@@ -107,7 +107,7 @@ public class TaxonomicTreePortalListController extends BaseListController<Taxono
         *         the {@link #TAXONTREE_INIT_STRATEGY}\r
         * @throws IOException\r
         */\r
-       @RequestMapping(value = { "/portal/taxontree/" }, method = RequestMethod.GET)\r
+       @RequestMapping(value = { "/portal/taxonTree" }, method = RequestMethod.GET)\r
        public List<TaxonomicTree> getTaxonomicTrees(HttpServletRequest request, HttpServletResponse response)\r
                        throws IOException {\r
                logger.info("getTaxonomicTrees()");\r
@@ -122,7 +122,7 @@ public class TaxonomicTreePortalListController extends BaseListController<Taxono
         * @throws IOException\r
         */\r
        @RequestMapping(\r
-                       value = {"/portal/taxontree/{treeUuid}/childNodes/"},\r
+                       value = {"/portal/taxonTree/{treeUuid}/childNodes"},\r
                        method = RequestMethod.GET)\r
        public List<TaxonNode> getChildNodes(\r
                        @PathVariable("treeUuid") UUID treeUuid,\r
@@ -134,7 +134,7 @@ public class TaxonomicTreePortalListController extends BaseListController<Taxono
        \r
        \r
        @RequestMapping(\r
-                       value = {"/portal/taxontree/{treeUuid}/childNodesAt/{rankUuid}/"},\r
+                       value = {"/portal/taxonTree/{treeUuid}/childNodesAt/{rankUuid}"},\r
                        method = RequestMethod.GET)\r
        public List<TaxonNode> getChildNodesAtRank(\r
                        @PathVariable("treeUuid") UUID treeUuid,\r
@@ -180,7 +180,7 @@ public class TaxonomicTreePortalListController extends BaseListController<Taxono
         *         the {@link #NODE_INIT_STRATEGY}\r
         */\r
        @RequestMapping(\r
-                       value = {"/portal/taxontree/{treeUuid}/childNodesOf/{taxonUuid}"}, \r
+                       value = {"/portal/taxonTree/{treeUuid}/childNodesOf/{taxonUuid}"}, \r
                        method = RequestMethod.GET)\r
        public List<TaxonNode> getChildNodesOfTaxon(\r
                        @PathVariable("treeUuid") UUID treeUuid,\r
@@ -213,7 +213,7 @@ public class TaxonomicTreePortalListController extends BaseListController<Taxono
         *         the {@link #NODE_INIT_STRATEGY}\r
         */\r
        @RequestMapping(\r
-                       value = {"/portal/taxontree/{treeUuid}/pathFrom/{taxonUuid}/toRank/{rankUuid}"}, \r
+                       value = {"/portal/taxonTree/{treeUuid}/pathFrom/{taxonUuid}/toRank/{rankUuid}"}, \r
                        method = RequestMethod.GET)\r
        public List<TaxonNode> getPathFromTaxonToRank(\r
                        @PathVariable("treeUuid") UUID treeUuid,\r
@@ -247,7 +247,7 @@ public class TaxonomicTreePortalListController extends BaseListController<Taxono
         *         the {@link #NODE_INIT_STRATEGY}\r
         */\r
        @RequestMapping(\r
-                       value = {"/portal/taxontree/{treeUuid}/pathFrom/{taxonUuid}"}, \r
+                       value = {"/portal/taxonTree/{treeUuid}/pathFrom/{taxonUuid}"}, \r
                        method = RequestMethod.GET)\r
        public List<TaxonNode> getPathFromTaxon(\r
                        @PathVariable("treeUuid") UUID treeUuid,\r

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TermListController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TermListController.java
index 3a8676e2a49003a27513a287e968316c92b0a9fa..96032d322c7168f866b69a4255ee3e917d5ef7be 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TermListController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TermListController.java
@@ -39,7 +39,7 @@ import eu.etaxonomy.cdm.model.location.NamedAreaType;
  *\r
  */\r
 @Controller\r
-@RequestMapping(value = {"/term/"})\r
+@RequestMapping(value = {"/term"})\r
 public class TermListController extends BaseListController<DefinedTermBase, ITermService> {\r
 \r
 \r

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/VocabularyController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/VocabularyController.java
index c40dd9365d40330b688bb21f8bb7514c63eeaf96..b8715a8ae593525b0407f4983013c03e81b0b013 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/VocabularyController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/VocabularyController.java
@@ -22,7 +22,7 @@ import eu.etaxonomy.cdm.model.common.TermVocabulary;
  *\r
  */\r
 @Controller\r
-@RequestMapping(value = {"/termvocabulary/{uuid}"})\r
+@RequestMapping(value = {"/termVocabulary/{uuid}"})\r
 public class VocabularyController extends BaseController<TermVocabulary, IVocabularyService> {\r
 \r
        /* (non-Javadoc)\r

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/VocabularyListController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/VocabularyListController.java
index ed88779bc2947f0bab6c953b500cdb3aa381dc34..ff1f9209b13068dbc7fbf07e5e45380bfe5783a4 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/VocabularyListController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/VocabularyListController.java
@@ -22,7 +22,7 @@ import eu.etaxonomy.cdm.model.common.TermVocabulary;
  *\r
  */\r
 @Controller\r
-@RequestMapping(value = {"/termvocabulary/"})\r
+@RequestMapping(value = {"/termVocabulary"})\r
 public class VocabularyListController extends BaseListController<TermVocabulary, IVocabularyService> {\r
 \r
        /* (non-Javadoc)\r

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonNodeBeanProcessor.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonNodeBeanProcessor.java
index 0d2c16cc2129d4aa498d021e4efd1f12c2e5d1a9..da7795db45debac66411a23a6fa1db5b8dfb81ff 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonNodeBeanProcessor.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonNodeBeanProcessor.java
@@ -18,16 +18,16 @@ import net.sf.json.JsonConfig;
 
 import org.apache.log4j.Logger;
 
-import eu.etaxonomy.cdm.model.common.CdmBase;
+import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 
 /**
  * @author n.hoffmann
  * @created Apr 9, 2010
  * @version 1.0
  */
-public class TaxonNodeBeanProcessor extends AbstractCdmBeanProcessor {
-       private static final Logger logger = Logger
-                       .getLogger(TaxonNodeBeanProcessor.class);
+public class TaxonNodeBeanProcessor extends AbstractCdmBeanProcessor<TaxonNode> {
+       
+       private static final Logger logger = Logger.getLogger(TaxonNodeBeanProcessor.class);
 
        /* (non-Javadoc)
         * @see eu.etaxonomy.cdm.remote.json.processor.AbstractCdmBeanProcessor#getIgnorePropNames()
@@ -43,7 +43,7 @@ public class TaxonNodeBeanProcessor extends AbstractCdmBeanProcessor {
         * @see eu.etaxonomy.cdm.remote.json.processor.AbstractCdmBeanProcessor#processBeanSecondStep(eu.etaxonomy.cdm.model.common.CdmBase, net.sf.json.JSONObject, net.sf.json.JsonConfig)
         */
        @Override
-       public JSONObject processBeanSecondStep(CdmBase bean, JSONObject json,
+       public JSONObject processBeanSecondStep(TaxonNode bean, JSONObject json,
                        JsonConfig jsonConfig) {
                return json;
        }

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonNodeDaoBeanProcessor.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonNodeDaoBeanProcessor.java
index e76f300dd198398794bfd39258bb68b4036261ee..1b05adc143e6086d0289de7e9b0b3d643a448899 100644 (file)
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonNodeDaoBeanProcessor.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonNodeDaoBeanProcessor.java
@@ -12,38 +12,42 @@ package eu.etaxonomy.cdm.remote.json.processor.bean;
 \r
 import java.util.List;\r
 \r
-import net.sf.json.CycleSetAcess;\r
 import net.sf.json.JSONObject;\r
 import net.sf.json.JsonConfig;\r
-import net.sf.json.processors.JsonBeanProcessor;\r
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;\r
 import eu.etaxonomy.cdm.remote.dto.TaggedText;\r
 \r
 /**\r
- * WARNING! The idea i started implementing here will not work at all!!\r
- * @author a.kohlbecker\r
- *\r
+ * OK !!! but should extend AbstractCDMBeanProcessor\r
  */\r
-public class TaxonNodeDaoBeanProcessor extends CycleSetAcess implements JsonBeanProcessor {\r
-       \r
-       \r
+public class TaxonNodeDaoBeanProcessor extends AbstractCdmBeanProcessor<TaxonNode> {\r
+\r
+\r
        /* (non-Javadoc)\r
-        * @see net.sf.json.processors.JsonBeanProcessor#processBean(java.lang.Object, net.sf.json.JsonConfig)\r
+        * @see eu.etaxonomy.cdm.remote.json.processor.bean.AbstractCdmBeanProcessor#getIgnorePropNames()\r
         */\r
-       public JSONObject processBean(Object bean, JsonConfig jsonConfig) {\r
-       \r
-               TaxonNode node = (TaxonNode)bean;\r
-               JSONObject json = new JSONObject();\r
+       @Override\r
+       public List<String> getIgnorePropNames() {\r
+               return null;\r
+       }\r
+\r
+       /* (non-Javadoc)\r
+        * @see eu.etaxonomy.cdm.remote.json.processor.bean.AbstractCdmBeanProcessor#processBeanSecondStep(eu.etaxonomy.cdm.model.common.CdmBase, net.sf.json.JSONObject, net.sf.json.JsonConfig)\r
+        */\r
+       @Override\r
+       public JSONObject processBeanSecondStep(TaxonNode bean, JSONObject json,\r
+                       JsonConfig jsonConfig) {\r
+               \r
                json.element("class", "TaxonNodeDao");\r
-               json.element("titleCache", node.getTaxon().getName().getTitleCache(), jsonConfig);\r
-               List<TaggedText> taggedTitle = TaxonNameBaseBeanProcessor.getTaggedName(node.getTaxon().getName());\r
+               json.element("titleCache", bean.getTaxon().getName().getTitleCache(), jsonConfig);\r
+               List<TaggedText> taggedTitle = TaxonNameBaseBeanProcessor.getTaggedName(bean.getTaxon().getName());\r
                json.element("taggedTitle", taggedTitle, jsonConfig);\r
-               json.element("taxonUuid", node.getTaxon().getUuid(), jsonConfig);\r
-               json.element("secUuid", node.getTaxon().getSec().getUuid(), jsonConfig);\r
-               json.element("taxonomicChildrenCount", node.getCountChildren(), jsonConfig);\r
+               json.element("taxonUuid", bean.getTaxon().getUuid(), jsonConfig);\r
+               json.element("secUuid", bean.getTaxon().getSec().getUuid(), jsonConfig);\r
+               json.element("taxonomicChildrenCount", bean.getCountChildren(), jsonConfig);\r
                String ranklabel = null;\r
-               if(node.getTaxon().getName().getRank() != null){\r
-                       ranklabel = node.getTaxon().getName().getRank().getLabel();\r
+               if(bean.getTaxon().getName().getRank() != null){\r
+                       ranklabel = bean.getTaxon().getName().getRank().getLabel();\r
                }\r
                json.element("rankLabel", ranklabel, jsonConfig);\r
                //json.element("treeUuid", node.getTaxonomicTree().getUuid(), jsonConfig);\r

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonomyNodeBeanProcessor.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonomyNodeBeanProcessor.java
deleted file mode 100644 (file)
index ecd7909..0000000
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonomyNodeBeanProcessor.java
+++ /dev/null
@@ -1,55 +0,0 @@
-// $Id$\r
-/**\r
- * Copyright (C) 2007 EDIT\r
- * European Distributed Institute of Taxonomy \r
- * http://www.e-taxonomy.eu\r
- * \r
- * The contents of this file are subject to the Mozilla Public License Version 1.1\r
- * See LICENSE.TXT at the top of this package for the full license terms.\r
- */\r
-\r
-package eu.etaxonomy.cdm.remote.json.processor.bean;\r
-\r
-import java.util.HashSet;\r
-import java.util.List;\r
-import java.util.Set;\r
-import java.util.UUID;\r
-\r
-import org.hibernate.Hibernate;\r
-\r
-import eu.etaxonomy.cdm.model.common.CdmBase;\r
-import eu.etaxonomy.cdm.model.taxon.Taxon;\r
-import eu.etaxonomy.cdm.remote.dto.TaggedText;\r
-\r
-import net.sf.json.CycleSetAcess;\r
-import net.sf.json.JSONObject;\r
-import net.sf.json.JsonConfig;\r
-import net.sf.json.processors.JsonBeanProcessor;\r
-\r
-/**\r
- * WARNING! The idea i started implementing here will not work at all!!\r
- * @author a.kohlbecker\r
- *\r
- */\r
-public class TaxonomyNodeBeanProcessor extends CycleSetAcess implements JsonBeanProcessor {\r
-       \r
-       \r
-       /* (non-Javadoc)\r
-        * @see net.sf.json.processors.JsonBeanProcessor#processBean(java.lang.Object, net.sf.json.JsonConfig)\r
-        */\r
-       public JSONObject processBean(Object bean, JsonConfig jsonConfig) {\r
-       \r
-               Taxon taxon = (Taxon)bean;\r
-               JSONObject json = new JSONObject();\r
-               json.element("titleCache", taxon.getName().getTitleCache(), jsonConfig);\r
-               List<TaggedText> taggedTitle = TaxonNameBaseBeanProcessor.getTaggedName(taxon.getName());\r
-               json.element("taggedTitle", taggedTitle, jsonConfig);\r
-               json.element("rankLabel", taxon.getName().getRank().getLabel(), jsonConfig);\r
-               json.element("uuid", taxon.getUuid(), jsonConfig);\r
-               json.element("secUuid", taxon.getSec().getUuid(), jsonConfig);\r
-               json.element("taxonomicChildrenCount", taxon.getTaxonomicChildrenCount(), jsonConfig);\r
-               \r
-               return json;\r
-       }\r
-\r
-}\r