Katja Luther [Thu, 18 Jun 2015 12:59:38 +0000 (12:59 +0000)]
minor
Katja Luther [Thu, 18 Jun 2015 12:50:54 +0000 (12:50 +0000)]
forgot to check in the changes
Katja Luther [Thu, 18 Jun 2015 12:46:20 +0000 (12:46 +0000)]
- add @Audited to all type properties
- add taxonNodeComparator for rank and alphabetical orderedVocabularyDao
- change delete() methods arguments to UUIDs
Andreas Müller [Thu, 18 Jun 2015 11:18:02 +0000 (13:18 +0200)]
Merge branch 'RankSpecificRootNodes-1'
Andreas Müller [Thu, 18 Jun 2015 11:11:45 +0000 (13:11 +0200)]
Fixing test for listRankSpecificRootNodes
Katja Luther [Thu, 18 Jun 2015 09:58:23 +0000 (09:58 +0000)]
add @Audited to the argument type
Andreas Müller [Thu, 18 Jun 2015 09:48:16 +0000 (11:48 +0200)]
fix listRankSpecificRootNodes behavior for ranks in between and some
additional tests
Cherian Mathew [Thu, 18 Jun 2015 09:22:48 +0000 (11:22 +0200)]
Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/cdmlib
Cherian Mathew [Thu, 18 Jun 2015 09:14:06 +0000 (11:14 +0200)]
IUserService, UserService : added db check methods
remoting-services : moved database service to be included in security filter
Andreas Müller [Thu, 18 Jun 2015 08:31:49 +0000 (10:31 +0200)]
Merge branch 'RankSpecificRootNodes-1'
Andreas Müller [Wed, 17 Jun 2015 17:31:40 +0000 (19:31 +0200)]
Merge branch 'master' of ssh://dev.e-taxonomy.eu/var/git/cdmlib
Andreas Müller [Wed, 17 Jun 2015 16:38:34 +0000 (18:38 +0200)]
some additional test for #2778
Andreas Müller [Wed, 17 Jun 2015 16:29:15 +0000 (18:29 +0200)]
add some tests for rankSpecificRootNodes, related to #2778
Andreas Müller [Wed, 17 Jun 2015 15:04:14 +0000 (17:04 +0200)]
Merge branch 'RankSpecificRootNodes-1' of https://dev.e-taxonomy.eu/git/cdmlib into RankSpecificRootNodes-1
Andreas Kohlbecker [Thu, 21 May 2015 09:15:30 +0000 (11:15 +0200)]
avoiding LEFT OUTER JOIN by splitting query in two
Andreas Kohlbecker [Wed, 17 Jun 2015 14:23:38 +0000 (16:23 +0200)]
adding support for https in UriUtils
Andreas Kohlbecker [Thu, 21 May 2015 09:15:30 +0000 (11:15 +0200)]
avoiding LEFT OUTER JOIN by splitting query in two
Andreas Müller [Wed, 17 Jun 2015 13:07:24 +0000 (15:07 +0200)]
cleanup dataset
Andreas Müller [Wed, 17 Jun 2015 12:42:09 +0000 (14:42 +0200)]
fix testdata for #2778
Andreas Müller [Wed, 17 Jun 2015 12:34:25 +0000 (14:34 +0200)]
fixing missing LanguageString in test dataset for #2778. However, test
still fails.
Patric Plitzner [Wed, 17 Jun 2015 11:07:58 +0000 (11:07 +0000)]
test commit
Andreas Kohlbecker [Tue, 16 Jun 2015 16:05:29 +0000 (16:05 +0000)]
only a test
Andreas Kohlbecker [Tue, 16 Jun 2015 16:05:12 +0000 (16:05 +0000)]
only a test
Andreas Müller [Tue, 16 Jun 2015 14:20:04 +0000 (16:20 +0200)]
fix #4976 Titlecache for new vocabularies not filled correctly
Andreas Müller [Tue, 16 Jun 2015 14:16:08 +0000 (16:16 +0200)]
minor cleanup
Andreas Müller [Tue, 16 Jun 2015 14:14:57 +0000 (16:14 +0200)]
minor cleanup
Cherian Mathew [Mon, 15 Jun 2015 13:44:07 +0000 (15:44 +0200)]
merging test file from remote master
Cherian Mathew [Mon, 15 Jun 2015 12:24:14 +0000 (14:24 +0200)]
DescriptionServiceImpl : added dao delete of description
OccurrenceServiceDeepDeleteTest : removed extra delete call
TaxonServiceImplTest : added testing of taxon.removeDescription
Cherian Mathew [Fri, 12 Jun 2015 16:35:51 +0000 (18:35 +0200)]
correcting wrong merge
Cherian Mathew [Fri, 12 Jun 2015 15:39:08 +0000 (17:39 +0200)]
pushing delete to end of method to fix problem with merge
Cherian Mathew [Mon, 15 Jun 2015 12:47:42 +0000 (14:47 +0200)]
Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/cdmlib
Andreas Kohlbecker [Mon, 15 Jun 2015 12:09:30 +0000 (14:09 +0200)]
implementing modifications requested in #2880
Patric Plitzner [Mon, 15 Jun 2015 11:36:53 +0000 (11:36 +0000)]
- correctly cleaned up between test invocations
Patric Plitzner [Mon, 15 Jun 2015 11:33:50 +0000 (11:33 +0000)]
- added missing table column to test DB
Andreas Kohlbecker [Mon, 15 Jun 2015 10:23:22 +0000 (12:23 +0200)]
implementing test to reproduce issue #2778 - the test runs succesfully, so the issue is already solved
Andreas Kohlbecker [Mon, 15 Jun 2015 10:20:15 +0000 (12:20 +0200)]
providing a example implementation of createTestDataSet()
Patric Plitzner [Mon, 15 Jun 2015 07:05:35 +0000 (07:05 +0000)]
- added test for "ignoreAuthorship" option
Patric Plitzner [Mon, 15 Jun 2015 07:05:00 +0000 (07:05 +0000)]
- text formatting
Patric Plitzner [Mon, 15 Jun 2015 07:04:50 +0000 (07:04 +0000)]
- re-enabled dna quality parsing
Cherian Mathew [Fri, 12 Jun 2015 10:50:25 +0000 (12:50 +0200)]
Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/cdmlib into remoting-4.0
Conflicts:
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImpl.java
Cherian Mathew [Fri, 12 Jun 2015 10:48:34 +0000 (12:48 +0200)]
reverting back last change
Cherian Mathew [Fri, 12 Jun 2015 10:26:37 +0000 (12:26 +0200)]
CdmCacher : corrected initializing of default cache
defaultApplicationContext : replaced component scan of cache with specific bean initialization
Andreas Kohlbecker [Thu, 11 Jun 2015 12:33:02 +0000 (14:33 +0200)]
fixing bug in last commit regarding #4974 (AdvancedBeanInitializer causes error with eu.etaxonomy.cdm.model.description.KeyStatement)
Andreas Kohlbecker [Thu, 11 Jun 2015 11:16:30 +0000 (13:16 +0200)]
fixing #4974 (AdvancedBeanInitializer causes error with eu.etaxonomy.cdm.model.description.KeyStatement)
Katja Luther [Thu, 11 Jun 2015 09:31:20 +0000 (09:31 +0000)]
adapt csv export for caryophyllales
Andreas M��ller [Tue, 9 Jun 2015 14:46:52 +0000 (14:46 +0000)]
minor
Patric Plitzner [Tue, 9 Jun 2015 14:13:04 +0000 (14:13 +0000)]
- added test to ignore because data base conflicts for later tests
Patric Plitzner [Tue, 9 Jun 2015 13:59:48 +0000 (13:59 +0000)]
- added test to ignore because data base conflicts for later tests
Patric Plitzner [Tue, 9 Jun 2015 12:23:28 +0000 (12:23 +0000)]
- cleanup DB after test run
Andreas M��ller [Tue, 9 Jun 2015 10:52:31 +0000 (10:52 +0000)]
minor
Andreas M��ller [Tue, 9 Jun 2015 10:51:47 +0000 (10:51 +0000)]
add override
Andreas Kohlbecker [Tue, 9 Jun 2015 10:19:33 +0000 (12:19 +0200)]
disabling sql tracing in logs
Andreas Kohlbecker [Tue, 9 Jun 2015 10:18:40 +0000 (12:18 +0200)]
fixing #4965 unsupported method getDatabase() in WrappedCdmDataSource breaks forceSchemaUpdate
Patric Plitzner [Tue, 9 Jun 2015 07:40:41 +0000 (07:40 +0000)]
- added more ggbn ABCD parameters to import and test
Cherian Mathew [Mon, 8 Jun 2015 11:18:27 +0000 (13:18 +0200)]
corrected duplicate methods and unimplemented method issue
Cherian Mathew [Mon, 8 Jun 2015 11:08:01 +0000 (13:08 +0200)]
Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/cdmlib into remoting-4.0
Conflicts:
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTerm.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NonViralName.java
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/INameService.java
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IPolytomousKeyNodeService.java
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonNodeService.java
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NameServiceImpl.java
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/PolytomousKeyNodeServiceImpl.java
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImpl.java
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonServiceImpl.java
Patric Plitzner [Mon, 8 Jun 2015 08:28:10 +0000 (08:28 +0000)]
- added more parameters to GGBN parser and test
Patric Plitzner [Fri, 5 Jun 2015 15:14:30 +0000 (15:14 +0000)]
- added more ggbn parameters
Andreas M��ller [Fri, 5 Jun 2015 12:54:00 +0000 (12:54 +0000)]
define default sort mode #4226
Andreas M��ller [Fri, 5 Jun 2015 12:36:06 +0000 (12:36 +0000)]
Adapt enum names for NodeSortMode #4226
Andreas M��ller [Fri, 5 Jun 2015 12:35:00 +0000 (12:35 +0000)]
minor
Andreas M��ller [Thu, 4 Jun 2015 14:30:31 +0000 (14:30 +0000)]
minor
Andreas M��ller [Thu, 4 Jun 2015 14:26:13 +0000 (14:26 +0000)]
hotfix for MN_Table_Remover
Andreas M��ller [Thu, 4 Jun 2015 14:25:05 +0000 (14:25 +0000)]
improve handling of substeps in update scripts (immediately stop updating if one step fails)
Andreas M��ller [Thu, 4 Jun 2015 14:24:23 +0000 (14:24 +0000)]
hotfix for SchemaUpdater_35_36
edit-jenkins [Thu, 4 Jun 2015 11:42:56 +0000 (11:42 +0000)]
[maven-release-plugin] prepare for next development iteration
edit-jenkins [Thu, 4 Jun 2015 11:42:48 +0000 (11:42 +0000)]
[maven-release-plugin] prepare release cdmlib-parent-3.6.0
Andreas M��ller [Thu, 4 Jun 2015 10:45:54 +0000 (10:45 +0000)]
change order of update steps
Katja Luther [Thu, 4 Jun 2015 09:33:09 +0000 (09:33 +0000)]
fix team cache strategy, add et al. if hasMoreMembers is set
Andreas M��ller [Wed, 3 Jun 2015 17:44:15 +0000 (17:44 +0000)]
fix caseType bug for IndexDropper #4843
Andreas M��ller [Wed, 3 Jun 2015 16:56:29 +0000 (16:56 +0000)]
update cdmlib-remote-webapp test h2 to model 3.6
Andreas Kohlbecker [Wed, 3 Jun 2015 15:20:36 +0000 (17:20 +0200)]
fixing broken image in swagger-ui
Katja Luther [Wed, 3 Jun 2015 13:19:22 +0000 (13:19 +0000)]
delete taxonnode if taxon is used somewhere else fixed
Andreas M��ller [Wed, 3 Jun 2015 13:00:15 +0000 (13:00 +0000)]
merge model changes 36 into trunk
Andreas M��ller [Wed, 3 Jun 2015 12:56:51 +0000 (12:56 +0000)]
minor
Andreas M��ller [Wed, 3 Jun 2015 12:56:25 +0000 (12:56 +0000)]
merge trunk into branch 36
Andreas M��ller [Wed, 3 Jun 2015 12:48:13 +0000 (12:48 +0000)]
merge trunk into 36 branch
Andreas M��ller [Wed, 3 Jun 2015 11:00:41 +0000 (11:00 +0000)]
jaxb annotation fixed for agentRelations #3583
Andreas M��ller [Wed, 3 Jun 2015 11:00:01 +0000 (11:00 +0000)]
rename authorTeam -> authorship #4332 for name authors
Andreas M��ller [Tue, 2 Jun 2015 22:30:13 +0000 (22:30 +0000)]
Fix UniqueIndexDropper for PostGreSQL #4843
Andreas M��ller [Tue, 2 Jun 2015 12:47:27 +0000 (12:47 +0000)]
merge trunk into 3.6 branch
Andreas M��ller [Tue, 2 Jun 2015 12:43:24 +0000 (12:43 +0000)]
merge trunk into 3.6 branch
Katja Luther [Tue, 2 Jun 2015 12:41:38 +0000 (12:41 +0000)]
minor
Katja Luther [Tue, 2 Jun 2015 12:39:47 +0000 (12:39 +0000)]
minor
Katja Luther [Tue, 2 Jun 2015 12:36:14 +0000 (12:36 +0000)]
minor
Andreas M��ller [Tue, 2 Jun 2015 12:33:30 +0000 (12:33 +0000)]
minor
Andreas M��ller [Tue, 2 Jun 2015 12:32:48 +0000 (12:32 +0000)]
minor
Andreas M��ller [Tue, 2 Jun 2015 12:32:10 +0000 (12:32 +0000)]
minor
Andreas M��ller [Tue, 2 Jun 2015 12:25:48 +0000 (12:25 +0000)]
minor
Andreas M��ller [Tue, 2 Jun 2015 12:24:57 +0000 (12:24 +0000)]
Move FullCoverageDataGenerator from test to real, to avoid dependency problems.
Katja Luther [Tue, 2 Jun 2015 12:14:07 +0000 (12:14 +0000)]
last changes for #4869
Katja Luther [Tue, 2 Jun 2015 11:44:51 +0000 (11:44 +0000)]
add SortMode enum and change the param for sorting of loadChildNodesOfTaxonNode from boolean to SortMode enum see #4226
Andreas Kohlbecker [Tue, 2 Jun 2015 10:47:52 +0000 (12:47 +0200)]
performance improvement in AbstractBeanProcessor.getMergedExcludes(), avoids the merging of the collection each time the processBean() method is called, this can take place several 10 thousand times for one request - contributes to #4925
Andreas Kohlbecker [Tue, 2 Jun 2015 10:44:10 +0000 (12:44 +0200)]
missing @Override
Katja Luther [Tue, 2 Jun 2015 09:43:06 +0000 (09:43 +0000)]
changes for #3998
Andreas M��ller [Mon, 1 Jun 2015 15:21:11 +0000 (15:21 +0000)]
remove dependeny to test (FullDataCoverage...)
Andreas M��ller [Mon, 1 Jun 2015 14:54:57 +0000 (14:54 +0000)]
adapt FullCoverageData method
Andreas M��ller [Mon, 1 Jun 2015 14:54:07 +0000 (14:54 +0000)]
fix setStatisticalValue method
Andreas M��ller [Mon, 1 Jun 2015 14:53:34 +0000 (14:53 +0000)]
minor
Andreas Kohlbecker [Mon, 1 Jun 2015 10:45:45 +0000 (12:45 +0200)]
adding c3p0 as test dependency - contibution to #4955