BGBM BDI Git - cdmlib.git/commit

author	Katja Luther <k.luther@bgbm.org>
	Wed, 9 Oct 2013 13:33:39 +0000 (13:33 +0000)
committer	Katja Luther <k.luther@bgbm.org>
	Wed, 9 Oct 2013 13:33:39 +0000 (13:33 +0000)
commit	85338079e1732e36c3817b86159110b0503eafaa
tree	58a4adc478334c035e3d1186aab176069a6a7794	tree \| snapshot
parent	b304740f21eb96ca7b546e166b147c344fbcf2d3	commit \| diff
parent	7c8ca82e90166893b1282350bce9981488082728	commit \| diff

merging delete functionality into trunk

31 files changed:

.gitattributes	diff1 \|	diff2 \|	blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TaxonNameBase.java	diff1 \|	diff2 \|	blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/Classification.java	diff1 \|	diff2 \|	blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/Taxon.java	diff1 \|	diff2 \|	blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNode.java	diff1 \|	diff2 \|	blob \| history
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/ClassificationDaoHibernateImpl.java	diff1 \|	diff2 \|	blob \| history
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImpl.java	diff1 \|	diff2 \|	blob \| history
cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.java	diff1 \|	diff2 \|	blob \| history
cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImplTest.java	diff1 \|	diff2 \|	blob \| history
cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.testDelete-result.xml	diff1 \|	diff2 \|	blob \| history
cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.testDelete-result1.xml	\|	\|	blob
cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.testFind.xml	diff1 \|	diff2 \|	blob \| history
cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.testFindDeleted.xml	diff1 \|	diff2 \|	blob \| history
cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.testGetTaxaByNameAndArea.xml	diff1 \|	diff2 \|	blob \| history
cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.xml	diff1 \|	diff2 \|	blob \| history
cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImplTest.xml	diff1 \|	diff2 \|	blob \| history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonNodeService.java	diff1 \|	diff2 \|	blob \| history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonService.java	diff1 \|	diff2 \|	blob \| history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NameServiceImpl.java	diff1 \|	diff2 \|	blob \| history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImpl.java	diff1 \|	diff2 \|	blob \| history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonServiceImpl.java	diff1 \|	diff2 \|	blob \| history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TermServiceImpl.java	diff1 \|	diff2 \|	blob \| history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/config/TaxonDeletionConfigurator.java	diff1 \|	diff2 \|	blob \| history
cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/NameServiceImplTest.java	diff1 \|	diff2 \|	blob \| history
cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/SecurityTest.java	diff1 \|	diff2 \|	blob \| history
cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImplTest.java	diff1 \|	diff2 \|	blob \| history
cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceImplTest.java	diff1 \|	diff2 \|	blob \| history
cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTest.java	diff1 \|	diff2 \|	blob \| history
cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/SecurityTest.xml	diff1 \|	diff2 \|	blob \| history
cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonServiceImplTest.testDeleteSynonym.xml	diff1 \|	diff2 \|	blob \| history
cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/lsid/LSIDAuthorityServiceTest.testGetAvailableServices.xml	diff1 \|	diff2 \|	blob \| history

RSS Atom

.gitattributes	diff1 \|	diff2 \|	blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TaxonNameBase.java	diff1 \|	diff2 \|	blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/Classification.java	diff1 \|	diff2 \|	blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/Taxon.java	diff1 \|	diff2 \|	blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNode.java	diff1 \|	diff2 \|	blob \| history
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/ClassificationDaoHibernateImpl.java	diff1 \|	diff2 \|	blob \| history
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImpl.java	diff1 \|	diff2 \|	blob \| history
cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.java	diff1 \|	diff2 \|	blob \| history
cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImplTest.java	diff1 \|	diff2 \|	blob \| history
cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.testDelete-result.xml	diff1 \|	diff2 \|	blob \| history
cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.testDelete-result1.xml	\|	\|	blob
cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.testFind.xml	diff1 \|	diff2 \|	blob \| history
cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.testFindDeleted.xml	diff1 \|	diff2 \|	blob \| history
cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.testGetTaxaByNameAndArea.xml	diff1 \|	diff2 \|	blob \| history
cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.xml	diff1 \|	diff2 \|	blob \| history
cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImplTest.xml	diff1 \|	diff2 \|	blob \| history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonNodeService.java	diff1 \|	diff2 \|	blob \| history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonService.java	diff1 \|	diff2 \|	blob \| history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NameServiceImpl.java	diff1 \|	diff2 \|	blob \| history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImpl.java	diff1 \|	diff2 \|	blob \| history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonServiceImpl.java	diff1 \|	diff2 \|	blob \| history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TermServiceImpl.java	diff1 \|	diff2 \|	blob \| history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/config/TaxonDeletionConfigurator.java	diff1 \|	diff2 \|	blob \| history
cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/NameServiceImplTest.java	diff1 \|	diff2 \|	blob \| history
cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/SecurityTest.java	diff1 \|	diff2 \|	blob \| history
cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImplTest.java	diff1 \|	diff2 \|	blob \| history
cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceImplTest.java	diff1 \|	diff2 \|	blob \| history
cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTest.java	diff1 \|	diff2 \|	blob \| history
cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/SecurityTest.xml	diff1 \|	diff2 \|	blob \| history
cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonServiceImplTest.testDeleteSynonym.xml	diff1 \|	diff2 \|	blob \| history
cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/lsid/LSIDAuthorityServiceTest.testGetAvailableServices.xml	diff1 \|	diff2 \|	blob \| history