EDIT

add i18n description for Classification. #4428

Geo and time scope for Classifications #3699

first implementation for DnaQuality #4434

adapt tests to missing Reference.series #4293 and not null constraint for test database ddl #4382

rename Reference.authorTeam -> authorship #4432

adapt tests to missing Reference.series #4293

minor

remove series from Reference #4293

fix update script to run with MySQL, add TermType IdentifierType, add List index on identifiers

adapt tests to 3.4

merge-update from trunk

adapted tcs rdf and xml import, using apache jena for rdf import
tcs import for caryophylales
minor

merge-update from trunk

HandlingCdmEntitiesTest.java / HandlingCdmEntitiesTest.xml : Added new test to describe save, update, merge of cdm entities (mimicking remoting)
cdmlib-remote-servlet.xml : added commented option to expose remoting
CdmIntegrationTest.java : added comment on how to disable transactional behaviour in tests

merge-update from trunk

fix delete taxon nodes with children

merge-update from trunk

bugfix for null rank in #4374

remove generics

generics

handle null name

• fixed case where a DerivedUnit is given as method parameter -> needed also to check for parent FieldUnits

• reverted accidentally removed methods due to merge with trunk

merge-update from trunk

• removed @Cascade for country in GatheringEvent because DefinedTerms should not be cascaded
  • added new service method to occurence service to find all CDM entities that are not saved via cascading
  • added tests for new method
  • added test for concurrent session saving of terms...

typos

typos

• temporarily disabled test

• used utility method for modifier

merge-update from trunk; added import preference to add media as media specimen

• replaced save() with saveOrUpdate()

• adpated test to model changes (cascading)

• changed from MySql to H2

• added test for saving non-cascaded CDM entities

added check for null cdm entity when putting default terms in cache

added possiblity to initialise some specific terms (like default language) which could be called outside a session

merge-update from trunk

fixing prefer specific distributions for #3904 (EuroMed: Implement filtering rules for Distributions), status=null was ereoneously preferred

fix the test

isDeletable ignores relations of identifiableEntity

• assured image order for images from image galleries #3242

merge-update from trunk

fix jenkins

• replaced using the dao with using the service for taxa

• finished DerivateHierarchyDTO citation

merge-update from trunk

• restructured derivate hierarchy query
  • step 1: get associated field units for a taxon (taxon service)
  • step 2: assemble derivate hierarchy for each field unit (occurrence service)

update abbrevTitleCache in bulk update (Cont.)

update abbrevTitleCache in bulk update

remove function tests which don't compile

generics

remove deprecated name service getVocabulary methods

minor

implement getNextHigherTerm and getNextLowerTerm #3327

move vocabulary tests to vocabulary service and fix @Ignore, remove deprecated methods from INameService

minor

minor

updated doc

• added type information to DTO
  • enhanced media labeling

• enhanced DerivateHierarchyDTO data

merge-update from trunk

• extended dto assembly

replace LockMode by LockOptions in service layer and persistence

merge-update from trunk

• fixed possible NPEs

return value of delete methods are DeleteResults

• added more parameters to DerivateHierarchyDTO

• added methods to add to DTO arrays
  • check if CDM entity already attached to session before loading it

• added more parameters to DerivateHierarchyDTO

• added more parameters to DerivateHierarchyDTO

• added service for retrieving all "associatied" FieldUnits for a taxon
  • added service for retrieving the "associated derivate hierarchies" for a taxon

• merge update from trunk

increased storage capacity of mock cdm cachers

rename getByIdInVocabulary

implementation for #4268 (allow defining custom presence and absence term colors for EditGeoServiceUtilities) and removing obsolete termservice parameters

minor

merge-update from trunk

minor

merge-update from trunk

removed 2.6.9 api

updated javadoc

add doc / comments

added comment for null values

IService, ServiceBase : added method findWithoutFlush
CdmCacher, CdmDaoCacher : split CdmCacher class to sub class which uses dao to access the data
MockCdmCacher : added mock cdm cacher for tests
TaxonNodeServiceImplTest, FeatureNodeServiceImplTest : removed duplicate @SpringApplicationContext annotation...

removed ehcache-2.6.9 api for now

temporarily ignoring failing tests to ensure compilation (see ticket 4276)

added cdm cache for bean initialisation

adding initial basic tests for cdm caching api

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

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

merged query call into one method to free connection resources

merge-update from trunk

add original label info to derived unit #4218

• fixed drag&drop for media

• added functionality to filter assigned specimens in the DerivateSearchView (fixes #4252)

fixing failing security test due to stricter handling of correct sort index