EDIT

• commented model changes for alternatve identifiers due to exceptions when connecting to data base #4275

merge-update from trunk

adding @Transient to new API methods introduced for #3327 (better API for OrderedTermBase and OrderedTermVocabulary)

• generalized simple user interface to add media (#3339)

• changed HashMap to LinkedHashMap to keep order of insertion
  • this should fix #3242

first implementation of alternative identifier #4275

remove old and misleading titleCache length

minor

remove TODO

merge-update from trunk

add vol to generic infereference formatting

• fixed typo

merge-update from trunk

isAncestor() using treeIndex

better handling of abbreviated title cache in references, series -> seriesPart and some improvements in the reference cache strategies #4280, #4239

merge-update from trunk

Formatting for aggregates with Authors (E+M exception)

Change authorTeam types in NonViralName from INomenclaturalAuthor to TeamOrPersonBase #1489

implement getNextHigherTerm and getNextLowerTerm #3327

cleaning up CdmBase

merge-update from trunk

reverting erroneously committed experimental branch (swagger)

ignoring joda time partial from json serialization for swagger model scanner

implementing CdmTypeScanner and test

javadoc

merge-update from trunk

minor

merge-update from trunk

revert last change in NameCacheStrategy

• merge update from trunk

add abbrev title do nomRef parser

minor

remove double dots before year in nomrefs

Remove ". " from year only nom-refs

increased storage capacity of mock cdm cachers

removed 2.6.9 reference

move MockCdmCacher to TermLoader

remove (bot.) for name creation in botanical names of rank section #4122 and #4279

fix failing single model test due to new MockCdmCacher

minor

merge-update from trunk

create new vocabulary for MediaSpecimenKindOfUnit, move Detail image and Specimen scan from old to new vocabulary and create new terms Living plant photo and Artwork #4269

fixing #4278 for FeatureNode

fixing #4278 for PolytomousKeys

alternative for protected: deproxy #4200

cleaning up TaxonNode class and also refactoring solution for #4200

fixing sortindex issue #4200

minor

merge-update from trunk

minor

convenience access for new kindOfUnit uuids #4269

First commit for the CDM Caching api
ICdmCacher, CdmCacher : CDM Cache class based on Ehcache
defaultApplicationContext.xml : added cache package to be component scanned
DefinedTermBase : new set/getCdmCacher method to make cacher available to term classes...

use unique name for GrantedAuthority and PermissionGroup also #4102

Unique username and some first update routine (still needs testing) #4102

merge-update from trunk

minor

merge-update from trunk

javadoc

add original label info to derived unit #4218

update schema version in CdmMetaData

moved publishFlag up to TaxonBase #4046

start bugfixing and refactoring sortindex handling in TaxonNode

• added null check

allow zoonames with year behind whitespace, not comma

fix matching for Integer #4229

fix "Error occurred when trying retrieve title for Named Area"

• made constructor protected to avoid JavaAssistEnhancementException (see https://stackoverflow.com/questions/7273125/hibernate-envers-and-javassist-enhancement-failed-exception)

fix for TaxonComparatorSearch

improve to better fulfill the Comparator contract

improve to better fulfill the Comparator contract

improve TaxonComparator to better fulfill the general Comparator contract.

further improve comparator contract implementation for TaxonComparatorSearch #4230

remove logging

fixing #4230, comparison issue

null handling for taxon names in nomSortOrderBrdige

serial Version ID for HomGroup

better handling NewInstance in DerivedUnit

set getDescendants back to protected, remove @transient

adding transient annotaion so that it is ignored in serializing

• made move methods session-safe by reloading the cdm entities
  • enhanced/added test
  • made constructor of PreservationMethod protected to avoid JavaAssistEnhancementException

set getDescendants() public

fixing bug for missing reference type

implement cache strategy for section references and remove generics from reference cache strategies.

Add preliminary SectionCacheStrategy and remove generics from reference cache strategies

adding Gazetteer to ReferenceSystem

fix for loading continents correctly

• added cascade saving to PreservationMethod of DerivedUnit

log childIndex is null

fix logging for taxa used multiple times in addParentChild

• added two NewInstance() methods to Amplification
  • added getUuidAndDescriptions to IAmplificationService and DAO

add tests for treeIndex and deletion of nodes

renaming protected setter to setStateData, see #2923 (Rename CategoricalData.states collection to stateData)

• added removeSingleRead() method to Amplification

#4114 sort order in taxon navigator and adding that autonyms could be whether infraspecific or infrageneric (Art. 22.3 and 26.3)

fix compareTo for IdentifiableEntity

• added reference to trac ticket

• made default constructor protected due to a hibernate problem (see https://stackoverflow.com/questions/7273125/hibernate-envers-and-javassist-enhancement-failed-exception)

• fixed a bug in the automated setting of the string length