EDIT

add rollback to ICdmRepository and use in TaxonNodeOutStreamPartitioner

ref #8180 ... and again try to fix the test data

ref #8180 ... and update test data in other projects

minor

ref #8437 using TermType.getGeneralizationOf() to expand the termType restriction

fix #8480 Use DescriptionTypes in descriptive data set service

ref #8432 adapt javadoc

move term node DAOs to term package

adapt TestModelUpdate to run for all 3 H2 DBs

Cleanup

fix #7957 add types to DescriptionBase

ref #8441 further implementation for FeatureState and inapplicableIf

ref #8467 add commented code

• un-comment when cloned descriptions can be added to taxon descriptions as sources

ref #3472: fix set name in source

ref #3472: make setting of name in source configurable

ref #3472: add nameInSource in makeTaxonNodeSynonym

ref #3472: swap Synonym and accTaxon should move all taxon information to the new taxon

update caches prgress monitor with name

ref #8385: add method to get voc by uuid

ref #8454 fix UserAndGroupServiceImplTest

ref #7099 add CdmAuthority to User, remove CDM_VIEW from tests, cleanup

ref #7099 rename CdmPermissionClass to PermissionClass

ref #7099 rename model.rights to model.permission

ref #7099 move CRUD and Operation to model

ref #7099 move CdmPermissionClass to model

ref #7099 move user, group and GrantedAuthorityImpl to new rights package

ref #7597 Fix deletion of aggregated descriptions

cleanup

ref #7597 Use UUID for service call

ref #7597 Fix concurrent modification exception

ref #8437 fixing LIE in DerivedUnitFacadeController

ref #7597 Delete all aggregated descriptions when re-aggregating

ref #8437 ITermTreeService termType Feature as filter includes also Character

setters of subtreeConfigurator should be void again, adapt tests

ref #8282: adapt save taxonnode to new doubtful attribute

minor

ref #7597 Add configuration to data set aggregation

• implement recursive aggregation

fix #8446 Allow setPublish for subtree to filter for hybrids

fix #7450 try to fix failing test when running in test suite

fix #7450 allow setPublish for subtree to include misapplied names and pro parte synonyms

fixing NPE in DerivedUnitFacadeCacheStrategy.getUnitNumber()

cleanup

cleanup and stream API for ForSubtreeConfigurator

pretty print testSetSecundumForSubtree test data

ref #7450 implement interfaces and signatures for setPublishForSubtree for misapplications and ppSyns (not yet implemented)

ref #7597 Add progress monitor to aggregation service call

ref #8365: fix NPE in abcd tests

use configurator for setPublish flag

ref #7450 revert the incorrect c&p from last commit

ref #7450 use PublishForSubtreeConfigurator in TaxonNodeService

cleanup

minor

Revert "minor - fix merge conflict"

This reverts commit fc3932ac4dd186b6f5809863356912f949ae202d.

minor - fix merge conflict

ref #8365 adding combination of collection code and unit number as specimenLabel to DerivedUnitFacade

ref #8437 using the listByRestriction method in favour of a new untested dao method & implementing page method in ITermTreeService

ref #8437 first implementation for listBy termType for TermTreeService, not yet tested

ref #7597 Adapt to service changes and rename long running method

ref #7597 Aggregation for each taxon based on associated specimens

minor

ref #8414 adding cycle detection to loadFieldUnitDTO()

fix #8426 fix IOOB Exception in RegistrationWorkingSet serialization

first implementation of /portal/name/{uuuid}/typeDesignationsInHomotypicalGroup

ref #8414 refactoring OccurrenceController:

• method to load a single FieldUnitDTO
• adding all intermediate derivatives to the FieldUnitDTO
• renaming service endpoint mapping to fieldUnitDTO
• adding missing @Transactional annotations
• Factory method in abstract DerivateDTO to construct specific subtype DTOs

adapt DescriptiveDataSet to allow also descriptive systems with features not only characters

cleanup

ref #6794 rename TermTree.NewInstance and set old version to deprecated

(cherry picked from commit 08b758e2bfba66c82fbc5a636e455edcccb9fa11)

remove createDefaultFeatureTree from ITermTreeService

ref #6794 rename IFeatureTreeDao in ITermTreeDao

ref #8404 Add update step list within updaters

minor

ref #6794 remove FeatureNodeService from BatchValidationUtil

ref #6794 delete FeatureDao

ref #6794 add TermTreeService and TermNodeService to httpInvokerServices

remove uplaced, excluded, partial and proparte from TaxonBase test data

ref #8281 add doubtful to TaxonNode

ref #6794 add TermNodeService and TermTreeService and make FeatureXXX services deprecated

ref #6794 rename some parameters, methods and classes

ref #6794 rename TermTreeNode -> TermNode

ref #6794 minor adaptations of tests

ref #6794 add TermRelation and rename FeatureNode -> TermTreeNode

ref #6794 add TermRelation and TermRelationBase

ref #6794 add TermRelation and rename FeatureNode -> TermTreeNode

ref #6794 change FeatureTree to TermTree

ref #6794 add TermRelation and rename FeatureNode -> TermTreeNode

ref #6794 change schema version and add missing attributes to updateScript

ref #6794 remove references to TermVocabulary.iterator()

ref #6794 adapt TermCollection test data to boolean values in TermCollection

ref #6794 change FeatureTree to TermTree

ref #6794 add TermRelation and rename FeatureNode -> TermTreeNode

ref #6794 fix FeatureNodeServiceImplTest

cleanup and ref #6794 rename TermTreeDaoImpl

replace BlankDataSet.xml by ClearDBDataSet.xml

ref #6794 adjust hibernate configuration to new TermCollection and adjust test data

ref #6794 change FeatureTree to TermTree

ref #6794 rename TermVocabulary table to TermCollection and remaining rename FeatureNode -> TermTreeNode

update service/dataset.xsd location

ref #6794 add TermRelation and rename FeatureNode -> TermTreeNode

ref #6794 adapt TermsDataSet-with_auditing_info in some packages after merge problem solved

ref #6794 add TermRelationshipType to test data

Updating develop poms back to pre merge state