EDIT

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 improved generics for commonservice findXXX methods

adding missing delete method to CommonServiceImpl

fix #6535 change CdmMetaData.propertyName from int to string

add saveOrUpdate to ICommonService

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

Merge remote-tracking branch 'origin/develop' into develop

ref #5972: add service method to get count of referencing objects

cleanup

Add generic find(clazz, uuid) method #5853

Allow retrieving objects via ICommonService and UUID (#5160)

#5160 Add new merge method with id's as arguments

Add find method which can be filtered to update editor session

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

#5056 Refactored 'save' call to return saved entity

#5012 Add service layer updates for remoting calls from the Bulk Editor

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

Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/cdmlib into remoting-4.0

Conflicts:
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTerm.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTermBase.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Reference.java...

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

adapt CommonService to allow collection save and add remotewebapp test H2 udpate

merge validation2 and model 3.5 into trunk

ICdmCacher, ICdmUuidCacher, CdmCacher, CdmTermCacher : refactored and added load method
Language, NameRelationshipType, Rank : now uses cacher only if termap is null or empty and only when class matches the specific term type
MockCdmCacher: not required anymore...

allow saving FullDataGenerator data through API (preliminary)

isDeletable ignores relations of identifiableEntity

if deletion of an object fails the method does not throw an exception but returns a message

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

add find(Class, id) to common service

change version ->3.3.0, move CdmMetaData, change schema version -> 20130924, fix TaxonServiceSearch test, update update-script

Made a few changes to schema version checking

merging PESI brach into trunk

Added isDatabaseSchemaCompatible().

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

bugfix metadata

CdmMetaData implemented (service layer)

matching in commonservice

merge for cdmlib-services

common service getReferencedCdmBases

svn keyword property "Id" added

Implemented additional service methods as part of #466. Ported Pager interface and implementations, refactored integration tests

Marshall/unmarshall TermVocabulary

Marshall/unmarshall Representations explicitly