Andreas Kohlbecker [Fri, 7 Sep 2018 11:24:39 +0000 (13:24 +0200)]
typo
Andreas Kohlbecker [Fri, 7 Sep 2018 11:24:07 +0000 (13:24 +0200)]
removing commented config line
Andreas Kohlbecker [Fri, 7 Sep 2018 11:17:35 +0000 (13:17 +0200)]
Revert "ref #7729 removing unused ehcache.xml - all config is code based"
This reverts commit
cf4ebe93a29635ab57e6ec066c32cdb344bbd297.
Andreas Kohlbecker [Fri, 7 Sep 2018 09:12:54 +0000 (11:12 +0200)]
ref #7729 removing unused ehcache.xml - all config is code based
Andreas Kohlbecker [Fri, 7 Sep 2018 09:08:56 +0000 (11:08 +0200)]
ref #7729 setting maxEntriesLocalHeap for the cdmDefaultCache and activating ehcache jmx management beans for the CdmTransientEntityCacher
Andreas Kohlbecker [Wed, 5 Sep 2018 08:13:03 +0000 (10:13 +0200)]
adjusting loglevel of bean initializers
Patrick Plitzner [Fri, 7 Sep 2018 06:33:18 +0000 (08:33 +0200)]
Merge branch 'develop' into taxonDecription
Katja Luther [Thu, 6 Sep 2018 18:43:00 +0000 (20:43 +0200)]
code cleaning
Katja Luther [Thu, 6 Sep 2018 17:23:18 +0000 (19:23 +0200)]
add TypeDesignationComparator
Katja Luther [Thu, 6 Sep 2018 16:53:08 +0000 (18:53 +0200)]
fix TypeDesignationSetManagerTest by sorting typeDesignations
Andreas Müller [Thu, 6 Sep 2018 13:49:45 +0000 (15:49 +0200)]
ref #7644 fix getYear() in test
Katja Luther [Thu, 6 Sep 2018 13:36:14 +0000 (15:36 +0200)]
adapt OccurrenceController to changes in OccurrenceService
Andreas Müller [Thu, 6 Sep 2018 13:24:34 +0000 (15:24 +0200)]
cleanup
Katja Luther [Thu, 6 Sep 2018 13:21:18 +0000 (15:21 +0200)]
minor
Katja Luther [Thu, 6 Sep 2018 13:13:41 +0000 (15:13 +0200)]
fix TypeDesignationSetManager, use values of map of typeDesignations instead of map in mapAndSort
Andreas Müller [Thu, 6 Sep 2018 13:00:27 +0000 (15:00 +0200)]
ref #7644 handle continued in getYear()
Katja Luther [Thu, 6 Sep 2018 12:41:57 +0000 (14:41 +0200)]
ref #7599: further improvement for specimenDtos
Katja Luther [Thu, 6 Sep 2018 11:36:27 +0000 (13:36 +0200)]
fix bugs in abcd import
Katja Luther [Thu, 6 Sep 2018 09:47:27 +0000 (11:47 +0200)]
fix TypeDesignationSetManager
Katja Luther [Thu, 6 Sep 2018 09:09:29 +0000 (11:09 +0200)]
getTypeDesignations in TypeDesignationSetManager should return a collection
Katja Luther [Thu, 6 Sep 2018 08:49:02 +0000 (10:49 +0200)]
move createShortCitation to ReferenceCacheStrategy
Katja Luther [Wed, 5 Sep 2018 13:03:18 +0000 (15:03 +0200)]
ref #7700: fide and parenthesis are separated separators in taggedText
Katja Luther [Wed, 5 Sep 2018 13:01:46 +0000 (15:01 +0200)]
ref #7700: use TypedesignationSetManager for creating TypeDesignationString for homotypic group in cdm light export
Katja Luther [Wed, 5 Sep 2018 12:53:26 +0000 (14:53 +0200)]
ref #7700: use TypedesignationSetManager for creating TypeDesignationString for homotypic group in cdm light export
Andreas Kohlbecker [Wed, 5 Sep 2018 07:58:39 +0000 (09:58 +0200)]
avoiding too extensive logging by commenting all hardcoded loglevels
Andreas Kohlbecker [Tue, 4 Sep 2018 13:13:56 +0000 (15:13 +0200)]
ref #7600 implementing setAnnotations()
Andreas Müller [Tue, 4 Sep 2018 11:49:34 +0000 (13:49 +0200)]
fix #7644 fix failing test in parser and add "continued" parsing to all relevant patterns
Andreas Kohlbecker [Tue, 4 Sep 2018 08:57:30 +0000 (10:57 +0200)]
ref #7666 NARROW NO-BREAK in UTF8 class
Andreas Müller [Tue, 4 Sep 2018 08:22:56 +0000 (10:22 +0200)]
ref #7644 some further fine tuning on setting CONTINUED/end date in TimePeriod and some cleanup
Andreas Müller [Tue, 4 Sep 2018 07:53:30 +0000 (09:53 +0200)]
ref #7644 implement "continued" in TimePeriod, still missing for most of the formats in parser
Andreas Kohlbecker [Tue, 4 Sep 2018 07:34:28 +0000 (09:34 +0200)]
ref #7666 adding NARROW NO-BREAK after doubtful marker - adapting test
Andreas Kohlbecker [Tue, 4 Sep 2018 07:13:24 +0000 (09:13 +0200)]
ref #7666 adding NARROW NO-BREAK after doubtful marker
Andreas Müller [Mon, 3 Sep 2018 20:41:07 +0000 (22:41 +0200)]
next try to fix usage of wrong signature in TaxEditor CacheLoader test
Andreas Müller [Mon, 3 Sep 2018 20:38:05 +0000 (22:38 +0200)]
next try to fix usage of wrong signature in TaxEditor CacheLoader test
Andreas Müller [Mon, 3 Sep 2018 19:51:46 +0000 (21:51 +0200)]
try to fix usage of wrong signature in TaxEditor CacheLoader test
Andreas Müller [Mon, 3 Sep 2018 19:51:16 +0000 (21:51 +0200)]
test trim in Excel import column recognition
Andreas Müller [Mon, 3 Sep 2018 19:09:52 +0000 (21:09 +0200)]
cleanup
Andreas Müller [Thu, 30 Aug 2018 22:45:48 +0000 (00:45 +0200)]
cleanup
Patrick Plitzner [Mon, 3 Sep 2018 09:43:01 +0000 (11:43 +0200)]
ref #7674 Change label of default description
Katja Luther [Mon, 3 Sep 2018 08:47:53 +0000 (10:47 +0200)]
ref #7553: move TypeDesignationSetmanagerTest to cdmlib
Patrick Plitzner [Mon, 3 Sep 2018 08:23:29 +0000 (10:23 +0200)]
ref #7674 Add equals() and hashCode() to RowWrapperDTO
Patrick Plitzner [Mon, 3 Sep 2018 05:25:58 +0000 (07:25 +0200)]
ref #7674 Fix initialization problems
Andreas Kohlbecker [Fri, 31 Aug 2018 11:03:31 +0000 (13:03 +0200)]
code cleanig
Andreas Kohlbecker [Fri, 31 Aug 2018 11:02:44 +0000 (13:02 +0200)]
code cleanig
Patrick Plitzner [Fri, 31 Aug 2018 10:02:37 +0000 (12:02 +0200)]
ref #7674 Create default taxon description when adding specimens
Andreas Müller [Thu, 30 Aug 2018 21:52:06 +0000 (23:52 +0200)]
javadoc, cleanup and rename permanentCacher
Andreas Müller [Thu, 30 Aug 2018 21:49:44 +0000 (23:49 +0200)]
javadoc, cleanup and rename permanentCacher
Andreas Müller [Thu, 30 Aug 2018 21:22:44 +0000 (23:22 +0200)]
ref #7709 remove NPE
Andreas Müller [Thu, 30 Aug 2018 21:03:23 +0000 (23:03 +0200)]
ref #7709 cleanup CdmTransientEntityCacher
Andreas Müller [Thu, 30 Aug 2018 20:45:08 +0000 (22:45 +0200)]
ref #7709 revert using uuid in CdmEntityCacheKey as key part
Andreas Müller [Thu, 30 Aug 2018 20:39:59 +0000 (22:39 +0200)]
cleanup
Andreas Müller [Thu, 30 Aug 2018 20:39:35 +0000 (22:39 +0200)]
ref #7709 revert using uuid in CdmEntityCacheKey as
Andreas Müller [Thu, 30 Aug 2018 12:18:26 +0000 (14:18 +0200)]
ref #7709 javadoc
Andreas Müller [Thu, 30 Aug 2018 11:47:07 +0000 (13:47 +0200)]
fix #7709 use uuid instead of id for CdmEntityCacheKey
Andreas Müller [Thu, 30 Aug 2018 11:36:50 +0000 (13:36 +0200)]
minor
Andreas Müller [Thu, 30 Aug 2018 11:36:33 +0000 (13:36 +0200)]
ref #7709 use more generics for CdmCacher (not completed yet)
Patrick Plitzner [Thu, 30 Aug 2018 10:36:12 +0000 (12:36 +0200)]
Merge branch 'develop' into taxonDecription
Andreas Kohlbecker [Wed, 29 Aug 2018 16:31:07 +0000 (18:31 +0200)]
ref #7702 avoiding NPE in TargetEntityStates when pervious state is null
Patrick Plitzner [Wed, 29 Aug 2018 15:12:58 +0000 (17:12 +0200)]
ref #7686 Do not use null for keys in map (JSON error)
Patrick Plitzner [Wed, 29 Aug 2018 14:34:31 +0000 (16:34 +0200)]
ref #7686 Do not ignore types without type status
Patrick Plitzner [Wed, 29 Aug 2018 14:33:52 +0000 (16:33 +0200)]
ref #7686 Use titleCache if no identifier can be found
Katja Luther [Tue, 28 Aug 2018 08:24:59 +0000 (10:24 +0200)]
ref #7694: adapt typedesignation output for cdmlight export
Andreas Müller [Mon, 27 Aug 2018 09:46:43 +0000 (11:46 +0200)]
ref# 7682 remove default value for Point.precision
Andreas Müller [Fri, 24 Aug 2018 08:25:20 +0000 (10:25 +0200)]
ref #7075 fix bugs in MediaExcelImport
Patrick Plitzner [Thu, 23 Aug 2018 15:11:19 +0000 (17:11 +0200)]
ref #7674 Fix lazy init exception
Patrick Plitzner [Thu, 23 Aug 2018 08:59:06 +0000 (10:59 +0200)]
ref #7674 Make aggregate service readOnly=false
Patrick Plitzner [Thu, 23 Aug 2018 07:48:59 +0000 (09:48 +0200)]
ref #7674 Change method name
Patrick Plitzner [Wed, 22 Aug 2018 15:49:14 +0000 (17:49 +0200)]
ref #7674 Add aggregated description to data set
Patrick Plitzner [Wed, 22 Aug 2018 13:22:19 +0000 (15:22 +0200)]
ref #7674 Refactor RowWrapper
- add sub classes fort specimen and taxon row wrapper
- add service methods
Patrick Plitzner [Wed, 22 Aug 2018 12:52:23 +0000 (14:52 +0200)]
ref #7674 Refactor RowWrapper
- code cleanup
Patrick Plitzner [Wed, 22 Aug 2018 08:52:30 +0000 (10:52 +0200)]
ref #7657 code refactoring
Patrick Plitzner [Wed, 22 Aug 2018 06:39:41 +0000 (08:39 +0200)]
ref #7657 Increase loading speed for matrix
Andreas Müller [Tue, 21 Aug 2018 14:05:47 +0000 (16:05 +0200)]
fix NPE in TypeDesignationSetManager.stringify(TypeDesignationSetManager.java:522)
Katja Luther [Mon, 20 Aug 2018 09:54:17 +0000 (11:54 +0200)]
fix NPE in CdmLightExport
Andreas Müller [Mon, 20 Aug 2018 10:48:46 +0000 (12:48 +0200)]
ref #7666 adapt test for new doubtful handling in formatter
Andreas Müller [Mon, 20 Aug 2018 09:52:36 +0000 (11:52 +0200)]
cleanup
Andreas Müller [Mon, 20 Aug 2018 09:52:21 +0000 (11:52 +0200)]
ref #6682 split doubtful in rel doubtful and taxon doubtful + use full authorshipCache for MAN non-authors
Andreas Müller [Fri, 17 Aug 2018 13:24:35 +0000 (15:24 +0200)]
ref #7664 adapt return type for many methods with defined typification
jenkins [Fri, 17 Aug 2018 13:23:51 +0000 (15:23 +0200)]
Updating develop poms back to pre merge state
jenkins [Fri, 17 Aug 2018 13:23:51 +0000 (15:23 +0200)]
Merge branch 'master' into develop
jenkins [Fri, 17 Aug 2018 13:23:50 +0000 (15:23 +0200)]
updating develop poms to master versions to avoid merge conflicts
jenkins [Fri, 17 Aug 2018 13:23:46 +0000 (15:23 +0200)]
Merge branch 'release/5.2.0'
jenkins [Fri, 17 Aug 2018 13:07:54 +0000 (15:07 +0200)]
updating poms for branch'release/5.2.0' with non-snapshot versions
jenkins [Fri, 17 Aug 2018 12:17:44 +0000 (14:17 +0200)]
updating poms for 5.3.0-SNAPSHOT development
Andreas Kohlbecker [Fri, 17 Aug 2018 11:26:40 +0000 (13:26 +0200)]
ref #7578 adding missing json config entry for the generic api
Andreas Kohlbecker [Fri, 17 Aug 2018 10:06:40 +0000 (12:06 +0200)]
removing unused duplicate property PreservedSpecimenDTOs
Katja Luther [Fri, 17 Aug 2018 09:37:58 +0000 (11:37 +0200)]
fieldUnitDTO code cleaning
Andreas Kohlbecker [Fri, 17 Aug 2018 08:53:32 +0000 (10:53 +0200)]
removing merge conflict artifact from eclipse launcher
Andreas Kohlbecker [Fri, 17 Aug 2018 08:30:24 +0000 (10:30 +0200)]
cleaning merge problem info in comment
Katja Luther [Fri, 17 Aug 2018 08:44:00 +0000 (10:44 +0200)]
code cleaning
Katja Luther [Fri, 17 Aug 2018 08:33:43 +0000 (10:33 +0200)]
fix getPreservedSpecimen in fieldUnitDTO
Patrick Plitzner [Fri, 17 Aug 2018 05:31:28 +0000 (07:31 +0200)]
Add source of type aggregation to description
Patrick Plitzner [Thu, 16 Aug 2018 10:10:27 +0000 (12:10 +0200)]
Fix LazyInitializationException
Andreas Müller [Thu, 16 Aug 2018 17:09:02 +0000 (19:09 +0200)]
ref #6682 types for both directions
Andreas Müller [Thu, 16 Aug 2018 16:47:26 +0000 (18:47 +0200)]
ref #6682 try to fix failing query in TaxonDao
Andreas Müller [Thu, 16 Aug 2018 16:15:43 +0000 (18:15 +0200)]
ref #6682 try to fix failing query in TaxonDao
Andreas Müller [Thu, 16 Aug 2018 16:09:16 +0000 (18:09 +0200)]
ref #6682 revert relType DTO
Andreas Müller [Thu, 16 Aug 2018 16:03:45 +0000 (18:03 +0200)]
ref #6682 add types and deduplicateMisapplications parameter to web service
Andreas Müller [Thu, 16 Aug 2018 15:53:08 +0000 (17:53 +0200)]
ref #6682 add types and deduplicateMisapplications parameter to web service
Andreas Müller [Thu, 16 Aug 2018 15:12:30 +0000 (17:12 +0200)]
ref #6682 add typeUuid and try to fix missing type issue