EDIT

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

cleanup tests in io and service

fix #6368 rename table and class TaxonNameBase

ref #6368 remove ZoologicalName in test DTYPE

ref #6368 remove BotanicalName in test DTYPE

ref #6368 remove some further occurrences of NonViralName

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

ref #6138 handle ClearDB_with_Terms_DataSet.xml correctly

fix #6138: add empty dataset to resources

fix #6535 change CdmMetaData.propertyName from int to string, adapt test schema and test

fix #6367 make nomenclaturalCode an attribute of TaxonNameBase

Revert "ref #6401 fix failing SecurityTest (due to wrong handling of furtherVotingResult in CdmPermissionVoter"

This reverts commit 5cb08c3f89abfd1bcb5af75f0b2882798418f27a.

ref #6401 fix failing SecurityTest (due to wrong handling of furtherVotingResult in CdmPermissionVoter

cleanup

fixing createTestData - applying manual additions from xml dataset

splitting TaxonService search tests for freetext and standard search - all enabled test cases are successful by now

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

cleanup

fix #3465 implement setSecundumForSubtree

adapt gestGetUuidAndTitleCache data to new model

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

Conflicts:
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonNodeService.java

ref #2380 Implement service for getting parent of
UuidAndTitleCache

• parent of either ITaxonTree or UuidAndTitleCache can be retrieved
• added JUnit test and test file

Cleanup merge model 4.1/develop

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...

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...

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

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

ref #5974 Remove synonym relationship first compiling implementation in cdmlib

fix #6089 Remove taxonomicParentCache and taxonomicChildrenCount, fix Testdata

fix #6072 Implement findIdentifiableEntityByMarkers

fix #6072 Implement findIdentifiableEntityByMarkers

#5875 Add isDefault flag to DescriptionBase

#5970 Add allowOverride

#4366 Transmissionengine aggregation of source references

#5177 fixing tests which where broken after rebasing the TransmissionEngine-speedup on develop
- lower rank limit of for the aggregation was too high

Further develop the CDM preferences #3958

Remove bidirectionality for supplemental data #5743

Update test data for xxxObj_type #3701

Adapt table and column names to hibernate 5 naming strategy #5369

... and some other changes to table/attribute names

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

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

Fix strategy injection test

Fix javassist error for specimen cache strategy loading #5545

Fix javassist error for specimen cache strategy loading #5545

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

adapt test for searching for name without taxon

adapt test for searching for name without taxon

Fix failing test in cdmlib-services

resolving conflicts after merge of ticket_4716 into develop

add the missing files

migrate to hibernate 5 for cdmlib-services and cdmlib-ext #4716

• (except for hibernate search tests)
• including new spring-config structure

Add test for all possible specimen associations

When retrieving associated specimens retrieve all
IndividualsAssocations, TypeDesignation, Determinations

Add test for deleting SingleRead that is attached to multpile seuqences
#5200

Added test for taxon (name) <-> specimen association

#5318

fixing move Accepted taxon to synonym

adding more test cases for ClassificationService

• testTaxonNodeByNameComparator now with hybrid name
• testlistRankSpecificRootNodes better testing of pager

fixing broken pager mechanism for listRankSpecificRootNodes() and improving test coverage

Avoid concurrent modification during deep delete.

• cloned derivation events of child derivatives
• added test

Add accidentally removed test file

Extend step-by-step deletion test

• Used correct single read deletion method.
• Created test file

rename authorTeam -> authorship #4332 for name authors

fix naming of ClassificationServiceDeepTest

merge trunk into model change 3.6

• added option to retrieve indirectly associated specimen
  • added service method to retrieve the completete derivative hierarchy for a given specimen
  • added test

• added significantIdentifer as search parameter to occurrenceService.findByTitle()

• added findOccurrences() and countOccurrences() to service layer
  • added configurator for these methods
  • optimized retrieval with HQL query
  • made use of service method in DerivateSearchView

Add hasMoreMembers to Team, update script still missing #4791

further fixes for collectorTitle #4311

fix search for common names in editor and minor

for infrageneric unranked rank adding unranked
fixing bug with deletion of names and homotypicalGroups

created new service in classificationService

it is a first draft of the createHierarchyService
based on taxonNames and until genus level.

change methodName fix for findByIdentier service

improve and rename findByIdentifier service

first tests for listByIdentifier

• fixed deep delete recursion bug
  • fixed tests

• extracted deepDelete tests to own java class
  • reduced exception logged in DeleteResult

• fully implemented deep delete (child derivates)
  • added tests

• implemented isDeletable() and delete()
  • fixed test XML files and tests

merge-update from trunk

• fixed testLoadData()
  • the field unit element in the XML needed to have the derivedFrom parameter

latest changes for AmplificationResult

some bugfixes to new Amplification modelling #4541

some adaptations after trunk merge to 3.4.1

merge-update from trunk

• added service method to get descriptions which have a specimen set as describedSpecimen
  • added test which fails because the XML is loaded incorrectly

fixing test for SingleReadAlignment and removal of SpecAndObs_Sequence

• added isDeleteFromIndividualsAssociation and isDeleteFromTypeDesignation to SpecimenDeleteConfigurator
  • implemented deletion for above mentioned flags
  • added more information to delete result when deleting specimens
  • added tests for above mentioned flags...

• added DISTINCT to HQL query for associated taxa
  • created and used XML data source in occurrence service test

• added xml resources for tests

fix #4450

rename Reference.authorTeam -> authorship #4432

adapt tests to missing Reference.series #4293

HandlingCdmEntitiesTest.java / HandlingCdmEntitiesTest.xml : Added new test to describe save, update, merge of cdm entities (mimicking remoting)
cdmlib-remote-servlet.xml : added commented option to expose remoting
CdmIntegrationTest.java : added comment on how to disable transactional behaviour in tests