cdmlib.git
8 years agoFix potential NPE
Patrick Plitzner [Mon, 22 Feb 2016 12:58:38 +0000 (13:58 +0100)]
Fix potential NPE

8 years agoMinor
Andreas Müller [Fri, 19 Feb 2016 13:15:26 +0000 (14:15 +0100)]
Minor

8 years agoAdd reported in error static method
Andreas Müller [Fri, 19 Feb 2016 13:14:48 +0000 (14:14 +0100)]
Add reported in error static method

8 years agoFix cache strategy for taxon base with appended name #5586 and #5577
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

8 years agoFix bug in TextData factory method.
Andreas Müller [Fri, 19 Feb 2016 08:38:54 +0000 (09:38 +0100)]
Fix bug in TextData factory method.

8 years agoupgrading yourkit agent to version 2015
Andreas Kohlbecker [Thu, 18 Feb 2016 15:59:04 +0000 (16:59 +0100)]
upgrading yourkit agent to version 2015

8 years agoMinor
Andreas Müller [Thu, 18 Feb 2016 12:18:43 +0000 (13:18 +0100)]
Minor

8 years agoAdd separator after nom status in taxon titleCache #5576
Andreas Müller [Thu, 18 Feb 2016 12:18:32 +0000 (13:18 +0100)]
Add separator after nom status in taxon titleCache #5576

8 years agoexcluding database drivers from cdmlib-remote-webapp.war
Andreas Kohlbecker [Thu, 18 Feb 2016 09:55:52 +0000 (10:55 +0100)]
excluding database drivers from cdmlib-remote-webapp.war

8 years agoremoving c3p0 jar 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

8 years agoFix for DnaSample relation to Identifier, Annotations, etc.
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

8 years agoFix failing test
Andreas Müller [Tue, 16 Feb 2016 16:00:29 +0000 (17:00 +0100)]
Fix failing test

8 years agoRevert "#5563 fixed by avoiding access to null FeatureNodes"
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.

8 years agoFix et al. for collectors #5568
Andreas Müller [Tue, 16 Feb 2016 15:43:29 +0000 (16:43 +0100)]
Fix et al. for collectors   #5568

8 years agoAdjust specimen delete configurator
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

8 years agoAdd missing Transactional annotation to delete method
Patrick Plitzner [Tue, 16 Feb 2016 10:09:28 +0000 (11:09 +0100)]
Add missing Transactional annotation to delete method

8 years ago#5563 fixed by avoiding access to null FeatureNodes
Andreas Kohlbecker [Tue, 16 Feb 2016 09:03:38 +0000 (10:03 +0100)]
#5563 fixed by avoiding access to null FeatureNodes

8 years agolatest changes to markup import
Andreas Müller [Mon, 15 Feb 2016 14:05:43 +0000 (15:05 +0100)]
latest changes to markup import

8 years agoFix CCE in DefinedTermDaoImpl.getPartOf (#5556) and make deproxy more
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

8 years agoMerge branch 'hotfix/3.12.4' into develop
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

8 years agoupdating poms for branch'hotfix/3.12.4' with non-snapshot versions
jenkins [Fri, 12 Feb 2016 13:44:48 +0000 (14:44 +0100)]
updating poms for branch'hotfix/3.12.4' with non-snapshot versions

8 years agoFix strategy injection test
Andreas Müller [Fri, 12 Feb 2016 13:41:15 +0000 (14:41 +0100)]
Fix strategy injection test

8 years agoFix test for cache strategy loading
Andreas Müller [Fri, 12 Feb 2016 13:02:41 +0000 (14:02 +0100)]
Fix test for cache strategy loading

8 years agoFix javassist error for specimen cache strategy loading #5545
Andreas Müller [Fri, 12 Feb 2016 12:54:38 +0000 (13:54 +0100)]
Fix javassist error for specimen cache strategy loading #5545

8 years agoFix test for cache strategy loading
Andreas Müller [Fri, 12 Feb 2016 13:02:41 +0000 (14:02 +0100)]
Fix test for cache strategy loading

8 years agoFix javassist error for specimen cache strategy loading #5545
Andreas Müller [Fri, 12 Feb 2016 12:54:38 +0000 (13:54 +0100)]
Fix javassist error for specimen cache strategy loading #5545

8 years agoLatest changes to markup import
Andreas Müller [Thu, 11 Feb 2016 11:10:43 +0000 (12:10 +0100)]
Latest changes to markup import

8 years agoupdating poms for 3.12.4 branch with snapshot versions
jenkins [Thu, 11 Feb 2016 09:52:12 +0000 (10:52 +0100)]
updating poms for 3.12.4 branch with snapshot versions

8 years agoAdd invasive to MarkupTransformer
Andreas Müller [Wed, 10 Feb 2016 15:17:57 +0000 (16:17 +0100)]
Add invasive to MarkupTransformer

8 years agoAdd new status to Markup-Transformer
Andreas Müller [Wed, 10 Feb 2016 11:09:00 +0000 (12:09 +0100)]
Add new status to Markup-Transformer

8 years agoMerge branch 'hotfix/3.12.3' into develop
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

8 years agoMerge branch 'hotfix/3.12.3' root/tags/cdmlib/3.12.3 3.12.3
jenkins [Wed, 10 Feb 2016 13:39:00 +0000 (14:39 +0100)]
Merge branch 'hotfix/3.12.3'

8 years agoupdating poms for branch'hotfix/3.12.3' with non-snapshot versions
jenkins [Wed, 10 Feb 2016 13:24:42 +0000 (14:24 +0100)]
updating poms for branch'hotfix/3.12.3' with non-snapshot versions

8 years agofixing init strategy which was broken after refacoring
Andreas Kohlbecker [Wed, 10 Feb 2016 13:12:03 +0000 (14:12 +0100)]
fixing init strategy which was broken after refacoring

8 years agoImplement preliminary Specimen cache strategy using facade cache
Andreas Müller [Tue, 9 Feb 2016 18:48:18 +0000 (19:48 +0100)]
Implement preliminary Specimen cache strategy using facade cache
strategy

8 years agoImprove status handling in markup import
Andreas Müller [Tue, 9 Feb 2016 15:16:38 +0000 (16:16 +0100)]
Improve status handling in markup import

8 years agoadapt test for searching for name without taxon
Katja Luther [Tue, 9 Feb 2016 15:10:29 +0000 (16:10 +0100)]
adapt test for searching for name without taxon

8 years agoadapt 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

8 years agofix #5538
Katja Luther [Tue, 9 Feb 2016 10:43:31 +0000 (11:43 +0100)]
fix  #5538

8 years agoAllow recognizing forma in ranks
Andreas Müller [Tue, 9 Feb 2016 10:13:51 +0000 (11:13 +0100)]
Allow recognizing forma in ranks

8 years agoLatest changes to markup import
Andreas Müller [Tue, 9 Feb 2016 10:13:14 +0000 (11:13 +0100)]
Latest changes to markup import

8 years agoRevert last commit (taxon node handling is done in taxeditor)
Patrick Plitzner [Mon, 8 Feb 2016 13:07:35 +0000 (14:07 +0100)]
Revert last commit (taxon node handling is done in taxeditor)

8 years agoFix potential NPE when creating a new taxon for a classfication
Patrick Plitzner [Mon, 8 Feb 2016 12:39:03 +0000 (13:39 +0100)]
Fix potential NPE when creating a new taxon for a classfication

8 years agoUse correct column length annotation #5535
Andreas Müller [Fri, 5 Feb 2016 13:03:31 +0000 (14:03 +0100)]
Use correct column length annotation #5535

8 years ago#5532 adding missing item to init strategy
Andreas Kohlbecker [Fri, 5 Feb 2016 09:54:51 +0000 (10:54 +0100)]
#5532 adding missing item to init strategy

8 years agominor
k.luther [Wed, 3 Feb 2016 14:13:22 +0000 (15:13 +0100)]
minor

8 years agocheck for empty excludeUuid list
k.luther [Wed, 3 Feb 2016 14:11:31 +0000 (15:11 +0100)]
check for empty excludeUuid list

8 years agosolving more problems which stem from previous refactoring
Andreas Kohlbecker [Thu, 4 Feb 2016 15:01:55 +0000 (16:01 +0100)]
solving more problems which stem from previous refactoring

8 years agosolving 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

8 years agominor
k.luther [Wed, 3 Feb 2016 14:13:22 +0000 (15:13 +0100)]
minor

cherry pick from develeop

8 years agonew createNewTaxonNode service method
Katja Luther [Tue, 2 Feb 2016 12:53:03 +0000 (13:53 +0100)]
new createNewTaxonNode service method

8 years agominor
k.luther [Thu, 4 Feb 2016 08:15:39 +0000 (09:15 +0100)]
minor

8 years agoMinor changes to ResultSetPartitioner
Andreas Müller [Wed, 3 Feb 2016 16:29:49 +0000 (17:29 +0100)]
Minor changes to ResultSetPartitioner

8 years agoFix volume range bug in name parser #5518
Andreas Müller [Wed, 3 Feb 2016 16:14:59 +0000 (17:14 +0100)]
Fix volume range bug in name parser #5518

8 years agoUpgrade lucene to 5.4.1 due to bugs in 5.4.0
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

8 years agoLatest fixes for markup import
Andreas Müller [Fri, 29 Jan 2016 11:58:02 +0000 (12:58 +0100)]
Latest fixes for markup import

8 years agoFix specimen retrieval by assignment status
Patrick Plitzner [Wed, 3 Feb 2016 13:43:27 +0000 (14:43 +0100)]
Fix specimen retrieval by assignment status

8 years agoupdating poms for 3.12.3 branch with snapshot versions
jenkins [Wed, 3 Feb 2016 13:39:12 +0000 (14:39 +0100)]
updating poms for 3.12.3 branch with snapshot versions

8 years agonew createNewTaxonNode service method
Katja Luther [Tue, 2 Feb 2016 12:53:03 +0000 (13:53 +0100)]
new createNewTaxonNode service method

8 years ago#5506 excluding NOP logger to help SLF4J binding the desired logger
Andreas Kohlbecker [Mon, 1 Feb 2016 16:56:49 +0000 (17:56 +0100)]
#5506 excluding NOP logger to help SLF4J binding the desired logger

8 years agocomment regarding c3p0 version linkange to cdm-server
Andreas Kohlbecker [Fri, 29 Jan 2016 17:51:57 +0000 (18:51 +0100)]
comment regarding c3p0 version linkange to cdm-server

8 years agoMinor
Andreas Müller [Wed, 27 Jan 2016 22:00:54 +0000 (23:00 +0100)]
Minor

8 years agoJavadoc
Andreas Müller [Fri, 22 Jan 2016 18:03:26 +0000 (19:03 +0100)]
Javadoc

8 years agoFix NPE in HibernateProxyHelper for null objects
Andreas Müller [Thu, 21 Jan 2016 14:26:30 +0000 (15:26 +0100)]
Fix NPE in HibernateProxyHelper for null objects

8 years agoRename persistence.xml to persistence_test.xml in cdmlib-test
Andreas Müller [Thu, 21 Jan 2016 12:42:22 +0000 (13:42 +0100)]
Rename persistence.xml to persistence_test.xml in cdmlib-test

8 years agoMinor
Andreas Müller [Wed, 20 Jan 2016 15:50:29 +0000 (16:50 +0100)]
Minor

8 years agoChange xstream from 1.4.8. -> 1.4.7
Andreas Müller [Wed, 20 Jan 2016 15:34:42 +0000 (16:34 +0100)]
Change xstream from 1.4.8. -> 1.4.7

8 years agoLatest updates to libraries #4716
Andreas Müller [Wed, 20 Jan 2016 15:24:54 +0000 (16:24 +0100)]
Latest updates to libraries #4716

8 years agoremoving old unused foreign package
Andreas Kohlbecker [Wed, 20 Jan 2016 15:14:04 +0000 (16:14 +0100)]
removing old unused foreign package

8 years agodocumenting reason for having a fereign package
Andreas Kohlbecker [Wed, 20 Jan 2016 15:13:10 +0000 (16:13 +0100)]
documenting reason for having a fereign package

8 years agoUpdate to latest dependencies #4716
Andreas Müller [Wed, 20 Jan 2016 15:04:51 +0000 (16:04 +0100)]
Update to latest dependencies  #4716

8 years agoCleanup CdmTermCacher and CdmCacher
Andreas Müller [Wed, 20 Jan 2016 13:52:24 +0000 (14:52 +0100)]
Cleanup CdmTermCacher and CdmCacher

8 years agocleaning up gitignore a bit
Andreas Kohlbecker [Wed, 20 Jan 2016 14:39:44 +0000 (15:39 +0100)]
cleaning up gitignore a bit

8 years agoswitching remoting on in eclipse launcher
Andreas Kohlbecker [Wed, 20 Jan 2016 13:30:49 +0000 (14:30 +0100)]
switching remoting on in eclipse launcher

8 years agodisabling csrf mode in spring security for remoting endpoints
Andreas Kohlbecker [Wed, 20 Jan 2016 13:29:59 +0000 (14:29 +0100)]
disabling csrf mode in spring security for remoting endpoints

8 years agosolving probelms with running the jetty-maven plugin:
Andreas Kohlbecker [Wed, 20 Jan 2016 13:29:08 +0000 (14:29 +0100)]
solving probelms with running the jetty-maven plugin:
    - plugin downgrade to jdk 1.7 compatible version
    - downgrading xstream to jdk 1.7 compatible version
    - setting user.home to target folder

8 years agoMinor
Andreas Müller [Wed, 20 Jan 2016 13:13:04 +0000 (14:13 +0100)]
Minor

8 years agoHandle AuditEvent hibernate sequence update in CdmUpdater correctly
Andreas Müller [Wed, 20 Jan 2016 08:39:46 +0000 (09:39 +0100)]
Handle AuditEvent hibernate sequence update in CdmUpdater correctly
#4716

8 years agoAdapt log4j.properties to hibernate deprecated logging problem
Andreas Müller [Tue, 19 Jan 2016 16:23:33 +0000 (17:23 +0100)]
Adapt log4j.properties to hibernate deprecated logging problem

8 years agoChange logging error to info
Patrick Plitzner [Wed, 20 Jan 2016 08:45:55 +0000 (09:45 +0100)]
Change logging error to info

8 years agoUse more generic postgresql driver
Andreas Müller [Tue, 19 Jan 2016 15:27:38 +0000 (16:27 +0100)]
Use more generic postgresql driver

8 years agoUse more generic postgresql driver
Andreas Müller [Tue, 19 Jan 2016 15:27:38 +0000 (16:27 +0100)]
Use more generic postgresql driver

8 years agoFix failing test in cdmlib-services
Andreas Müller [Tue, 19 Jan 2016 15:07:01 +0000 (16:07 +0100)]
Fix failing test in cdmlib-services

8 years agoUse correct StringUtils class
Andreas Müller [Tue, 19 Jan 2016 14:52:50 +0000 (15:52 +0100)]
Use correct StringUtils class

8 years agominor
Andreas Müller [Tue, 19 Jan 2016 13:36:04 +0000 (14:36 +0100)]
minor

8 years agoLatest changes markup import
Andreas Müller [Tue, 19 Jan 2016 13:35:23 +0000 (14:35 +0100)]
Latest changes markup import

8 years agoFix NPE in DistributionNodeByAreaLabelComparator
Andreas Müller [Tue, 19 Jan 2016 12:44:45 +0000 (13:44 +0100)]
Fix NPE in DistributionNodeByAreaLabelComparator

8 years ago#5479 preliminar solution for user defined presenceAbsence terms vocabularies
Andreas Kohlbecker [Mon, 18 Jan 2016 15:23:01 +0000 (16:23 +0100)]
#5479 preliminar solution for user defined presenceAbsence terms vocabularies

8 years agoFurther fix right quotation mark parsing
Andreas Müller [Thu, 14 Jan 2016 15:33:04 +0000 (16:33 +0100)]
Further fix right quotation mark parsing

8 years agoAdd different apostroph to author name parser
Andreas Müller [Tue, 12 Jan 2016 14:12:27 +0000 (15:12 +0100)]
Add different apostroph to author name parser

8 years agoimprove getPresenceTerm and getNamedArea in CdmImportBase
Andreas Müller [Tue, 12 Jan 2016 11:36:57 +0000 (12:36 +0100)]
improve getPresenceTerm and getNamedArea in CdmImportBase

8 years agoAdd originalRecord to excel import state and cleanup
Andreas Müller [Tue, 12 Jan 2016 11:35:42 +0000 (12:35 +0100)]
Add originalRecord to excel import state and cleanup

8 years agoAdd NomenclaturalStateType 'ined.'
Andreas Müller [Tue, 12 Jan 2016 11:33:43 +0000 (12:33 +0100)]
Add NomenclaturalStateType 'ined.'

8 years agoAdd commented base code for guessBasionym function to Homotypical group
Andreas Müller [Tue, 12 Jan 2016 11:33:04 +0000 (12:33 +0100)]
Add commented base code for guessBasionym function to Homotypical group

- and cleanup

8 years agoCleanup
Andreas Müller [Tue, 12 Jan 2016 11:30:47 +0000 (12:30 +0100)]
Cleanup

8 years ago#5477 circumventing bug that broke test and creating nwe test to reproduce the issue
Andreas Kohlbecker [Thu, 14 Jan 2016 15:16:37 +0000 (16:16 +0100)]
#5477 circumventing bug that broke test and creating nwe test to reproduce the issue

8 years agoAdd assignmentStatus as parameter to occurrence retrieval in service
Patrick Plitzner [Wed, 6 Jan 2016 17:26:51 +0000 (18:26 +0100)]
Add assignmentStatus as parameter to occurrence retrieval in service
method

8 years agofix gitattributes and add derived file to gitignore
Patrick Plitzner [Wed, 13 Jan 2016 08:48:23 +0000 (09:48 +0100)]
fix gitattributes and add derived file to gitignore

8 years agolowering jetty-maven-plugin version to 9.1.3.v20140225 for compatibillity with java 1.7
Andreas Kohlbecker [Tue, 12 Jan 2016 14:07:01 +0000 (15:07 +0100)]
lowering jetty-maven-plugin  version to 9.1.3.v20140225 for compatibillity with java 1.7

8 years agoRevert "fixing path to spring aspect jar and updating antrun plugin"
Andreas Kohlbecker [Tue, 12 Jan 2016 14:05:38 +0000 (15:05 +0100)]
Revert "fixing path to spring aspect jar and updating antrun plugin"

This reverts commit 621096729bf02d85279f4520d47fab9ea330edbe.