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)

first implementation of alternative identifier #4275

remove old and misleading titleCache length

minor

remove TODO

merge-update from trunk

implement getNextHigherTerm and getNextLowerTerm #3327

cleaning up CdmBase

reverting erroneously committed experimental branch (swagger)

ignoring joda time partial from json serialization for swagger model scanner

merge-update from trunk

minor

• merge update from trunk

increased storage capacity of mock cdm cachers

removed 2.6.9 reference

move MockCdmCacher to TermLoader

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

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

minor

javadoc

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

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

#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

add NomStatus vocabulary for ICZN #4085

minor

implementing #4082 (implement default permission groups)

User.getAuthorities() made public as preliminary solution to #4053 (Transient field User.authorities not refreshed on reloading entity)

part 1 of fixing #2414 (Group updating doesn't work) by using CascaseType.REFRESH and test method extended

fixing and implementing test for #3782 (Security Context is not updated after editing GrantedAuthorities of a Group)

implementing global PUBLISH role, also introducing the interface IPublishable; solves #3980 (Implement PUBLISH role into cdmlib security)

minor

Set setTitleCache to deprecated and add javadoc

code cosmetics

implementing rule 2 and 3 for #3904 (EuroMed: Implement filtering rules for Distributions) - all existing test running successfully

new factory methods

remove import

fixing #3891 (ordered distributions provided by portal/description//DistributionTree randomly broken) also related to #965 (Return type of partOf, kindOf etc. has to be decided)

added PresenceAbsenceTerm, KindOfUnit to the list of instantiable term types

some more proxy handling

fix sort order bug for lazy initialized names

update java doc

some Java doc for new term loading

refactor term loading for performance

removing unnessecary casts

commenting also method with important information related to #965 (Return type of partOf, kindOf etc. has to be decided)

• DefinedTerm is ordered as in enum (#3752)

javadoc for tree index constants

minor

fix titleCache truncation size issue (e.g. #3774)

reordering and changing tests for OriginalSOurceType and make second non capital in MeasurementUnit.csv

change version ->3.3.0, move CdmMetaData, change schema version -> 20130924, fix TaxonServiceSearch test, update update-script

moving preferences into new package and some minor changes

merge trunk into v3.3 branch

some more changes to CdmPreferences including key size

minor

partial implementation of CDM preferences (dao, service and enums): #3555

Javadoc for DnaMarker

final implementation of MaterialOrMethodEvent, Cloning, PreservationMethod, ... #3360

update script for vocabulary representations #3708 and some bugfixes on vocabularies and code

fix #3550 (duplicated reading of TermVocabulary representations during term loading)

Change WaterbodyOrCountry name to Country #3700

move code

allow DefinedTerms to be partOf

split Waterbody and Country vocabulary and make waterbody an ordinary NamedArea #3700

Chloroplast DNA Markers and some more Eukaryotes #3591

bugfix for DOI handling

implement DOI class and use in Reference #3572

persist Sequence direction via enum key #3686

Change CdmMetaData term version

minor changes, remove private methods

merge trunk into cdm3.3 branch

add kindOfUnit vocabularies to CDM and tests (update script still missing) #3568

add kindOfUnit termType #3568

replace specification by specialization

remove imports

fix failing tests for linkbackUri (#3345 and #3374)

final adaptations for Annotation.linkbackUri #3374 and #3345

log text for enum exceptions

TitleCacheLength updater #1592

first version of abbreviated title cache generation for references : #1551

implement tree index update

cleanup blank abbrevLabels

latest changes to Schema updater and handling of blank abbrevLabels

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

validate termType not null and some minor changes

set termType when loading terms

update update script such that no validation errors exist anymore

change some names in molecular and update the update script

merge trunk to cdm-3.3 branch