BGBM BDI Git - cdmlib.git/commit

BGBM BDI Projects / cdmlib.git / commit

summary | shortlog | log | commit | commitdiff | tree
(parent: cf1c7a4) | patch

author	Andreas Müller <a.mueller@bgbm.org>
	Tue, 31 Mar 2015 23:59:06 +0000 (23:59 +0000)
committer	Andreas Müller <a.mueller@bgbm.org>
	Tue, 31 Mar 2015 23:59:06 +0000 (23:59 +0000)
commit	6c84a3ee5efb42f568d3d42930b4b91992f66444
tree	595a004b3f84674b2cd210ad76674cfe54b56057	tree \| snapshot
parent	cf1c7a4d36be421fe0bd9f04671044568e22c1fa	commit \| diff

Make deduplication of TeamOrPersonBase possible in cdmlib #4768 and solve test problem in CdmGenericDaoImplTest #2096, finding some bugs in between

16 files changed:

.gitattributes		diff \| blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/AnnotatableEntity.java		diff \| blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Annotation.java		diff \| blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/IdentifiableEntity.java		diff \| blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Identifier.java		diff \| blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/HomotypicalGroup.java		diff \| blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/ReferenceFactory.java		diff \| blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/agent/PersonDefaultCacheStrategy.java		diff \| blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/merge/DefaultMergeStrategy.java		diff \| blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/merge/IMergeStrategy.java		diff \| blob \| history
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/ICdmGenericDao.java		diff \| blob \| history
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmGenericDaoImpl.java		diff \| blob \| history
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/DeduplicationHelper.java	[new file with mode: 0644]	blob
cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmGenericDaoImplTest.java		diff \| blob \| history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/CommonServiceImpl.java		diff \| blob \| history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ICommonService.java		diff \| blob \| history