EDIT

ref #6752 stricter handling of Reference.setDatePublished (only for calling methods)

ref #6241 replaced @created by @since in cdmlib

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

ref #6241 change @date to @since

minor

fix failing clone tests

add comparator test for sortByName

ref #6630 and ref #6368 remove generics from TaxonName

fix #6368 rename table and class TaxonNameBase

ref #6368 remove TaxonNameBase subclasses

ref #922 move compareTo test to subclasses

cleanup merge problems

ref #6362, ref #6365 remove occurrence of NonViralName, BotanicalName, ZoologicalName and others

cleanup

ref #6365 use TaxonNameFactory for botanical names

ref #6365 use TaxonNameFactory for zoological names

ref #6365 merge static methods from BotanicaName to TaxonNameBase

ref #6365 replace ZoologicalName factory methods

ref #6365 Move all ZoologicalName attributes up to TaxonNameBase

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

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

ref #5974 Replace synonymRelationshipType by SynonymType and replace some other occurrences of synonym relationship

ref #5974 Remove synonym relationship first compiling implementation in cdmlib

ref #6089 Remove all calls and methods for taxonomicChildrenCount and taxonomicParentCache

ref #6045 Add test for getAncestor()

ref #6089 Remove all calls and methods for taxonomicChildrenCount and taxonomicParentCache

ref #6045 Add test for getAncestor()

Remove generics from Reference in cdmlib-model #5830

Fix sort order for nom illeg with date #3338

Include nom. illeg. in homotypic group ordering #3338

Some additional tests for sorting homotypical groups #3338

Add circular check for homotypicgouptaxon comparator #3338

Include rank comparison in HomotypicGroupTaxonComparator #3338

Improve sort order within a homotypic group (new Comparator) #3338

Improve sort order within a homotypic group (new Comparator) #3338

Add some more BeanUtil test to other classes #5307

Fix bean read/write inconsistency in Taxon and TaxonBase #5307

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

rename Reference.authorTeam -> authorship #4432

removing old ignore and FIXME #530

making TaxonNodeByNameComparator truely null save - #2912 (NPE in TaxonNodeByNameComparator when Taxon in TaxoNode is null)

minor

some fixes for modell change branche

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

update ReferenceFactory method

Hibernate 4 migration. All test running except for SDDImport (Out of memory)

minor

change getSynonymsInGroup to synonymRelationship dependency (not sec dependency anymore).
See #2580

Move "RemoveSynonymsInSameHomotypicGroupTest" to TaxonTest

fixing #1925 (CICHORIEAE taxon tree order of taxa and bastards)
and also moving ITaxonNodeComparator into model

Refactored MediaMetaData and family. Renamed it to MediaInfo. API is now less confusing and more consistent.

tests for clone methods

clone() method for Classification:
the method returns a classification with clones of all nodes and their relationships

revert changes leading to failing tests in TaxonTest

tests for the cloning methods

merge 3.0.2 to trunk

implemented isRelatedConcept

merging /branches/cdmlib/SPRINT-Chichorieae1/ to trunk

bugfix for TaxonNode.getParent == null

fixed a bug that occurred when executing operations on taxon nodes on root level

Merging revisions 7377-7378,7390-7396,7400-7405,7412-7414,7442-7443,7448-7449,7453-7456 of http://dev.e-taxonomy.eu/svn/branches/cdmlib/2.2 into trunk - test in error, see #1274, #1275

merging branches/cdmlib/2.2 [7345:7377] to trunk

see also:
https://dev.e-taxonomy.eu/trac/changeset?new=branches%2Fcdmlib%2F2.2%407377&old=branches%2Fcdmlib%2F2.2%407345

merged from branches/cdmlib/2.2 7238-7345 into trunk

fixes #1109

bugfix for new taxon node methods

moved taxonNode specific code to TaxonTreeService. Cleaned up the datasource classes

fixes #1017

changed some methods in taxonomic tree and added missing functionality to VocabularyEnum, also put English as the first line in Language.csv file because it is default and initialisation of languages made problems

Merging for cdmlib-model

Corrected the implementation of removeRootNode in TaxonomicTree

Added methods concerning taxonomic tree to taxon service.

TaxonomicTree implementation (model)

taxonomic view and node in model

bug fix for Taxon.addDescription()

Committing large number of changes relating to versioning implementation (#108)

Major changes to the cdmlib default term loading and initialization, plus indexing of some model entities as part of #476

test for isMisapliedName

TimePeriod -> jodaTime

Performed project cleanup.

Added constructor parameter "infraGenericEpithet" to BotanicalName/ZoologicalName instantiations

~