Cherian Mathew [Fri, 12 Jun 2015 13:01:34 +0000 (15:01 +0200)]
BaseRemotingTest, RemotingSessionAwareTest : made abstract since there are not runnable tests
CdmEntitySessionManagerTest (.xml) : fixed test data
Cherian Mathew [Fri, 12 Jun 2015 12:29:20 +0000 (14:29 +0200)]
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
Cherian Mathew [Thu, 11 Jun 2015 15:50:02 +0000 (17:50 +0200)]
fixed issues with resource loading for maven int tests
Cherian Mathew [Thu, 11 Jun 2015 08:50:35 +0000 (10:50 +0200)]
corrected merge to latest snapshot version
updated hibernate config file and test db
setup testing framework with jetty and maven
Cherian Mathew [Tue, 9 Jun 2015 07:32:37 +0000 (09:32 +0200)]
fixed classpath issues and issues from last merge
Cherian Mathew [Fri, 5 Jun 2015 11:23:02 +0000 (13:23 +0200)]
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.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/operation/DeleteOperation.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/ChangeAcceptedTaxonToSynonymOperation.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/DeleteOperation.java
eu.etaxonomy.taxeditor.store/plugin.xml
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStoreConnector.java
edit-jenkins [Thu, 4 Jun 2015 13:49:43 +0000 (13:49 +0000)]
Updated version in config files to 3.6.1-SNAPSHOT
edit-jenkins [Thu, 4 Jun 2015 12:58:53 +0000 (12:58 +0000)]
Updated version in config files to 3.6.0
Patric Plitzner [Thu, 4 Jun 2015 11:23:45 +0000 (11:23 +0000)]
- added wizard page listener to react on ENTER key #4853
Patric Plitzner [Thu, 4 Jun 2015 10:57:39 +0000 (10:57 +0000)]
- added wizard page listener to react on ENTER key #4853
Patric Plitzner [Thu, 4 Jun 2015 10:54:32 +0000 (10:54 +0000)]
- added context menu entry for editing classifications
- used generic extension point for cdmViewer in navigation project (#4865)
Patric Plitzner [Thu, 4 Jun 2015 10:52:43 +0000 (10:52 +0000)]
- code conventions
Patric Plitzner [Thu, 4 Jun 2015 10:50:56 +0000 (10:50 +0000)]
- code conventions
Katja Luther [Thu, 4 Jun 2015 09:39:48 +0000 (09:39 +0000)]
minor
Katja Luther [Thu, 4 Jun 2015 09:09:52 +0000 (09:09 +0000)]
add checkbox for additional team members
Katja Luther [Wed, 3 Jun 2015 13:22:24 +0000 (13:22 +0000)]
change synonym to accepted taxon message when taxon could not be deleted
Katja Luther [Wed, 3 Jun 2015 13:19:59 +0000 (13:19 +0000)]
delete taxonnode if taxon is used somewhere else fixed
Cherian Mathew [Wed, 3 Jun 2015 12:50:15 +0000 (14:50 +0200)]
removed unused config and added comments
Cherian Mathew [Wed, 3 Jun 2015 12:38:20 +0000 (14:38 +0200)]
reset swtbot dependencies and set all swtbot tests to ignore for the moment
Cherian Mathew [Wed, 3 Jun 2015 11:59:24 +0000 (13:59 +0200)]
forgot to add in last commit
Cherian Mathew [Wed, 3 Jun 2015 11:56:16 +0000 (13:56 +0200)]
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
ContextManager.java : adding check to make sure the workbench is created before initialisation
eu.etaxonomy.taxeditor.test/.classpath : moved resource from src/main/resources to src/test/resourcesto be maven comliant
eu.etaxonomy.taxeditor.test/pom.xml : added tycho-surefire-plugin config to run tests
TaxonNameEditorTest : removed logger setting
BaseRemotingTest : removed unused call to disk cache
CdmPersistentRemoteSourceTest, AbstractLazyInitializerTest, RemoteLazyLoadingTest : changed assert calls to be compatible with junit 4.8.2
OperationTestBase, BaseRemotingTest : changed to abstract to not be included in test run
eu.etaxonomy.taxeditor/pom.xml : made the building of products as optional (separate profile)
pom.xml : added unitils version property
eu.etaxonomy.taxeditor.test/lib : added test dependency jars
Cherian Mathew [Wed, 3 Jun 2015 11:42:12 +0000 (13:42 +0200)]
moved reseources from src/main/resources to src/test/resources to be maven compliant
Katja Luther [Wed, 3 Jun 2015 07:55:09 +0000 (07:55 +0000)]
#4725
Katja Luther [Tue, 2 Jun 2015 12:51:38 +0000 (12:51 +0000)]
minor
Katja Luther [Tue, 2 Jun 2015 09:43:50 +0000 (09:43 +0000)]
fix for #3998
Cherian Mathew [Mon, 1 Jun 2015 15:57:23 +0000 (17:57 +0200)]
updated version numbers
Cherian Mathew [Mon, 1 Jun 2015 15:07:47 +0000 (17:07 +0200)]
CdmApplicationRemoteController : moved cdm model caching to start before application context init
CdmApplicationRemoteConfiguration : moved bean initialization from autowiring to getBean in getters for better performance
httpInvokerServiceClients.xml : changed init startegy for services to lazy init
CdmModelCacher : commented out logging
Patric Plitzner [Mon, 1 Jun 2015 08:05:33 +0000 (08:05 +0000)]
- fixed compile error and possible NPE #4810
Cherian Mathew [Fri, 29 May 2015 16:33:14 +0000 (18:33 +0200)]
MANIFEST.MF : added apache commons exception package for use in messaging utils
MessagingUtils : updated to add all causes in the child statuses
Cherian Mathew [Fri, 29 May 2015 14:21:50 +0000 (16:21 +0200)]
Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/taxeditor
Cherian Mathew [Fri, 29 May 2015 14:16:34 +0000 (16:16 +0200)]
DefinedTermDropAdapter : added selection of source objects after drop and disabled insert feedback for non OrderedTermBase objects
DefinedTermEditor : added custom sorter for OrderedTermBase (descending)
MoveDefinedTermOperation : added possibility to move term when cursor is in the insert part of the list
Katja Luther [Thu, 28 May 2015 12:08:37 +0000 (12:08 +0000)]
new session for every search in bulk editor
Andreas M��ller [Thu, 28 May 2015 11:58:16 +0000 (11:58 +0000)]
Improve error message
Cherian Mathew [Thu, 28 May 2015 11:14:15 +0000 (13:14 +0200)]
Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/taxeditor
Cherian Mathew [Thu, 28 May 2015 11:13:24 +0000 (13:13 +0200)]
replaced simple editor-datasource compatibility check with version comparison check
Katja Luther [Thu, 28 May 2015 09:09:42 +0000 (09:09 +0000)]
fixing the disabling of the ToggleableTextElement when the titlecache is protected.
Cherian Mathew [Thu, 28 May 2015 08:45:13 +0000 (10:45 +0200)]
added comment for sync get method call
Andreas M��ller [Thu, 28 May 2015 08:28:59 +0000 (08:28 +0000)]
fix potential NPE
Andreas M��ller [Wed, 27 May 2015 16:18:28 +0000 (16:18 +0000)]
cleanup
Andreas M��ller [Wed, 27 May 2015 16:10:04 +0000 (16:10 +0000)]
minor
Andreas M��ller [Wed, 27 May 2015 16:09:35 +0000 (16:09 +0000)]
clean up
Cherian Mathew [Wed, 27 May 2015 15:54:53 +0000 (17:54 +0200)]
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
httpInvokerServiceClients.xml : removed lazy loading of beans
Andreas M��ller [Wed, 27 May 2015 15:52:31 +0000 (15:52 +0000)]
Renaming menu labels for new team and person
Andreas M��ller [Wed, 27 May 2015 15:11:31 +0000 (15:11 +0000)]
use plural for bulk editor labels
Andreas M��ller [Wed, 27 May 2015 15:00:04 +0000 (15:00 +0000)]
minor
Patric Plitzner [Wed, 27 May 2015 12:09:35 +0000 (12:09 +0000)]
- fixed preferences for adding vocabulary name to term label #4448
Cherian Mathew [Wed, 27 May 2015 12:07:33 +0000 (14:07 +0200)]
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
remotingApplicationContext : merged imported bean definition files into this one
CdmApplicationRemoteControllerTest : test for application controller
RemotingMonitoredGenericApplicationContext, RemotingMonitoredListableBeanFactory : removed since specific monitoring is not required in remoting
remoting_persistence_security.xml, remoting_services_security.xml : merged into remotingApplicationContext
Patric Plitzner [Wed, 27 May 2015 07:12:05 +0000 (07:12 +0000)]
- added preferences for vocabulary names in term labels #4448
Patric Plitzner [Wed, 27 May 2015 06:54:07 +0000 (06:54 +0000)]
- combo dropdowns intitially show an empty field which is now removed when selecting any other entry
- added vocabulary information to term label #4448
Cherian Mathew [Tue, 26 May 2015 16:23:57 +0000 (18:23 +0200)]
corrected app context generation
Cherian Mathew [Tue, 26 May 2015 16:18:12 +0000 (18:18 +0200)]
- corrected recursive autowiring
- changed application context loading to be more performant
Patric Plitzner [Tue, 26 May 2015 15:07:14 +0000 (15:07 +0000)]
- removed empty element from combo dropdown #4448
Andreas M��ller [Tue, 26 May 2015 11:42:57 +0000 (11:42 +0000)]
moving UuidAndTitleCache from model to persistence (changes in Editor). #4799
Patric Plitzner [Tue, 26 May 2015 10:52:36 +0000 (10:52 +0000)]
- initially expand modifier section if modifiers exist #4448
Patric Plitzner [Tue, 26 May 2015 10:40:46 +0000 (10:40 +0000)]
- moved OriginalLabel above sources #4776
Patric Plitzner [Tue, 26 May 2015 10:38:25 +0000 (10:38 +0000)]
- fixed copy&paste error #4799
Patric Plitzner [Tue, 26 May 2015 09:40:10 +0000 (09:40 +0000)]
- refactored naming of modifier section #4448
Patric Plitzner [Tue, 26 May 2015 09:30:38 +0000 (09:30 +0000)]
- fixed NPE (#4448)
Patric Plitzner [Tue, 26 May 2015 08:59:50 +0000 (08:59 +0000)]
- fixed NPE (#4883)
Patric Plitzner [Tue, 26 May 2015 08:52:11 +0000 (08:52 +0000)]
- added identifier section to specimen details view
Patric Plitzner [Tue, 26 May 2015 08:28:06 +0000 (08:28 +0000)]
- moved OriginalLabelData to specimen details section (#4776)
Patric Plitzner [Tue, 26 May 2015 07:04:04 +0000 (07:04 +0000)]
- added id to entity selection dialogs (#4799)
Patric Plitzner [Tue, 26 May 2015 06:41:36 +0000 (06:41 +0000)]
- adding of empty persons to teams via DetailsView is not possible anymore (#4913)
Cherian Mathew [Fri, 22 May 2015 17:10:55 +0000 (19:10 +0200)]
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
Cherian Mathew [Fri, 22 May 2015 09:37:12 +0000 (11:37 +0200)]
fixed problems with new classes in merge
Cherian Mathew [Fri, 22 May 2015 09:25:01 +0000 (11:25 +0200)]
fixed problems with merge
Cherian Mathew [Fri, 22 May 2015 08:54:21 +0000 (10:54 +0200)]
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
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/TaxonNameEditor.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/TransientTaxonService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/DeleteTaxonDescriptionOperation.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TreeNodeDropAdapterAssistant.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/MoveTaxonHandler.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/ChangeAcceptedTaxonToSynonymOperation.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/MoveTaxonOperation.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/parser/MatchStrategyConfigurator.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/parser/ParseHandler.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStoreConnector.java
eu.etaxonomy.taxeditor.test/.classpath
eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
Cherian Mathew [Thu, 21 May 2015 16:51:35 +0000 (18:51 +0200)]
removed test dir as source dir
Cherian Mathew [Thu, 21 May 2015 13:16:55 +0000 (15:16 +0200)]
Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/taxeditor
Cherian Mathew [Thu, 21 May 2015 13:07:59 +0000 (15:07 +0200)]
corrected visibility check for edit authorities editor
Cherian Mathew [Thu, 21 May 2015 13:07:59 +0000 (15:07 +0200)]
corrected visibility check for edit authorities editor
Andreas M��ller [Thu, 21 May 2015 12:44:33 +0000 (12:44 +0000)]
fix UTF-8 issue in menu label
Cherian Mathew [Thu, 21 May 2015 11:50:15 +0000 (13:50 +0200)]
MANIFEST.MF, feature.xml : removed dependency on specific versions
rcp.target : added vm arguments
Cherian Mathew [Thu, 21 May 2015 09:59:00 +0000 (11:59 +0200)]
corrected target definition
Cherian Mathew [Thu, 21 May 2015 09:33:44 +0000 (11:33 +0200)]
Merge remote-tracking branch 'origin/master' into move-to-luna
Andreas M��ller [Wed, 20 May 2015 17:35:04 +0000 (17:35 +0000)]
added id to uuidAndTitleCache fixes in TaxEditor #4799
Cherian Mathew [Wed, 20 May 2015 17:17:48 +0000 (19:17 +0200)]
changed nebula update site to the stable release url
Cherian Mathew [Wed, 20 May 2015 17:16:46 +0000 (19:16 +0200)]
dependency changes to move to e4
Cherian Mathew [Wed, 20 May 2015 14:26:09 +0000 (14:26 +0000)]
Cherian Mathew [Wed, 20 May 2015 14:05:50 +0000 (14:05 +0000)]
.classpath, MANIFEST.MF, build.properties, pom.xml : added cdm-server jar to lib dir and project classpath
/lib : added ignore for cdm-server jar
CacheLoader : reverted update of cached entity field
cdmlib-remote-webapp.war : updated to latest version
Cherian Mathew [Wed, 20 May 2015 12:31:34 +0000 (12:31 +0000)]
corrected usage of service calls returning update/delete result objects
Cherian Mathew [Wed, 20 May 2015 12:24:16 +0000 (12:24 +0000)]
InspectSessionsDialog : added filtering
CdmStore : clearing caches and session before connecting
ParseHandler : using NonViralName instead of TaxonNameBase
AbstractPostTaxonOperation, AbstractPostOperation, AbstractPersistentPostOperation : added CdmEntitySessionEnabled object to constructor
NewTaxonNodeWizard : explicitly fire changes
Cherian Mathew [Wed, 20 May 2015 12:16:41 +0000 (12:16 +0000)]
corrected / moved existing tests
Cherian Mathew [Wed, 20 May 2015 12:12:31 +0000 (12:12 +0000)]
added cdm entitysession enabled objects to operations
Cherian Mathew [Wed, 20 May 2015 12:00:29 +0000 (12:00 +0000)]
CdmTransientEntityCacher : adding cache to default cache manager
EntityCacherDebugResult : corrections
cdmlib-remote-webapp.war : new version
Katja Luther [Wed, 20 May 2015 10:59:15 +0000 (10:59 +0000)]
#4907 create in agent bulkeditor has no effect
Andreas Müller [Tue, 19 May 2015 15:05:32 +0000 (15:05 +0000)]
remove syso
Andreas Müller [Mon, 18 May 2015 15:18:05 +0000 (15:18 +0000)]
minor
Patric Plitzner [Mon, 18 May 2015 13:04:58 +0000 (13:04 +0000)]
- deproxy CDM entities to get correct class as part title of DetailsView
Patric Plitzner [Mon, 18 May 2015 12:45:08 +0000 (12:45 +0000)]
- show recordBasis for specimens as part title of DetailsView
Patric Plitzner [Mon, 18 May 2015 11:03:53 +0000 (11:03 +0000)]
- simplified part title of DetailsView
Katja Luther [Mon, 18 May 2015 09:59:52 +0000 (09:59 +0000)]
bulkeditor: merge of teams and persons and convert team to person and person to team
Patric Plitzner [Wed, 13 May 2015 13:08:28 +0000 (13:08 +0000)]
- unified section headers for derivative details view
- show selected element in part title of DetailsView
Patric Plitzner [Wed, 13 May 2015 09:37:41 +0000 (09:37 +0000)]
- fixed filtering by specimen type (UNKNOWN = wild card)
Patric Plitzner [Wed, 13 May 2015 09:07:33 +0000 (09:07 +0000)]
- added transient service methods
Patric Plitzner [Wed, 13 May 2015 08:07:10 +0000 (08:07 +0000)]
- when searching for a taxon also the indirectly associated specimens of the derivative hierarchy are shown
Patric Plitzner [Mon, 11 May 2015 12:46:39 +0000 (12:46 +0000)]
- missing @Override
Katja Luther [Mon, 11 May 2015 11:49:42 +0000 (11:49 +0000)]
minor
Katja Luther [Mon, 11 May 2015 11:48:09 +0000 (11:48 +0000)]
natural order preferences
Katja Luther [Mon, 11 May 2015 11:47:30 +0000 (11:47 +0000)]
add dialog for the natural order preference
BGBM BDI Projects / taxeditor.git / log