EDIT

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

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

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

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

Empty text fields return empty string and not null

Revert "index on develop: 6992bef Rename NonViralName authorteams to authorship #4968"

This reverts commit 32cded397931ad359f7818fdfb91a113a074342e.

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

Rename NonViralName authorteams to authorship #4968

Update cdmlib version to 3.6.3-SNAPSHOT

Fix initialisation of mock session owner

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

Conflicts:
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeComparator.java

Delete renamed file

Fix remaining conflict

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

#5007 : Rename move taxon node handler

Fixes from Katja for commit issue

#5007 : Integrated remoting handler / operations for taxon navigator ui

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

Fix problem with non persisted taxon titleCache change: #5018

adapt service call to model change

adapt transient service methods to cdmlib changes

• update parent scroll form on property change (fixes #4881)

• removed initial expand of sections

• fixed potential NPE

• fixed potential NPE

• changed type of "Materials & Methods" to text instead of DefinedTerm
  • fixed label

• split off "Preparation/Preservation section" from dna sample general section

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

change delete argument to UUID

add empty test folder

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

RemotingCdmUpdateOperation : corrected exception handling
RemotingChangeAcceptedTaxonToSynonymOperation : new remoting operation class
server.properties : server properties for test

rebase from remoting-4.0 branch

plugin.xml : updated plugin for new remoting handlers
RemotingCdmHandler, RemotingCdmOperation, RemotingCdmUpdateOperation : new handler / operation architecture
RemotingChangeAcceptedTaxonToSynonymHandler : using new remoting handler design
CdmStorePropertyTester : added isRemoting test

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

corrected pom merge

Merge remote-tracking branch 'origin/develop' into develop

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

minor

setting root logger setting to WARN

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

ignoring bin folder

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

fixing for compatibility with merged cdmlib

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

removed reference to cdm-server

• added transient service methods

add empty folder

• fixed order of team members #4936

• fixed NPE (#4937)

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

• removed test folder

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

• removed test folder from classpatch

fix umlaute in key menus and add gitignore for rcp.target

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

fixed classpath issues and issues from last merge

fixed manifest versions

new .gitignore file

removed test source from classpath

fixed update to snapshot

corrected cdmlib version to snapshot

Updating develop poms back to pre merge state

Merge branch 'master' into develop

Updating develop poms to hotfix version to avoid merge conflicts

Merge branch 'hotfix/3.6.1'

updating poms for branch'hotfix/3.6.1' with non-snapshot versions

version updates for 3.6.1

updating poms for branch '3.6.1' with snapshot versions

fixing classpath config

fixing classpath config

Release 3.6.0 merge

merged jgitfow plugin

merged for gitflow plugin

added jgitflow plugin

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

• updating versions due to release