BGBM BDI Git - cdmlib.git/commit

author	Katja Luther <k.luther@bgbm.org>
	Mon, 22 Mar 2010 09:46:12 +0000 (09:46 +0000)
committer	Katja Luther <k.luther@bgbm.org>
	Mon, 22 Mar 2010 09:46:12 +0000 (09:46 +0000)
commit	9cc4226b2bb31e9bca12ad7f4192525e8d82b5d3
tree	0d6e34595c7abc7de1f43849cd208f63bb6e0528	tree \| snapshot
parent	0a0ba874c3464e894d6fa9e809c5f052512f3f1e	commit \| diff

merging PESI brach into trunk

141 files changed:

.gitattributes		diff \| blob \| history
app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/AlgaTerraActivator.java		diff \| blob \| history
app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/SalvadorActivator.java		diff \| blob \| history
app-import/src/main/java/eu/etaxonomy/cdm/app/common/CdmDestinations.java		diff \| blob \| history
app-import/src/main/java/eu/etaxonomy/cdm/app/common/TestActivator.java	[new file with mode: 0644]	blob
app-import/src/main/java/eu/etaxonomy/cdm/app/images/ImageImportConfigurator.java		diff \| blob \| history
app-import/src/main/java/eu/etaxonomy/cdm/app/images/ImageImportState.java		diff \| blob \| history
app-import/src/main/java/eu/etaxonomy/cdm/app/pesi/ErmsActivator.java	[deleted file]	blob \| history
app-import/src/main/java/eu/etaxonomy/cdm/app/pesi/EuroMedActivator.java		diff \| blob \| history
app-import/src/main/java/eu/etaxonomy/cdm/app/pesi/FaunaEuropaeaActivator.java		diff \| blob \| history
app-import/src/main/java/eu/etaxonomy/cdm/app/pesi/FaunaEuropaeaSources.java		diff \| blob \| history
app-import/src/main/java/eu/etaxonomy/cdm/app/pesi/PesiExportActivator.java		diff \| blob \| history
app-import/src/main/java/eu/etaxonomy/cdm/app/tcs/TcsRdfTestActivator.java		diff \| blob \| history
app-import/src/main/java/eu/etaxonomy/cdm/app/tcs/TcsXmlTestActivator.java		diff \| blob \| history
app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/cichorieae/CichorieaeActivator.java		diff \| blob \| history
app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/cichorieae/CichorieaeImageActivator.java		diff \| blob \| history
app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/cichorieae/TaraxacumActivator.java		diff \| blob \| history
app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/diptera/DipteraActivator.java		diff \| blob \| history
app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/palmae/PalmaeActivator.java		diff \| blob \| history
app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/palmae/config/PalmaeProtologueImportConfigurator.java		diff \| blob \| history
app-import/src/main/java/eu/etaxonomy/cdm/io/CichorieaeImageImport.java		diff \| blob \| history
cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/mediaMetaData/MediaMetaData.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelAuthorImport.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelAuthorTeamImport.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelCommonNamesImport.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelFactsImport.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelImportBase.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelImportConfigurator.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelImportState.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelNameFactsImport.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelNameStatusImport.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelOccurrenceImport.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelReferenceImport.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonImport.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonNameImport.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonNameRelationImport.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonRelationImport.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTypesImport.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelUserImport.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelWebMarkerCategoryImport.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelWebMarkerImport.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/mapper/DbSingleAttributeExportMapperBase.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/mapper/MethodMapper.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmApplicationAwareDefaultExport.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmApplicationAwareDefaultImport.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmImportBase.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/DbExportStateBase.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/DbImportStateBase.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/DefaultImportState.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ExportStateBase.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/IImportConfigurator.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/IIoConfigurator.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ImportConfiguratorBase.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ImportHelper.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ImportStateBase.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/IoConfiguratorBase.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/IoStateBase.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/RelatedObjectsHelper.java	[new file with mode: 0644]	blob
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ResultSetPartitioner.java	[new file with mode: 0644]	blob
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/XmlImportState.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportExtensionMapper.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportMapping.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportObjectCreationMapper.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportStringMapper.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/IDbImportMapper.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/common/ExcelImportConfiguratorBase.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/common/ExcelImportState.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/CdmImportConfigurator.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/CdmImportState.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaDistributionImport.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaHeterotypicSynonymImport.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaImportBase.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaImportConfigurator.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaImportState.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaTransformer.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/JaxbImportConfigurator.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/JaxbImportState.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/reference/endnote/in/EndnoteImportConfigurator.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/reference/endnote/in/EndnoteImportState.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDImportConfigurator.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/SpecimenImportConfigurator.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/SpecimenImportState.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/SpecimenImportConfigurator.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/SpecimenImportState.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/taxonx/TaxonXImportConfigurator.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/taxonx/TaxonXImportState.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsrdf/CdmOneToManyXmlMapper.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsrdf/CdmSingleAttributeXmlMapperBase.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsrdf/TcsRdfImportConfigurator.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsrdf/TcsRdfImportState.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsrdf/TcsRdfReferenceImport.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/in/TcsXmlImportConfigurator.java		diff \| blob \| history
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/in/TcsXmlImportState.java		diff \| blob \| history
cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/erms/ermsErrors.txt	[new file with mode: 0644]	blob
cdmlib-io/src/test/resources/termCodeCreator.xls	[new file with mode: 0644]	blob
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/CdmMetaData.java		diff \| blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTermBase.java		diff \| blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/ExtensionType.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/Language.java		diff \| blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/RelationshipTermBase.java		diff \| blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TermVocabulary.java		diff \| blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/DescriptionElementBase.java		diff \| blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TaxonDescription.java		diff \| blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TextData.java		diff \| blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/Continent.java		diff \| blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/NamedArea.java		diff \| blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/location/WaterbodyOrCountry.java		diff \| blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/Media.java		diff \| blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/MediaRepresentation.java		diff \| blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/MediaRepresentationPart.java		diff \| blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/BacterialName.java		diff \| blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NonViralName.java		diff \| blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/Rank.java		diff \| blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TaxonNameComparator.java	[new file with mode: 0644]	blob
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/ReferenceFactory.java		diff \| blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/SynonymRelationshipType.java		diff \| blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/Taxon.java		diff \| blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonComparator.java		diff \| blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNode.java		diff \| blob \| history
cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/name/BacterialNameDefaultCacheStrategy.java	[new file with mode: 0644]	blob
cdmlib-model/src/main/resources/terms/ExtensionType.csv		diff \| blob \| history
cdmlib-model/src/main/resources/terms/SynonymRelationshipType.csv		diff \| blob \| history
cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/CdmMetaDataTest.java	[new file with mode: 0644]	blob
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/ICdmEntityDao.java		diff \| blob \| history
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/IOriginalSourceDao.java		diff \| blob \| history
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmEntityDaoBase.java		diff \| blob \| history
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/OriginalSourceDaoImpl.java		diff \| blob \| history
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/name/TaxonNameDaoHibernateImpl.java		diff \| blob \| history
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImpl.java		diff \| blob \| history
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/name/ITaxonNameDao.java		diff \| blob \| history
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/taxon/ITaxonDao.java		diff \| blob \| history
cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.java		diff \| blob \| history
cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/database/TermsDataSet-with_auditing_info.xml		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/DescriptionServiceImpl.java		diff \| blob \| history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ICommonService.java		diff \| blob \| history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IDescriptionService.java		diff \| blob \| history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonService.java		diff \| blob \| history
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonServiceImpl.java		diff \| blob \| history
cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/CommonServiceImplTest.java		diff \| blob \| history

RSS Atom