last changes for #5325
#5335 Use new getLanguageByLabel methof in term service
#5268 Use convert methods which use uuids
fixing #5324 and #5325
add moveDescription to transientService
Update transient services for new load method
Update root entity merge calls to use new merge method.
Use convenience method for associated taxa
minor
merge branches
merge
improve messaging for deleteResult
Adapt transient services
Update transient services with new merge method
move descriptions in a service call
#5247 Fix duplicate entity issue for new entities by using the new merge service method which returns the input transient object
Merge branch 'develop' into remoting-4.0
Conflicts: eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
Add new service call
#5224 Using new cdmlib call for changing synonym to accepted taxon
Conflicts: eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java...
Add unimplemented methods
#5213 Use method to move descriptions using uuids
Add annotation service to config
Fix new occurrence / sequence move method calls
Correct transient service method
Update operation for move taxon nodes
Conflicts: eu.etaxonomy.taxeditor.cdmlib/.classpath eu.etaxonomy.taxeditor.editor/plugin.xml eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditor.java eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java...
change preferences page for taxonnode sort
adapting transient service implementation to changes in cdmlib
Conflicts: eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java...
Remove comments
fix jenkins
#5130 Extend import wizards to import data via remoting and Add tests for the same
Update operation calls to use uuids as arguments
Add method to sessionOwner objects to fine tune performance using property paths
#5067 Integrate remoting sessions in derivate hierachy views, Adapt existing actions
Make editor transient term service compatible with cdmlib term service
#5054 Update test for checking terms update
Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0
Conflicts: eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java
#5056 Adapt editor to service layer 'save' method refactoring in cdmlib
Conflicts: eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
Make editor compatible with latest cdmlib service layer updates
#5012 Adding remoting session and updating save methods for Bulk Editor
Replace properties file with xml file
#5012 updates for making Bulk Editor remoting capable
Add missing transient method
Conflicts: eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/lazyloading/CdmLazyLoader.java eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/collection/internal/AbstractPersistentCollection.java...
Update transient services with new delete method
#5009 Add operations and corresponding tests for delete / update nodes actions
#5009 : missed in last commit
Conflicts: eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteTaxonOperation.java eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java...
Fix issues with merge conflicts
Fixes from Katja for commit issue
adapt transient service methods to cdmlib changes
Conflicts: eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteTaxonOperation.java...
fixed conflicts from last commit
all delete methods need an Uuid as argument
Conflicts: eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java...
Conflicts: eu.etaxonomy.taxeditor.cdmlib/.classpath eu.etaxonomy.taxeditor.cdmlib/.gitignore eu.etaxonomy.taxeditor.cdmlib/pom.xml eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmServiceCacher.java...
Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0
Conflicts: .gitattributes eu.etaxonomy.taxeditor.cdmlib/.classpath eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java...
cdmlib-ehcache : removed disk based cache manager since the hb config is now cached in memory CdmApplicationRemoteController, CdmModelCacher, CdmRemoteCacheManager, CdmModelGetMethodCacherTest : running the hibernate config load in separate thread CdmTransientEntityCacher, EntityCacherDebugResult, CdmStore, SessionsViewPart: refactoring...
CdmApplicationRemoteController : refactoring code to simplify application context loading and making it performant CdmModelCacher : removed unused method CdmRemoteCacheManager : moved cache from disk to memory httpInvokerServiceClients : lazy initializing all service beans...
moving UuidAndTitleCache from model to persistence (changes in Editor). #4799
fixed problems with merge
Merge branch 'move-to-luna' into remoting-4.0
Conflicts: eu.etaxonomy.taxeditor.cdmlib/.classpath eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF eu.etaxonomy.taxeditor.cdmlib/build.properties eu.etaxonomy.taxeditor.cdmlib/pom.xml eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/remotingApplicationContext.xml...
Partial fix of Ticket #4728
fix new methods in agent service for transient services
made up-to-date with service layer changes
CdmTransientEntityCacher : overriding cache field only in the case of initialised cdm entity CdmEntitySession, ICdmEntitySession, MockCdmEntitySession : added update + delete methods DeleteSynonymOperation, MoveFactualDataHandler : changed service call to uuid one...
MultiPageTaxonEditor : added cdm entity session capabilities to update and register data changes TaxonNavigator, TaxonNavigatorDataChangeBehavior : added refreshing of specific objects MoveFactualDataHandler : moved business logic to service call using uuids...
Extend TransientClassificationService to be compliant with CdmLib
adapt services to new findByIdentifer in Editor
fix transient repository issue
update Transient services
adapt transientServices to returntype of isdeletable methods
fix #4450
merge-update from trunk