EDIT

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

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

validate termType not null and some minor changes

implemented IEnumTerm and its hierarchies #3611, #3618

implement RankClass, remove iso639_2, add max values to distance attributes, change type for distances,

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

using NumericField and spatial type for search field

cleaning up @Field annotations

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

restoring r16675 (reintegrating ^{/branches/cdmlib/campanula} with pom.xml modifications for maven 3 and fix for ticket #3148 termBase titleCache problems)

reverting r16675 (reintegrating ^{/branches/cdmlib/campanula} with pom.xml modifications for maven 3 and fix for ticket #3148 termBase titleCache problems)

merged changes from trunk for later reintegration

minor

made termsourceuri a real URI (#2313)

make termbase.uri and GenBankAccession.uri real java.net.URI #2340

remaining clone methods

hide term vocabulary constructors and create factory methods instead

hide term vocabulary constructors and create factory methods instead

Factory methods and non-public constructor for term vocabularies

remove compareTo in NamedArea and changed according tests

merging PESI brach into trunk

TermBase and descendants indexed using hibernate search

Deleting empty compareTo methods from DefinedTerms

CHANGES TO THE CDMLIB-MODEL: Media and DefinedTermBase become IdentifiableEntity, new classes to represent descriptive dataset and keys

1. Media extends IdentifiableEntity
2. addition of a ComparableTo method
3. deletion of the redundant attribute 'rights'...

Added Cascade.MERGE for some, not all relationships where Cascade.SAVE_UPDATE exists, also added @NaturalId on uuid field to (a) index this column, speeding it up and (b) ensure uniqueness within a table of a given uuid (following the same semantics as equals())

reintroducing transient getters where required for cdm-remote; removing cast from inside getNomenclaturalReference(){}

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

Delete Warning, no substantial changes

Fixing hibernate mappings relating to issues #457 and #460, allowing schema generation as a precursor to using unitils / dbunit

Marshall/unmarshall TermVocabulary

Marshall/unmarshall Representations explicitly

Performed project cleanup.

has errors