EDIT

Merge branch 'develop' into termSearch

ref #7998 Add service method for UuidAndTitleCache by term type

ref #8011 Add service method to find term DTOs by label

ref #7932 first implementation of PreferenceResolver and some adaption to PreferenceService API.

• Correct handling of subtree subjects still open.
• Also creation of user defined subjects still open.

ref #7887 Remove getParent()

ref #7887 Implement term service methods based on DTOs

ref #7829, ref #7800 improve nom. ref. matcher (also changes the result type => needs adaptation in client Apps)

revert: Add series parsing with letters (test) - all unwanted commits

Add series parsing with letters (test)

ref #7345: add dao and service methods to get UuidAndTitleCache marked with a special markerType

minor issue with return type of listToTaxonRelationships() fixed

ref #7664 adapt return type for many methods with defined typification

ref #6682 add types and deduplicateMisapplications parameter to web service

ref #7590 replacing not flag in restrictions by AND_NOT and OR_NOT operators

ref #7590 implementing AND and OR operator for restrictions and harmonizing code

fix #7527 making page by parameter with criteria and restrictions available in the service layer

cleanup

ref #7525 ref #7523 allowing to use Restriction as exclude filter

ref #7525 restoring all previously removed Criteria methods

fix #7525 replacing Criteria lists by cdm Restrictions in CdmEntityDaoBase.*ByTitle() methods

use long instead of int (cont.)

use long instead of int (cont.)

use long instead of int (cont.)

use long instead of int in some of the count methods, use base methods for pageSize/number and order for criteria and queries, cleanup

cleanup and remove rows(xxx) method

ref #3560 implement unpublished for load and find in service layer

ref #6241 replaced @created by @since in cdmlib

ref #6241 change @date to @since (fix)

ref #6241 change @date to @since

move getUuidAndTitleCache methods to identifiableDao

adapt uuidAndTitleCache services and dao methods to search for a pattern

add level to titleCache of namedArea in uuidAndTitleCache search

add uuidAndTitleCache method to get uuidAndTitleCache of namedArea depending on vocabulary

fix creation of new namedAreas in specimen import and search for isocode

Merge branch 'develop' into feature/cdm-4.7

Conflicts:
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Feature.java

Add propertyPath to service method

ref #6612 cleanup generics

ref #6612 PropertyNameMatchMode to Restriction class which contains the values to be tested

fix compile error and some cleanup

#6612 generic dao list method providing a flexible multi property filter:

• PropertyNameMatchMode class introduces
• AbstractPagerImpl.limitStartforRange() to replace hasResultsInRange()

ref #6612 new dao method list entities filtered by a parameter value

cleanup

ref #6262: adding funtionality to library to access rights for selection dialog

ref #6262: create dao and service for rights

emall fix for selection of reference as inreference

Cleanup

ref #6401 Fix problems with generics due to jdk1.8

ref #6190 removing svn property place holder in first line of code

minor

Cleanup and replace int by long in count

ref #5972: add method to count referencing objects

fix #6122 add titleCache service

fix #6120 Cleanup uuidAndTitleCache methods

fix #6072 Implement findIdentifiableEntityByMarkers

refactoring listByIds to loadByIds

add limit and pattern to the uuid and titlecache methods

Further develop the CDM preferences #3958

Add generic find(clazz, uuid) method #5853

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