cdm-vaadin.git
6 years agoref #6169 feature completed: adding new type designation workingsets
Andreas Kohlbecker [Fri, 21 Jul 2017 13:32:56 +0000 (15:32 +0200)]
ref #6169 feature completed: adding new type designation workingsets

6 years agoref #6169 TypeDesignationSetManager can handle empty sets and can add typeDesignations
Andreas Kohlbecker [Wed, 19 Jul 2017 14:22:24 +0000 (16:22 +0200)]
ref #6169 TypeDesignationSetManager can handle empty sets and can add typeDesignations

6 years agoref #6169 Button row to create new registrations in a registration working set
Andreas Kohlbecker [Mon, 17 Jul 2017 08:30:37 +0000 (10:30 +0200)]
ref #6169 Button row to create new registrations in a registration working set

6 years agoref #6811 avoiding repeated loading of views
Andreas Kohlbecker [Mon, 17 Jul 2017 07:09:43 +0000 (09:09 +0200)]
ref #6811 avoiding repeated loading of views

6 years agoMerge branch 'release/4.9.0' into develop
jenkins [Thu, 20 Jul 2017 13:46:42 +0000 (15:46 +0200)]
Merge branch 'release/4.9.0' into develop

6 years agoupdating poms for branch'release/4.9.0' with non-snapshot versions
jenkins [Thu, 20 Jul 2017 13:42:25 +0000 (15:42 +0200)]
updating poms for branch'release/4.9.0' with non-snapshot versions

6 years agojenkins bumping cdmlib.version to 4.9.0
jenkins [Thu, 20 Jul 2017 13:42:07 +0000 (15:42 +0200)]
jenkins bumping cdmlib.version to 4.9.0

6 years agojenkins bumping cdmlib.version to 4.9.0-SNAPSHOT
jenkins [Thu, 20 Jul 2017 12:22:52 +0000 (14:22 +0200)]
jenkins bumping cdmlib.version to 4.9.0-SNAPSHOT

6 years agoupdating poms for 4.10.0-SNAPSHOT development
jenkins [Thu, 20 Jul 2017 12:22:49 +0000 (14:22 +0200)]
updating poms for 4.10.0-SNAPSHOT development

6 years agoupdating poms for 4.9.0 branch with snapshot versions
jenkins [Thu, 20 Jul 2017 12:22:49 +0000 (14:22 +0200)]
updating poms for 4.9.0 branch with snapshot versions

6 years agojenkins bumping cdmlib.version to 4.10.0-SNAPSHOT
jenkins [Thu, 20 Jul 2017 11:40:26 +0000 (13:40 +0200)]
jenkins bumping cdmlib.version to 4.10.0-SNAPSHOT

7 years agoremoving debug mode switch
Andreas Kohlbecker [Thu, 13 Jul 2017 14:07:51 +0000 (16:07 +0200)]
removing debug mode switch

7 years agofixing bug in JodaTimePartialConverter: missing breaks in switch after refactoring
Andreas Kohlbecker [Thu, 13 Jul 2017 13:38:38 +0000 (15:38 +0200)]
fixing bug in JodaTimePartialConverter: missing breaks in switch after refactoring

7 years agofix #6810 View for starting new registrations implemented
Andreas Kohlbecker [Thu, 13 Jul 2017 13:34:29 +0000 (15:34 +0200)]
fix #6810 View for starting new registrations implemented

7 years agosolving spring scope related problems with the LoginView by introducing a RedirectToL...
Andreas Kohlbecker [Thu, 13 Jul 2017 09:24:48 +0000 (11:24 +0200)]
solving spring scope related problems with the LoginView by introducing a RedirectToLoginView

7 years agoref #6724 converter to deproxy hibernate beans
Andreas Kohlbecker [Tue, 11 Jul 2017 07:35:32 +0000 (09:35 +0200)]
ref #6724 converter to deproxy hibernate beans

7 years agoref #6724 geolocation field: map improvement
Andreas Kohlbecker [Tue, 11 Jul 2017 07:04:44 +0000 (09:04 +0200)]
ref #6724 geolocation field: map improvement

7 years agoref #6724 geolocation field: map layout
Andreas Kohlbecker [Mon, 10 Jul 2017 13:09:34 +0000 (15:09 +0200)]
ref #6724 geolocation field: map layout

7 years agoref #6724 geolocation field with log lat parsing and map
Andreas Kohlbecker [Mon, 10 Jul 2017 13:03:43 +0000 (15:03 +0200)]
ref #6724 geolocation field with log lat parsing and map

7 years agoref #6724 removing initstrategy which is no longer nedded after #6687 is fixed and...
Andreas Kohlbecker [Mon, 10 Jul 2017 09:57:43 +0000 (11:57 +0200)]
ref #6724 removing initstrategy which is no longer nedded after #6687 is fixed and disabling referenceSystemField

7 years agoref #6687 clearing session in parent view on refresh
Andreas Kohlbecker [Mon, 10 Jul 2017 09:29:56 +0000 (11:29 +0200)]
ref #6687 clearing session in parent view on refresh

7 years agoref #6687 using read-only transactions in non editor view presenters
Andreas Kohlbecker [Mon, 10 Jul 2017 08:19:02 +0000 (10:19 +0200)]
ref #6687 using read-only transactions in non editor view presenters

7 years agoref #6687 closing ConversationHolder on view exit
Andreas Kohlbecker [Mon, 10 Jul 2017 07:27:35 +0000 (09:27 +0200)]
ref #6687 closing ConversationHolder on view exit

7 years agofix #6687 per view implementation of the 'session-per-conversation' pattern
Andreas Kohlbecker [Fri, 7 Jul 2017 09:48:55 +0000 (11:48 +0200)]
fix #6687 per view implementation of the 'session-per-conversation' pattern

7 years agoignoring all *.log files
Andreas Kohlbecker [Fri, 7 Jul 2017 07:48:05 +0000 (09:48 +0200)]
ignoring all *.log files

7 years agoMerge branch 'release/4.8.0' into develop
jenkins [Thu, 6 Jul 2017 15:52:43 +0000 (17:52 +0200)]
Merge branch 'release/4.8.0' into develop

7 years agoupdating poms for branch'release/4.8.0' with non-snapshot versions
jenkins [Thu, 6 Jul 2017 15:50:43 +0000 (17:50 +0200)]
updating poms for branch'release/4.8.0' with non-snapshot versions

7 years agorenaming package.html to resolve package documentation conflict
Andreas Kohlbecker [Thu, 6 Jul 2017 15:49:58 +0000 (17:49 +0200)]
renaming package.html to resolve package documentation conflict

7 years agojenkins bumping cdmlib.version to 4.8.0
jenkins [Thu, 6 Jul 2017 14:43:37 +0000 (16:43 +0200)]
jenkins bumping cdmlib.version to 4.8.0

7 years agojenkins bumping cdmlib.version to 4.8.0-SNAPSHOT
jenkins [Thu, 6 Jul 2017 10:46:13 +0000 (12:46 +0200)]
jenkins bumping cdmlib.version to 4.8.0-SNAPSHOT

7 years agoupdating poms for 4.9.0-SNAPSHOT development
jenkins [Thu, 6 Jul 2017 10:46:09 +0000 (12:46 +0200)]
updating poms for 4.9.0-SNAPSHOT development

7 years agojenkins bumping cdmlib.version to 4.9.0-SNAPSHOT
jenkins [Thu, 6 Jul 2017 10:45:58 +0000 (12:45 +0200)]
jenkins bumping cdmlib.version to 4.9.0-SNAPSHOT

7 years agoref #6759 importing switch-valo theme
Andreas Kohlbecker [Tue, 4 Jul 2017 14:23:16 +0000 (16:23 +0200)]
ref #6759 importing switch-valo theme

7 years agoremoving obsolte widget set file
Andreas Kohlbecker [Thu, 29 Jun 2017 08:59:59 +0000 (10:59 +0200)]
removing obsolte widget set file

7 years agofix #6759 using valo theme support included into the addon
Andreas Kohlbecker [Thu, 29 Jun 2017 08:57:54 +0000 (10:57 +0200)]
fix #6759 using valo theme support included into the addon

7 years agofix #6759 last layout adjustment
Andreas Kohlbecker [Thu, 29 Jun 2017 06:36:10 +0000 (08:36 +0200)]
fix #6759 last layout adjustment

7 years agoref #6759 using new dom style of switch
Andreas Kohlbecker [Wed, 28 Jun 2017 19:25:50 +0000 (21:25 +0200)]
ref #6759 using new dom style of switch

7 years agoref #6759 using new icon style of switch
Andreas Kohlbecker [Wed, 28 Jun 2017 06:14:13 +0000 (08:14 +0200)]
ref #6759 using new icon style of switch

7 years agofix #6758 removing registration type icon
Andreas Kohlbecker [Tue, 27 Jun 2017 09:25:43 +0000 (11:25 +0200)]
fix #6758 removing registration type icon
  - replacing TypeStatusLabel by the new class RegistrationStateLabel

7 years agoref #6687 SpecimenTypeDesignationWorkingsetEditor save operation
Andreas Kohlbecker [Tue, 27 Jun 2017 09:04:36 +0000 (11:04 +0200)]
ref #6687 SpecimenTypeDesignationWorkingsetEditor save operation
  - implementing saveBean() method
  - fixing bug in CdmStore

7 years agoref #6687 using conversational transaction for presave and save operation
Andreas Kohlbecker [Mon, 26 Jun 2017 14:45:55 +0000 (16:45 +0200)]
ref #6687 using conversational transaction for presave and save operation

7 years agoref #6687 moving all update and delete operations into a dedicated class: CdmStore
Andreas Kohlbecker [Mon, 26 Jun 2017 11:39:57 +0000 (13:39 +0200)]
ref #6687 moving all update and delete operations into a dedicated class: CdmStore

7 years agopopup editor window width, method documentation and SpecimenTypeDesignationWorkingset...
Andreas Kohlbecker [Mon, 26 Jun 2017 08:01:50 +0000 (10:01 +0200)]
popup editor window width, method documentation and SpecimenTypeDesignationWorkingsetPopupEditor to undefined width

7 years agoref #6193 adding more terms
Andreas Kohlbecker [Mon, 26 Jun 2017 07:40:50 +0000 (09:40 +0200)]
ref #6193 adding more terms

7 years agoref #6724 types editor row items enablement by derivationEventType & avoiding LIEs...
Andreas Kohlbecker [Fri, 23 Jun 2017 21:38:40 +0000 (23:38 +0200)]
ref #6724 types editor row items enablement by derivationEventType & avoiding LIEs durting DerivedUnitConversion

7 years agoref #6724 SpecimenTypeDesignationWorkingsetEditor with Types sub section for containe...
Andreas Kohlbecker [Fri, 23 Jun 2017 10:00:35 +0000 (12:00 +0200)]
ref #6724 SpecimenTypeDesignationWorkingsetEditor with Types sub section for contained SpecimenTypeDesignation

7 years agoref #6724 Custom Field for geo location Points
Andreas Kohlbecker [Thu, 22 Jun 2017 11:54:44 +0000 (13:54 +0200)]
ref #6724 Custom Field for geo location Points

7 years agoref #6724 SpecimenTypeDesignationWorkingsetEditor improvements
Andreas Kohlbecker [Thu, 22 Jun 2017 09:25:01 +0000 (11:25 +0200)]
ref #6724 SpecimenTypeDesignationWorkingsetEditor improvements
  - better country select item captions
  - extending the SpecimenTypeDesignationWorkingSetDTO
  - adding more fields to the editor
  - Custom component for the min-max-freetext fields like 'Absolute elevation'

7 years agoref #6724 registration specific DerivationEventTypes: CULTURE_METABOLIC_INACTIVE
Andreas Kohlbecker [Tue, 20 Jun 2017 19:44:03 +0000 (21:44 +0200)]
ref #6724 registration specific DerivationEventTypes: CULTURE_METABOLIC_INACTIVE

7 years agoref #6724 registration specific DerivationEventTypes
Andreas Kohlbecker [Tue, 20 Jun 2017 07:23:38 +0000 (09:23 +0200)]
ref #6724 registration specific DerivationEventTypes

7 years agoref #6719 renaming the TypeDesignationConverter to TypeDesignationSetManager
Andreas Kohlbecker [Mon, 19 Jun 2017 10:13:38 +0000 (12:13 +0200)]
ref #6719 renaming the TypeDesignationConverter to TypeDesignationSetManager

7 years agoref #6719 updating documentation on the TypeDesignationConverter
Andreas Kohlbecker [Mon, 19 Jun 2017 10:11:07 +0000 (12:11 +0200)]
ref #6719 updating documentation on the TypeDesignationConverter

7 years agoref #6724 implementing SpecimenTypeDesignationWorkingSetDTO as editor dto and modifyi...
Andreas Kohlbecker [Mon, 19 Jun 2017 08:51:54 +0000 (10:51 +0200)]
ref #6724 implementing SpecimenTypeDesignationWorkingSetDTO as editor dto and modifying the TypeDesignationConverter accordingly
  - SpecimenTypeDesignation editor operates on SpecimenTypeDesignationWorkingSetDTO
  - TypeDesignationConverter.TypeDesignationWorkingSet have field for the baseEntity

7 years agoref #6719 fixing bug releated to sorting
Andreas Kohlbecker [Fri, 16 Jun 2017 07:08:17 +0000 (09:08 +0200)]
ref #6719 fixing bug releated to sorting

7 years agoref #6535 fix updated test H2 in vaadin
Andreas Müller [Thu, 15 Jun 2017 14:14:34 +0000 (16:14 +0200)]
ref #6535 fix updated test H2 in vaadin

7 years agoref #6719 adapting test case
Andreas Kohlbecker [Thu, 15 Jun 2017 06:53:52 +0000 (08:53 +0200)]
ref #6719 adapting test case

7 years agoref #6719 cleaning up
Andreas Kohlbecker [Thu, 15 Jun 2017 06:51:17 +0000 (08:51 +0200)]
ref #6719 cleaning up

7 years agoref #6719 better handling of case when statusType is null
Andreas Kohlbecker [Thu, 15 Jun 2017 06:24:10 +0000 (08:24 +0200)]
ref #6719 better handling of case when statusType is null

7 years agoref #6719 deterministic sortorder when base enitity is TaxonName (NameTypes)
Andreas Kohlbecker [Thu, 15 Jun 2017 05:48:59 +0000 (07:48 +0200)]
ref #6719 deterministic sortorder when base enitity is TaxonName (NameTypes)

7 years agoref #6719 fixing bug in name editor event
Andreas Kohlbecker [Wed, 14 Jun 2017 07:35:44 +0000 (09:35 +0200)]
ref #6719 fixing bug in name editor event

7 years agofixing import missing after merge
Andreas Kohlbecker [Tue, 13 Jun 2017 13:23:39 +0000 (15:23 +0200)]
fixing import missing after merge

7 years agoMerge branch 'feature/#6687' into develop
Andreas Kohlbecker [Tue, 13 Jun 2017 13:21:13 +0000 (15:21 +0200)]
Merge branch 'feature/#6687' into develop

7 years agoref #6724 initial trunk implementation for a SpecimenTypeDesignationWorkingsetEditor
Andreas Kohlbecker [Tue, 13 Jun 2017 13:13:54 +0000 (15:13 +0200)]
ref #6724 initial trunk implementation for a SpecimenTypeDesignationWorkingsetEditor

7 years agoref #6719 RegistrationItemEditButtons active; Chooser for new type designations
Andreas Kohlbecker [Tue, 13 Jun 2017 10:01:36 +0000 (12:01 +0200)]
ref #6719 RegistrationItemEditButtons active; Chooser for new type designations

7 years agoref #6719 RegistrationItems with edit buttons for name and per typedesignationWorkingSet
Andreas Kohlbecker [Tue, 13 Jun 2017 09:00:29 +0000 (11:00 +0200)]
ref #6719 RegistrationItems with edit buttons for name and per typedesignationWorkingSet

7 years agoref #6719 introducing TypeDesignationWorkingSet with string representation
Andreas Kohlbecker [Tue, 13 Jun 2017 07:32:06 +0000 (09:32 +0200)]
ref #6719 introducing TypeDesignationWorkingSet with string representation

7 years agoref #6719 skipping fieldunit during cache generation
Andreas Kohlbecker [Tue, 13 Jun 2017 06:39:15 +0000 (08:39 +0200)]
ref #6719 skipping fieldunit during cache generation

7 years agoref #6719 improved TypeDesignationConverter
Andreas Kohlbecker [Mon, 12 Jun 2017 22:17:56 +0000 (00:17 +0200)]
ref #6719 improved TypeDesignationConverter

7 years agoref #6719 refactoring and better test
Andreas Kohlbecker [Mon, 12 Jun 2017 11:40:48 +0000 (13:40 +0200)]
ref #6719 refactoring and better test

7 years agoref #6169 RegistrationItem separate name button + action for type buttons
Andreas Kohlbecker [Mon, 12 Jun 2017 09:54:16 +0000 (11:54 +0200)]
ref #6169 RegistrationItem separate name button + action for type buttons

7 years agoref #6687 reverting hibernate.event.merge.entity_copy_observer to default for next...
Andreas Kohlbecker [Mon, 12 Jun 2017 09:51:32 +0000 (11:51 +0200)]
ref #6687 reverting hibernate.event.merge.entity_copy_observer to default for next release

7 years agoref #6169 disabling registration workflow tabsheet
Andreas Kohlbecker [Fri, 9 Jun 2017 10:55:46 +0000 (12:55 +0200)]
ref #6169 disabling registration workflow tabsheet

7 years agoref #6169 button tooltips
Andreas Kohlbecker [Fri, 9 Jun 2017 10:30:15 +0000 (12:30 +0200)]
ref #6169 button tooltips

7 years agoref #6169 TeamOrPersonField with buttons to remove and add Person and Team instances
Andreas Kohlbecker [Fri, 9 Jun 2017 10:24:27 +0000 (12:24 +0200)]
ref #6169 TeamOrPersonField with buttons to remove and add Person and Team instances

7 years agoref #6169 add, remove, move buttons in ToManyRelatedEntitiesListSelect operational...
Andreas Kohlbecker [Fri, 9 Jun 2017 09:32:57 +0000 (11:32 +0200)]
ref #6169 add, remove, move buttons in ToManyRelatedEntitiesListSelect operational and with correct state

7 years agoref #6169 fixing width
Andreas Kohlbecker [Thu, 8 Jun 2017 22:17:02 +0000 (00:17 +0200)]
ref #6169 fixing width

7 years agosolving compilation probelm due to class literal with type parameters
Andreas Kohlbecker [Thu, 8 Jun 2017 14:40:55 +0000 (16:40 +0200)]
solving compilation probelm due to class literal with type parameters

7 years agoref #6707 1st attempt to make editing transient properties possible - save fails...
Andreas Kohlbecker [Thu, 8 Jun 2017 14:27:50 +0000 (16:27 +0200)]
ref #6707 1st attempt to make editing transient properties possible - save fails with LIE

7 years agoref #6169 removing grid view from ListViewBean
Andreas Kohlbecker [Thu, 8 Jun 2017 10:17:53 +0000 (12:17 +0200)]
ref #6169 removing grid view from ListViewBean

7 years agoref #6169 documenting bean nesting in ToManyRelatedEntitiesListSelect
Andreas Kohlbecker [Thu, 8 Jun 2017 10:09:09 +0000 (12:09 +0200)]
ref #6169 documenting bean nesting in ToManyRelatedEntitiesListSelect

7 years agoref #6169 fixing missing set value in ToManyRelatedEntitiesComboboxSelect
Andreas Kohlbecker [Thu, 8 Jun 2017 10:03:10 +0000 (12:03 +0200)]
ref #6169 fixing missing set value in ToManyRelatedEntitiesComboboxSelect

7 years agoref #6169 basionymToggle moved to top and has correct initial state
Andreas Kohlbecker [Thu, 8 Jun 2017 10:01:30 +0000 (12:01 +0200)]
ref #6169 basionymToggle moved to top and has correct initial state

7 years agoref #6169 ToManyRelatedEntitiesComboboxSelect, CdmFilterablePagingProvider and CdmTit...
Andreas Kohlbecker [Thu, 8 Jun 2017 08:23:26 +0000 (10:23 +0200)]
ref #6169 ToManyRelatedEntitiesComboboxSelect, CdmFilterablePagingProvider and CdmTitleCacheCaptionGenerator implemented

7 years agoref #6169 fixing NPE
Andreas Kohlbecker [Wed, 7 Jun 2017 13:40:17 +0000 (15:40 +0200)]
ref #6169 fixing NPE

7 years agoref #6169 renaming FieldListEditor to ToManyRelatedEntitiesListSelect
Andreas Kohlbecker [Wed, 7 Jun 2017 13:39:53 +0000 (15:39 +0200)]
ref #6169 renaming FieldListEditor to ToManyRelatedEntitiesListSelect

7 years agofixing test case
Andreas Kohlbecker [Tue, 6 Jun 2017 15:28:58 +0000 (17:28 +0200)]
fixing test case

7 years agoMerge branch 'phycobank' into develop
Andreas Kohlbecker [Tue, 6 Jun 2017 12:21:52 +0000 (14:21 +0200)]
Merge branch 'phycobank' into develop

 Conflicts:
src/main/java/eu/etaxonomy/cdm/mock/Registration.java
    src/main/java/eu/etaxonomy/cdm/mock/RegistrationService.java
src/main/java/eu/etaxonomy/cdm/vaadin/model/DbTableDTO.java
src/main/java/eu/etaxonomy/cdm/vaadin/model/registration/RegistrationWorkingSet.java
src/main/java/eu/etaxonomy/cdm/vaadin/util/converter/TypeDesignationConverter.java
src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/settings/SettingsPresenter.java
src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/RegistrationDTO.java
src/test/java/eu/etaxonomy/cdm/vaadin/presenter/ConceptRelationshipPresenterTest.java

7 years agoref #6687 attempt to get rid of the hibernate.event.merge.entity_copy_observer=allow... feature/#6687 origin/feature/#6687
Andreas Kohlbecker [Tue, 6 Jun 2017 11:07:25 +0000 (13:07 +0200)]
ref #6687 attempt to get rid of the hibernate.event.merge.entity_copy_observer=allow - not working yet

7 years agoTODO notes phycobank origin/phycobank
Andreas Kohlbecker [Tue, 6 Jun 2017 10:59:10 +0000 (12:59 +0200)]
TODO notes

7 years agoref #6368 adapting cdm-vaadin to new TaxonName model
Andreas Kohlbecker [Tue, 6 Jun 2017 09:57:21 +0000 (11:57 +0200)]
ref #6368 adapting cdm-vaadin to new TaxonName model

7 years agoswitching to 4.8.0-SNAPSHOT
Andreas Kohlbecker [Tue, 6 Jun 2017 09:44:07 +0000 (11:44 +0200)]
switching to 4.8.0-SNAPSHOT

7 years agoadapt vaadin to model changes 4.7 feature/cdm4.7 origin/feature/cdm4.7
Andreas Müller [Mon, 5 Jun 2017 20:42:45 +0000 (22:42 +0200)]
adapt vaadin to model changes 4.7

7 years agoupdate test schema and test database for vaadin
Andreas Müller [Mon, 5 Jun 2017 18:37:37 +0000 (20:37 +0200)]
update test schema and test database for vaadin

7 years agoref #6446, ref #6368 remove TaxonnameBase in vaadin,
Andreas Müller [Mon, 5 Jun 2017 08:26:27 +0000 (10:26 +0200)]
ref #6446, ref #6368 remove TaxonnameBase in vaadin,

7 years agoref #6673 comment on deprecated method
Andreas Kohlbecker [Fri, 2 Jun 2017 20:08:34 +0000 (22:08 +0200)]
ref #6673 comment on deprecated method

7 years agoref #6169 disabling nomReffield in name editor
Andreas Kohlbecker [Fri, 2 Jun 2017 19:51:20 +0000 (21:51 +0200)]
ref #6169 disabling nomReffield in name editor

7 years agoref #6169 fixing bug in ToOneRelatedEntityCombobox: initial selection was always...
Andreas Kohlbecker [Fri, 2 Jun 2017 19:50:49 +0000 (21:50 +0200)]
ref #6169 fixing bug in ToOneRelatedEntityCombobox: initial selection was always null

7 years agoref #6169 adding combinationAutorField to name editor
Andreas Kohlbecker [Fri, 2 Jun 2017 19:49:16 +0000 (21:49 +0200)]
ref #6169 adding combinationAutorField to name editor

7 years agoref #6169 renaming taxon package to name
Andreas Kohlbecker [Fri, 2 Jun 2017 09:57:08 +0000 (11:57 +0200)]
ref #6169 renaming taxon package to name

7 years agofix #6687 hibernate.event.merge.entity_copy_observer=log to avoid merge problems
Andreas Kohlbecker [Fri, 2 Jun 2017 09:53:41 +0000 (11:53 +0200)]
fix #6687 hibernate.event.merge.entity_copy_observer=log to avoid merge problems