EDIT

ref #6241 replaced @created by @since in cdmlib

smaller changes and code cleaning

cleanup

ref #6965 rename static Name Identifier methods

fix #6531 add wfo identifier uuid to DefinedTerm class

fix #6515 Add IPNI name identifier

ref #6314: add Tropicos Name Identifier Type

#4716 reduicing clutter in the lucene index and solving performance problems which probably fixes #4277 and #3663

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

fix test and add factory method #3583

more getters/adders, update script, vocabulary and test vocabulary for TaxonNodeAgentRelation #3583

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

add LSID and Alternative field number to Identifier Type vocabulary #4708, #4674

updated getTermByUuid methods in the term classes to use the cacher

factory method for Identifier Type

remove TODO

make all defined terms comparable

update JaxbImportActivator

convenience access for new kindOfUnit uuids #4269

new factory methods

• DefinedTerm is ordered as in enum (#3752)

allow DefinedTerms to be partOf

Update script for termtype and some other, remove InstitutionType and COntinent, update idInVocabulary, ...

first implementation of new molecular package #3360

make term loader required constructor protected and exchange modifier classes by DefinedTerm

exchange modifier classes by DefinedTerm, add termtype to csv files, make term loader required constructor private