Update for Natural Language (file not used yet)
[cdmlib.git] / .gitattributes
index 270529cca83d4166868f56237892b7ad16205ca6..4ab62d6bba647dfaeb6f5750825477e9de8192d5 100644 (file)
@@ -13,6 +13,7 @@ app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/SalvadorExport.j
 app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/TreeCreator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/common/CdmDestinations.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/common/ImportUtils.java -text
+app-import/src/main/java/eu/etaxonomy/cdm/app/common/TestActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/excelImport/distribution/CichorieaeDistributionActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/excelImport/taxa/NormalExplicitActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/images/AbstractImageImporter.java -text
@@ -21,12 +22,13 @@ app-import/src/main/java/eu/etaxonomy/cdm/app/images/ImageImportState.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/jaxb/CdmDiffActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/jaxb/JaxbExportActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/jaxb/JaxbImportActivator.java -text
-app-import/src/main/java/eu/etaxonomy/cdm/app/pesi/ErmsActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/pesi/EuroMedActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/pesi/FaunaEuropaeaActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/pesi/FaunaEuropaeaSources.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/pesi/PesiDestinations.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/pesi/PesiExportActivator.java -text
+app-import/src/main/java/eu/etaxonomy/cdm/app/pesi/erms/ErmsActivator.java -text
+app-import/src/main/java/eu/etaxonomy/cdm/app/pesi/merging/FaunaEuErmsMergingActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/pilotOutputHtml/SimpleDescriptionOutput.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/references/EndNoteImportActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/sdd/AnthuriumActivator.java -text
@@ -48,6 +50,7 @@ app-import/src/main/java/eu/etaxonomy/cdm/app/sdd/ViolaUpdateActivator.java -tex
 app-import/src/main/java/eu/etaxonomy/cdm/app/sdd/applicationContext.xml -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/synthesysImport/SpecimenImport.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/synthesysImport/SynthesysCacheActivator.java -text
+app-import/src/main/java/eu/etaxonomy/cdm/app/tcs/TcsRdfTestActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/tcs/TcsSources.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/tcs/TcsXmlTestActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/util/TestDatabase.java -text
@@ -73,6 +76,7 @@ app-import/src/main/resources/Asteraceae[!!-~]Specimen[!!-~]Images[!!-~]Vienna.x
 app-import/src/main/resources/AsteraceaeSpecimenImagesVienna.mdb -text
 app-import/src/main/resources/arecaceae.rdf -text
 app-import/src/main/resources/distribution/distribution_cich.xls -text
+app-import/src/main/resources/globis.rdf.xml -text
 app-import/src/main/resources/images/images_cich.xls -text
 app-import/src/main/resources/images/images_diptera.xls -text
 app-import/src/main/resources/images/palmae/KPALM00000001.jpg -text
@@ -1183,25 +1187,22 @@ cdmlib-io/README.TXT -text
 cdmlib-io/pom.xml -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTransformer.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/CdmBooleanMapper.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/CdmExtensionMapper.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/CdmOneToManyMapper.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/CdmStringMapper.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelAuthorImport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelAuthorTeamImport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelCommonNamesImport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelFactsImport.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelGeneralImport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelImportBase.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelImportConfigurator.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelImportState.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelNameFactsImport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelNameStatusImport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelOccurrenceImport.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelRefDetailImport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelReferenceImport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonImport.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonImportValidator.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonNameImport.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonNameImportValidator.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonNameRelationImport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTaxonRelationImport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelTypesImport.java -text
@@ -1210,6 +1211,24 @@ cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelWebMarkerC
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelWebMarkerImport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/IPartitionedIO.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/ResultSetPartitioner.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/validation/BerlinModelAuthorImportValidator.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/validation/BerlinModelAuthorTeamImportValidator.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/validation/BerlinModelCommonNamesImportValidator.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/validation/BerlinModelFactsImportValidator.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/validation/BerlinModelGeneralImportValidator.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/validation/BerlinModelNameFactsImportValidator.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/validation/BerlinModelNameStatusImportValidator.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/validation/BerlinModelOccurrenceImportValidator.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/validation/BerlinModelRefDetailImportValidator.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/validation/BerlinModelReferenceImportValidator.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/validation/BerlinModelTaxonImportValidator.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/validation/BerlinModelTaxonNameImportValidator.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/validation/BerlinModelTaxonNameRelationImportValidator.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/validation/BerlinModelTaxonRelationImportValidator.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/validation/BerlinModelTypesImportValidator.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/validation/BerlinModelUserImportValidator.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/validation/BerlinModelWebMarkerCategoryImportValidator.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/validation/BerlinModelWebMarkerImportValidator.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/BerlinModelAuthorExport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/BerlinModelAuthorTeamExport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/BerlinModelExportBase.java -text
@@ -1251,18 +1270,16 @@ cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/mapper/RefDetailMapp
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/mapper/TeamOrPersonMapper.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmApplicationAwareDefaultExport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmApplicationAwareDefaultImport.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmAttributeMapperBase.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmDefaultExport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmDefaultIOBase.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmDefaultImport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmExportBase.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmImportBase.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmIoBase.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmIoMapping.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmSingleAttributeMapperBase.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/DbExportBase.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/DbExportConfiguratorBase.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/DbExportStateBase.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/DbImportStateBase.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/DefaultImportState.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ExportConfiguratorBase.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ExportStateBase.java -text
@@ -1275,6 +1292,8 @@ cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/IExportConfigurator.java -tex
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/IImportConfigurator.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/IIoConfigurator.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/IOValidator.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/IPartitionedIO.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/IPartitionedState.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/IXmlMapper.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ImportConfiguratorBase.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ImportHelper.java -text
@@ -1283,12 +1302,83 @@ cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ImportWrapper.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/IoConfiguratorBase.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/IoStateBase.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/MapWrapper.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/MultipleAttributeMapperBase.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/PartitionerProfiler.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/RelatedObjectsHelper.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ResultSetPartitioner.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/Source.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/SourceConnectionException.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/XmlExportConfiguratorBase.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/XmlExportState.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/XmlImportState.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/CdmAttributeMapperBase.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/CdmIoMapping.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/CdmSingleAttributeMapperBase.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbIgnoreMapper.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportAnnotationCreationMapper.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportAnnotationMapper.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportCommonNameCreationMapper.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportDefinedTermCreationMapperBase.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportDescriptionElementCreationMapperBase.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportDescriptionElementSourceCreationMapper.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportDistributionCreationMapper.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportExtensionCreationMapper.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportExtensionMapper.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportExtensionTypeCreationMapper.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportFeatureCreationMapper.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportImageCreationMapper.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportImageGalleryMapper.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportMapperBase.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportMapping.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportMarkerCreationMapper.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportMediaMapper.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportMultiAttributeMapperBase.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportMultiLanguageTextMapper.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportNameTypeDesignationMapper.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportObjectCreationMapper.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportObjectCreationMapperBase.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportObjectMapper.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportStringMapper.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportSupplementCreationMapperBase.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportSynonymMapper.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportTaxIncludedInMapper.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportTextDataCreationMapper.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbImportTruncatedStringMapper.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbNotYetImplementedMapper.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/DbSingleAttributeImportMapperBase.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/IDbImportMapper.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/IInputTransformer.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/IMappingImport.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/InputTransformerBase.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/MultipleAttributeMapperBase.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/UndefinedTransformerMethodException.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/erms/ErmsAreaImport.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/erms/ErmsDrImport.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/erms/ErmsImageImport.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/erms/ErmsImportBase.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/erms/ErmsImportConfigurator.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/erms/ErmsImportRankMap.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/erms/ErmsImportState.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/erms/ErmsLinkImport.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/erms/ErmsNotesImport.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/erms/ErmsNotesSourcesImport.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/erms/ErmsReferenceImport.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/erms/ErmsSourceUsesImport.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/erms/ErmsTaxonImport.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/erms/ErmsTaxonRelationImport.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/erms/ErmsTransformer.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/erms/ErmsVernacularImport.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/erms/ErmsVernacularSourcesImport.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/erms/ICheckIgnoreMapper.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/erms/validation/ErmsAreaImportValidator.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/erms/validation/ErmsGeneralImportValidator.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/erms/validation/ErmsImageImportValidator.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/erms/validation/ErmsLinkImportValidator.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/erms/validation/ErmsNoteImportValidator.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/erms/validation/ErmsRankImportValidator.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/erms/validation/ErmsReferenceImportValidator.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/erms/validation/ErmsSourceUsesImportValidator.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/erms/validation/ErmsTaxonImportValidator.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/erms/validation/ErmsVernacularSourceImportValidator.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/common/ExcelImportConfiguratorBase.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/common/ExcelImportState.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/common/ExcelImporterBase.java -text
@@ -1317,11 +1407,13 @@ cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaTaxon.jav
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaTaxonNameImport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaTransformer.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/CdmDocumentBuilder.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/CdmIDResolver.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/CdmMarshallerListener.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/CdmResourceResolver.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/CdmSchemaGenerator.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/DataSet.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/DefaultErrorHandler.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/Error.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/JaxbExport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/JaxbExportConfigurator.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/JaxbExportState.java -text
@@ -1331,6 +1423,21 @@ cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/JaxbImportState.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/LsInputImpl.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/WarningTolerantValidationEventHandler.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/package-info.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pesi/merging/FaunaEuErmsMerging.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiAdditionalTaxonSourceExport.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiCollectionExportMapping.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiExportBase.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiExportConfigurator.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiExportMapping.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiExportState.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiNoteExport.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiNoteSourceExport.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiOccurrenceExport.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiOccurrenceSourceExport.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiRelTaxonExport.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiSourceExport.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiTaxonExport.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pesi/out/PesiTransformer.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pilotOutputHtml/PilotOutputDescriptionExporter.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pilotOutputHtml/PilotOutputDocumentBuilder.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/pilotOutputHtml/PilotOutputExportConfigurator.java -text
@@ -1418,6 +1525,7 @@ cdmlib-io/src/main/resources/schema/cdm/taxon.xsd -text
 cdmlib-io/src/main/resources/schema/xml/XMLSchema.xsd -text
 cdmlib-io/src/main/resources/schema/xml/xml.xsd -text
 cdmlib-io/src/site/site.xml -text
+cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/erms/ermsErrors.txt -text
 cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/excel/taxa/NormalExplicitImportTest.java -text
 cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/jaxb/AgentsTest.java -text
 cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/jaxb/AnnotationTest.java -text
@@ -1478,15 +1586,19 @@ cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/sdd/SDDDescriptionIOTest-input.
 cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/taxonx/TaxonXImportConfiguratorTest-input.xml -text
 cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/tcsrdf/TcsRdfImportConfiguratorTest-input.xml -text
 cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/tcsxml/TcsXmlImportConfiguratorTest-input.xml -text
+cdmlib-io/src/test/resources/termCodeCreator.xls -text
 cdmlib-io/src/test/resources/unitils.properties -text
 cdmlib-model/LICENSE.TXT -text
 cdmlib-model/README.TXT -text
 cdmlib-model/pom.xml -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/aspectj/PropertyChangeAspect.aj -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/datagenerator/TaxonGenerator.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/hibernate/DateTimeBridge.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/hibernate/HibernateProxyHelper.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/hibernate/PartialBridge.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/hibernate/StripHtmlBridge.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/jaxb/CdmAccessor.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/jaxb/CdmAccessorFactoryImpl.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/jaxb/CdmNamespacePrefixMapper.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/jaxb/ClassAdapter.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/jaxb/DateTimeAdapter.java -text
@@ -1595,6 +1707,7 @@ cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/MediaKey.java -tex
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Modifier.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/MultiAccessKey.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/NameFeature.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/NaturalLanguageTerm.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/PolytomousKey.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/PresenceAbsenceTermBase.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/PresenceTerm.java -text
@@ -1664,6 +1777,7 @@ cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/Rank.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/SpecimenTypeDesignation.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/SpecimenTypeDesignationStatus.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TaxonNameBase.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TaxonNameComparator.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TypeDesignationBase.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TypeDesignationStatusBase.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/ViralName.java -text
@@ -1744,6 +1858,7 @@ cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/SynonymRelationshipType.
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/Taxon.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonBase.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonComparator.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonComparatorSearch.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNode.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonRelationship.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonRelationshipType.java -text
@@ -1769,6 +1884,7 @@ cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/agent/TeamDefaultCach
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/common/IIdentifiableEntityCacheStrategy.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/common/IdentifiableEntityDefaultCacheStrategy.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/description/TaxonDescriptionDefaultCacheStrategy.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/name/BacterialNameDefaultCacheStrategy.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/name/BotanicNameDefaultCacheStrategy.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/name/CacheUpdate.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/name/INameCacheStrategy.java -text
@@ -1812,13 +1928,23 @@ cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/parser/NonViralNameParserIm
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/parser/ParserProblem.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/validation/Level2.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/validation/Level3.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/validation/annotation/BasionymsMustShareEpithetsAndAuthors.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/validation/annotation/ChildTaxaMustBeLowerRankThanParent.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/validation/annotation/ChildTaxaMustDeriveNameFromParent.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/validation/annotation/CorrectEpithetsForRank.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/validation/annotation/HomotypicSynonymsShouldBelongToGroup.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/validation/annotation/MustHaveAuthority.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/validation/annotation/NamesWithHomotypicRelationshipsMustBelongToSameGroup.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/validation/annotation/NoDuplicateNames.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/validation/annotation/NullOrNotEmpty.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/validation/annotation/TaxonNameCannotBeAcceptedAndSynonym.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/validation/constraint/BasionymsMustShareEpithetsAndAuthorsValidator.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/validation/constraint/ChildTaxaMustBeLowerRankThanParentValidator.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/validation/constraint/ChildTaxaMustDeriveNameFromParentValidator.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/validation/constraint/CorrectEpithetsForRankValidator.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/validation/constraint/HomotypicSynonymsShouldBelongToGroupValidator.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/validation/constraint/MustHaveAuthorityValidator.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/validation/constraint/NamesWithHomotypicRelationshipsMustBelongToSameGroupValidator.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/validation/constraint/NullOrNotEmptyValidator.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/validation/constraint/StubValidator.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/validation/constraint/TaxonNameCannotBeAcceptedAndSynonymValidator.java -text
@@ -1843,6 +1969,7 @@ cdmlib-model/src/main/resources/terms/NameTypeDesignationStatus.csv -text
 cdmlib-model/src/main/resources/terms/NamedArea.csv -text
 cdmlib-model/src/main/resources/terms/NamedAreaLevel.csv -text
 cdmlib-model/src/main/resources/terms/NamedAreaType.csv -text
+cdmlib-model/src/main/resources/terms/NaturalLanguageTerm.csv -text
 cdmlib-model/src/main/resources/terms/NomenclaturalCode.csv -text
 cdmlib-model/src/main/resources/terms/NomenclaturalStatusType.csv -text
 cdmlib-model/src/main/resources/terms/PresenceTerm.csv -text
@@ -1890,6 +2017,7 @@ cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/agent/InstitutionTypeTest.java
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/agent/InstitutionalMembershipTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/AnnotationTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/CdmBaseTest.java -text
+cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/CdmMetaDataTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/DefaultTermInitializerTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/DefinedTermBaseTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/ExtensionTypeTest.java -text
@@ -1983,6 +2111,8 @@ cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/types/SybaseDatabaseT
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/AbstractBeanInitializer.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/BeanInitializer.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/IAlternativeSpellingSuggestionParser.java -text
+cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/IMethodCache.java -text
+cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/MethodCacheImpl.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/QueryParseException.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/agent/IAgentDao.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/AuditEventSort.java -text
@@ -2128,6 +2258,7 @@ cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/database/types/SqlServer2005Da
 cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/database/types/SybaseDatabaseTypeTest.java -text
 cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/datagenerator/TaxonGenerator.java -text
 cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/BeanInitializerIntegration.java -text
+cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/MethodCacheImplTest.java -text
 cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/FreeTextSearchIntegration.java -text
 cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/agent/AgentDaoImplTest.java -text
 cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/AnnotationDaoTest.java -text
@@ -2250,6 +2381,7 @@ cdmlib-persistence/src/test/resources/log4j.properties -text
 cdmlib-persistence/src/test/resources/unitils.properties -text
 cdmlib-remote/LICENSE.TXT -text
 cdmlib-remote/README.TXT -text
+cdmlib-remote/dist/cdmserver_1-1_all.deb -text
 cdmlib-remote/ide/eclipse/cdmlib-remote[!!-~]-[!!-~]jetty[!!-~]run[!!-~]\[debug\].launch -text
 cdmlib-remote/ide/eclipse/cdmlib-remote[!!-~]-[!!-~]remote[!!-~]debug.launch -text
 cdmlib-remote/pom.xml -text
@@ -2257,7 +2389,6 @@ cdmlib-remote/src/main/installer/lib/ant-deb-task-0.0.1.jar -text
 cdmlib-remote/src/main/installer/linux/Makefile -text
 cdmlib-remote/src/main/installer/linux/build-deb.xml -text
 cdmlib-remote/src/main/installer/linux/copyright -text
-cdmlib-remote/src/main/installer/linux/datasources.xml -text
 cdmlib-remote/src/main/installer/linux/postinst -text
 cdmlib-remote/src/main/installer/linux/postrm -text
 cdmlib-remote/src/main/installer/templates/.cdmLibrary/datasources.xml -text
@@ -2412,6 +2543,7 @@ cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/view/OaiPmhResponseView.java
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/view/PatternViewResolver.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/view/RdfView.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/view/WsdlView.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/view/XmlView.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/view/oaipmh/GetRecordView.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/view/oaipmh/IdentifyView.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/view/oaipmh/ListIdentifiersView.java -text
@@ -2505,8 +2637,10 @@ cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IFeatureTreeService.j
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IIdentifiableEntityService.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IIdentificationKeyService.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ILocationService.java -text
+cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IMarkerService.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IMediaService.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/INameService.java -text
+cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/INaturalLanguageGenerator.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IOccurrenceService.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IReferenceService.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IService.java -text
@@ -2521,8 +2655,10 @@ cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IWorkingSetService.ja
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IdentifiableServiceBase.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IdentificationKeyServiceImpl.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/LocationServiceImpl.java -text
+cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/MarkerServiceImpl.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/MediaServiceImpl.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NameServiceImpl.java -text
+cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NaturalLanguageGenerator.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceImpl.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ReferenceServiceImpl.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ServiceBase.java -text
@@ -2579,6 +2715,7 @@ cdmlib-services/src/main/resources/wsdl/LSIDPortTypes.wsdl -text
 cdmlib-services/src/site/site.xml -text
 cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/CommonServiceImplTest.java -text
 cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/DescriptionServiceImplTest.java -text
+cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/MediaServiceImplTest.java -text
 cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/NameServiceImplTest2.java -text
 cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceImplTest.java -text
 cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTest.java -text
@@ -2614,6 +2751,8 @@ cdmlib-services/src/test/java/eu/etaxonomy/cdm/validation/TaxonNameCannotBeAccep
 cdmlib-services/src/test/java/eu/etaxonomy/cdm/validation/ValidationTest.java -text
 cdmlib-services/src/test/resources/dbscripts/001_cdm.ddl -text
 cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/CommonServiceImplTest.xml -text
+cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/OregonScientificDS6639-DSC_0307-small.jpg -text
+cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/OregonScientificDS6639-DSC_0307-small.tif -text
 cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonServiceImplTest.xml -text
 cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/TaxonServiceSearchTest.xml -text
 cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/UserServiceImplTest.xml -text
@@ -2663,6 +2802,8 @@ eclipse-plugin/commons-collections-3.2.jar -text
 eclipse-plugin/commons-collections-3.2src.zip -text
 eclipse-plugin/commons-dbcp-1.2.2.jar -text
 eclipse-plugin/commons-dbcp-1.2.2src.zip -text
+eclipse-plugin/commons-io-1.4.jar -text
+eclipse-plugin/commons-io-1.4src.zip -text
 eclipse-plugin/commons-lang-2.4.jar -text
 eclipse-plugin/commons-logging-1.0.4.jar -text
 eclipse-plugin/commons-pool-1.3.jar -text
@@ -2715,6 +2856,8 @@ eclipse-plugin/lucene-core-2.4.0.jar -text
 eclipse-plugin/lucene-core-2.4.0src.zip -text
 eclipse-plugin/lucene-spellchecker-2.4.0.jar -text
 eclipse-plugin/lucene-spellchecker-2.4.0src.zip -text
+eclipse-plugin/mail-1.4.jar -text
+eclipse-plugin/mail-1.4src.zip -text
 eclipse-plugin/msbase-2000.3.jar -text
 eclipse-plugin/mssqlserver-2000.3.jar -text
 eclipse-plugin/msutil-2000.3.jar -text
@@ -2739,6 +2882,8 @@ eclipse-plugin/org.springframework.jdbc-3.0.0.RC1.jar -text
 eclipse-plugin/org.springframework.jdbc-3.0.0.RC1src.zip -text
 eclipse-plugin/org.springframework.orm-3.0.0.RC1.jar -text
 eclipse-plugin/org.springframework.orm-3.0.0.RC1src.zip -text
+eclipse-plugin/org.springframework.oxm-3.0.0.RC1.jar -text
+eclipse-plugin/org.springframework.oxm-3.0.0.RC1src.zip -text
 eclipse-plugin/org.springframework.test-3.0.0.RC1.jar -text
 eclipse-plugin/org.springframework.test-3.0.0.RC1src.zip -text
 eclipse-plugin/org.springframework.transaction-3.0.0.RC1.jar -text
@@ -2752,37 +2897,18 @@ eclipse-plugin/slf4j-api-1.5.2.jar -text
 eclipse-plugin/slf4j-api-1.5.2src.zip -text
 eclipse-plugin/slf4j-log4j12-1.5.2.jar -text
 eclipse-plugin/slf4j-log4j12-1.5.2src.zip -text
-eclipse-plugin/spring-2.5.6.jar -text
-eclipse-plugin/spring-2.5.6src.zip -text
-eclipse-plugin/spring-agent-2.5.6.jar -text
-eclipse-plugin/spring-agent-2.5.6src.zip -text
-eclipse-plugin/spring-aop-2.5.6.jar -text
-eclipse-plugin/spring-aop-2.5.6src.zip -text
-eclipse-plugin/spring-aspects-2.5.6.jar -text
-eclipse-plugin/spring-aspects-2.5.6src.zip -text
+eclipse-plugin/spring-beans-2.5.6-sources.jar -text
 eclipse-plugin/spring-beans-2.5.6.jar -text
-eclipse-plugin/spring-beans-2.5.6src.zip -text
-eclipse-plugin/spring-context-2.5.6.jar -text
-eclipse-plugin/spring-context-2.5.6src.zip -text
-eclipse-plugin/spring-core-2.5.6.jar -text
-eclipse-plugin/spring-core-2.5.6src.zip -text
-eclipse-plugin/spring-jdbc-2.5.6.jar -text
-eclipse-plugin/spring-jdbc-2.5.6src.zip -text
+eclipse-plugin/spring-beans-3.0.0.RELEASE.jar -text
+eclipse-plugin/spring-beans-3.0.0.RELEASEsrc.zip -text
+eclipse-plugin/spring-expression-3.0.0.RELEASE.jar -text
+eclipse-plugin/spring-expression-3.0.0.RELEASEsrc.zip -text
 eclipse-plugin/spring-modules-lucene-0.8a.jar -text
 eclipse-plugin/spring-modules-lucene-0.8asrc.zip -text
-eclipse-plugin/spring-orm-2.5.6.jar -text
-eclipse-plugin/spring-orm-2.5.6src.zip -text
-eclipse-plugin/spring-security-core-2.0.4-tests.jar -text
-eclipse-plugin/spring-security-core-2.0.4.jar -text
-eclipse-plugin/spring-security-core-2.0.4src.zip -text
-eclipse-plugin/spring-test-2.5.6.jar -text
-eclipse-plugin/spring-test-2.5.6src.zip -text
-eclipse-plugin/spring-tx-2.5.6.jar -text
-eclipse-plugin/spring-tx-2.5.6src.zip -text
-eclipse-plugin/spring-web-2.5.6.jar -text
-eclipse-plugin/spring-web-2.5.6src.zip -text
-eclipse-plugin/spring-webmvc-2.5.6.jar -text
-eclipse-plugin/spring-webmvc-2.5.6src.zip -text
+eclipse-plugin/spring-security-core-3.0.0.RELEASE.jar -text
+eclipse-plugin/spring-security-core-3.0.0.RELEASEsrc.zip -text
+eclipse-plugin/spring-tx-3.0.0.RELEASE.jar -text
+eclipse-plugin/spring-tx-3.0.0.RELEASEsrc.zip -text
 eclipse-plugin/src/test/java/eu/etaxonomy/cdm/aspectj/PropertyChangeTest.java -text
 eclipse-plugin/wsdl4j-1.6.1.jar -text
 eclipse-plugin/wsdl4j-1.6.1src.zip -text
@@ -2794,97 +2920,10 @@ eclipse-plugin/yjp-controller-api-redist-8.0.1.jar -text
 eclipse-updateSite/.project -text
 eclipse-updateSite/index.html -text
 eclipse-updateSite/site.xml -text
-libraryTesterApplication/.classpath -text
-libraryTesterApplication/.project -text
-libraryTesterApplication/cdmResources/applicationContext.xml -text
-libraryTesterApplication/cdmResources/cdm.datasource.xml -text
-libraryTesterApplication/cdmResources/sessionfactory.xml -text
-libraryTesterApplication/lib/antlr-2.7.6.jar -text
-libraryTesterApplication/lib/aopalliance-1.0.jar -text
-libraryTesterApplication/lib/asm-attrs.jar -text
-libraryTesterApplication/lib/asm.jar -text
-libraryTesterApplication/lib/aspectjrt-1.5.2a.jar -text
-libraryTesterApplication/lib/cglib-2.1.3.jar -text
-libraryTesterApplication/lib/commons-collections-2.1.1.jar -text
-libraryTesterApplication/lib/commons-logging-1.0.4.jar -text
-libraryTesterApplication/lib/dom4j-1.6.1.jar -text
-libraryTesterApplication/lib/ehcache-1.2.3.jar -text
-libraryTesterApplication/lib/ejb3-persistence.jar -text
-libraryTesterApplication/lib/hibernate-annotations.jar -text
-libraryTesterApplication/lib/hibernate-commons-annotations.jar -text
-libraryTesterApplication/lib/hibernate-validator.jar -text
-libraryTesterApplication/lib/hibernate3.jar -text
-libraryTesterApplication/lib/hsqldb.jar -text
-libraryTesterApplication/lib/javassist.jar -text
-libraryTesterApplication/lib/jaxb-api.jar -text
-libraryTesterApplication/lib/jaxb-impl-2.0-sources.jar -text
-libraryTesterApplication/lib/jaxb-impl-2.0.jar -text
-libraryTesterApplication/lib/jdbc2_0-stdext.jar -text
-libraryTesterApplication/lib/jdom-1.0.jar -text
-libraryTesterApplication/lib/jta.jar -text
-libraryTesterApplication/lib/jtds-1.2.2.jar -text
-libraryTesterApplication/lib/junit-4.4.jar -text
-libraryTesterApplication/lib/log4j-1.2.14.jar -text
-libraryTesterApplication/lib/msbase-2000.3.jar -text
-libraryTesterApplication/lib/mssqlserver-2000.3.jar -text
-libraryTesterApplication/lib/msutil-2000.3.jar -text
-libraryTesterApplication/lib/mysql-connector-java-3.1.14-bin.jar -text
-libraryTesterApplication/lib/opencsv-1.8.jar -text
-libraryTesterApplication/lib/postgresql-8.2-504.jdbc4.jar -text
-libraryTesterApplication/lib/spring-2.5.jar -text
-libraryTesterApplication/lib/spring-beans-2.5.jar -text
-libraryTesterApplication/lib/spring-context-2.5.jar -text
-libraryTesterApplication/lib/spring-core-2.5.jar -text
-libraryTesterApplication/lib/spring-jdbc-2.5.jar -text
-libraryTesterApplication/lib/spring-orm-2.5.jar -text
-libraryTesterApplication/lib/spring-test-2.5.jar -text
-libraryTesterApplication/lib/spring-tx-2.5.jar -text
-libraryTesterApplication/lib/xercesImpl.jar -text
-libraryTesterApplication/lib/xml-apis.jar -text
-libraryTesterApplication/src/CdmDestinations.java -text
-libraryTesterApplication/src/Profiling.java -text
-libraryTesterApplication/src/testJar/TestJarMain.java -text
-musiclib-hibernatetest/listAnnotatedClasses.py -text
-musiclib-hibernatetest/pom.xml -text
-musiclib-hibernatetest/src/main/java/org/bgbm/model/Annotatable.java -text
-musiclib-hibernatetest/src/main/java/org/bgbm/model/Annotation.java -text
-musiclib-hibernatetest/src/main/java/org/bgbm/model/Band.java -text
-musiclib-hibernatetest/src/main/java/org/bgbm/model/EntityBase.java -text
-musiclib-hibernatetest/src/main/java/org/bgbm/model/Label.java -text
-musiclib-hibernatetest/src/main/java/org/bgbm/model/Record.java -text
-musiclib-hibernatetest/src/main/java/org/bgbm/model/Track.java -text
-musiclib-hibernatetest/src/main/java/org/bgbm/model/package-info.java -text
-musiclib-hibernatetest/src/main/java/org/bgbm/persistence/dao/DaoBase.java -text
-musiclib-hibernatetest/src/main/java/org/bgbm/persistence/dao/GenericDao.java -text
-musiclib-hibernatetest/src/main/java/org/bgbm/persistence/dao/IDao.java -text
-musiclib-hibernatetest/src/main/java/org/bgbm/persistence/dao/RecordDaoImpl.java -text
-musiclib-hibernatetest/src/main/resources/appInitContext.xml -text
-musiclib-hibernatetest/src/main/resources/applicationContext.xml -text
-musiclib-hibernatetest/src/main/resources/log4j.properties -text
-musiclib-hibernatetest/src/site/site.xml -text
-musiclib-hibernatetest/src/test/java/org/bgbm/persistence/dao/DatabaseInitialiser.java -text
-musiclib-hibernatetest/src/test/java/org/bgbm/persistence/dao/RecordDaoImplTest.java -text
-musiclib-hibernatetest/src/test/java/org/bgbm/persistence/dao/TestIt.java -text
-musiclib-hibernatetest/target/mvn-eclipse-cache.properties -text
 pdfdocs/cdm.pdf -text
 pdfdocs/cdmlib-config.properties -text
 pdfdocs/cdmlib-doc.sh -text
 pdfdocs/pdfdoclet-1.0.2-all.jar -text
-pluginTesterApplication/.classpath -text
-pluginTesterApplication/.project -text
-pluginTesterApplication/META-INF/MANIFEST.MF -text
-pluginTesterApplication/build.properties -text
-pluginTesterApplication/icons/alt_window_16.gif -text
-pluginTesterApplication/icons/alt_window_32.gif -text
-pluginTesterApplication/plugin.xml -text
-pluginTesterApplication/src/plugintesterapplication/Activator.java -text
-pluginTesterApplication/src/plugintesterapplication/Application.java -text
-pluginTesterApplication/src/plugintesterapplication/ApplicationActionBarAdvisor.java -text
-pluginTesterApplication/src/plugintesterapplication/ApplicationWorkbenchAdvisor.java -text
-pluginTesterApplication/src/plugintesterapplication/ApplicationWorkbenchWindowAdvisor.java -text
-pluginTesterApplication/src/plugintesterapplication/Perspective.java -text
-pluginTesterApplication/src/plugintesterapplication/View.java -text
-pluginTesterApplication/src/test/testClass.java -text
 /pom.xml -text
 /settings.xml -text
 src/docbkx/ReferenceDocumentation.xml -text