jenkins [Thu, 29 Aug 2019 16:35:01 +0000 (18:35 +0200)]
Updating develop poms back to pre merge state
jenkins [Thu, 29 Aug 2019 16:35:00 +0000 (18:35 +0200)]
Merge branch 'master' into develop
jenkins [Thu, 29 Aug 2019 16:34:59 +0000 (18:34 +0200)]
updating develop poms to master versions to avoid merge conflicts
jenkins [Thu, 29 Aug 2019 16:34:55 +0000 (18:34 +0200)]
Merge branch 'release/5.9.0'
jenkins [Thu, 29 Aug 2019 16:17:06 +0000 (18:17 +0200)]
updating poms for branch'release/5.9.0' with non-snapshot versions
jenkins [Thu, 29 Aug 2019 14:11:25 +0000 (16:11 +0200)]
updating poms for 5.10.0-SNAPSHOT development
Patrick Plitzner [Thu, 29 Aug 2019 14:06:52 +0000 (16:06 +0200)]
ref #8248 Minor fixes for session saving
Andreas Müller [Thu, 29 Aug 2019 13:04:58 +0000 (15:04 +0200)]
ref #8441 remove cascading from FeatureState.feature and .state
Katja Luther [Thu, 29 Aug 2019 08:58:28 +0000 (10:58 +0200)]
avoid NPE in abcd import
Katja Luther [Thu, 29 Aug 2019 08:52:37 +0000 (10:52 +0200)]
smaller issues in Abcd import
Patrick Plitzner [Thu, 29 Aug 2019 07:11:44 +0000 (09:11 +0200)]
ref #8248 Check existing feature/state of FeatureState during import
Patrick Plitzner [Thu, 29 Aug 2019 07:10:43 +0000 (09:10 +0200)]
ref #8248 Adapt to new term node service
Patrick Plitzner [Wed, 28 Aug 2019 14:46:22 +0000 (16:46 +0200)]
ref #8248 Fix import of character structure and property
Katja Luther [Wed, 28 Aug 2019 13:25:28 +0000 (15:25 +0200)]
Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/cdmlib into develop
Katja Luther [Wed, 28 Aug 2019 13:24:04 +0000 (15:24 +0200)]
SpecimenTypeDesignation representations for names
Patrick Plitzner [Wed, 28 Aug 2019 12:53:09 +0000 (14:53 +0200)]
ref #8248 Import applicability feature states
Patrick Plitzner [Wed, 28 Aug 2019 10:57:28 +0000 (12:57 +0200)]
ref #6774 export feature states
Patrick Plitzner [Wed, 28 Aug 2019 10:14:44 +0000 (12:14 +0200)]
ref #6794 Fix endless loop in OWL export
Patrick Plitzner [Wed, 28 Aug 2019 09:33:00 +0000 (11:33 +0200)]
ref #6794 Add progress monitor break point
Patrick Plitzner [Wed, 28 Aug 2019 09:32:46 +0000 (11:32 +0200)]
ref #6794 Fix potential ClassCastException
Katja Luther [Wed, 28 Aug 2019 07:17:01 +0000 (09:17 +0200)]
adapt cdm light column names
Andreas Müller [Wed, 28 Aug 2019 00:06:09 +0000 (02:06 +0200)]
fix NPE in setNomenclaturalSource
Andreas Müller [Wed, 28 Aug 2019 00:05:45 +0000 (02:05 +0200)]
revert JAXB issues on NamedArea
Andreas Müller [Wed, 28 Aug 2019 00:05:25 +0000 (02:05 +0200)]
cleanup
Andreas Müller [Tue, 27 Aug 2019 23:43:04 +0000 (01:43 +0200)]
remove redundant JAXB parameters from NamedArea
Andreas Müller [Tue, 27 Aug 2019 23:42:19 +0000 (01:42 +0200)]
ref #8479 add listUUIDs method
Andreas Müller [Tue, 27 Aug 2019 23:41:49 +0000 (01:41 +0200)]
cleanup
Andreas Müller [Tue, 27 Aug 2019 14:36:07 +0000 (16:36 +0200)]
improved logging for TaxonNode with missing sortIndex
Andreas Müller [Tue, 27 Aug 2019 14:35:37 +0000 (16:35 +0200)]
ref #8479 propertyPaths fix for TermVocabulary
Andreas Müller [Tue, 27 Aug 2019 14:32:45 +0000 (16:32 +0200)]
ref #8479 add concurrency, TaxonNodeOutStreamPartitionerConcurrent
Andreas Müller [Tue, 27 Aug 2019 14:26:24 +0000 (16:26 +0200)]
ref #8479 ordering for taxon nodes implemented in TaxonNodeFilter and in loadById
Andreas Müller [Tue, 27 Aug 2019 13:28:00 +0000 (15:28 +0200)]
ref #8479 propertyPaths for TaxonNodeOutStreamPartitioner and introduce interface ITaxonNodeOutStreamPartitioner
Andreas Müller [Tue, 27 Aug 2019 13:02:19 +0000 (15:02 +0200)]
minor
Katja Luther [Tue, 27 Aug 2019 10:06:50 +0000 (12:06 +0200)]
ref #8385: label issues
Katja Luther [Tue, 27 Aug 2019 07:08:51 +0000 (09:08 +0200)]
ref #8299: CdmLightExportTable new column
Katja Luther [Mon, 26 Aug 2019 12:55:17 +0000 (14:55 +0200)]
ref #8299: add TypeCache and TypeString to homotypical group table
Andreas Müller [Sun, 25 Aug 2019 11:35:09 +0000 (13:35 +0200)]
ref #8479 allow manual last commit for TaxonNodeOutStreamPartitioner
Andreas Müller [Fri, 23 Aug 2019 22:44:21 +0000 (00:44 +0200)]
allow TaxonNodeOutStreamPartitioner to be readOnly = false and use in in CsvNameExport preliminary
Andreas Müller [Fri, 23 Aug 2019 22:43:31 +0000 (00:43 +0200)]
cleanup
Andreas Müller [Fri, 23 Aug 2019 21:55:24 +0000 (23:55 +0200)]
remove setRollbackOnly to test if this causes exception in TaxEditor tests. Also it looks like it should be used only in specific contexts
Andreas Müller [Fri, 23 Aug 2019 21:54:07 +0000 (23:54 +0200)]
rename rollback method
Andreas Müller [Fri, 23 Aug 2019 21:53:25 +0000 (23:53 +0200)]
cleanup
Andreas Müller [Fri, 23 Aug 2019 21:07:12 +0000 (23:07 +0200)]
add rollback to ICdmRepository and use in TaxonNodeOutStreamPartitioner
Andreas Müller [Fri, 23 Aug 2019 16:34:29 +0000 (18:34 +0200)]
cleanup
Andreas Müller [Fri, 23 Aug 2019 14:39:22 +0000 (16:39 +0200)]
cleanup
Andreas Müller [Fri, 23 Aug 2019 12:50:58 +0000 (14:50 +0200)]
ref #8180 ... and again try to fix the test data
Andreas Müller [Fri, 23 Aug 2019 12:35:21 +0000 (14:35 +0200)]
ref #8180 ... and update test data in other projects
Andreas Müller [Fri, 23 Aug 2019 12:25:05 +0000 (14:25 +0200)]
ref #8180 fix incorrect UUID in test data
Andreas Müller [Fri, 23 Aug 2019 12:07:55 +0000 (14:07 +0200)]
ref #7600 add explict adders for adder and remover methods to EntityCollectionSetterAdapter
Andreas Müller [Fri, 23 Aug 2019 12:05:28 +0000 (14:05 +0200)]
minor
Andreas Müller [Fri, 23 Aug 2019 12:04:59 +0000 (14:04 +0200)]
ref #8479 make TaxonNode.addAgentRelation public and adapt remove method name
Andreas Müller [Fri, 23 Aug 2019 12:02:28 +0000 (14:02 +0200)]
adapt CdmLightClassificationExport to hasXXX methods
Andreas Müller [Fri, 23 Aug 2019 12:01:46 +0000 (14:01 +0200)]
ref #8180 Add vocabulary to test data
Andreas Kohlbecker [Fri, 23 Aug 2019 10:59:14 +0000 (12:59 +0200)]
ref #8437 using TermType.getGeneralizationOf() to expand the termType restriction
Katja Luther [Fri, 23 Aug 2019 10:43:25 +0000 (12:43 +0200)]
add doubtful flag to TaxonNodeDto
Andreas Müller [Fri, 23 Aug 2019 09:21:11 +0000 (11:21 +0200)]
cleanup
Andreas Müller [Fri, 23 Aug 2019 09:18:46 +0000 (11:18 +0200)]
fix clone method for User
Andreas Müller [Fri, 23 Aug 2019 09:17:59 +0000 (11:17 +0200)]
ref #8180 Add Presence state vocabulary to default terms
Andreas Müller [Fri, 23 Aug 2019 09:08:28 +0000 (11:08 +0200)]
ref #8479 add hasXXX methods to TaxonNodeFilter
Andreas Müller [Fri, 23 Aug 2019 09:07:33 +0000 (11:07 +0200)]
ref #8479 make TaxonNodeOutStreamPartitioner read only by default.
Andreas Müller [Wed, 21 Aug 2019 09:46:06 +0000 (11:46 +0200)]
fix #8482 workaround fix for DescriptionType includes error
Andreas Müller [Tue, 20 Aug 2019 22:16:34 +0000 (00:16 +0200)]
minor
Katja Luther [Wed, 21 Aug 2019 07:49:52 +0000 (09:49 +0200)]
add higher Taxon search option to specimen search
Andreas Müller [Mon, 19 Aug 2019 14:47:44 +0000 (16:47 +0200)]
syntax for collective species uuid
Andreas Müller [Mon, 19 Aug 2019 14:22:57 +0000 (16:22 +0200)]
minor
Andreas Müller [Mon, 19 Aug 2019 14:19:45 +0000 (16:19 +0200)]
some minor adaptations to CdmLightExport and CsvNameExport
Andreas Müller [Mon, 19 Aug 2019 14:18:01 +0000 (16:18 +0200)]
minor
Patrick Plitzner [Mon, 19 Aug 2019 14:13:02 +0000 (16:13 +0200)]
fix #8480 Use DescriptionTypes in descriptive data set service
Katja Luther [Mon, 19 Aug 2019 07:51:36 +0000 (09:51 +0200)]
add preference predicates
Andreas Müller [Fri, 16 Aug 2019 23:02:58 +0000 (01:02 +0200)]
ref #8432 adapt javadoc
Andreas Müller [Fri, 16 Aug 2019 22:57:40 +0000 (00:57 +0200)]
ref #8432 adapt TermTreeDaoImpl.load such that default feature tree is only created and returned if the default feature tree uuid is passed to it
Andreas Müller [Fri, 16 Aug 2019 22:54:28 +0000 (00:54 +0200)]
minor
Andreas Müller [Fri, 16 Aug 2019 18:03:55 +0000 (20:03 +0200)]
ref #7957 add javadoc to description types
Andreas Müller [Fri, 16 Aug 2019 17:00:08 +0000 (19:00 +0200)]
ref #8441 add tests for FeatureState loading and move some test data to terms package
Andreas Müller [Fri, 16 Aug 2019 16:27:38 +0000 (18:27 +0200)]
ref #8441 fix mapping for FeatureState
Andreas Müller [Fri, 16 Aug 2019 14:33:21 +0000 (16:33 +0200)]
minor
Andreas Müller [Fri, 16 Aug 2019 14:32:54 +0000 (16:32 +0200)]
move term node DAOs to term package
Andreas Müller [Fri, 16 Aug 2019 09:02:18 +0000 (11:02 +0200)]
ref #7959 rename DescriptionState -> DescriptionType and fix bug for enum loading
Andreas Müller [Fri, 16 Aug 2019 08:48:28 +0000 (10:48 +0200)]
adapt cached model to 5.8.2
Andreas Müller [Fri, 16 Aug 2019 08:38:58 +0000 (10:38 +0200)]
for the moment set TermCollection.orderRelevant default to true
Andreas Müller [Fri, 16 Aug 2019 08:36:36 +0000 (10:36 +0200)]
adapt TestModelUpdate to run for all 3 H2 DBs
Andreas Müller [Fri, 16 Aug 2019 08:34:51 +0000 (10:34 +0200)]
adapt test H2 to model changes v5.8.2
Andreas Müller [Fri, 16 Aug 2019 08:34:18 +0000 (10:34 +0200)]
ref #7957 add not null to update script for DescriptionBase.types
Andreas Müller [Fri, 16 Aug 2019 08:07:22 +0000 (10:07 +0200)]
Cleanup
Andreas Müller [Fri, 16 Aug 2019 08:07:00 +0000 (10:07 +0200)]
ref #7099 , ref #8464 some adaptions on constraints for CdmAuthority
Andreas Müller [Fri, 16 Aug 2019 08:04:43 +0000 (10:04 +0200)]
fix #7957 add types to DescriptionBase
Andreas Müller [Thu, 15 Aug 2019 10:55:43 +0000 (12:55 +0200)]
Use AccessType Field for Character class
Andreas Müller [Thu, 15 Aug 2019 10:54:11 +0000 (12:54 +0200)]
ref #8441 adapt testdata and SDDDocumentBuilder to FeatureState
Andreas Müller [Thu, 15 Aug 2019 10:53:19 +0000 (12:53 +0200)]
minor
Andreas Müller [Wed, 14 Aug 2019 12:28:22 +0000 (14:28 +0200)]
ref #8441 further implementation for FeatureState and inapplicableIf
Andreas Müller [Fri, 9 Aug 2019 10:14:46 +0000 (12:14 +0200)]
ref #8441 FeatureState classes added and TermNode adapted
Patrick Plitzner [Fri, 16 Aug 2019 08:00:16 +0000 (10:00 +0200)]
ref #8467 add commented code
- un-comment when cloned descriptions can be added to taxon
descriptions as sources
Katja Luther [Fri, 16 Aug 2019 07:01:35 +0000 (09:01 +0200)]
ref #3472: fix set name in source
Katja Luther [Thu, 15 Aug 2019 11:57:04 +0000 (13:57 +0200)]
ref #3472: make setting of name in source configurable
Katja Luther [Thu, 15 Aug 2019 08:41:20 +0000 (10:41 +0200)]
ref #3472: add nameInSource in makeTaxonNodeSynonym
Katja Luther [Thu, 15 Aug 2019 08:34:05 +0000 (10:34 +0200)]
ref #3472: swap Synonym and accTaxon should move all taxon information to the new taxon
Katja Luther [Thu, 15 Aug 2019 08:24:16 +0000 (10:24 +0200)]
add add unitGUID to abcd import
Katja Luther [Thu, 15 Aug 2019 08:22:50 +0000 (10:22 +0200)]
update caches prgress monitor with name
Katja Luther [Thu, 15 Aug 2019 08:20:58 +0000 (10:20 +0200)]
ref #8385: add method to get voc by uuid
Andreas Müller [Wed, 14 Aug 2019 09:04:20 +0000 (11:04 +0200)]
Adapt uniqueness and notNull for some authority parameters