EDIT

#5297 Integrate remoting monitor cancel functionality in ui

#5297 Add remoting progress monitoring

#5297 Change active seesion variable to a inheritable thread local variable and add relevant tests

Add monitered operation

#5297 Add post monitor operation callback, Add report text dialog

#5297 Add progress monitor client manager...

fix test for TaxonNavigator: all nodes need a taxon, except the topmost one

Add deproxy of entities in assertSame assertions

remove Ignore on saveNewTerm test

Add test for editor / server cdmlib version check

#5302 Add cdm version and services version check

Update root entity merge calls to use new merge method.

#5299 Handle session caching of new entities

Add missing properties file for tests

#5247 Fix duplicate entity issue for new entities by using the new merge service method which returns the input transient object

#5250 Initial attempt at property paths

Ignore test server ping tests

Ignore edit test server ping test

Ignore unauthenticated user test for now

Add test for unathenticated user

Enable test for taxon nodes deletion

Correct test to use uuids

Correct transient service method

#5138 Add test for normal Person load case

#5181 Fix incorrect load of CdmServiceCacher when connecting via Datasource view

Ignoring test until #5138 is fixed

#5138 Add test for cascade error

#5143, #5144 Improve load performance for name editor

Move Base operations test class to right package

Correct properties file load and server info test

#4073 Initial implementation of local cdm-server

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

#5129 Extend export ui for remoting

Correct test method call

Add access to service cacher

#4932 Remove autowired members, Use serliaised cdm model map

Set security context for tests

Correct tests to account for change in cache loader mechanism

Fix duplicate entity issue with newly created cdm entities

Use new find method with update

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

Update ICdmEntitySessionEnabled to no longer extend ICdmChangeListener

#5054 Update test for checking terms update

#5054 Update Term Editor to be remoting compatible

#5054 Integrate remoting session in Term Editor

This commit also fixes a loading bug in the CdmServiceCacher, adds a test for creating term vocabulary and adapts to the change in the save call (#5056)

#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

Move test file to correct location

Rename classes according to convention

#5009 Add operations and corresponding tests for delete / update nodes actions

#5009 : missed in last commit

#5009 Correct test and test data

#5009 Add delete handler / operation for polytomous key view with corresponding test class

Move xml validation to base test class

Remove manual session creation and re-enable failing tests

Ignore failing tests to check if other tests fail

Add logs to debug test issue on integration jenkins

Fix test by making sure that all entities are loaded in sessions

Remove unnecessary call to session debugger

#5034 Add tests for handler / operations architecture

Fix test

Fix LanguageString issue with test data

Add log4j extras to apply expression filters

Move test data to be compatible with last commit

Move test classes to right packages

#5028,#5032 Add implementation and use of new test service and Set http invoker read timeout to 0 (never )

Fix remaining test erros for collection call changes from #5031

#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

Enable tests again

#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

setting root loffer level to warn

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

removing properties file from repo

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

moved reseources from src/main/resources to src/test/resources to be maven compliant

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

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

CacheLoader : added strict check in recurive loop for same (not only equal) objects
EntityCacherDebugResult : removed deproxy of objects
ProxyUtils : refactoring
httpInvokerServiceClients.xml : corrected validation service class name
hibernate.cfg.xml, cdmTest.*.db : updated to latest

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

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

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

refactoring and added tests

ApplicationUtil : Added 'Remoting' to title
CdmTransientEntityCacher : corrected recursive call for delete functionality
RemotingLoginDialog : Added refresh functionality
PolytomousKeyTest : updated test data and added tests for delete functionality

reverting incorrect commit

added h2 db to resources and delete test to test class

merge from trunk

merge from trunk