EDIT

correct handling of terms with multiple representations

implementing better namedAreasInUse service for #3994 (Select widget to choose the filter areas for the advanced search)

merge validation commits r23146, r23162, r23163 into trunk

add listener for taxon name in determination event and run update script again

fixing persistence tests on AgentBase.collectorTitle #4311

merge validation2 and model 3.5 into trunk

add amplification cache test

rename abstract class

merge cdmlib-persistence from validation branch to trunk

• change visibility of createTestDataSet to public

• change visibility of createTestDataSet to public

merge-update from trunk

• added abstract method createTestData() to CdmIntegrationalTest
  • method should be used for generatin test XML data sets
  • making it abstract and enforcing implementation in sub classes ensures that the same structure is used thus making it easier for the developer to find similar examples....

merge-update from trunk

merge PresenceTerm and AbsenceTerm #4521

minor

changes in service layer for fixes in bulg editor and search for misapplied names and common names in editor

fix #4450

merge-update from trunk

minor

Make Contact URL an url #3920

rename Reference.authorTeam -> authorship #4432

rename Reference.authorTeam -> authorship #4432

merge-update from trunk

typos

merge-update from trunk

reverting test for #686 (orderindex of rank undefined) to ist original version and removing ignore since the bug is fixed now

merge-update from trunk

replace LockMode by LockOptions in service layer and persistence

merge-update from trunk

additional test for sortindex handling #4200

minor

test for #4200

merge-update from trunk

fixing #4273 (java.lang.ClassCastException in TaxonDaoHibernateImpl.countTaxaByCommonName() breaks taxon search) and most probably also other CommonName search related tickets

first development for the export filter

add original label info to derived unit #4218

better use of generics in service layer and persistence list methods

adapt the service method loadChildNodesOfTaxonNode
with param recursive choose whether you get only the children of the node or the children of the children ...

Changed limits to INTEGER, so it is possible to nullify these parameters if needed

*added Test for service method: getTaxonOfAcceptedTaxaByClassification and countTaxonOfAcceptedTaxaByClassification
*fixed SQL Statement so it works with H2 DB

performance improvement for listChildNodes of a taxon

adating test to modified number of taxa

implementing dao method listAcceptedTaxaFor, for #4112

CdmPermissionClasses for names and references, tests implemented, bug in CdmPermissionClass.from() fixed - #4055 (action enablement adapts to the users granted authorities)

removing old TODO

DistributionInfoForTaxon methods implemented in services and controllers

rootNode adaption for classification

remove test method call

delete terms

refactor term loading for performance

fixed problem with deletion of nodes.

merging delete functionality into trunk

methods to list and page all NamedAreas in use

moving preferences into new package and some minor changes

merge trunk into v3.3 branch

some better implementation for CdmPreferences dao including some tests #3555

some bugfixes for TaxonNode sorting #3508

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

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

Change WaterbodyOrCountry name to Country #3700

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

some fixes for modell change branche

some bugfixes and persistence implementation for abbrev title in reference

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

replace asserts

change some names in molecular and update the update script

merge trunk to cdm-3.3 branch

first implementation of new molecular package #3360

Rename RightsTerm -> RightsType #1306

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

make Sequence-PhylogeneticTree ManyToMany (#2540)

resizing titleCache and fullTitleCache (#1592) and renaming CategoricalData.states -> stateData (#2923)

remove ReferencedMediaBase and Figure, let PhylogeneticTree inherit from Media, remove citation and microcitation columns from DB

rename FieldObservation -> FieldUnit #3351

adding recordBasis to SpecimenOrObservationBase and removing some DerivedUnit classes (all #3378) and adding kindOfUnit to SpecimenOrObservationBase (except for according termType and vocabulary) #3568.

enhanced filter capabilities for DescriptionElements & a TermBaseListPropertyEditor

Remove GenBankAccession class, Spatium for EN_DASH and some minor stuff for v3.3

URIs->CLOBs

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

remove TdwgArea and add termType and idInVocabulary (#2998, #3478, #3479, #3539) in persistence

update factory methods for original sources #1549

update ReferenceFactory method

update ReferenceFactory method

merge trunk to hibernate4

Updated existing tests to add '[]' around CRUD values

added test from CDM Authority parsing

minor

remove import

explicitely ordering taxa for test ReferenceDaoHibernateImplTest.testListCoveredTaxa()

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

add lazy load GenBankAccession test

Allow Locus to be loaded by javassist (fixing #3340)

controller method for listByAssociatedTaxon(); default OrderHints; method harmonization in DAO classes

modifying FirstDataInserter for existing tests

simpler and more predictable persistence/query/MatchMode.java

fixing testing context in persitence and fixing test

reverting last commit - will be committed again later

merging in git branch 'methodSecurityExpressions' and resolving conflict in SecurityTest.java