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
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
pplitzner [Mon, 15 Jun 2015 07:46:19 +0000 (09:46 +0200)]
- removed test folder from classpatch
Andreas Müller [Fri, 12 Jun 2015 15:37:21 +0000 (17:37 +0200)]
fix umlaute in key menus and add gitignore for rcp.target
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 [Mon, 8 Jun 2015 11:00:15 +0000 (13:00 +0200)]
fixed manifest versions
Cherian Mathew [Mon, 8 Jun 2015 10:22:13 +0000 (12:22 +0200)]
new .gitignore file
Cherian Mathew [Mon, 8 Jun 2015 10:20:28 +0000 (12:20 +0200)]
removed test source from classpath
Cherian Mathew [Mon, 8 Jun 2015 10:13:56 +0000 (12:13 +0200)]
fixed update to snapshot
Cherian Mathew [Mon, 8 Jun 2015 08:26:47 +0000 (10:26 +0200)]
corrected cdmlib version to snapshot
Cherian Mathew [Fri, 5 Jun 2015 16:16:58 +0000 (18:16 +0200)]
Updating develop poms back to pre merge state
Cherian Mathew [Fri, 5 Jun 2015 16:16:57 +0000 (18:16 +0200)]
Merge branch 'master' into develop
Cherian Mathew [Fri, 5 Jun 2015 16:16:57 +0000 (18:16 +0200)]
Updating develop poms to hotfix version to avoid merge conflicts
Cherian Mathew [Fri, 5 Jun 2015 16:16:56 +0000 (18:16 +0200)]
Merge branch 'hotfix/3.6.1'
Cherian Mathew [Fri, 5 Jun 2015 16:16:54 +0000 (18:16 +0200)]
updating poms for branch'hotfix/3.6.1' with non-snapshot versions
Cherian Mathew [Fri, 5 Jun 2015 16:15:54 +0000 (18:15 +0200)]
version updates for 3.6.1
Cherian Mathew [Fri, 5 Jun 2015 15:55:12 +0000 (17:55 +0200)]
updating poms for branch '3.6.1' with snapshot versions
Cherian Mathew [Fri, 5 Jun 2015 15:53:49 +0000 (17:53 +0200)]
fixing classpath config
Cherian Mathew [Fri, 5 Jun 2015 15:51:50 +0000 (17:51 +0200)]
fixing classpath config
Cherian Mathew [Fri, 5 Jun 2015 14:42:11 +0000 (16:42 +0200)]
Release 3.6.0 merge
Cherian Mathew [Fri, 5 Jun 2015 14:31:17 +0000 (16:31 +0200)]
merged jgitfow plugin
Cherian Mathew [Fri, 5 Jun 2015 14:12:48 +0000 (16:12 +0200)]
merged for gitflow plugin
Cherian Mathew [Fri, 5 Jun 2015 14:07:00 +0000 (16:07 +0200)]
added jgitflow plugin
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
Patric Plitzner [Thu, 4 Jun 2015 16:43:56 +0000 (16:43 +0000)]
- updating versions due to release
Cherian Mathew [Thu, 4 Jun 2015 13:55:14 +0000 (15:55 +0200)]
updated to snapshot version
Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/taxeditor into develop
Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath
edit-jenkins [Thu, 4 Jun 2015 13:49:43 +0000 (13:49 +0000)]
Updated version in config files to 3.6.1-SNAPSHOT
Cherian Mathew [Thu, 4 Jun 2015 13:30:07 +0000 (15:30 +0200)]
Merge branch 'move-to-luna' of wp5.e-taxonomy.eu:/var/git/taxeditor into develop
Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath
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