Andreas Kohlbecker [Fri, 22 Aug 2014 11:23:09 +0000 (11:23 +0000)]
first attempt to fix #4294 (order of map legend entries conforms to term order)
Andreas Kohlbecker [Fri, 22 Aug 2014 11:20:56 +0000 (11:20 +0000)]
adding @Transient to new API methods introduced for #3327 (better API for OrderedTermBase and OrderedTermVocabulary)
Andreas Müller [Thu, 21 Aug 2014 18:08:10 +0000 (18:08 +0000)]
minor
Andreas Müller [Thu, 21 Aug 2014 18:03:47 +0000 (18:03 +0000)]
minor
Andreas Müller [Thu, 21 Aug 2014 17:54:53 +0000 (17:54 +0000)]
remove potential NPE in CdmDataSourceBase
Katja Luther [Thu, 21 Aug 2014 12:23:10 +0000 (12:23 +0000)]
fix the test
Katja Luther [Thu, 21 Aug 2014 10:45:23 +0000 (10:45 +0000)]
isDeletable ignores relations of identifiableEntity
Patric Plitzner [Thu, 21 Aug 2014 07:52:52 +0000 (07:52 +0000)]
- generalized simple user interface to add media (#3339)
Katja Luther [Wed, 20 Aug 2014 12:58:30 +0000 (12:58 +0000)]
Patric Plitzner [Wed, 20 Aug 2014 07:17:05 +0000 (07:17 +0000)]
- assured image order for images from image galleries #3242
Patric Plitzner [Tue, 19 Aug 2014 15:14:47 +0000 (15:14 +0000)]
- changed HashMap to LinkedHashMap to keep order of insertion
- this should fix #3242
Andreas Müller [Tue, 19 Aug 2014 14:54:44 +0000 (14:54 +0000)]
first implementation of alternative identifier #4275
Andreas Müller [Tue, 19 Aug 2014 14:35:39 +0000 (14:35 +0000)]
remove old and misleading titleCache length
Andreas Müller [Tue, 19 Aug 2014 14:27:06 +0000 (14:27 +0000)]
minor
Andreas Müller [Tue, 19 Aug 2014 14:26:15 +0000 (14:26 +0000)]
remove TODO
Patric Plitzner [Tue, 19 Aug 2014 13:32:26 +0000 (13:32 +0000)]
merge-update from trunk
Patric Plitzner [Tue, 19 Aug 2014 13:32:10 +0000 (13:32 +0000)]
merge-update from trunk
Andreas Kohlbecker [Tue, 19 Aug 2014 12:11:12 +0000 (12:11 +0000)]
updating team
Katja Luther [Tue, 19 Aug 2014 08:01:39 +0000 (08:01 +0000)]
fix jenkins
Katja Luther [Mon, 18 Aug 2014 20:31:43 +0000 (20:31 +0000)]
Katja Luther [Mon, 18 Aug 2014 20:01:55 +0000 (20:01 +0000)]
Andreas Müller [Mon, 18 Aug 2014 14:58:27 +0000 (14:58 +0000)]
add vol to generic infereference formatting
Katja Luther [Mon, 18 Aug 2014 07:58:55 +0000 (07:58 +0000)]
Patric Plitzner [Wed, 13 Aug 2014 14:11:39 +0000 (14:11 +0000)]
- changed initialization of CDM entities
- fixed typo
Patric Plitzner [Wed, 13 Aug 2014 14:11:00 +0000 (14:11 +0000)]
- replaced using the dao with using the service for taxa
Patric Plitzner [Wed, 13 Aug 2014 14:08:47 +0000 (14:08 +0000)]
- fixed typo
Patric Plitzner [Wed, 13 Aug 2014 09:25:39 +0000 (09:25 +0000)]
merge-update from trunk
Patric Plitzner [Wed, 13 Aug 2014 09:21:46 +0000 (09:21 +0000)]
- finished DerivateHierarchyDTO citation
Katja Luther [Tue, 12 Aug 2014 08:33:04 +0000 (08:33 +0000)]
isAncestor() using treeIndex
Andreas Kohlbecker [Mon, 11 Aug 2014 13:28:58 +0000 (13:28 +0000)]
gitignore
Andreas Müller [Mon, 11 Aug 2014 13:15:35 +0000 (13:15 +0000)]
missing update
Andreas Müller [Mon, 11 Aug 2014 13:03:12 +0000 (13:03 +0000)]
better handling of abbreviated title cache in references, series -> seriesPart and some improvements in the reference cache strategies #4280, #4239 , changes in tests
Andreas Müller [Mon, 11 Aug 2014 12:56:59 +0000 (12:56 +0000)]
better handling of abbreviated title cache in references, series -> seriesPart and some improvements in the reference cache strategies #4280, #4239
Patric Plitzner [Mon, 11 Aug 2014 12:22:13 +0000 (12:22 +0000)]
merge-update from trunk
Patric Plitzner [Mon, 11 Aug 2014 12:16:01 +0000 (12:16 +0000)]
- restructured derivate hierarchy query
- step 1: get associated field units for a taxon (taxon service)
- step 2: assemble derivate hierarchy for each field unit (occurrence service)
Patric Plitzner [Mon, 11 Aug 2014 11:43:56 +0000 (11:43 +0000)]
- added timeout and null check
Andreas Müller [Fri, 8 Aug 2014 14:46:58 +0000 (14:46 +0000)]
Formatting for aggregates with Authors (E+M exception)
Andreas Müller [Fri, 8 Aug 2014 13:54:37 +0000 (13:54 +0000)]
Change authorTeam types in NonViralName from INomenclaturalAuthor to TeamOrPersonBase #1489
Andreas Kohlbecker [Fri, 8 Aug 2014 13:12:48 +0000 (13:12 +0000)]
reverting test for #686 (orderindex of rank undefined) to ist original version and removing ignore since the bug is fixed now
Andreas Kohlbecker [Fri, 8 Aug 2014 13:12:42 +0000 (13:12 +0000)]
throwing exception in case vocabulary is not found
Andreas Müller [Thu, 7 Aug 2014 17:38:58 +0000 (17:38 +0000)]
minor
Andreas Müller [Thu, 7 Aug 2014 17:28:31 +0000 (17:28 +0000)]
removing old ignore and FIXME #530
Andreas Müller [Thu, 7 Aug 2014 17:16:16 +0000 (17:16 +0000)]
update abbrevTitleCache in bulk update (Cont.)
Andreas Müller [Thu, 7 Aug 2014 17:15:06 +0000 (17:15 +0000)]
update abbrevTitleCache in bulk update
Andreas Müller [Thu, 7 Aug 2014 16:46:17 +0000 (16:46 +0000)]
remove function tests which don't compile
Andreas Müller [Thu, 7 Aug 2014 16:42:53 +0000 (16:42 +0000)]
generics
Andreas Müller [Thu, 7 Aug 2014 16:40:29 +0000 (16:40 +0000)]
remove deprecated name service getVocabulary methods
Andreas Müller [Thu, 7 Aug 2014 16:31:10 +0000 (16:31 +0000)]
minor
Andreas Müller [Thu, 7 Aug 2014 16:27:21 +0000 (16:27 +0000)]
implement getNextHigherTerm and getNextLowerTerm #3327
Andreas Müller [Thu, 7 Aug 2014 16:25:33 +0000 (16:25 +0000)]
move vocabulary tests to vocabulary service and fix @Ignore, remove deprecated methods from INameService
Andreas Müller [Thu, 7 Aug 2014 15:44:25 +0000 (15:44 +0000)]
minor
Andreas Müller [Thu, 7 Aug 2014 15:38:09 +0000 (15:38 +0000)]
minor
Andreas Müller [Thu, 7 Aug 2014 15:32:38 +0000 (15:32 +0000)]
cleaning up CdmBase
Cherian Mathew [Thu, 7 Aug 2014 11:57:46 +0000 (11:57 +0000)]
added check for non-null operation in constructors
Cherian Mathew [Thu, 7 Aug 2014 09:33:23 +0000 (09:33 +0000)]
moved ehcache-core version to parent pom
Cherian Mathew [Thu, 7 Aug 2014 09:08:39 +0000 (09:08 +0000)]
making sure operation is always initialised
Cherian Mathew [Thu, 7 Aug 2014 09:07:48 +0000 (09:07 +0000)]
updated doc
Cherian Mathew [Thu, 7 Aug 2014 09:06:44 +0000 (09:06 +0000)]
moved ehcache-core version to root pom
Patric Plitzner [Wed, 6 Aug 2014 07:20:03 +0000 (07:20 +0000)]
merge-update from trunk
Patric Plitzner [Wed, 6 Aug 2014 06:54:46 +0000 (06:54 +0000)]
- added type information to DTO
- enhanced media labeling
Patric Plitzner [Tue, 5 Aug 2014 14:14:15 +0000 (14:14 +0000)]
- enhanced DerivateHierarchyDTO data
Patric Plitzner [Tue, 5 Aug 2014 09:17:23 +0000 (09:17 +0000)]
merge-update from trunk
Patric Plitzner [Tue, 5 Aug 2014 08:15:25 +0000 (08:15 +0000)]
- extended dto assembly
Patric Plitzner [Tue, 5 Aug 2014 08:14:59 +0000 (08:14 +0000)]
- cleaned code
Andreas Kohlbecker [Tue, 5 Aug 2014 05:34:17 +0000 (05:34 +0000)]
reverting erroneously committed experimental branch (swagger)
Andreas Kohlbecker [Mon, 4 Aug 2014 16:26:29 +0000 (16:26 +0000)]
ignoring joda time partial from json serialization for swagger model scanner
Andreas Kohlbecker [Mon, 4 Aug 2014 16:26:25 +0000 (16:26 +0000)]
adding swagger-ui
Andreas Kohlbecker [Mon, 4 Aug 2014 16:26:13 +0000 (16:26 +0000)]
working configuration of java based spring mvc config for swagger
Andreas Kohlbecker [Mon, 4 Aug 2014 16:26:11 +0000 (16:26 +0000)]
implementing CdmTypeScanner and test
Andreas Kohlbecker [Mon, 4 Aug 2014 16:26:07 +0000 (16:26 +0000)]
adding dependencies for swagger
Andreas Kohlbecker [Mon, 4 Aug 2014 16:26:05 +0000 (16:26 +0000)]
ignoring ide or maven project files
Andreas Kohlbecker [Mon, 4 Aug 2014 16:26:03 +0000 (16:26 +0000)]
ignoring ide or maven project files
Andreas Kohlbecker [Mon, 4 Aug 2014 16:26:01 +0000 (16:26 +0000)]
renaming SpringMVCConfig
Andreas Müller [Mon, 4 Aug 2014 15:18:45 +0000 (15:18 +0000)]
javadoc
Patric Plitzner [Mon, 4 Aug 2014 12:04:49 +0000 (12:04 +0000)]
- added line limit for web service response
Patric Plitzner [Mon, 4 Aug 2014 11:36:51 +0000 (11:36 +0000)]
- fixed BioCaseServiceWrapperTest
- fixed info log
Andreas Müller [Mon, 4 Aug 2014 10:41:25 +0000 (10:41 +0000)]
remove series from FullCoverageDataGenerator
Andreas Müller [Mon, 4 Aug 2014 10:40:50 +0000 (10:40 +0000)]
replace LockMode by LockOptions in service layer and persistence
Andreas Müller [Mon, 4 Aug 2014 10:13:40 +0000 (10:13 +0000)]
replace deprecated .lock method in CdmEntityDaoBase
Patric Plitzner [Mon, 4 Aug 2014 10:07:24 +0000 (10:07 +0000)]
merge-update from trunk
Andreas Müller [Wed, 30 Jul 2014 15:52:24 +0000 (15:52 +0000)]
minor
Patric Plitzner [Wed, 30 Jul 2014 15:18:49 +0000 (15:18 +0000)]
- fixed possible NPEs
Katja Luther [Wed, 30 Jul 2014 12:05:18 +0000 (12:05 +0000)]
return value of delete methods are DeleteResults
Andreas Kohlbecker [Wed, 30 Jul 2014 11:21:43 +0000 (11:21 +0000)]
reenabling vaadin + more specific component scan for mvc
Andreas Kohlbecker [Wed, 30 Jul 2014 11:21:43 +0000 (11:21 +0000)]
comment explaining the need to extend WebMvcConfigurationSupport
Andreas Kohlbecker [Wed, 30 Jul 2014 11:21:42 +0000 (11:21 +0000)]
first fully functional pure java based spring mvc configuration, vaadin has been excluded so far, welcome file configuration is working now in web.xml
Andreas Kohlbecker [Wed, 30 Jul 2014 11:21:40 +0000 (11:21 +0000)]
switching to java based spring mvc configuration (work in progress)
Andreas Kohlbecker [Wed, 30 Jul 2014 11:21:39 +0000 (11:21 +0000)]
whitespace
Andreas Kohlbecker [Wed, 30 Jul 2014 11:21:38 +0000 (11:21 +0000)]
turning the static index.jsp into a index.html
Andreas Kohlbecker [Wed, 30 Jul 2014 11:21:37 +0000 (11:21 +0000)]
adapting contollers to new CdmAntPathMatcher pattern syntax
Andreas Kohlbecker [Wed, 30 Jul 2014 11:21:35 +0000 (11:21 +0000)]
minor comments
Andreas Kohlbecker [Wed, 30 Jul 2014 11:21:35 +0000 (11:21 +0000)]
changing the CdmAntPathMatcher to make it conform with spring mvc, where a ReqeustMapping values always has a leading slash even if it is implicit (it is added by the RequestMappingHandlerMapping if it is missing!)
Andreas Kohlbecker [Wed, 30 Jul 2014 11:21:34 +0000 (11:21 +0000)]
implementing tests for the pathmatchers and fixing a bug in the CdmAntPathMatcher
Andreas Kohlbecker [Wed, 30 Jul 2014 11:21:33 +0000 (11:21 +0000)]
resolving ambiguity in serveral web service controllers
Andreas Kohlbecker [Wed, 30 Jul 2014 11:21:30 +0000 (11:21 +0000)]
switching fom spring mvc xml configuration to java configuration
Patric Plitzner [Wed, 30 Jul 2014 08:02:34 +0000 (08:02 +0000)]
merge-update from trunk
Patric Plitzner [Wed, 30 Jul 2014 07:57:21 +0000 (07:57 +0000)]
- added more parameters to DerivateHierarchyDTO
Andreas Kohlbecker [Tue, 29 Jul 2014 13:48:51 +0000 (13:48 +0000)]
fixing a bug in ClassificationPortalListController
Andreas Kohlbecker [Tue, 29 Jul 2014 13:39:20 +0000 (13:39 +0000)]
resolvin a conflict and cleaning up of ClassificationPortalListController, this changes the thre return type of the list method in the controller (recovering lost commithere)
Patric Plitzner [Tue, 29 Jul 2014 13:24:21 +0000 (13:24 +0000)]
- added methods to add to DTO arrays
- check if CDM entity already attached to session before loading it