EDIT

Remove bidirectionality for supplemental data #5743

Clean up AnnotationDao and AnnotationService

Fix deduplication problem with list order #5652

Fix CCE in DefinedTermDaoImpl.getPartOf (#5556) and make deproxy more
generic

resolving conflicts after merge of ticket_4716 into develop

add null check for delete and minor

organizing imports

Generalize term service method listByTermType()

Fix issues after rebase #4716

Upgrade to hibernate 5 with persistence tests running #4716

Fix bug for embeddable classes in AdvancedBeanInitializer #5383

Fully remove old vocabulary.byClass methods #3843

Remove listEmpty method from TermVocabularyDao #3843

Add vocabulary list method by term types #3843

Merge branch 'ticket-5066' into develop

Conflicts:
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmEntityDaoBase.java
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/PostMergeEntityListener.java

minor clean ups

Add new merge method for root entitites which returns the newly created MergeResult object

Merge branch 'develop' into ticket-5066

Conflicts:
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Language.java
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/CdmListenerIntegrator.java

Set transient id for root merge object

Add a new merge method in the service base class which allows the option to return the transient object

Allow retrieving objects via ICommonService and UUID (#5160)

changes for tcs import, fixing taxonnodecomparator, polytomouskey deletion and converting from person to team and team to person

Update service layer calls to use uuids, Add property paths to find call for performance tuning

#5066 Replace cdmlib persistence hibernate events listener with pre-[insert/update] for updatedby / createdby updates

Stash updated for bkp

#5056 Refactored 'save' call to return saved entity

#5031 Corrected common service / dao collection methods to use uuid + fieldName

Fix ignored test in TaxonDaoHibernateImplTest #2815

merge trunk into 3.6 branch

minor

Move FullCoverageDataGenerator from test to real, to avoid dependency problems.

remove dependeny to test (FullDataCoverage...)

adapt FullCoverageData method

fix test and add factory method #3583

moving UuidAndTitleCache from model to persistence. #4799

added id to uuidAndTitleCache

fix term loading bug for originally empty vocabularies #4248

allow different type merging not only for reallocation of links

Make deduplication of TeamOrPersonBase possible in cdmlib #4768 and solve test problem in CdmGenericDaoImplTest #2096, finding some bugs in between

merge validation2 and model 3.5 into trunk

for infrageneric unranked rank adding unranked
fixing bug with deletion of names and homotypicalGroups

missing persistence changes for findByIdentifier

improve and rename findByIdentifier service

first tests for listByIdentifier

first untested version for findByIdentifier #4594

fixing test for SingleReadAlignment and removal of SpecAndObs_Sequence

merge PresenceTerm and AbsenceTerm #4521

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

preliminary remove data generator

preliminary remove data generator

allow saving FullDataGenerator data through API (preliminary)

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

isDeletable ignores relations of identifiableEntity

replace LockMode by LockOptions in service layer and persistence

replace deprecated .lock method in CdmEntityDaoBase

added findByUuidWithoutFlush method

minor

• added service method to term service that retrieves terms by TermType

better use of generics in service layer and persistence list methods

handle null objects for save, saveOrUpdate and Update

further fixes for subareas #4220

implementing dao method listAcceptedTaxaFor, for #4112

added containsValue method to retrieve value object for maps

added remote collection methods to service layer to be able to make remote calls on server side persisted collections

added initializeCollection method to initialize a lazy loaded collection

update javadoc and override

add hql method to GenericDao (not clean yet)

fix term loading bug

fixing test for missing terms

refactor term loading for performance

Handle user types in getReferencingObjects

making sure users to be authenticated are alays up to date

moving all beaninitializer classes to new package 'eu.etaxonomy.cdm.persistence.dao.initializer'

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

some better implementation for CdmPreferences dao including some tests #3555

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

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

Change WaterbodyOrCountry name to Country #3700

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

VocabularyServiceImpl.java, TermVocabularyDaoImpl.java, IVocabularyService.java, ITermVocabularyDao.java : added method (findByTermType) to find all vocabularies related to a particular term type.
TermType.java : Added method (getEmptyDefinedTermBase) to return DefinedTermBase object corresponding to the (this) TermType....

Rename RightsTerm -> RightsType #1306

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

fix handling of iso639_2 (add vocabulary check)

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

bugfix für list type

adding missing @Override and removing absolte casts

preliminar solution for handling and setting the lucene version

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

avoiding sql exception

fixing MediaAutoInitializer & fixing bug in AbstractBeanInitializer

implementing full stack from IEventBaseDao to EventBaseController

fixing #3224 (specimens: Collect Specimens and Observations (+ Facts) via taxon relations.)

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

new load(int id, List propertyPaths); method

AT: committing CDMLIB to Branch post Merge

AT: committing latest changes to the CDMLib to try and fix issues with the function findByTitle

AT: change to fix a lazy initialization problem

merging revisions 14601:14603, 14653:14683 from branches/cdmlib/vibrant-index into trunk (contains: IdentifyableListController, jsonp support for REST service)