EDIT

ref #6241 change @date to @since (fix)

ref #6241 change @date to @since

adapted deleteResult

ref #6190 removing svn property place holder in first line of code

ref #6283: minor changes to fix exceptions in polytomous key editing

ref #6283: fix NPE exceptions caused by null values in children list

solving polytomouskey node sort index problems

#5536

workaround for delete of polytomous keynodes, because of null values in children list

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

changes for deleting polytomous key nodes

Fix delete to return null if node corresponding to uuid does not exist

corrected duplicate methods and unimplemented method issue

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...

changes for #3998

delete method returns DeleteResult

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

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...

#3877

add deletion of polytomouskeynodes

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

rename PolytomousKeyNodeService