Katja Luther [Tue, 15 Mar 2016 12:28:22 +0000 (13:28 +0100)]
minor
Katja Luther [Mon, 14 Mar 2016 14:13:58 +0000 (15:13 +0100)]
fix the taxeditor tests
Katja Luther [Mon, 14 Mar 2016 11:36:26 +0000 (12:36 +0100)]
minor
Katja Luther [Mon, 14 Mar 2016 10:51:59 +0000 (11:51 +0100)]
TaxonNodeByNameComparator is not a component anymore and add configurable delete method for media
Katja Luther [Thu, 3 Mar 2016 13:52:16 +0000 (14:52 +0100)]
fix move synonym to another accepted taxon
Andreas Kohlbecker [Thu, 10 Mar 2016 21:09:36 +0000 (22:09 +0100)]
fixing cdm database detection for h2 databases
Andreas Müller [Mon, 7 Mar 2016 16:36:51 +0000 (17:36 +0100)]
Add cultivated, presence questionable to PresenceAbsenceTerms #5443
Andreas Müller [Wed, 2 Mar 2016 10:46:50 +0000 (11:46 +0100)]
Update cdmlib version from 3.13.0-SNAPSHOT to 4.0.0-SNAPSHOT
Andreas Müller [Wed, 2 Mar 2016 09:13:54 +0000 (10:13 +0100)]
Fix combination author without space parsing #5618
Andreas Müller [Tue, 1 Mar 2016 10:52:19 +0000 (11:52 +0100)]
Implement notho rank recognition #3868
Patrick Plitzner [Mon, 29 Feb 2016 15:44:19 +0000 (16:44 +0100)]
Refactor associated taxa assembly to include uuid #5611
k.luther [Mon, 29 Feb 2016 12:34:42 +0000 (13:34 +0100)]
workaround for #5590
Andreas Kohlbecker [Fri, 26 Feb 2016 16:24:44 +0000 (17:24 +0100)]
fixing LIE related to point locatins in OccurrenceListController
Katja Luther [Fri, 26 Feb 2016 11:56:13 +0000 (12:56 +0100)]
workaround for delete of polytomous keynodes, because of null values in children list
Andreas Müller [Thu, 25 Feb 2016 15:34:13 +0000 (16:34 +0100)]
Add post-separator to better handle tagged text
Andreas Kohlbecker [Thu, 25 Feb 2016 14:07:37 +0000 (15:07 +0100)]
noone should ever have a bin folder in the project folders
Andreas Kohlbecker [Thu, 25 Feb 2016 14:03:36 +0000 (15:03 +0100)]
java spring configuration for remoting services
Andreas Müller [Wed, 24 Feb 2016 15:52:58 +0000 (16:52 +0100)]
Add MySQL to Source class
Andreas Kohlbecker [Wed, 17 Feb 2016 21:13:17 +0000 (22:13 +0100)]
removing all (almost all) spy6 references and dependencies
Andreas Kohlbecker [Wed, 24 Feb 2016 15:22:57 +0000 (16:22 +0100)]
new ide launcher
Andreas Kohlbecker [Wed, 24 Feb 2016 15:22:34 +0000 (16:22 +0100)]
updating data in swagger doc
Katja Luther [Wed, 24 Feb 2016 14:59:22 +0000 (15:59 +0100)]
remote webapp pom fixed for windows
Andreas Kohlbecker [Wed, 24 Feb 2016 13:49:08 +0000 (14:49 +0100)]
setting maven test scope for cdmlib-test again
Andreas Kohlbecker [Wed, 24 Feb 2016 13:43:02 +0000 (14:43 +0100)]
cosmetics
Andreas Kohlbecker [Wed, 24 Feb 2016 13:42:16 +0000 (14:42 +0100)]
easier string profile selection
Andreas Müller [Tue, 23 Feb 2016 20:22:52 +0000 (21:22 +0100)]
Preliminary add tableGeneratorGlobalOverride to all session factories
again #4716 ()
see also r27338 and r27330
p.plitzner [Tue, 23 Feb 2016 08:07:57 +0000 (09:07 +0100)]
Refactor format method of cdm formatter
Andreas Müller [Tue, 23 Feb 2016 14:13:18 +0000 (15:13 +0100)]
like before
Andreas Müller [Tue, 23 Feb 2016 14:08:17 +0000 (15:08 +0100)]
Move TableGenerator(GlobalOverride) from test to persistence #4716
Andreas Müller [Tue, 23 Feb 2016 13:58:29 +0000 (14:58 +0100)]
Add new test for author name parsing
Andreas Kohlbecker [Tue, 23 Feb 2016 13:58:03 +0000 (14:58 +0100)]
minimum documentation on TableGeneratorGlobalOverride
Andreas Müller [Tue, 23 Feb 2016 09:36:44 +0000 (10:36 +0100)]
Minor
Andreas Kohlbecker [Tue, 23 Feb 2016 10:35:45 +0000 (11:35 +0100)]
removing test dependencies from java doc
Andreas Kohlbecker [Tue, 23 Feb 2016 10:35:08 +0000 (11:35 +0100)]
fixing spring profiles setup
Andreas Kohlbecker [Tue, 23 Feb 2016 10:34:00 +0000 (11:34 +0100)]
adding jackson dependencies again to default scope
Andreas Kohlbecker [Tue, 23 Feb 2016 09:09:36 +0000 (10:09 +0100)]
adding missing dependencies to launchers and adding permGenSpace setting again (java 7 compatibility)
Andreas Kohlbecker [Tue, 23 Feb 2016 08:02:56 +0000 (09:02 +0100)]
removing tableGeneratorOverride from non testing application contexts
Andreas Kohlbecker [Mon, 22 Feb 2016 16:34:19 +0000 (17:34 +0100)]
serving swagger api doc in production mode (default) from static files:
- default spring profile with StaticSwaggerApiDoc controller
- swagger spring profiles with generically generated documentaiton only for integration test environments
- creating the resulting war file after running the integration tests
- during integration tests the SwaggerGroupsIT class fetches the dynamically provided documentation
p.plitzner [Mon, 22 Feb 2016 15:22:44 +0000 (16:22 +0100)]
Refactor formatter framework
- Simplify interface
- added javadoc
- added static methods
Patrick Plitzner [Mon, 22 Feb 2016 12:58:38 +0000 (13:58 +0100)]
Fix potential NPE
Andreas Müller [Fri, 19 Feb 2016 13:15:26 +0000 (14:15 +0100)]
Minor
Andreas Müller [Fri, 19 Feb 2016 13:14:48 +0000 (14:14 +0100)]
Add reported in error static method
Andreas Müller [Fri, 19 Feb 2016 13:04:18 +0000 (14:04 +0100)]
Fix cache strategy for taxon base with appended name #5586 and #5577
Andreas Müller [Fri, 19 Feb 2016 08:38:54 +0000 (09:38 +0100)]
Fix bug in TextData factory method.
Andreas Kohlbecker [Thu, 18 Feb 2016 15:59:04 +0000 (16:59 +0100)]
upgrading yourkit agent to version 2015
Andreas Müller [Thu, 18 Feb 2016 12:18:43 +0000 (13:18 +0100)]
Minor
Andreas Müller [Thu, 18 Feb 2016 12:18:32 +0000 (13:18 +0100)]
Add separator after nom status in taxon titleCache #5576
Andreas Kohlbecker [Thu, 18 Feb 2016 09:55:52 +0000 (10:55 +0100)]
excluding database drivers from cdmlib-remote-webapp.war
Andreas Kohlbecker [Wed, 17 Feb 2016 21:28:01 +0000 (22:28 +0100)]
removing c3p0 jar from cdmlib-remote-webapp.war
Patrick Plitzner [Wed, 17 Feb 2016 12:07:55 +0000 (13:07 +0100)]
Fix for DnaSample relation to Identifier, Annotations, etc.
- Add DnaSample to metaDef for Any relation in package-info.java
- added test for SampleDesignation for DnaSample
Andreas Müller [Tue, 16 Feb 2016 16:00:29 +0000 (17:00 +0100)]
Fix failing test
Andreas Kohlbecker [Tue, 16 Feb 2016 15:54:37 +0000 (16:54 +0100)]
Revert "#5563 fixed by avoiding access to null FeatureNodes"
This reverts commit
cabfc584dd026a8c139b837af01af786bb619bed.
Andreas Müller [Tue, 16 Feb 2016 15:43:29 +0000 (16:43 +0100)]
Fix et al. for collectors #5568
Patrick Plitzner [Tue, 16 Feb 2016 13:37:49 +0000 (14:37 +0100)]
Adjust specimen delete configurator
- when isDeleteChildren is true then also molecular data will be
deleted
- specimen descriptions will always be deleted
Patrick Plitzner [Tue, 16 Feb 2016 10:09:28 +0000 (11:09 +0100)]
Add missing Transactional annotation to delete method
Andreas Kohlbecker [Tue, 16 Feb 2016 09:03:38 +0000 (10:03 +0100)]
#5563 fixed by avoiding access to null FeatureNodes
Andreas Müller [Mon, 15 Feb 2016 14:05:43 +0000 (15:05 +0100)]
latest changes to markup import
Andreas Müller [Mon, 15 Feb 2016 13:15:35 +0000 (14:15 +0100)]
Fix CCE in DefinedTermDaoImpl.getPartOf (#5556) and make deproxy more
generic
jenkins [Mon, 15 Feb 2016 09:10:24 +0000 (10:10 +0100)]
Merge branch 'hotfix/3.12.4' into develop
Conflicts:
cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeCacheStrategyInjectionTest.java
cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeCacheStrategyInjectionTest.xml
jenkins [Fri, 12 Feb 2016 13:44:48 +0000 (14:44 +0100)]
updating poms for branch'hotfix/3.12.4' with non-snapshot versions
Andreas Müller [Fri, 12 Feb 2016 13:41:15 +0000 (14:41 +0100)]
Fix strategy injection test
Andreas Müller [Fri, 12 Feb 2016 13:02:41 +0000 (14:02 +0100)]
Fix test for cache strategy loading
Andreas Müller [Fri, 12 Feb 2016 12:54:38 +0000 (13:54 +0100)]
Fix javassist error for specimen cache strategy loading #5545
Andreas Müller [Fri, 12 Feb 2016 13:02:41 +0000 (14:02 +0100)]
Fix test for cache strategy loading
Andreas Müller [Fri, 12 Feb 2016 12:54:38 +0000 (13:54 +0100)]
Fix javassist error for specimen cache strategy loading #5545
Andreas Müller [Thu, 11 Feb 2016 11:10:43 +0000 (12:10 +0100)]
Latest changes to markup import
jenkins [Thu, 11 Feb 2016 09:52:12 +0000 (10:52 +0100)]
updating poms for 3.12.4 branch with snapshot versions
Andreas Müller [Wed, 10 Feb 2016 15:17:57 +0000 (16:17 +0100)]
Add invasive to MarkupTransformer
Andreas Müller [Wed, 10 Feb 2016 11:09:00 +0000 (12:09 +0100)]
Add new status to Markup-Transformer
Andreas Kohlbecker [Wed, 10 Feb 2016 13:45:50 +0000 (14:45 +0100)]
Merge branch 'hotfix/3.12.3' into develop
Conflicts:
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImpl.java
cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTest.java
jenkins [Wed, 10 Feb 2016 13:39:00 +0000 (14:39 +0100)]
Merge branch 'hotfix/3.12.3'
jenkins [Wed, 10 Feb 2016 13:24:42 +0000 (14:24 +0100)]
updating poms for branch'hotfix/3.12.3' with non-snapshot versions
Andreas Kohlbecker [Wed, 10 Feb 2016 13:12:03 +0000 (14:12 +0100)]
fixing init strategy which was broken after refacoring
Andreas Müller [Tue, 9 Feb 2016 18:48:18 +0000 (19:48 +0100)]
Implement preliminary Specimen cache strategy using facade cache
strategy
Andreas Müller [Tue, 9 Feb 2016 15:16:38 +0000 (16:16 +0100)]
Improve status handling in markup import
Katja Luther [Tue, 9 Feb 2016 15:10:29 +0000 (16:10 +0100)]
adapt test for searching for name without taxon
Katja Luther [Tue, 9 Feb 2016 14:58:04 +0000 (15:58 +0100)]
adapt test for searching for name without taxon
Katja Luther [Tue, 9 Feb 2016 10:43:31 +0000 (11:43 +0100)]
fix #5538
Andreas Müller [Tue, 9 Feb 2016 10:13:51 +0000 (11:13 +0100)]
Allow recognizing forma in ranks
Andreas Müller [Tue, 9 Feb 2016 10:13:14 +0000 (11:13 +0100)]
Latest changes to markup import
Patrick Plitzner [Mon, 8 Feb 2016 13:07:35 +0000 (14:07 +0100)]
Revert last commit (taxon node handling is done in taxeditor)
Patrick Plitzner [Mon, 8 Feb 2016 12:39:03 +0000 (13:39 +0100)]
Fix potential NPE when creating a new taxon for a classfication
Andreas Müller [Fri, 5 Feb 2016 13:03:31 +0000 (14:03 +0100)]
Use correct column length annotation #5535
Andreas Kohlbecker [Fri, 5 Feb 2016 09:54:51 +0000 (10:54 +0100)]
#5532 adding missing item to init strategy
k.luther [Wed, 3 Feb 2016 14:13:22 +0000 (15:13 +0100)]
minor
k.luther [Wed, 3 Feb 2016 14:11:31 +0000 (15:11 +0100)]
check for empty excludeUuid list
Andreas Kohlbecker [Thu, 4 Feb 2016 15:01:55 +0000 (16:01 +0100)]
solving more problems which stem from previous refactoring
Andreas Kohlbecker [Thu, 4 Feb 2016 14:18:21 +0000 (15:18 +0100)]
solving problems which stem from previous refactoring
k.luther [Wed, 3 Feb 2016 14:13:22 +0000 (15:13 +0100)]
minor
cherry pick from develeop
Katja Luther [Tue, 2 Feb 2016 12:53:03 +0000 (13:53 +0100)]
new createNewTaxonNode service method
k.luther [Thu, 4 Feb 2016 08:15:39 +0000 (09:15 +0100)]
minor
Andreas Müller [Wed, 3 Feb 2016 16:29:49 +0000 (17:29 +0100)]
Minor changes to ResultSetPartitioner
Andreas Müller [Wed, 3 Feb 2016 16:14:59 +0000 (17:14 +0100)]
Fix volume range bug in name parser #5518
Andreas Müller [Wed, 3 Feb 2016 14:18:26 +0000 (15:18 +0100)]
Upgrade lucene to 5.4.1 due to bugs in 5.4.0
Andreas Müller [Fri, 29 Jan 2016 11:58:02 +0000 (12:58 +0100)]
Latest fixes for markup import
Patrick Plitzner [Wed, 3 Feb 2016 13:43:27 +0000 (14:43 +0100)]
Fix specimen retrieval by assignment status
jenkins [Wed, 3 Feb 2016 13:39:12 +0000 (14:39 +0100)]
updating poms for 3.12.3 branch with snapshot versions
Katja Luther [Tue, 2 Feb 2016 12:53:03 +0000 (13:53 +0100)]
new createNewTaxonNode service method
Andreas Kohlbecker [Mon, 1 Feb 2016 16:56:49 +0000 (17:56 +0100)]
#5506 excluding NOP logger to help SLF4J binding the desired logger
Andreas Kohlbecker [Fri, 29 Jan 2016 17:51:57 +0000 (18:51 +0100)]
comment regarding c3p0 version linkange to cdm-server