EDIT

fix #6209: adapt the message if a datasource is not available

Revert "ref #6118 catching exception during checkConnection"

This reverts commit bb7b4f601b49f1ba29f149405246f120b4c46a9a.

ref #6118 catching exception during checkConnection

fix #5759 remove all switches for remoting and standalone

i18n for SearchManager

missed to commit changes in search manager

Show message when data model creation was succeessful and refresh data
source view #5758

add PolytomousKeyService to CdmStore.getService and EditFromSelectionWizard

More i18n for #5758

i18n for #5758

Remove "Close Connection" and changed "Connect" to "Create Data Model"
#5758

fix for #5710 reset the terms when changing the datasource in remoting

fix #5669

Set taxon filter when opening derivativwe editor from taxon navigator
#5514

add media bulk editor see #4730

Fix field unit filter for bulk editor #5572

Add parameter to set max specimen count before warning

Generalize term service method listByTermType()

Move getService to CdmStore

#5207 Add validation of credentials on target server before starting application context

#5250 Refactor code for improving derivate search performance

Streamline search method due to cdmlib service changes

#4073 Add new project for lanuching embedded jetty server using cdmlib webapp

#4073 Add jetty server dependencies

#4073 Add stop start possibility for server

#4073 Add functionality to control managed server in login dialog

#4073 Add start / stop methods for managed server...

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

#5321 Add missing return statement for bad credentials

#5247 Use updated entities

#5250 Initial attempt at property paths

#5259 initialising default ranks

#5250 Add property paths to speed up search

Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java

Fixed potnetial NPE

Optimize Code #5103

Replace spring application context loading with programmatic loading

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

Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java

Support UUID search in bulk editors (#5103)

Trim code

#5134, #5136 (and potentially #5135) Fix incorrect clean up of session manager and Check for class in new taxon wizard

#5029 Add dev remote source quick connect

#5029 Add functionality for login to remember credentials, reconnect and switch user

#5029 Implement oneclick login for remoting

#5098 : Fix issue with authentication when using search bar

#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

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

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

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

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

Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/taxeditor

replaced simple editor-datasource compatibility check with version comparison check

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

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

InspectSessionsDialog : added filtering
CdmStore : clearing caches and session before connecting
ParseHandler : using NonViralName instead of TaxonNameBase
AbstractPostTaxonOperation, AbstractPostOperation, AbstractPersistentPostOperation : added CdmEntitySessionEnabled object to constructor...

bulkeditor: merge of teams and persons and convert team to person and person to team

remove javadoc

fix NPE bug and termloading bug for Usage Records #4247

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

javadoc

merge taxeditor validation2 into trunk

merge from trunk

merge from trunk

• adapted to 3.4.0 cdm changes

merge from trunk

updated packages for remoting source

MessagingUtils : added new method for a warning dialog when not connected to a datasource
CdmStore : changed warning dialog to new method mentioned above
LanguagePreferencePage, PreferencesUtil, AbstractMenuPreferences : checks to fail nicely if not connected to a datasoruce

fix #4450

• fixed double exception dialog popup when not connected to data source
  • fixed NPE when starting ABCD import with dirty editors

Handle null object in StoreUtil.getCdmEntity

Moved all logging and dialog functionality to the new class MessagingUtils.
Refactoring code to adapt to above change.
Added new custom error dialog - CdmErrorDialog
Added runtime exception handling to the ApplicationWorkbenchAdvisor by adding a custom status handler

• added support for term retrieval by TermVocabulary
  • adapted MediaSpecimen DetailsView

• not running imports and exports deleted from menu
• preferences for concept relations fixed
• open taxon editor with one click in taxon navigator

• set CdmFormFactory.createTermComboElement() to deprecated
  • replaced (almost) all uses of the method with CdmFormFactory.createDefinedTermComboElement which works with TermType instead of classes

remove deprecated method

refactoring cdm data source to cdm source
plugin.xml : added clone menu item / command

adding a taxon bulk editor and changes because the delete methods does not throw exceptions anymore

CdmStore : no longer need to set configuration in hibernate classes here
CdmStoreConnector : new method to retrieve configuration based on cdm source type

updating to align with refactored cdm source classes / interfaces

• fixed javadoc

• fixed ClassCastException for FeatureNodeContainers

implementing #4120: User always needs to have the right to change password and hiding all user related menu contributions if no user is logged in

setting application configuration and boolean remoting flag (bean) in hibernate proxy classes to differentiate local and remoting

catching PermissionDeniedExceptions when only doing a check, so these exceptions no longer pollute the log

more details in exception message of StoreUtil.getCdmEntity()

no longer using a conversation for the login dialog and thus fixing problems after putting wrong credentials

• renamed getBaseUnit() to baseUnit()

• added util method to get for getting a CDM entity (used in authenication/permission framework)
  • made use of this method where the type of the parameter was too general (like object)
  • made getBaseUnit() of DerivedUnitFacade public

RolesSourceProvider to enable activities by cdm roles and protecting bulkeditors and term editors - #4055 (action enablement adapts to the users granted authorities)

reverting cdm application / controller refactoring and simply extending the CdmApplicationRemoteConfiguration class
by throwing UnsupportedOperationException for methods that are not supported by remoting

correcting import

refactoring CdmApplicationConfiguration/Controller to allow for remoting
CdmStoreConnector : added application configuration call for remoting (currently commented)

• added "Search"-Button to DerivateSearchView

merge from trunk

added possibility to switch to remoting

part 2 of preliminary solution to #4053 (Transient field User.authorities not refreshed on reloading entity)

part 2 of fixing #2414 (Group updating doesn't work) by committing and restarting the transaction in the conversation

solving #4011 (disallow changing publish flag for users with insuffcient rights) for TaxonBase

adapting to new use new ICdmPermissionEvaluator

• added preliminary method for getting specimen by type/record basis (needs enhancement with direct SQL queries)

• added a flag to force also searching for FieldUnits when searching occurrences