EDIT

fix #5330

fix #5179 and adapting the tests because the classification argument is needed now

fix delete of specimen with specimenDescriptions

Add vocabulary list method by term types #3843

Cleanup SecurityTest

Adapt listeners and tests to new pre-insert strategy #5066

#5256 Add test for description reference problem

minor

fixing move Accepted taxon to synonym

more detailed measuring time of accumulation in TransmissionEngineDistribution for performance testing

adding more test cases for ClassificationService

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

simplifying test code

adapting test to modified test data

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

set the test to ignore, because the funcionality is not implemented yet.

revert the local changes

changes for tcs import, fixing taxonnodecomparator, polytomouskey deletion and converting from person to team and team to person

changes for deleting polytomous key nodes

#4408 fixing a bug regarding fallback areas and adding more tests

merging fallbackAreaFilter rule into hiddenArea rule

all rules separated

Avoid concurrent modification during deep delete.

• cloned derivation events of child derivatives
• added test

Correct test to save taxon before making servive layer call

#5056 Refactored 'save' call to return saved entity

test for fallbackArea rule in DescriptionUtility.filterDistrubution for EuroPlusMed - #4408

implementing fallbackArea rule into DescriptionUtility.filterDistrubution for EuroPlusMed - #4408

Ignore createTestData()

Extend step-by-step deletion test

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

subAreaPreference Rule can be run completely separately
- also reoving old unused code
- removing documentation on osoltete rule
- removing all missleading errors on the subAreaPreference in documentation an comments

Clean up transmission engine and BerlinModelTransformer

Rename NonViralName.xxxAuthorTeam to xxxAuthorship #4968

Copy DeterminationEvent data when moving derivates

• add @Audited to all type properties
• add taxonNodeComparator for rank and alphabetical orderedVocabularyDao
• change delete() methods arguments to UUIDs

DescriptionServiceImpl : added dao delete of description
OccurrenceServiceDeepDeleteTest : removed extra delete call
TaxonServiceImplTest : added testing of taxon.removeDescription

Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/cdmlib into remoting-4.0

Conflicts:
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTerm.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NonViralName.java
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/INameService.java...

merge trunk into 3.6 branch

changes for #3998

fix naming of ClassificationServiceDeepTest

• limited the amount of exceptions stored in a delete result #4810

moving UuidAndTitleCache from model to persistence. #4799

Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/cdmlib into remoting-4.0

Conflicts:
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTerm.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTermBase.java
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Reference.java...

• 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()

minor

Partial fix of Ticket #4728

minor

fix move description element bug #4806

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

first implementation of team->person->team conversion #4769, #4770

minor

Fixing failing search test, using better utf8 handling

fixing broken characters

further fixes for collectorTitle #4311

merge validation2 and model 3.5 into trunk

fix search for common names in editor and minor

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

CdmCacherTest : ignoring for now since we have reverted to using termmaps on server side
ITaxonService, TaxonServiceImpl, ITaxonNodeService, TaxonNodeServiceImpl, INameService, NameServiceImpl,IDescriptionService, DescriptionServiceImpl : added uuid methods and return type as UpdateResult with updatedObjects set...

merge from trunk

MockCdmCacher : not required
TaxonServiceSearchTest : removed reference to mock cacher

add UpdateResult and make DeleteResult a subclass

minor

created new service in classificationService

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

• fixed deletion result relates objects
  • removed @Ignore from tests

• temporarily disabled tests to have jenkins compile

• temporarily disabled tests to have jenkins compile

fix findByIdentifier failing test

latest changes for findByIdentifier service

improve and rename findByIdentifier service

remove imports

correct logger info

first tests for listByIdentifier

remove imports

• added comment

• fixed deep delete recursion bug
  • fixed tests

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

add original label info to specimen facade #4218, #4565

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

added unit test for derived unit facade with parent but no field unit #4532

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

fix Occurrence test

• change visibility of createTestDataSet to public

• organized imports

conflict fiexes after merging trunk

merge-update from trunk

• added abstract method createTestData() to CdmIntegrationalTest
  • method should be used for generatin test XML data sets
  • making it abstract and enforcing implementation in sub classes ensures that the same structure is used thus making it easier for the developer to find similar examples....

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

preliminary set OccurrenceServie.loadData test to ignore, as data is not loading correctly

preliminary set OccurrenceServie.loadData test to ignore, as data is not loading correctly

some bugfixes to new Amplification modelling #4541

some adaptations after trunk merge to 3.4.1

merge-update from trunk

separate Amplification and AmplificationResult.java #4541

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

• changed service method to retrieve the directly related objects
  • adapted tests

• commented unused field from SpecimenDeleteConfigurator
  • added TODOs for deletion checking for specimens
  • added emtpy isDeletable() method

isDeletable returns DeleteResult

merge-update from trunk