EDIT

#5224 Using new cdmlib call for changing synonym to accepted taxon

Merge branch 'develop' into remoting-4.0

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

Trim code

Replace saveOrUpdate with merge

#5052 Integrate remoting in granted authorites editor

Fix new occurrence / sequence move method calls

Correct transient service method

#5187 Use new move methods with uuids as args

Update operation for move taxon nodes

Add unimplemented methods

Merge branch 'develop' into remoting-4.0

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

#5188 Add special for deleting sequence

#5186 Fix erros in sequence merge and creating new specimen

minor

change preferences page for taxonnode sort

adapting transient service implementation to changes in cdmlib

• deprecated method removed

fixing #5150

Fix NPE

#5143, #5144 Improve load performance for name editor

Move Base operations test class to right package

Disable MediaView for bulk editor (#5162)

• bulk editor does only activate media view when showing taxa
• code trimming

Move property tester to editor plugin

#4073 Initial implementation of local cdm-server

Merge branch 'develop' into remoting-4.0

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

Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop

changes for move descriptions and description elements

Remove comments

Rename Derivative View to Derivative Editor

fix jenkins

minor

fix delete polytomouskeynode and improve merge in bulk editor

#5130 Extend import wizards to import data via remoting and Add tests for the same

#5123, #5124 Make ChecklistEditor remoting session aware and fix performance issue with available distribution pereference page

Fix Polytomous Key duplicate entry issue

Add remoting operation / handlers for key list editor

Fix duplicate entity issue with newly created cdm entities

Use new find method with update

Add unimplemented methods to transient service

Update transient service to be compatible with cdmlib service

#5010 : Initial commit to fix duplicate entry issue when creating new key node

Update operation calls to use uuids as arguments

Add method to sessionOwner objects to fine tune performance using property paths

Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java

Update handlers to use uuids inarguments

Update ICdmEntitySessionEnabled to no longer extend ICdmChangeListener

#5067 Integrate remoting sessions in derivate hierachy views, Adapt existing actions

Refactor ICdmViewer framework

Removed unnecessary ExecutionEvent

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

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

Fix deletion of single reads in Derivative Editor

Add missing transient method

#5010, #5046 Integrate remoting in polytomous key editor

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

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

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

#5007 : Add remoting handler / operations for the taxon navigator

adapt service call to model change

adapt transient service methods to cdmlib changes

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

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

ICdmDataChangeService, CdmUIDataChangeService, CdmDataChangeService : added new data change service with different services for the ui and non-ui states
CdmApplicationState, CdmStore : added data change service to app state
CdmChangeEvent, ICdmChangeListener : added change listener and even to fire in case of data changes...

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

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

• added transient service methods

• removed inBetween target for Derivative Editor (fixes #4966)

fixed classpath issues and issues from last merge

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

• added wizard page listener to react on ENTER key #4853

• added context menu entry for editing classifications
  • used generic extension point for cdmViewer in navigation project (#4865)

minor

fix for #3998

Improve error message

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 new classes in merge

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

added cdm entitysession enabled objects to operations

• added transient service methods

• missing @Override

minor

#4855 add MoveSynonymToAnotherAcceptedTaxonHandler and some clean up of the plugin.xml especially the delete

• changed "derivate" to "derivatives"

• added sorting by title cache of specimens to individual associations in factual data view

minor

Partial fix of Ticket #4728

Fix Ticket #4729