EDIT

fix #6132 first implementation of parent taxon in TaxonInContextDTO

add getIdentifierType to IO Transformers

Cleanup

Revert "updating poms for 4.5.0-SNAPSHOT development"

This reverts commit 9ff0eb6731c1b854d6bea082b5bd87e001b202bd.

reverting version to 4.4.0-SNAPSHOT

ref #2985 portal controller for named areas

updating poms for 4.5.0-SNAPSHOT development

ref #2985 fixing init strategy to add the gateringEvent.collectingAreas

ref #2985 controller method to return extensions with type and solving probelm with pagin of sets in generic controller

ref #6211 cleanup old code

cleanup

fix #6122 use StringResultDTO for titleCache service

doc

cleanup

ref #6211 avoiding to deep initialization of synonym groups

fix #6211 fix API incompatibility

cleanup

fix #6211 reduce initialization for synonymy

ref #6211 try to fix heap consumption in synonymy service

minor

ref #6220 javadoc

fix #6220 Improve isOrphaned definition for Taxon.

ref #6199 test for reading excluded, unplaced and excludedNote

Fix proparte is null in update script

cleanup

fix sortindex updater and SynonymDeduplicator

ref #5974 fixing LIE in controller

Cleanup

ref #3934 update Salvador import for facts

solving polytomouskey node sort index problems

Latest BM import updates for Salvador

ref #4867 Set sec reference for taxa in cloned classification

fix #6200 Change order of NomenclaturalCodeUpdater and allowOverride adder to avoid null values

Remove deprecated adder methods for multilanguage text

ref #5634 add getter and putter for excluded note

cleanup and javadoc

ref #5976 add PKNode sortindex update

ref #5974 fix update script for synonym duplicates

cleanup

ref #3925 and #5974 Improve update script for non unique subqueries

ref #5970 remove transient from allowOverride

Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/cdmlib into develop

delete TestCase from BioCaseQueryServiceWrapper

Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/cdmlib into develop

Conflicts:
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TaxonInteraction.java
cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/TestModelUpdate.java

cleanup

Minor changes to classification clone method

Clean up

Clean up deprecated methods in name service

Cleanup

ref #4866 Set sec reference for taxa when cloning classification

minor

missed to add the adapted test

fix #5680: get method needs to be named like the attribute

switching maven-jetty plugin back to jdk 1.7 compatible version

fix #6023 solving compatibility problems of aspectj with java 1.8 and fixing invalid path reference

updating maven-jetty plugin

smaller changes for abcd import

revert adding error log

minor

minor

ref #6166: import siblings if an specimen and smaller changes in ABCD
import

ref #4866 Fix transient object exception

• fixed typo

ref #5449 Imporvements for CSV export

• Fix initialization problems
• Correctly match taxon name to chosen classification
• allow export for single leaf node

ref #4866 Test for first implementation for clone classification

ref #4866 Create new description set when cloning taxon (avoid
HibernateException)

ref #4866 First implementation for clone classification (including test)

adapt gestGetUuidAndTitleCache data to new model

fix compile error in ITaxonNodeService

Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/cdmlib into develop

Conflicts:
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonNodeService.java

fix #6174: isDeletable needs to be called with UUID and the objects is
loaded on server side

ref #5458 Add classification filter to service method

fix media deletion

ref #5458 Added find-by-titleCache method for taxon node service

abcd import: association type living culture is a parent child relation

ref #2380 Implement service for getting parent of
UuidAndTitleCache

• parent of either ITaxonTree or UuidAndTitleCache can be retrieved
• added JUnit test and test file

ref #2380 Implement service for getting children of
UuidAndTitleCache

• direct children of either ITaxonTree or UuidAndTitleCache can be retrieved
• added JUnit test

fix #4453 Enhance portal visualization of molecular data

• used DefinedTerm constants for UUIDS
• used titleCache for all DerivedUnits
• move string representations to portal code

add test for ermIdInVocabularyComparator

fix TermIdInVocabularyComparator

move taxonnode needs to save old parent and child node

Improve taxon delete test

ref #5974 implement substitute method for TaxonService.getAllRelationships

update path to dataset.xsd in persistence test data

Cleanup merge model 4.1/develop

Merge remote-tracking branch 'origin/develop' into develop

ref #5972: add service method to get count of referencing objects

enabling http POST for a couple of name catalogue controller methods

Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNode.java
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImpl.java
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImpl.java...

childNode needs to be saved in TestService to fix the editor test

set test to ignore, create ticket to fix this.

fix failing test

minor

Merge remote-tracking branch 'origin/cdm-4.1' into develop

minor

remaining merge issue for morge develop to cdm4.1

Merge remote-tracking branch 'origin/develop' into cdm-4.1

Conflicts:
cdmlib-db/pom.xml
cdmlib-ext/pom.xml
cdmlib-io/pom.xml
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/taxa/NormalExplicitImport.java
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/SpecimenImportBase.java...

update remote-webapp test H2 to model 4.1

fix #5634 Update excluded/unplaced for TaxonNodes with no taxon_id

minor

fix #5974 fix moving synonym type to TaxonBase and SynonymRelationType label