fix transient services
fix #6120 Cleanup uuidAndTitleCache methods
fix transientServices (2)
Fix compile errors in transient services for loadByIds
Adapt all transient services to latest API changes
Updated dependencies for taxeditor (still unstable)
Refactoring type designation gathering according to model change
Tweak performance for typeDesignation cache in label provider
Fix incorrect merge
Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop
Add missing transient services
Implement new load method for uuid lists
Add missing transient service method
Adapt transient service to cdmlib changes
Adapt to service changes #5200
Update transient services for new load method
Update root entity merge calls to use new merge method.
Use convenience method for associated taxa
Adapt transient services
Update transient services with new merge method
#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/TransientDescriptionService.java eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java...
Fix new occurrence / sequence move method calls
Correct transient service method
Update operation for move taxon nodes
Add unimplemented methods
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...
fix jenkins
Add unimplemented methods to transient service
#5067 Integrate remoting sessions in derivate hierachy views, Adapt existing actions
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
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.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...
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...
made up-to-date with service layer changes
adapt services to new findByIdentifer in Editor
update Transient services
adapt transientServices to returntype of isdeletable methods
merge-update from trunk
LockMode issues in transient services
adaption for error handling of delete methods
implementing findWithoutFlush method in transient services
update new generic services in TaxEditor #4224
adding a taxon bulk editor and changes because the delete methods does not throw exceptions anymore
adding missing methods