EDIT

#5031 Update remoting code to be compatible with new common service collection calls

#5025 : Implement load of UpdateResult using new cdm entity identifier

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/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties

#4074 : Fix initialisation, use and disposal of mocke session owner

Fix initialisation of mock session owner

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

TaxonNavigator : added refresh of navigator on data change
TaxonNavigatorLabels : new interface with label strings used by taxon navigator handlers
RemotingChangeAcceptedTaxonToSynonymHandler : using TaxonNavigatorLabels
RemotingMoveFactualDataHandler : remoting version of move factual data handler...

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

removed programmatic log level setting

corrected remote source to use initialzed cdm server

CdmRemoteSourceBase : using user service for db checks
httpInvokerServiceClients.xml : updated database service config
HttpInvokerServicesTest : added polytomous key service ping
server.properties : added back server properties file

CdmApplicationState:New class to handle application state
CdmStore, BaseRemotingTest : using new application state class
TaxonNavigatorTest : ignoring test for now
TaxonNavigatorTest : increased max memory for jetty

eu.etaxonomy.taxeditor.cdmlib/.classpath,MANIFEST.MF : removed cdm-server jar from classpath
OperationTestBase, TaxonNameEditorTest, : refactoring
MockConversationEnabled : class to mock interface IConversationEnabled
TaxonNavigatorTest (.xml) : added test + data...

BaseRemotingTest, RemotingSessionAwareTest : made abstract since there are not runnable tests
CdmEntitySessionManagerTest (.xml) : fixed test data

RemotingSessionAwareTest : added new class which handles pre-config of test classes which require a session
*Test.java : set super class to RemotingSessionAwareTest
*.xml : removed DefinedTermBase entites from datasets so that the terms are not deleted
ServiceInterceptorTest : correction

fixed issues with resource loading for maven int tests

corrected merge to latest snapshot version
updated hibernate config file and test db
setup testing framework with jetty and maven

reset swtbot dependencies and set all swtbot tests to ignore for the moment

forgot to add in last commit

eu.etaxonomy.taxeditor.cdmlib/.classpath, eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF, eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF : moved test jars to test project
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF : added packages required by test project to exported package list...

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

• corrected recursive autowiring
• changed application context loading to be more performant

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

dependency changes to move to e4

corrected / moved existing tests

implemented new method in interface

refactoring and added tests

merge from trunk

merge from trunk

updated current tests and added new ones

CdmServerInstanceInfo, RemotingLoginDialog, ShowRemotingLoginWindowHandler : functionality for remoting login
moved classes to appropriate locations.
merged from trunk.

merge from trunk

moving tests from cdmlib to the test project

• fixed org.hamcrest dependency error which occurs when doing a fresh set up of the editor workspace

Reorganized the test classes

Created tests for the "New" menu

Adding a test case for creation of a classification