Cherian Mathew [Mon, 29 Jun 2015 15:58:38 +0000 (17:58 +0200)]
Move test file to correct location
Cherian Mathew [Mon, 29 Jun 2015 14:09:55 +0000 (16:09 +0200)]
#5009 Update plugin to use remoting handlers
Cherian Mathew [Mon, 29 Jun 2015 13:04:24 +0000 (15:04 +0200)]
Rename classes according to convention
Cherian Mathew [Mon, 29 Jun 2015 12:49:12 +0000 (14:49 +0200)]
#5009 : Add handler for update all nodes operation
Cherian Mathew [Mon, 29 Jun 2015 13:20:33 +0000 (15:20 +0200)]
Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0
Conflicts:
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/lazyloading/CdmLazyLoader.java
eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/collection/internal/AbstractPersistentCollection.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
Cherian Mathew [Mon, 29 Jun 2015 12:52:58 +0000 (14:52 +0200)]
Update transient services with new delete method
Cherian Mathew [Mon, 29 Jun 2015 12:24:40 +0000 (14:24 +0200)]
#5009 Add operations and corresponding tests for delete / update nodes actions
#5009 : missed in last commit
Cherian Mathew [Fri, 26 Jun 2015 07:55:18 +0000 (09:55 +0200)]
#5009 Correct test and test data
Cherian Mathew [Thu, 25 Jun 2015 15:09:26 +0000 (17:09 +0200)]
#5009 Add delete handler / operation for polytomous key view with corresponding test class
Patrick Plitzner [Mon, 29 Jun 2015 12:26:07 +0000 (14:26 +0200)]
Show abbreviated title cache for authors and refernce in taxon details
view
Patrick Plitzner [Wed, 24 Jun 2015 17:55:55 +0000 (19:55 +0200)]
Show URI parsing exceptions below URI text field (fixes #5055, #5003, #4587)
Patrick Plitzner [Wed, 24 Jun 2015 18:58:19 +0000 (20:58 +0200)]
Avoid duplication of edited team member (#4997)
Patrick Plitzner [Wed, 24 Jun 2015 19:39:38 +0000 (21:39 +0200)]
Add no marker without a markerType (#4588)
Patrick Plitzner [Mon, 29 Jun 2015 11:41:37 +0000 (13:41 +0200)]
Add ticket number to TODO
Patrick Plitzner [Mon, 29 Jun 2015 10:15:24 +0000 (12:15 +0200)]
Refresh view after media view has been switched
Patrick Plitzner [Mon, 29 Jun 2015 10:01:12 +0000 (12:01 +0200)]
Add MediaViewSwitch to media collection elements
Refactored code to use a static method that creates the IAction object.
This can be added by the GUI element itself.
Patrick Plitzner [Mon, 29 Jun 2015 05:04:53 +0000 (07:04 +0200)]
Add button for advanced media view to media attached to desccriptions
Patrick Plitzner [Sat, 27 Jun 2015 12:16:14 +0000 (14:16 +0200)]
Remove duplicate code for advanced media view (#4862)
Refactored code and added interface and abstract class to avoid
duplicate code.
Patrick Plitzner [Sat, 27 Jun 2015 12:13:59 +0000 (14:13 +0200)]
Remove comments
Patrick Plitzner [Wed, 24 Jun 2015 19:40:05 +0000 (21:40 +0200)]
Remove comments
Patrick Plitzner [Wed, 24 Jun 2015 12:18:47 +0000 (14:18 +0200)]
Fix typo
Cherian Mathew [Mon, 29 Jun 2015 10:47:50 +0000 (12:47 +0200)]
Move xml validation to base test class
Cherian Mathew [Mon, 29 Jun 2015 09:24:02 +0000 (11:24 +0200)]
Remove manual session creation and re-enable failing tests
Cherian Mathew [Mon, 29 Jun 2015 09:14:02 +0000 (11:14 +0200)]
Ignore failing tests to check if other tests fail
Cherian Mathew [Mon, 29 Jun 2015 08:40:48 +0000 (10:40 +0200)]
Add logs to debug test issue on integration jenkins
Cherian Mathew [Fri, 26 Jun 2015 20:41:01 +0000 (22:41 +0200)]
Fix test by making sure that all entities are loaded in sessions
Cherian Mathew [Fri, 26 Jun 2015 16:04:32 +0000 (18:04 +0200)]
Remove unnecessary call to session debugger
Cherian Mathew [Fri, 26 Jun 2015 15:49:01 +0000 (17:49 +0200)]
#5036 Add missing command for polytomous key delete
Cherian Mathew [Fri, 26 Jun 2015 14:45:13 +0000 (16:45 +0200)]
#5034 Add tests for handler / operations architecture
Fix test
Cherian Mathew [Fri, 26 Jun 2015 13:12:27 +0000 (15:12 +0200)]
Fix LanguageString issue with test data
Cherian Mathew [Fri, 26 Jun 2015 13:11:25 +0000 (15:11 +0200)]
Add log4j extras to apply expression filters
Cherian Mathew [Fri, 26 Jun 2015 09:37:01 +0000 (11:37 +0200)]
Move test data to be compatible with last commit
Cherian Mathew [Fri, 26 Jun 2015 09:34:10 +0000 (11:34 +0200)]
Move test classes to right packages
Cherian Mathew [Fri, 26 Jun 2015 09:20:48 +0000 (11:20 +0200)]
#5028,#5032 Add implementation and use of new test service and Set http invoker read timeout to 0 (never )
Cherian Mathew [Thu, 25 Jun 2015 15:21:07 +0000 (17:21 +0200)]
Fix remoting code compilation errors
Cherian Mathew [Thu, 25 Jun 2015 13:34:45 +0000 (15:34 +0200)]
Fix remaining test erros for collection call changes from #5031
Cherian Mathew [Thu, 25 Jun 2015 12:46:34 +0000 (14:46 +0200)]
#5031 Update remoting code to be compatible with new common service collection calls
Cherian Mathew [Thu, 25 Jun 2015 08:31:15 +0000 (10:31 +0200)]
Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0
Cherian Mathew [Wed, 24 Jun 2015 15:42:12 +0000 (17:42 +0200)]
#5025 : Implement load of UpdateResult using new cdm entity identifier
Patrick Plitzner [Wed, 24 Jun 2015 12:19:58 +0000 (14:19 +0200)]
Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop
Patrick Plitzner [Wed, 24 Jun 2015 12:19:43 +0000 (14:19 +0200)]
Empty text fields return empty string and not null
k.luther [Wed, 24 Jun 2015 11:08:18 +0000 (13:08 +0200)]
Revert "index on develop:
6992bef Rename NonViralName authorteams to authorship #4968"
This reverts commit
32cded397931ad359f7818fdfb91a113a074342e.
Cherian Mathew [Wed, 24 Jun 2015 07:40:31 +0000 (09:40 +0200)]
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
Cherian Mathew [Wed, 24 Jun 2015 07:26:41 +0000 (09:26 +0200)]
Enable tests again
Cherian Mathew [Wed, 24 Jun 2015 07:06:11 +0000 (09:06 +0200)]
#4074 : Fix initialisation, use and disposal of mocke session owner
Andreas Müller [Tue, 23 Jun 2015 16:34:38 +0000 (18:34 +0200)]
Rename NonViralName authorteams to authorship #4968
Cherian Mathew [Tue, 23 Jun 2015 16:22:30 +0000 (18:22 +0200)]
Update cdmlib version to 3.6.3-SNAPSHOT
Cherian Mathew [Tue, 23 Jun 2015 16:13:15 +0000 (18:13 +0200)]
Fix initialisation of mock session owner
Cherian Mathew [Tue, 23 Jun 2015 13:06:40 +0000 (15:06 +0200)]
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
Cherian Mathew [Tue, 23 Jun 2015 12:45:38 +0000 (14:45 +0200)]
Delete renamed file
Cherian Mathew [Tue, 23 Jun 2015 11:18:06 +0000 (13:18 +0200)]
Fix remaining conflict
Cherian Mathew [Tue, 23 Jun 2015 11:15:53 +0000 (13:15 +0200)]
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
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientCollectionService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java
Cherian Mathew [Tue, 23 Jun 2015 11:01:02 +0000 (13:01 +0200)]
Fix issues with merge conflicts
Cherian Mathew [Tue, 23 Jun 2015 08:28:00 +0000 (10:28 +0200)]
#5007 : Rename move taxon node handler
Cherian Mathew [Tue, 23 Jun 2015 08:09:36 +0000 (10:09 +0200)]
Fixes from Katja for commit issue
Cherian Mathew [Tue, 23 Jun 2015 07:31:24 +0000 (09:31 +0200)]
#5007 : Integrated remoting handler / operations for taxon navigator ui
Cherian Mathew [Mon, 22 Jun 2015 14:58:55 +0000 (16:58 +0200)]
#5007 : Add remoting handler / operations for the taxon navigator
Andreas Müller [Mon, 22 Jun 2015 14:35:17 +0000 (16:35 +0200)]
Fix problem with non persisted taxon titleCache change: #5018
Patrick Plitzner [Mon, 22 Jun 2015 13:50:09 +0000 (15:50 +0200)]
adapt service call to model change
Patrick Plitzner [Mon, 22 Jun 2015 13:49:50 +0000 (15:49 +0200)]
adapt transient service methods to cdmlib changes
Patrick Plitzner [Mon, 22 Jun 2015 12:38:25 +0000 (14:38 +0200)]
- update parent scroll form on property change (fixes #4881)
Patrick Plitzner [Mon, 22 Jun 2015 06:56:23 +0000 (08:56 +0200)]
- removed initial expand of sections
Patrick Plitzner [Mon, 22 Jun 2015 06:50:16 +0000 (08:50 +0200)]
- fixed potential NPE
Patrick Plitzner [Mon, 22 Jun 2015 05:54:33 +0000 (07:54 +0200)]
- fixed potential NPE
Patrick Plitzner [Wed, 17 Jun 2015 15:35:46 +0000 (17:35 +0200)]
- changed type of "Materials & Methods" to text instead of DefinedTerm
- fixed label
Patrick Plitzner [Wed, 17 Jun 2015 15:27:48 +0000 (17:27 +0200)]
- split off "Preparation/Preservation section" from dna sample general
section
Cherian Mathew [Mon, 22 Jun 2015 10:51:55 +0000 (12:51 +0200)]
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
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
Cherian Mathew [Mon, 22 Jun 2015 09:31:26 +0000 (11:31 +0200)]
fixed conflicts from last commit
Katja Luther [Thu, 18 Jun 2015 13:28:35 +0000 (15:28 +0200)]
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
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java
Katja Luther [Thu, 18 Jun 2015 13:15:42 +0000 (15:15 +0200)]
change delete argument to UUID
Andreas Müller [Fri, 19 Jun 2015 13:15:04 +0000 (15:15 +0200)]
add empty test folder
Cherian Mathew [Fri, 19 Jun 2015 13:20:14 +0000 (15:20 +0200)]
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
RemotingMoveFactualDataOperation : remoting version of move factual data operation
RemotingMoveTaxonHandler : remoting version of move taxon handler
RemotingMoveTaxonOperation : remoting version of move taxon operation
RemotingChangeAcceptedTaxonToSynonymOperation : replaced constructor input cdm entities to their uuids
RemotingCdmHandler : updated to handle other status severities and to handle warning status in post operation
RemotingCdmUpdateOperation : updated for warning status
TaxonNavigatorTest : added move taxon and move factual data tests
Cherian Mathew [Fri, 19 Jun 2015 08:31:18 +0000 (10:31 +0200)]
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
ICdmEntitySessionEnabled : extends new change service interface
ICdmEntitySession, CdmEntitySession : removed data change un/registration since this is now handled by the new data change service
BaseRemotingTest, MockCdmEntitySession, *Editor, *ViewPart, *Navigator : refactoring with new change listener
RemotingCdmHandler, RemotingCdmOperation, RemotingCdmUpdateOperation : added new handler / operation architecture base classes
AbstractUtility : added method for running async operation with callback to handler
RemotingChangeAcceptedTaxonToSynonymHandler,RemotingChangeAcceptedTaxonToSynonymOperation : first implementations of new handler / operation architecture
plugin.xml : added standalone and remoting handlers for ChangeAcceptedTaxonToSynonym
*Test : adapted for new handler / operation and change service
Cherian Mathew [Wed, 17 Jun 2015 16:24:02 +0000 (18:24 +0200)]
RemotingCdmUpdateOperation : corrected exception handling
RemotingChangeAcceptedTaxonToSynonymOperation : new remoting operation class
server.properties : server properties for test
Cherian Mathew [Fri, 19 Jun 2015 08:42:09 +0000 (10:42 +0200)]
rebase from remoting-4.0 branch
Cherian Mathew [Tue, 16 Jun 2015 11:43:56 +0000 (13:43 +0200)]
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
Cherian Mathew [Thu, 18 Jun 2015 13:33:34 +0000 (15:33 +0200)]
Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0
Cherian Mathew [Thu, 18 Jun 2015 13:24:27 +0000 (15:24 +0200)]
corrected pom merge
Andreas Müller [Thu, 18 Jun 2015 13:22:24 +0000 (15:22 +0200)]
Merge remote-tracking branch 'origin/develop' into develop
Cherian Mathew [Thu, 18 Jun 2015 13:17:06 +0000 (15:17 +0200)]
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
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
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientNameService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientReferenceService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTermService.java
eu.etaxonomy.taxeditor.test/.classpath
Andreas Müller [Thu, 18 Jun 2015 13:04:56 +0000 (15:04 +0200)]
minor
Cherian Mathew [Thu, 18 Jun 2015 12:29:22 +0000 (14:29 +0200)]
setting root logger setting to WARN
Cherian Mathew [Thu, 18 Jun 2015 12:08:37 +0000 (14:08 +0200)]
removed programmatic log level setting
Cherian Mathew [Thu, 18 Jun 2015 11:55:34 +0000 (13:55 +0200)]
corrected remote source to use initialzed cdm server
Cherian Mathew [Thu, 18 Jun 2015 10:58:11 +0000 (12:58 +0200)]
setting root loffer level to warn
Cherian Mathew [Thu, 18 Jun 2015 09:28:20 +0000 (11:28 +0200)]
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
Cherian Mathew [Thu, 18 Jun 2015 07:45:39 +0000 (09:45 +0200)]
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
Cherian Mathew [Wed, 17 Jun 2015 16:27:35 +0000 (18:27 +0200)]
ignoring bin folder
Patrick Plitzner [Tue, 16 Jun 2015 12:04:22 +0000 (14:04 +0200)]
Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/taxeditor into develop
Cherian Mathew [Tue, 16 Jun 2015 11:53:53 +0000 (13:53 +0200)]
fixing for compatibility with merged cdmlib
Cherian Mathew [Tue, 16 Jun 2015 08:24:03 +0000 (10:24 +0200)]
removing properties file from repo
Cherian Mathew [Tue, 16 Jun 2015 08:18:03 +0000 (10:18 +0200)]
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
cdmTest.*.db : latest test db
Cherian Mathew [Mon, 15 Jun 2015 14:21:12 +0000 (16:21 +0200)]
removed reference to cdm-server
Patrick Plitzner [Mon, 15 Jun 2015 14:11:56 +0000 (16:11 +0200)]
- added transient service methods
Andreas Müller [Mon, 15 Jun 2015 13:23:54 +0000 (15:23 +0200)]
add empty folder
Patrick Plitzner [Mon, 15 Jun 2015 13:08:22 +0000 (15:08 +0200)]
- fixed order of team members #4936
Patrick Plitzner [Mon, 15 Jun 2015 12:31:29 +0000 (14:31 +0200)]
- fixed NPE (#4937)
Patrick Plitzner [Mon, 15 Jun 2015 10:46:37 +0000 (12:46 +0200)]
- removed inBetween target for Derivative Editor (fixes #4966)
Patrick Plitzner [Mon, 15 Jun 2015 07:56:34 +0000 (09:56 +0200)]
- removed test folder
Patrick Plitzner [Mon, 15 Jun 2015 07:49:29 +0000 (09:49 +0200)]
Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop