EDIT

fix #10163 fix labels for "Orthography Conserved" and "Conserved Desig"

cleanup

ref #10156: call service method with parameter

ref #10156: adapt TaxonController - continue

ref #10156: adapt TaxonController

ref #10156: addOriginals to taxonServive.listMedia

ref #10156: add parameter for collecting original media

ref #10137: improve derivate handling in dtos

ref #10137: improve derivate handling in dtos

ref #10137: only derived unit associated to the taxon should be collected in rootUnitsforAssociatedTaxon and flags should also be added to parent dto

minor

minor

cleanup

ref #9771 improvements to Cdm2CdmImportBase including a first (not ready) version for VocabularyFilter

ref #2934 some adaptations for "Moose" import in cdmlib

ref #10072, ref #2934 adapt some log4j2(-test).xml in cdmlib

remove exception when comparing terms from 2 different vocabularies

ref #10072 move and rename log4j.xml for cdmlib test

ref #10072 fix LogUtilsTest after correct use of log4j2.xml

ref #10072 rename log4j.xml to log4j2.xml in cdmlib

cleanup

ref #10141 fix CCE in LogUtils.setLevel()

fix #10139 try to fix NPE in RegistrationDTO.typeDesignationSetKeyToTypedEntity()

ref #9711 change defaults for Cdm2CdmImportConfigurator

replace detache by detach

cleanup

cleanup

ref #9359, ref #10072 final adaptations for upgrade to log4j2 in cdmlib

cleanup

ref #10118: add new PreferencePredicate

ref #5655, #10083: fix cdmLight namerelationship handling

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

ref #10009, ref #9359 replace hibernate search Rectangle by RectangleDTO

ref #10009, ref #9359 replace hibernate search Rectangle by RectangleDTO

dummy

ref #10009, ref #9359 replace hibernate search Rectangle by RectangleDTO

fix #10102: non names should be in italics

ref #10009 replace CircularFifoBuffer by ArrayBlockingQueue to avoid commons-collections

Updating develop poms back to pre merge state

Merge branch 'master' into develop

updating develop poms to master versions to avoid merge conflicts

Merge branch 'release/5.32.0'

updating poms for branch'release/5.32.0' with non-snapshot versions

updating poms for 5.33.0-SNAPSHOT development

updating poms for 5.32.0 branch with snapshot versions

cleanup

ref #10067 make typed query an hibernate query

ref #10067 test if Query works

cleanup

ref #10083 add avoids homonym of to nonRelNames in cdmlight

fix trim of nonRelNames

cleanup

add PermissionClass for TextualTypeDesignation

move object name to beginning in CdmEntityInfo.label

cleanup

move fieldName to beginning in CdmEntityInfo.label

ref #10096 adapt cdmLight tests to use current TaxonNodeStatus.label

ref #10096 add short label to TaxonNodeStatus

ref #10096 use longer form for TaxonNodeStatus labels

use inlineSymbol not symbol for splitted symbol

cleanup

cleanup and javadoc

ref #10082 split MAN pro parte symbol in formatter (cont.)

ref #10082 split MAN pro parte symbol in formatter

cleanup

cleanup (rename reverse->inverse)

ref #10096 add correct UTF8 for status unresolved

javadoc

fix TaxonNodeServiceImplTest.testSaveDetached

ref #10067 adapt KeywordAnalyzer handling to v5.4.33 (only used for TaxonName.nameCache)

ref #10101 delegat onMerge(event) to onMerge(event, alreadyCopied) in PostMergeEntityListener

ref #10101, ref #8127, ref #3722, ref #5536 remove HHH_9751_Util class as it is not used anymore

cleanup

ref #10101 removed cascade from TermNode.parent, not needed and probably also not correct

ref #10101 removed cascade from TermRelationBase.graph, not needed and probably also not correct

ref #10101 add testSaveDetachedWithMove test to PolytomousKeyNodeServiceTest

ref #10084 revert filtering by description type in query, needs further investigation

ref #10084 adapt query to TypedQuery

cleanup

ref #10101 add saveDetached tests to PolytomousKeyNodeServiceTest (and replace save by merge in other tests)

ref #10101 add (partly ignored) tests to TaxonNodeServiceImplTest and TermNodeServiceImplTest

ref #10096 adapt cdmlight test to longer taxon node status labels

ref #10096 add long labels to TaxonNodeStatus and add commented default status

cleanup

ref #10101 catch and log no-session exception in PostMergeEntityListener instead of removing initialization completely

ref #10101 again preliminary remove children initialization in PostMergeEntityListener

return false in finally again, just in case this is important

ref #10101 add the childNodes touche for TaxonNode and TermNode again in PostMergeEntityListener

ref #10101 preliminary remove children initialization in PostMergeEntityListener

ref #10101 adapt PolytomousKeyNodeServiceTest to new orphaned delete method in services

cleanup and allow merge with objectsToRemove in all services

ref #10101 add sortindex fix to taxon node and term node, too

ref #10101 fix sortindex gaps in polytomous key merge

add cleansweep to PolytomousKeyNodeServiceTest tests

javadoc

ref #10101 fix possbile null value in refreshNodeNumbering

cleanup

javadoc

ref #10101 add commented implementation for trying to handle orphan removal in the PostMergeEntityListener

handle non-persisted objects in delete()