EDIT

#5536

refactoring taxonNode controllers - return dtos from the service layer, support for #5887

refactoring NodeSortMode

minor

add limit and pattern to the uuid and titlecache methods

small changes for moving taxonnodes

fix move taxonnode and remove null values from childrenlists in several places

minor

fix move synonym to another accepted taxon

Fix CCE in DefinedTermDaoImpl.getPartOf (#5556) and make deproxy more
generic

Merge branch 'hotfix/3.12.3' into develop

Conflicts:
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImpl.java
cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTest.java

Revert last commit (taxon node handling is done in taxeditor)

Fix potential NPE when creating a new taxon for a classfication

minor

minor

cherry pick from develeop

new createNewTaxonNode service method

new createNewTaxonNode service method

resolving conflicts after merge of ticket_4716 into develop

minor

add null check for delete and minor

#4313 implementing full stack of methods to expose TaxonNodeAgentRelations via remote controllers

#4313 relationship type as additinal filter option for TaxonNodeAgentRelation services

#4313 implementing full stack of methods to expose TaxonNodeAgentRelations throught the AgentController with filter options

#4313 implementing full stack of methods to expose TaxonNodeAgentRelations via remote controllers

fix #5341 and fixing deletion of specimen

Revert "minor"

This reverts commit 64367d007ba404e037ccc2b6794b46c4f1f321bc.

minor

minor

fix #5179 and adapting the tests because the classification argument is needed now

fix move taxon node in natural order

fixing merge conflict

Add taxon to updated objects when taxon is not to be deleted

fixing move Accepted taxon to synonym

#5019 Set correct updated objects

Make new move method write on commit

changes for tcs import, fixing taxonnodecomparator, polytomouskey deletion and converting from person to team and team to person

Fix taxon node comparator handling #4226

#5025 : Add new cdm entity identifier object and use case in taxon node service

#5007 : Correct setting of updated objects when deleting taxon

• add @Audited to all type properties
• add taxonNodeComparator for rank and alphabetical orderedVocabularyDao
• change delete() methods arguments to UUIDs

Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/cdmlib into remoting-4.0

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

minor

Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/cdmlib into remoting-4.0

Conflicts:
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTerm.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NonViralName.java
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/INameService.java...

define default sort mode #4226

Adapt enum names for NodeSortMode #4226

delete taxonnode if taxon is used somewhere else fixed

minor

add SortMode enum and change the param for sorting of loadChildNodesOfTaxonNode from boolean to SortMode enum see #4226

Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/cdmlib into remoting-4.0

Conflicts:
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTerm.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTermBase.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Reference.java...

make the taxonomic tree editable in natural order (see #3771), adding comparator

fix search for common names in editor and minor

moveTaxon() with uuids instead of objects as arguments

added cdmEntity object in UpdateResult and updated service class accordingly

CdmCacherTest : ignoring for now since we have reverted to using termmaps on server side
ITaxonService, TaxonServiceImpl, ITaxonNodeService, TaxonNodeServiceImpl, INameService, NameServiceImpl,IDescriptionService, DescriptionServiceImpl : added uuid methods and return type as UpdateResult with updatedObjects set...

merge from trunk

ICdmCacher, ICdmUuidCacher, CdmCacher, CdmTermCacher : refactored and added load method
Language, NameRelationshipType, Rank : now uses cacher only if termap is null or empty and only when class matches the specific term type
MockCdmCacher: not required anymore...

add UpdateResult and make DeleteResult a subclass

ITaxonNodeService, TaxonNodeServiceImpl : added methods using uuids
CdmDataChangeEvent : added new instance method for cdm entity session
CdmPostDataChangeObservableListener : added cdm entity session commit

ConversationHolderMock : overriding all methods
DeleteConfiguratorBase : now implements serializable

isDeletable returns DeleteResult

fix delete taxon nodes with children

return value of delete methods are DeleteResults

set sorting in getChildNodes optional & minor for delete in bulk editor

remove deprecated method

adapt the service method loadChildNodesOfTaxonNode
with param recursive choose whether you get only the children of the node or the children of the children ...

if deletion of an object fails the method does not throw an exception but returns a message

Changed limits to INTEGER, so it is possible to nullify these parameters if needed

*added service layer method: countAllNodesForClassification
*improved performance CSVDemoExport

*Update of the CSVExport WS.
*fixed memory leak
*new service method to pull list of TaxonNode according to a given classification

add service to get all nodes of a classification

move taxon to homotypical synonym fixed

fix changeTaxonToSynonym with homotypic Synonyms

fix bug in change accepted taxa to synonym with taxonrelations

fix accepted to synonym operation by removing call of delete(name)

rootNode adaption for classification

minor

service adaption for deletion of a selection of taxonnodes

add deleteTaxonNode service method

documentation

whitespace

fixing #3792 (permission problem when turning a taxon into a synonmy of another taxon)

fixed problem with deletion of nodes.

merging delete functionality into trunk

moving all beaninitializer classes to new package 'eu.etaxonomy.cdm.persistence.dao.initializer'

minor changes

implement sortIndex for TaxonNode and remove usedSynonym from addChildNode methods (#3508)

switching transaction propagation strategy from Propagation.SUPPORTS to Propagation.REQUIRED, see http://dev.e-taxonomy.eu/trac/wiki/CdmTransactions

check if type of synonym relation is not null

added possibility to move accepted taxon (with homotypic synonyms) to a synonym

TaxonNodeServiceImpl : added clearing of relation sets
TaxonDaoHibernateImpl : added 'isOrphaned' field to hql query for building UuidAndTitleCache objects

fixing MediaAutoInitializer & fixing bug in AbstractBeanInitializer

bugfix for #2558 (concurrent modification in TaxonNodeServiceImpl.makeTaxonNodeASynonymOfAnotherTaxonNode(...) )