EDIT

fix #7323 adding missing uuid match check in furtherVotingDescissions()

cleanup

ref #7289 suppressing HHH90000003

silencing chatty test

silencing chatty test

fix #7158 Add pro parte misapplied name to the concept relationship types

ref #7203 add performance debugging for TaxonNodeFilter.areaFilter

ref #7166 remove distributions with absent status from filter results

ref #7175, ref #7180, ref #7165, ref #7166 Adapting TaxonNodeFilter for unpublished, minMaxRank and areas

cleanup

fix #7166 fixing test

fix #7166 temporarily fixing test

fix #7173 RegistrationDao methods support for sections (with test)

fix #7166 code restructuring

fix #7166 Implement area filter for TaxonNodeFilter

ref #7165 Add rank filter to TaxonNodeFilter

• Added JUnit test

ref #6361 removing TaxonName.DTYPE and Reference.DTYPE

• changing dbscripts/001-cdm.h2.sql
• adapting test data sets

cleaner CdmAuthority constructor

fix #7026 RegistrationVoter with further voting deccision for registrationStatus

fix #7027 consistent toString method for CdmAuthorities and more tests

fix DatabaseTypeEnumTest

intoducing CdmAuthorityParsingException to avoid invalid use of non api sun.security.provider.PolicyParser.ParsingException

fix #7021 excluding not protected cache fields from modification check in CdmSecurityHibernateInterceptor

fix #7018 ref #7020 simple permission voter and authorities for SpecimenOrObservationBase implemented, more complex voter implementation postponed

ref #7018 ref #7016 turning the not needed TypeDesignationVoter into a SpecimenOrObservationBaseVoter

ref #7016 implementing TypeDesignationVoter and more robust permissions:

• avoiding string based cdm authorities
• full test set for CdmPermissionClass

Revert "ref #6886 test to repoduce issue with users having only CREATE permission"

This reverts commit 3795d1bf926c9b126317a85d880235301a0a4b16.

ref #6886 test to repoduce issue with users having only CREATE permission

fix #6851 use country label instead of description in specimen cache strategy

ref #6754 ref #6755 add includeRootNodes and fix count

ref #6754 fix taxon node filter tests

ref #6754 improve taxon node filter

ref #6754 repair zip creation for large datasets

ref #6722 implement life-form in derived unit facade

ref #5817 update test data for rename RelationshipTermBase_inverseRepresentation

minor

ref #3734 fix compilation issue

ref #6630 and ref #6368 remove generics from TaxonName

ref #6630 unified all taxon name cache strategies except for ViralNameDefaultCacheStrategy

fix #6368 rename table and class TaxonNameBase

ref #6368 remove ZoologicalName in test DTYPE

ref #6368 remove BotanicalName in test DTYPE

ref #6368 remove TaxonNameBase subclasses

Merge branch 'develop' into feature/cdm-4.7

Conflicts:
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Feature.java

cleanup

fix #6662 adapt person formatting, put initials to end

ref #6612 PropertyNameMatchMode to Restriction class which contains the values to be tested

#6612 generic dao list method providing a flexible multi property filter:

• PropertyNameMatchMode class introduces
• AbstractPagerImpl.limitStartforRange() to replace hasResultsInRange()

ref #6612 implement count for listByRef and add implement filtering by status in listByRef

ref #6612 implemented list (ref ...) for RegistrationDaoHibernateImpl

fix #6367 make nomenclaturalCode an attribute of TaxonNameBase

Merge branch 'develop' into feature/cdm-4.7

Conflicts:
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/distribution/excelupdate/ExcelDistributionUpdate.java
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/update/MnTableCreator.java

ref #6612 new dao method list entities filtered by a parameter value

ref #5258 add accessed to Reference (WebPage)

adapt GrantedAuthorityImpl factory method

ref #6459 added IntextReferenceHelper class and added some more tests (for name and Annotation)

fix failing tests

fix failing tests

fix #6459 Implement deduplication for IntextReferences

cleanup

ref #6362, ref #6365 remove occurrence of NonViralName, BotanicalName, ZoologicalName and others

fix #6405 more tests for CdmPermissionVoter.furtherVotingDescisions and fixing the premature returning of DENIED votes made there

ref #6405 tests for the CdmPermissionVoter

cleanup

Cleanup

ref #1606: add methods to provide filter for reference type

ref #6365 use TaxonNameFactory for botanical names

ref #6365 use TaxonNameFactory for zoological names

ref #6365 merge static methods from BotanicaName to TaxonNameBase

ref #6365 replace ZoologicalName factory methods

ref #6365 Move all ZoologicalName attributes up to TaxonNameBase

ref #6362 removed some NonViralName occurrences (non-compiling as changing in model are still missing)

fix #6296: fix problems for simple search

add test for different search combinations

fix #6342: fix exception for ? in selection dialog

fix #6296: include the common name search into the search query of taxa and synonyms

ref #6190 removing svn property place holder in first line of code

minor

fix #6236 add alphabetic length ordering to name search

Cleanup

fix #6128 include authorship option in taxon and name search

ref #6199 test for reading excluded, unplaced and excludedNote

solving polytomouskey node sort index problems

Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/cdmlib into develop

Conflicts:
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TaxonInteraction.java
cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/TestModelUpdate.java

cleanup

ref #5974 implement substitute method for TaxonService.getAllRelationships

update path to dataset.xsd in persistence test data

Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNode.java
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImpl.java
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImpl.java...

fix failing test

remaining merge issue for morge develop to cdm4.1

Merge remote-tracking branch 'origin/develop' into cdm-4.1

Conflicts:
cdmlib-db/pom.xml
cdmlib-ext/pom.xml
cdmlib-io/pom.xml
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/taxa/NormalExplicitImport.java
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/SpecimenImportBase.java...

#5634 Add excludedNote to TaxonNode (still some tests not running)

ref #3925 Adapt tests for moving unplaced and excluded

ref #6099: removing cascading to child nodes and adapting the service and persistence layer

fix #5952 Add identityCache

cleanup

ref #3658 remove nomenclaturalCode from all datasource related classes

• and rename NomenclaturalCodeAwareDataSource

#3547 remove not needed dataset.dtd from persistence

ref #5974 Replace synonymRelationshipType by SynonymType and replace some other occurrences of synonym relationship

ref #5974 Remove synonym relationship first compiling implementation in cdmlib