EDIT

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

widget is disposed exception ticket (#4657)

• fixed title for Uses view part

fix NPE bug and termloading bug for Usage Records #4247

• added functionality to choose the taxon name for a taxon in the DetailsView (#4393)

minor

export of csv files with name informations and for Print output(for caryophyllales)

ticket #4804

adjusted old comment to code block

Fixed Ticket #4557

Fix issue #3656

• removed debug sysos

• added findOccurrences() and countOccurrences() to service layer
  • added configurator for these methods
  • optimized retrieval with HQL query
  • made use of service method in DerivateSearchView

fix new methods in agent service for transient services

• added missing cdmlib method

• added check for open derivate editor command
  • set title of factual data view corresponding to the current selection

• added check for open derivate editor command

• adapted transient service to cdmlib changes

• fixed possible NPE

• refactored DTO assembly for compressed specimen table in the data portal
  • now data is assembled for each individual preserved specimen and the for the parent field unit

Fixed column bug for checklist editor....

switch of ValidationDaemon

minor renaming

Added Create Hierarchy Service for Editor as a experimental feature

Removed Reference Tab from checklist editor....

• enabled supplemental view for ConceptView (#4681)

improve messaging

bug fixxing in bulk editor and referencing objects view
bug fixing in deletion of names and homotypical groups

• added derivate hierarchy section
  • refactored DerivateContentProvider

merge from trunk

made up-to-date with service layer changes

• fixed possible NPE

• added context menu optio to create a media specimen with an existing media (fixes #2385)

• refactored cdmViewer extension point to be more generic

• enhanced cdmViewer popup dialog
  • added java doc

• fix for java 1.6 compatibility

• implemented framework which links an input element to viewers/editors which are able to display information about the element
  • added ICdmViewer interface
  • added extension point to register ICdmViewer
  • registered EditorCdmViewer for the taxeditor.editor plugin

• added context menu option to open multiple specimen IndividualsAssociations from the factual data view

• fixed MediaViewPart selection listening (#4575)

• refactored delete configrator dialog
  • added dialog to derivate deletion

• removed default configurator setting

#4658

ticket #4575

CdmTransientEntityCacher, EntityCacherDebugResult : moved debug methods to debug result class
ProxyUtils : new class for util methods to do with hibernate proxy objects
ICdmEntitySessionEnabled, CdmEntitySessionInput, PolytomousKeyEditorInput, TaxonNameEditor, PolytomousKeyViewPart, TaxonNavigator, AbstractCdmViewPart, MultiPageTaxonEditor : Added getRootEntities method...

• added missing transient service methods

show media information for taxa in bulk editor

CdmRemoteCacheManager : added cache getter methods
CdmTransientEntityCacher, CdmEntitySession, CdmEntitySessionManager, ICdmEntitySession, ICdmEntitySessionManager, ICdmEntitySessionManagerObserver, MockCdmEntitySession, MockCdmEntitySessionManager , eu.etaxonomy.taxeditor.cdmlib/src/main/resources/cdmlib-ehcache.xml : added statistics config , getter method for live stats and observer to update when sessions are bound and disposed...

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

CdmModelCacher : added recursive search in super classes
CdmTransientEntityCacher : corrected caching
EntityCacherDebugResult : new debug result object
CdmEntitySession, ICdmEntitySession, MockCdmEntitySession : added debug method
CdmEntitySessionInput : new super class for editor input objects...

MoveDescriptionToOtherTaxonOperation, MultiPageTaxonEditor, ChangeSynonymToAcceptedTaxonHandler, DeleteTaxonBaseHandler, ChangeSynonymToAcceptedTaxonOperation, DeleteTaxonBaseOperation, DeleteTaxonOperation, MoveDescriptionToOtherTaxonHandler : indentation...

merge from trunk

factual data for bulkeditor, improving referencing objects view, make delete in bulkeditor visible for synonyms

merge from trunk

Extend TransientClassificationService to be compliant with CdmLib

• added TaxonDeletionConfigurator to delete operations

merge from trunk

• delete description CDM entity when invoking Delete*DescriptionOperation (fixes #4605)

• fixed unnecessary double checking