EDIT

resolving conflicts after merge of ticket_4716 into develop

organizing imports

Generalize term service method listByTermType()

Further adapt to new jackson and new lucene version #4716

Fully remove old vocabulary.byClass methods #3843

Remove listEmpty method from TermVocabularyDao #3843

Add vocabulary list method by term types #3843

Add new merge method for root entitites which returns the newly created MergeResult 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)

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

#5056 Refactored 'save' call to return saved entity

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

moving UuidAndTitleCache from model to persistence. #4799

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

improve and rename findByIdentifier service

first tests for listByIdentifier

first untested version for findByIdentifier #4594

minor changes

allow saving FullDataGenerator data through API (preliminary)

isDeletable ignores relations of identifiableEntity

replace LockMode by LockOptions in service layer and persistence

added findByUuidWithoutFlush method

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

better use of generics in service layer and persistence list methods

further fixes for subareas #4220

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

javadoc

add hql method to GenericDao (not clean yet)

minor javadoc

some Java doc for new term loading

refactor term loading for performance

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

Change WaterbodyOrCountry name to Country #3700

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

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

remove model changing validations fix Delete_Orphan #3379

adding missing @Override and removing absolte casts

fixing MediaAutoInitializer & fixing bug in AbstractBeanInitializer

implementing full stack from IEventBaseDao to EventBaseController

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

new load(int id, List propertyPaths); method

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

add includeEmpty vocs (#2704)

implement getTermVocabulariesByTermClasses also for subclasses (#2704)

change return type for merge (#2654)

use real URI in getTermByUri

getTermByRepresentationAbbrev

countByTitle() method for IIdentifiableService

implement list find method for user and group services (#2283 and #2284). Tests are still missing.

Added countByReferenceTitle()

Added findByReferenceTitle()

saveOrUpdateAll

merging /branches/cdmlib/SPRINT-Chichorieae1/ to trunk

Added a method to retrieve terms by class.

merging PESI brach into trunk

merge cate-development2 branch with trunk

Allowed replace(T x, T y) to accept null for the second argument and globally replace x with null or remove x from collections

Altered ReferringObjectMetadataFactoryImpl to exclude bidirectional relationships where the replaced entity is the "owner" of the related entity (i.e. the relationship is mapped by @OneToMany & mappedBy != null) since those kind of relationships don't make sense in the context of a global replace method.

Updated ICdmEntityDao replace(T x, T y) and refresh(T t, LockMode lockMode, List propertyPaths) and added methods to IAnnotationDao

Added public T replace(T x, T y) to ICdmEntityDao, implementation and tests

Added merge(T t, LockMode lockmode) and refresh(T t, LockMode lockmode) to allow developers to bypass the session & second-level cache (useful in some instances)

Refactored free text search to re-use the same code for all identifiable entities. Switched to StandardAnalyzer to include indexing of numbers. Removed redundant code from taxonDao.delete() method (as included entities deleted using hibernate's cascade method)

Refactored methods in VersionableDaoBase etc + added Query-By-Example for CdmEntityDaoBase

Added methods and tests to recover changes to data

Refactored OrderHint and added RandomOrder, plus a couple of small bug fixes in VersionableDaoBase

licence comment added

Merged in changes from cate-development branch and upgraded to spring 3.0.0.RC1

changed flush mode to COMMIT. Solves lots of issues regarding hibernate conversations.
added getUuidAndTitleCache methods at service level

Intensive model change for referenceBase and subclass, smaller model changes for taxonBase and marker

CdmMetaData implemented (persistence)

Implemented Grouping Criteria method for ICdmEntityDao, including group by count and group by year / month / day for dateTime fields

Added free-text search methods to name & occurrence DAO's

matching in persistence

Merge for cdmlib-persistence and bugfix in TaxonDaoHibernateImplTest

refactoring of ICdmGenericDao.getReferencingCdmBases()

minor

Session clean

findByUuid for sets of uuids

new dao methods and cleaning up ITaxonDao

Expanded on getByRepresentationText in IDefinedTermDao

generic dao changes

Updated tests to reflect the new unique uuid constraint, corrected the CacheStrategyGenerator listener to correctly add updatedBy / createdBy metadata on saveOrUpdate events, corrected a couple of DAO methods, and added merge(T t) to ICdmEntityDao to allow the persisting of detached objects

Refactored ISearchableDao to make it more generic, then added it and implementations to daos for Agents, References and Media

Lots of changes, including,
adding List orderHints, List propertyPaths to dao methods
New MarkerDao & impl
Expanded test coverage of beanintialization and cache strategy generator configuration

additional DAO methods for new REST service & bug fixes e.g. in AbstractBeanInitializer

Changed DataChangeEvent architecture

configurable initialization of entities of list() methods

configurable bean initialization methods

removing cast from inside getNomenclaturalReference() in model

Merged branches/cdmlib/2.0 changes r5130:5370 into the trunk