Refactored webapplication specific configurations into a new project. cdmlib-remote...

[cdmlib.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index a7925e3470d2937391a578e689a291e3966d1d1c..7d4e45a31dd6fbd092165bbdeded614655fb1985 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -8,13 +8,19 @@ app-import/src/main/java/eu/etaxonomy/cdm/app/abcdImport/SynthesysCacheActivator
 app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/AlgaTerraActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/BerlinModelDestinations.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/BerlinModelSources.java -text
+app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/CampanulaceaeActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/SalvadorActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/SalvadorExport.java -text
 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/CdmImportSources.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/eflora/EfloraSources.java -text
+app-import/src/main/java/eu/etaxonomy/cdm/app/eflora/FloraMalesianaActivator.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/globis/GlobisActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/images/AbstractImageImporter.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/images/ImageImportConfigurator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/images/ImageImportState.java -text
@@ -27,11 +33,15 @@ app-import/src/main/java/eu/etaxonomy/cdm/app/pesi/FaunaEuropaeaActivator.java -
 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/FaunaEuErmsFindIdenticalNamesActivator.java -text
+app-import/src/main/java/eu/etaxonomy/cdm/app/pesi/merging/FaunaEuErmsMergeActivator.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
 app-import/src/main/java/eu/etaxonomy/cdm/app/sdd/CicadActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/sdd/CicadUpdateActivator.java -text
+app-import/src/main/java/eu/etaxonomy/cdm/app/sdd/CichorieaeActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/sdd/ErythroneuraActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/sdd/ErythroneuraUpdateActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/sdd/FreshwaterAquaticInsectsActivator.java -text
@@ -48,16 +58,20 @@ 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
 app-import/src/main/java/eu/etaxonomy/cdm/app/util/TestTransaction.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/viennaImport/ViennaActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/cichorieae/CichorieaeActivator.java -text
+app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/cichorieae/CichorieaeCacheUpdater.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/cichorieae/CichorieaeImageActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/cichorieae/TaraxacumActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/diptera/DipteraActivator.java -text
+app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/diptera/DipteraCollectionImport.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/diptera/DipteraDistributionParser.java -text
+app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/diptera/DipteraPostImportUpdater.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/palmae/PalmaeActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/palmae/PalmaeExcelProtologueActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/palmae/PalmaeImageActivator.java -text
@@ -69,10 +83,25 @@ app-import/src/main/java/eu/etaxonomy/cdm/io/CichorieaeImageImport.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/io/PalmaeImageImport.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/io/PalmaeProtologueImport.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/io/ProtologueImport.java -text
+app-import/src/main/java/eu/etaxonomy/cdm/io/eflora/floraMalesiana/FloraMalesianaImportBase.java -text
+app-import/src/main/java/eu/etaxonomy/cdm/io/eflora/floraMalesiana/FloraMalesianaImportConfigurator.java -text
+app-import/src/main/java/eu/etaxonomy/cdm/io/eflora/floraMalesiana/FloraMalesianaImportState.java -text
+app-import/src/main/java/eu/etaxonomy/cdm/io/eflora/floraMalesiana/FloraMalesianaTaxonImport.java -text
+app-import/src/main/java/eu/etaxonomy/cdm/io/eflora/floraMalesiana/FloraMalesianaTransformer.java -text
+app-import/src/main/java/eu/etaxonomy/cdm/io/eflora/floraMalesiana/UnmatchedLeads.java -text
+app-import/src/main/java/eu/etaxonomy/cdm/io/globis/GlobisImportBase.java -text
+app-import/src/main/java/eu/etaxonomy/cdm/io/globis/GlobisImportConfigurator.java -text
+app-import/src/main/java/eu/etaxonomy/cdm/io/globis/GlobisImportState.java -text
+app-import/src/main/java/eu/etaxonomy/cdm/io/globis/GlobisReferenceImport.java -text
+app-import/src/main/java/eu/etaxonomy/cdm/io/globis/GlobisTransformer.java -text
+app-import/src/main/java/eu/etaxonomy/cdm/io/globis/validation/GlobisReferenceImportValidator.java -text
 app-import/src/main/resources/Asteraceae[!!-~]Specimen[!!-~]Images[!!-~]Vienna.xls -text
 app-import/src/main/resources/AsteraceaeSpecimenImagesVienna.mdb -text
 app-import/src/main/resources/arecaceae.rdf -text
+app-import/src/main/resources/collections/Acronyms.tab -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/globis_valid.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
@@ -82,6 +111,7 @@ app-import/src/main/resources/images/protologue_links_palmae.xls -text
 app-import/src/main/resources/log4j.properties -text
 app-import/src/main/resources/sdd/Cicad.sdd11.xml -text
 app-import/src/main/resources/sdd/Cicad2.sdd11.xml -text
+app-import/src/main/resources/sdd/Crepis-test.sdd -text
 app-import/src/main/resources/sdd/Erythroneura.sdd11.xml -text
 app-import/src/main/resources/sdd/LIAS_Main.sdd11.xml -text
 app-import/src/main/resources/sdd/SDD-Test-Simple.xml -text
@@ -1135,6 +1165,42 @@ app-import/src/main/resources/taxonX/palm_tc_98863.xml -text
 app-import/src/main/resources/taxonX/palm_tc_98882.xml -text
 app-import/src/main/resources/taxonX/palm_tc_98886.xml -text
 app-import/src/main/resources/tcsXmlTest.xml -text
+cdm-server/LICENSE.TXT -text
+cdm-server/ide/eclipse/Bootloader[!!-~]-[!!-~]Help.launch -text
+cdm-server/ide/eclipse/Bootloader.launch -text
+cdm-server/ide/eclipse/run[!!-~]cdm-server.jar[!!-~]in[!!-~]debugmode.launch -text
+cdm-server/ide/eclipse/run[!!-~]cdm-server.jar.launch -text
+cdm-server/pom.xml -text
+cdm-server/src/main/assembly/assembly.xml -text
+cdm-server/src/main/installer/lib/ant-deb-task-0.0.1.jar -text
+cdm-server/src/main/installer/linux/Makefile -text
+cdm-server/src/main/installer/linux/build-deb.xml -text
+cdm-server/src/main/installer/linux/cdmserver -text
+cdm-server/src/main/installer/linux/copyright -text
+cdm-server/src/main/installer/linux/postinst -text
+cdm-server/src/main/installer/linux/postrm -text
+cdm-server/src/main/installer/templates/.cdmLibrary/datasources.xml -text
+cdm-server/src/main/installer/templates/copyright -text
+cdm-server/src/main/installer/win32/Launch4JavaCDMSERVER.xml -text
+cdm-server/src/main/installer/win32/cdmserver.nsi -text
+cdm-server/src/main/installer/win32/cdmserver/bin/cdmserver.bat -text
+cdm-server/src/main/java/eu/etaxonomy/cdm/server/Bootloader.java -text
+cdm-server/src/main/java/eu/etaxonomy/cdm/server/CdmInstanceProperties.java -text
+cdm-server/src/main/java/eu/etaxonomy/cdm/server/CommandOptions.java -text
+cdm-server/src/main/java/eu/etaxonomy/cdm/server/DataSourcePropertyParser.java -text
+cdm-server/src/main/java/eu/etaxonomy/cdm/server/JvmManager.java -text
+cdm-server/src/main/resources/c3p0.properties -text
+cdm-server/src/main/resources/log4j.properties -text
+cdm-server/src/main/webapp/WEB-INF/web.xml -text
+cdm-server/src/main/webapp/css/server.css -text
+cdm-server/src/main/webapp/css/style.css -text
+cdm-server/src/main/webapp/favicon.ico -text
+cdm-server/src/main/webapp/index.html -text
+cdm-server/src/main/webapp/index.jsp -text
+cdm-server/src/main/webapp/js/jquery.js -text
+cdm-server/src/main/webapp/js/jquery.min.js -text
+cdm-server/src/main/webapp/js/oai-pmh-status.js -text
+cdm-server/src/main/webapp/robots.txt -text
 cdmlib-commons/LICENSE.TXT -text
 cdmlib-commons/README.TXT -text
 cdmlib-commons/pom.xml -text
@@ -1144,6 +1210,8 @@ cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/DoubleResult.java -text
 cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/ExcelUtils.java -text
 cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/FileCopy.java -text
 cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/ResultWrapper.java -text
+cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/Tree.java -text
+cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/TreeNode.java -text
 cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/XmlHelp.java -text
 cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/mediaMetaData/AudioMetaData.java -text
 cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/mediaMetaData/ImageMetaData.java -text
@@ -1178,38 +1246,60 @@ cdmlib-ext/src/test/resources/eu/etaxonomy/cdm.datasources.xml -text
 cdmlib-ext/src/test/resources/eu/etaxonomy/cdm/applicationContext.xml -text
 cdmlib-ext/src/test/resources/eu/etaxonomy/cdm/cdm.datasources.xml -text
 cdmlib-ext/src/test/resources/log4j.properties -text
+cdmlib-feature-source/.project -text
+cdmlib-feature-source/build.properties -text
+cdmlib-feature-source/feature.xml -text
+cdmlib-feature/.classpath -text
+cdmlib-feature/.project -text
+cdmlib-feature/build.properties -text
+cdmlib-feature/feature.xml -text
 cdmlib-io/LICENSE.TXT -text
 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/BerlinModelOccurrenceSourceImport.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
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelUserImport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/in/BerlinModelWebMarkerCategoryImport.java -text
 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/BerlinModelOccurrenceSourceImportValidator.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
@@ -1249,20 +1339,20 @@ cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/mapper/IndexCounter.
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/mapper/MethodMapper.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/mapper/RefDetailMapper.java -text
 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/CacheUpdater.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CacheUpdaterConfigurator.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,7 +1365,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/IXmlMapper.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/ImportConfiguratorBase.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ImportHelper.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ImportStateBase.java -text
@@ -1283,12 +1374,86 @@ 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/IDbImportTransformed.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/mapping/IDbImportTransformer.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/IXmlMapper.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
@@ -1299,8 +1464,6 @@ cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/taxa/NormalExplicitImportConfi
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/taxa/NormalExplicitRow.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/taxa/TaxonExcelImportState.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/taxa/TaxonExcelImporterBase.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/CdmImportConfigurator.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/CdmImportState.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaAuthorImport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaDistribution.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaDistributionImport.java -text
@@ -1317,11 +1480,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,13 +1496,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
@@ -1358,18 +1531,16 @@ cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDExportState.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDImportConfigurator.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDImportState.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDIoBase.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/AbcdIO.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/SpecimenImportConfigurator.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/SpecimenImportState.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/SpecimenIoBase.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/UnitsGatheringArea.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/UnitsGatheringEvent.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/SpecimenImportConfigurator.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/SpecimenImportState.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/SpecimenIoBase.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/SynthesysIO.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/UnitsGatheringArea.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/UnitsGatheringEvent.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/SpecimenIoBase.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/UnitsGatheringArea.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/UnitsGatheringEvent.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/Abcd206DataHolder.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/Abcd206Import.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/Abcd206ImportConfigurator.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/abcd206/in/Abcd206ImportState.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/in/SpecimenExcelImport.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/in/SpecimenExcelImportConfigurator.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/excel/in/SpecimenExcelImportState.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/taxonx/SimpleSpecimen.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/taxonx/TaxonXDescriptionImport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/taxonx/TaxonXImportConfigurator.java -text
@@ -1425,6 +1596,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
@@ -1455,7 +1627,6 @@ cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/test/function/TestDatabase.java -tex
 cdmlib-io/src/test/java/eu/etaxonomy/cdm/test/integration/TestCdmDbComparator.java -text
 cdmlib-io/src/test/resources/dbscripts/001_cdm.ddl -text
 cdmlib-io/src/test/resources/eu/etaxonomy/cdm/applicationContext-test.xml -text
-cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/abcd206/SpecimenImportConfiguratorTest-input.xml -text
 cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/dataset.dtd -text
 cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/excel/taxa/DenormalExplicit.xls -text
 cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/excel/taxa/DenormalImplied.xls -text
@@ -1482,18 +1653,22 @@ cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/jaxb/TermTest.xml -text
 cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/reference/EndnoteRecordImportTest-input.xml -text
 cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/sdd/SDD-Test-Simple.xml -text
 cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/sdd/SDDDescriptionIOTest-input.xml -text
+cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/specimen/abcd206/in/SpecimenImportConfiguratorTest-input.xml -text
 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
@@ -1601,7 +1776,7 @@ cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/MeasurementUnit.ja
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/MediaKey.java -text
 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
@@ -1640,6 +1815,7 @@ cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/ImageFile.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/Media.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/MediaRepresentation.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/MediaRepresentationPart.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/MediaUtils.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/MovieFile.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/ReferencedMedia.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/Rights.java -text
@@ -1671,6 +1847,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
@@ -1751,6 +1928,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
@@ -1771,11 +1949,15 @@ cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/view/context/ThreadLocalAuditE
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/IStrategy.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/StrategyBase.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/agent/INomenclaturalAuthorCacheStrategy.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/agent/InstitutionDefaultCacheStrategy.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/agent/PersonDefaultCacheStrategy.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/agent/TeamDefaultCacheStrategy.java -text
 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/common/TermDefaultCacheStrategy.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/media/MediaDefaultCacheStrategy.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
@@ -1783,6 +1965,7 @@ cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/name/INonViralNameCac
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/name/NameCacheStrategyBase.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/name/NonViralNameDefaultCacheStrategy.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/name/ZooNameDefaultCacheStrategy.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/occurrence/CollectionDefaultCacheStrategy.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/reference/ArticleDefaultCacheStrategy.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/reference/BookDefaultCacheStrategy.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/reference/BookSectionDefaultCacheStrategy.java -text
@@ -1817,15 +2000,29 @@ cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/parser/INonViralNameParser.
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/parser/NonViralNameParserImpl.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/parser/NonViralNameParserImplRegExBase.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/parser/ParserProblem.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/parser/TaxonNameParserHistory.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/parser/location/CoordinateConverter.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/ChildTaxaMustNotSkipRanks.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/ChildTaxaMustNotSkipRanksValidator.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
@@ -1850,6 +2047,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
@@ -1869,6 +2067,8 @@ cdmlib-model/src/main/resources/terms/TaxonRelationshipType.csv -text
 cdmlib-model/src/main/resources/terms/TdwgArea.csv -text
 cdmlib-model/src/main/resources/terms/TextFormat.csv -text
 cdmlib-model/src/main/resources/terms/WaterbodyOrCountry.csv -text
+cdmlib-model/src/main/resources/update/update_r2.1.2.2_r2.4.1.2.mysql.sql -text
+cdmlib-model/src/main/resources/update/update_term_r2.4.2.1-r2.4.2.2.mysql.sql -text
 cdmlib-model/src/site/resources/images/uml/Agent.png -text
 cdmlib-model/src/site/resources/images/uml/Base_classes.png -text
 cdmlib-model/src/site/resources/images/uml/Defined_terms.png -text
@@ -1891,12 +2091,15 @@ cdmlib-model/src/site/resources/images/uml/Types_section.png -text
 cdmlib-model/src/site/resources/images/uml/package_overview.png -text
 cdmlib-model/src/site/site.xml -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/aspectj/PropertyChangeTest.java -text
+cdmlib-model/src/test/java/eu/etaxonomy/cdm/datagenerator/TaxonGenerator.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/DatabaseInitialiser.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/agent/AgentValidationTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/agent/InstitutionTypeTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/agent/InstitutionalMembershipTest.java -text
+cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/agent/TeamTest.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
@@ -1911,6 +2114,7 @@ cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/init/DefaultTermInitial
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/init/TermLoaderTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/PresenceAbsenceTermBaseTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/TextDataTest.java -text
+cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/location/PointTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/location/TdwgAreaTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/media/MediaTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/BotanicalNameTest.java -text
@@ -1932,16 +2136,23 @@ cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/TaxonTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/TaxonomicTreeTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/agent/PersonDefaultCacheStrategyTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/agent/TeamDefaultCacheStrategyTest.java -text
+cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/common/TermDefaultCacheStrategyTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/description/TaxonDescriptionDefaultCacheStrategyTest.java -text
+cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/media/MediaDefaultCacheStrategyTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/BotanicNameCacheStrategyTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/NonViralNameDefaultCacheStrategyTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/ZoologicalNameCacheStrategyTest.java -text
+cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/reference/ArticleDefaultCacheStrategyTest.java -text
+cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/reference/BookDefaultCacheStrategyTest.java -text
+cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/reference/BookSectionDefaultCacheStrategyTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/reference/CdDvdDefaultCacheStrategyTest.java -text
+cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/reference/ReferenceTypeTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/taxon/TaxonBaseDefaultCacheStrategyTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/match/DefaultMatchStrategyTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/merge/DefaultMergeStrategyTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/parser/NonViralNameParserImplTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/parser/ParserProblemTest.java -text
+cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/parser/location/CoordinateConverterTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/test/function/TestFullReferenceParser.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/test/function/TestModel.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/test/function/TestSpecimen.java -text
@@ -1961,6 +2172,7 @@ cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplication
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/CdmDataSource.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/CdmDataSourceBase.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/CdmPersistentDataSource.java -text
+cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/DataSourceBeanLoader.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/DataSourceInfo.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/DataSourceNotFoundException.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/DataSourceReloader.java -text
@@ -1988,9 +2200,13 @@ cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/types/SqlServer2000Da
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/types/SqlServer2005DatabaseType.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/types/SybaseDatabaseType.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/AbstractBeanInitializer.java -text
+cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/AutoPropertyInitializer.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/TitleCacheAutoInitializer.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
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/common/IAnnotatableDao.java -text
@@ -2106,6 +2322,7 @@ cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/query/GroupByCount
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/query/GroupByDate.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/query/Grouping.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/query/MatchMode.java -text
+cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/query/NativeSqlOrderHint.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/query/OrderHint.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/query/RandomOrder.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/view/IAuditEventDao.java -text
@@ -2135,6 +2352,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
@@ -2255,24 +2473,193 @@ cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/override.prop
 cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/override.properties-testPersistentDataSource -text
 cdmlib-persistence/src/test/resources/log4j.properties -text
 cdmlib-persistence/src/test/resources/unitils.properties -text
+cdmlib-plugin/.classpath -text
+cdmlib-plugin/.project -text
+cdmlib-plugin/META-INF/MANIFEST.MF -text
+cdmlib-plugin/_makeSources.bat -text
+cdmlib-plugin/_makeSources.sh -text
+cdmlib-plugin/activation-1.1.jar -text
+cdmlib-plugin/activation-1.1src.zip -text
+cdmlib-plugin/antlr-2.7.6.jar -text
+cdmlib-plugin/aopalliance-1.0.jar -text
+cdmlib-plugin/asm-attrs.jar -text
+cdmlib-plugin/asm.jar -text
+cdmlib-plugin/aspectjrt-1.6.3.jar -text
+cdmlib-plugin/aspectjtools-1.6.3.jar -text
+cdmlib-plugin/aspectjweaver-1.6.3.jar -text
+cdmlib-plugin/build.properties -text
+cdmlib-plugin/build_ant.xml -text
+cdmlib-plugin/c3p0-0.9.1.jar -text
+cdmlib-plugin/c3p0-0.9.1src.zip -text
+cdmlib-plugin/cglib-2.1.3.jar -text
+cdmlib-plugin/commons-beanutils-1.7.0.jar -text
+cdmlib-plugin/commons-beanutils-1.7.0src.zip -text
+cdmlib-plugin/commons-collections-3.2.jar -text
+cdmlib-plugin/commons-collections-3.2src.zip -text
+cdmlib-plugin/commons-dbcp-1.2.2.jar -text
+cdmlib-plugin/commons-dbcp-1.2.2src.zip -text
+cdmlib-plugin/commons-io-1.4.jar -text
+cdmlib-plugin/commons-io-1.4src.zip -text
+cdmlib-plugin/commons-lang-2.4.jar -text
+cdmlib-plugin/commons-logging-1.0.4.jar -text
+cdmlib-plugin/commons-pool-1.3.jar -text
+cdmlib-plugin/commons-pool-1.3src.zip -text
+cdmlib-plugin/dom4j-1.6.1.jar -text
+cdmlib-plugin/dozer-4.4.jar -text
+cdmlib-plugin/dozer-4.4src.zip -text
+cdmlib-plugin/ehcache-1.2.3.jar -text
+cdmlib-plugin/ehcache-1.2.3src.zip -text
+cdmlib-plugin/ejb3-persistence.jar -text
+cdmlib-plugin/ezmorph-1.0.4.jar -text
+cdmlib-plugin/ezmorph-1.0.4src.zip -text
+cdmlib-plugin/h2-1.1.115.jar -text
+cdmlib-plugin/hibernate-3.2.6.ga.jar -text
+cdmlib-plugin/hibernate-3.2.6.gasrc.zip -text
+cdmlib-plugin/hibernate-annotations-3.4.0-SNAPSHOT.jar -text
+cdmlib-plugin/hibernate-annotations-3.4.0-SNAPSHOTsrc.zip -text
+cdmlib-plugin/hibernate-commons-annotations-3.4.0-SNAPSHOT.jar -text
+cdmlib-plugin/hibernate-commons-annotations-3.4.0-SNAPSHOTsrc.zip -text
+cdmlib-plugin/hibernate-core-3.4.0-SNAPSHOT.jar -text
+cdmlib-plugin/hibernate-core-3.4.0-SNAPSHOTsrc.zip -text
+cdmlib-plugin/hibernate-envers-3.4.0-SNAPSHOT.jar -text
+cdmlib-plugin/hibernate-envers-3.4.0-SNAPSHOTsrc.zip -text
+cdmlib-plugin/hibernate-search-3.0.1.GA.jar -text
+cdmlib-plugin/hibernate-search-3.1.0.GA.jar -text
+cdmlib-plugin/hibernate-search-3.1.0.GAsrc.zip -text
+cdmlib-plugin/hibernate-tools-3.2.0.ga.jar -text
+cdmlib-plugin/hibernate-validator-3.1.0.GA.jar -text
+cdmlib-plugin/hibernate-validator-4.0.0.CR1.jar -text
+cdmlib-plugin/hibernate-validator-4.0.0.CR1src.zip -text
+cdmlib-plugin/hibernate-validator.jar -text
+cdmlib-plugin/hibernate3.jar -text
+cdmlib-plugin/hibernate3src.zip -text
+cdmlib-plugin/hsqldb.jar -text
+cdmlib-plugin/javassist.jar -text
+cdmlib-plugin/jaxb-api-2.1.6.jar -text
+cdmlib-plugin/jaxb-impl-2.1.6-sources.jar -text
+cdmlib-plugin/jaxb-impl-2.1.6.jar -text
+cdmlib-plugin/jdbc-1.2.jar -text
+cdmlib-plugin/jdbc2_0-stdext.jar -text
+cdmlib-plugin/jdom-1.0.jar -text
+cdmlib-plugin/joda-time-1.5.jar -text
+cdmlib-plugin/joda-time-1.5src.zip -text
+cdmlib-plugin/joda-time-hibernate-1.0.jar -text
+cdmlib-plugin/json-lib-2.2.3-jdk15.jar -text
+cdmlib-plugin/json-lib-2.2.3-jdk15src.zip -text
+cdmlib-plugin/jsr250-api-1.0.jar -text
+cdmlib-plugin/jsr250-api-1.0src.zip -text
+cdmlib-plugin/jta.jar -text
+cdmlib-plugin/jtds-1.2.2.jar -text
+cdmlib-plugin/junit-4.4.jar -text
+cdmlib-plugin/log4j-1.2.14.jar -text
+cdmlib-plugin/log4j-1.2.14src.zip -text
+cdmlib-plugin/lsid-client-1.1.2.jar -text
+cdmlib-plugin/lsid-server-1.1.2.jar -text
+cdmlib-plugin/lucene-core-2.4.0.jar -text
+cdmlib-plugin/lucene-core-2.4.0src.zip -text
+cdmlib-plugin/lucene-spellchecker-2.4.0.jar -text
+cdmlib-plugin/lucene-spellchecker-2.4.0src.zip -text
+cdmlib-plugin/mail-1.4.jar -text
+cdmlib-plugin/mail-1.4src.zip -text
+cdmlib-plugin/msbase-2000.3.jar -text
+cdmlib-plugin/mssqlserver-2000.3.jar -text
+cdmlib-plugin/msutil-2000.3.jar -text
+cdmlib-plugin/mysql-connector-java-3.1.14-bin.jar -text
+cdmlib-plugin/opencsv-1.8.jar -text
+cdmlib-plugin/org.apache.commons.codec-1.3.0.jar -text
+cdmlib-plugin/org.springframework.aop-3.0.0.RELEASE.jar -text
+cdmlib-plugin/org.springframework.aop-3.0.0.RELEASEsrc.zip -text
+cdmlib-plugin/org.springframework.asm-3.0.0.RELEASE.jar -text
+cdmlib-plugin/org.springframework.asm-3.0.0.RELEASEsrc.zip -text
+cdmlib-plugin/org.springframework.aspects-3.0.0.RELEASE.jar -text
+cdmlib-plugin/org.springframework.aspects-3.0.0.RELEASEsrc.zip -text
+cdmlib-plugin/org.springframework.beans-3.0.0.RELEASE.jar -text
+cdmlib-plugin/org.springframework.beans-3.0.0.RELEASEsrc.zip -text
+cdmlib-plugin/org.springframework.context-3.0.0.RELEASE.jar -text
+cdmlib-plugin/org.springframework.context-3.0.0.RELEASEsrc.zip -text
+cdmlib-plugin/org.springframework.context.support-3.0.0.RELEASE.jar -text
+cdmlib-plugin/org.springframework.context.support-3.0.0.RELEASEsrc.zip -text
+cdmlib-plugin/org.springframework.core-3.0.0.RELEASE.jar -text
+cdmlib-plugin/org.springframework.core-3.0.0.RELEASEsrc.zip -text
+cdmlib-plugin/org.springframework.expression-3.0.0.RELEASE.jar -text
+cdmlib-plugin/org.springframework.expression-3.0.0.RELEASEsrc.zip -text
+cdmlib-plugin/org.springframework.jdbc-3.0.0.RELEASE.jar -text
+cdmlib-plugin/org.springframework.jdbc-3.0.0.RELEASEsrc.zip -text
+cdmlib-plugin/org.springframework.orm-3.0.0.RELEASE.jar -text
+cdmlib-plugin/org.springframework.orm-3.0.0.RELEASEsrc.zip -text
+cdmlib-plugin/org.springframework.oxm-3.0.0.RC1.jar -text
+cdmlib-plugin/org.springframework.oxm-3.0.0.RC1src.zip -text
+cdmlib-plugin/org.springframework.oxm-3.0.0.RELEASE.jar -text
+cdmlib-plugin/org.springframework.oxm-3.0.0.RELEASEsrc.zip -text
+cdmlib-plugin/org.springframework.test-3.0.0.RELEASE.jar -text
+cdmlib-plugin/org.springframework.test-3.0.0.RELEASEsrc.zip -text
+cdmlib-plugin/org.springframework.transaction-3.0.0.RELEASE.jar -text
+cdmlib-plugin/org.springframework.transaction-3.0.0.RELEASEsrc.zip -text
+cdmlib-plugin/org.springframework.web-3.0.0.RELEASE.jar -text
+cdmlib-plugin/org.springframework.web-3.0.0.RELEASEsrc.zip -text
+cdmlib-plugin/org.springframework.web.servlet-3.0.0.RELEASE.jar -text
+cdmlib-plugin/org.springframework.web.servlet-3.0.0.RELEASEsrc.zip -text
+cdmlib-plugin/plugin.xml -text
+cdmlib-plugin/poi-3.1-FINAL.jar -text
+cdmlib-plugin/pom.xml -text
+cdmlib-plugin/postgresql-8.2-504.jdbc4.jar -text
+cdmlib-plugin/sanselan-0.94-incubator.jar -text
+cdmlib-plugin/servlet-api-2.5.jar -text
+cdmlib-plugin/servlet-api-2.5src.zip -text
+cdmlib-plugin/slf4j-api-1.5.2.jar -text
+cdmlib-plugin/slf4j-api-1.5.2src.zip -text
+cdmlib-plugin/slf4j-log4j12-1.5.2.jar -text
+cdmlib-plugin/slf4j-log4j12-1.5.2src.zip -text
+cdmlib-plugin/spring-beans-2.5.6-sources.jar -text
+cdmlib-plugin/spring-beans-2.5.6.jar -text
+cdmlib-plugin/spring-beans-3.0.0.RELEASE.jar -text
+cdmlib-plugin/spring-beans-3.0.0.RELEASEsrc.zip -text
+cdmlib-plugin/spring-expression-3.0.0.RELEASE.jar -text
+cdmlib-plugin/spring-expression-3.0.0.RELEASEsrc.zip -text
+cdmlib-plugin/spring-modules-cache-0.7.jar -text
+cdmlib-plugin/spring-modules-cache-0.7src.zip -text
+cdmlib-plugin/spring-modules-lucene-0.8a.jar -text
+cdmlib-plugin/spring-modules-lucene-0.8asrc.zip -text
+cdmlib-plugin/spring-security-core-3.0.0.RELEASE.jar -text
+cdmlib-plugin/spring-security-core-3.0.0.RELEASEsrc.zip -text
+cdmlib-plugin/spring-tx-3.0.0.RELEASE.jar -text
+cdmlib-plugin/spring-tx-3.0.0.RELEASEsrc.zip -text
+cdmlib-plugin/src/main/assembly/assembly.xml -text
+cdmlib-plugin/src/test/java/eu/etaxonomy/cdm/aspectj/PropertyChangeTest.java -text
+cdmlib-plugin/wsdl4j-1.6.1.jar -text
+cdmlib-plugin/wsdl4j-1.6.1src.zip -text
+cdmlib-plugin/xercesImpl.jar -text
+cdmlib-plugin/xml-apis.jar -text
+cdmlib-plugin/xml-resolver-1.2.jar -text
+cdmlib-plugin/xml-resolver-1.2src.zip -text
+cdmlib-plugin/xom-1.0.jar -text
+cdmlib-plugin/xstream-1.3.1.jar -text
+cdmlib-plugin/xstream-1.3.1src.zip -text
+cdmlib-plugin/yjp-controller-api-redist-8.0.1.jar -text
+cdmlib-remote-webapp/LICENSE.TXT -text
+cdmlib-remote-webapp/README.TXT -text
+cdmlib-remote-webapp/ide/eclipse/cdmserver[!!-~]-[!!-~]run.launch -text
+cdmlib-remote-webapp/pom.xml -text
+cdmlib-remote-webapp/src/main/java/eu/etaxonomy/cdm/remote/config/AbstractWebApplicationConfigurer.java -text
+cdmlib-remote-webapp/src/main/java/eu/etaxonomy/cdm/remote/config/DataSourceConfigurer.java -text
+cdmlib-remote-webapp/src/main/java/eu/etaxonomy/cdm/remote/config/LoggingConfigurer.java -text
+cdmlib-remote-webapp/src/main/webapp/WEB-INF/applicationContext.views.xml -text
+cdmlib-remote-webapp/src/main/webapp/WEB-INF/applicationContext.xml -text
+cdmlib-remote-webapp/src/main/webapp/WEB-INF/cdmrest-servlet.xml -text
+cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/configurable.xml -text
+cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/datasources-local.xml -text
+cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/empty-default-datasource.xml -text
+cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/p6spy.xml -text
+cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/routing-datasource.xml -text
+cdmlib-remote-webapp/src/main/webapp/WEB-INF/views.xml -text
+cdmlib-remote-webapp/src/main/webapp/WEB-INF/web.xml -text
+cdmlib-remote-webapp/src/main/webapp/human.xsl -text
+cdmlib-remote-webapp/src/main/webapp/oai2.xsl -text
+cdmlib-remote-webapp/src/site/site.xml -text
+cdmlib-remote-webapp/src/test/java/eu/etaxonomy/AppTest.java -text
 cdmlib-remote/LICENSE.TXT -text
 cdmlib-remote/README.TXT -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
-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
-cdmlib-remote/src/main/installer/templates/cdmserver -text
-cdmlib-remote/src/main/installer/templates/copyright -text
-cdmlib-remote/src/main/installer/win32/Launch4JavaCDMSERVER.xml -text
-cdmlib-remote/src/main/installer/win32/cdmserver.nsi -text
-cdmlib-remote/src/main/installer/win32/cdmserver/bin/cdmserver.bat -text
 cdmlib-remote/src/main/java/carbonfive/spring/web/pathparameter/ParameterizedPathFilter.java -text
 cdmlib-remote/src/main/java/carbonfive/spring/web/pathparameter/ParameterizedPathMatcher.java -text
 cdmlib-remote/src/main/java/carbonfive/spring/web/pathparameter/ParameterizedPathMatcherException.java -text
@@ -2286,8 +2673,12 @@ cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/AnnotatableContro
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/BadResumptionTokenException.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/BaseController.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/BaseListController.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ClassificationController.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ClassificationListController.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DerivedUnitFacadeController.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionController.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionListController.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionPortalController.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ExternalGeoController.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/FeatureListController.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/HttpStatusMessage.java -text
@@ -2305,13 +2696,20 @@ cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ReferenceControll
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ReferenceListController.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonController.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonListController.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonNodeController.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonNodeListController.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonPortalController.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonomicTreeController.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonomicTreePortalController.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonomicTreePortalListController.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TermController.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TermListController.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/VocabularyController.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/VocabularyListController.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/interceptor/ContentNegociationHandlerInterceptor.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/interceptor/DatasourceContextHandlerInterceptor.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/interceptor/LocaleContextHandlerInterceptor.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/oaipmh/TaxonOaiPmhController.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/util/CdmAntPathMatcher.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/TagEnum.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/TaggedText.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/assembler/DozerBeanMapperFactoryBean.java -text
@@ -2328,6 +2726,8 @@ cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/dc/Relation.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/oaipmh/About.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/oaipmh/DeletedRecord.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/oaipmh/Description.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/oaipmh/Error.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/oaipmh/ErrorCode.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/oaipmh/GetRecord.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/oaipmh/Granularity.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/oaipmh/Header.java -text
@@ -2340,8 +2740,6 @@ cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/oaipmh/Metadata.java -te
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/oaipmh/MetadataFormat.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/oaipmh/MetadataPrefix.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/oaipmh/OAIPMH.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/oaipmh/OAIPMHerror.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/oaipmh/OAIPMHerrorcode.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/oaipmh/OaiDc.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/oaipmh/ObjectFactory.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/oaipmh/Record.java -text
@@ -2375,36 +2773,49 @@ cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/tdwg/voc/TaxonRelationsh
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/tdwg/voc/Team.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/editor/ClassPropertyEditor.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/editor/DateTimeEditor.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/editor/IsoDateTimeEditor.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/editor/LSIDAuthorityPropertyEditor.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/editor/LSIDPropertyEditor.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/editor/MatchModePropertyEditor.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/editor/MetadataPrefixEditor.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/editor/NamedAreaLevelPropertyEditor.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/editor/NamedAreaPropertyEditor.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/editor/RankPropertyEditor.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/editor/SetSpecEditor.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/editor/UUIDListPropertyEditor.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/editor/UUIDPropertyEditor.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/editor/UuidList.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/exception/CannotDisseminateFormatException.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/exception/CdmExceptionResolver.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/exception/NoRecordsMatchException.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/JsonConfigFactoryBean.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/AbstractCdmBeanProcessor.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/CGLibEnhancedBeanProcessorMatcher.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/CalendarJSONValueProcessor.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/CdmBeanProcessingRegistry.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/CdmProxyBeanProcessorMatcher.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/ClassJSONValueProcessor.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/DateTimeJSONValueProcessor.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/HibernateJSONValueProcessor.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/HibernateJSONValueProcessorMatcher.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/HibernateProxyBeanProcessor.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/HibernateProxyBeanProcessorMatcher.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/MediaBeanProcessor.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/NameRelationshipBeanProcessor.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/PartialJSONValueProcessor.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/TaxonBeanProcessor.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/TaxonNameBaseBeanProcessor.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/TaxonNodeBeanProcessor.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/TaxonRelationshipBeanProcessor.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/TaxonomyNodeBeanProcessor.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/TermBaseBeanProcessor.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/TextDataBeanProcessor.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/UUIDJSONValueProcessor.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/AbstractCdmBeanProcessor.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/HibernateProxyBeanProcessor.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/MediaBeanProcessor.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/NameRelationshipBeanProcessor.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/ReferenceBaseBeanProcessor.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonBeanProcessor.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonNameBaseBeanProcessor.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonNameDescriptionBeanProcessor.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonNodeBeanProcessor.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonNodeDaoBeanProcessor.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TaxonRelationshipBeanProcessor.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TermBaseBeanProcessor.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TextDataBeanProcessor.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/bean/TypeDesignationBaseBeanProcessor.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/matcher/CGLibEnhancedBeanProcessorMatcher.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/matcher/CdmProxyBeanProcessorMatcher.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/matcher/HibernateJSONValueProcessorMatcher.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/matcher/HibernateProxyBeanProcessorMatcher.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/value/CalendarJSONValueProcessor.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/value/ClassJSONValueProcessor.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/value/DateTimeJSONValueProcessor.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/value/HibernateJSONValueProcessor.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/value/MapJSONValueProcessor.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/value/PartialJSONValueProcessor.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/value/UUIDJSONValueProcessor.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/util/CardinalityPropertyFilter.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/util/InitializedHibernatePropertyFilter.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/l10n/LocaleContext.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/service/AuthorityController.java -text
@@ -2419,6 +2830,8 @@ 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/ExceptionView.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
@@ -2433,37 +2846,14 @@ cdmlib-remote/src/main/java/eu/etaxonomy/remote/dto/rdf/Rdf.java -text
 cdmlib-remote/src/main/java/net/sf/json/CycleSetAcess.java -text
 cdmlib-remote/src/main/resources/eu/etaxonomy/cdm/remote.xml -text
 cdmlib-remote/src/main/resources/eu/etaxonomy/cdm/remote/dto/oaipmh/mappings.xml -text
+cdmlib-remote/src/main/resources/eu/etaxonomy/cdm/remote/dto/oaipmh/oai2.xsl -text
 cdmlib-remote/src/main/resources/eu/etaxonomy/cdm/remote/dto/tdwg/mappings-deep.xml -text
 cdmlib-remote/src/main/resources/eu/etaxonomy/cdm/remote/dto/tdwg/mappings-shallow.xml -text
 cdmlib-remote/src/main/resources/eu/etaxonomy/cdm/remote/dto/tdwg/mappings.xml -text
+cdmlib-remote/src/main/resources/eu/etaxonomy/cdm/remote/ehcache.xml -text
+cdmlib-remote/src/main/resources/eu/etaxonomy/cdm/remote/json/jsonConfigurations.xml -text
 cdmlib-remote/src/main/resources/log4j.properties -text
-cdmlib-remote/src/main/resources/oai-pmh.xsd -text
 cdmlib-remote/src/main/resources/spy.properties -text
-cdmlib-remote/src/main/webapp/WEB-INF/applicationContext.views.xml -text
-cdmlib-remote/src/main/webapp/WEB-INF/applicationContext.xml -text
-cdmlib-remote/src/main/webapp/WEB-INF/cdmrest-servlet.xml -text
-cdmlib-remote/src/main/webapp/WEB-INF/datasources/datasources-local.xml -text
-cdmlib-remote/src/main/webapp/WEB-INF/datasources/empty-default-datasource.xml -text
-cdmlib-remote/src/main/webapp/WEB-INF/datasources/example.cdmlibrary/datasources-set-A.xml -text
-cdmlib-remote/src/main/webapp/WEB-INF/datasources/example.cdmlibrary/datasources-set-B.xml -text
-cdmlib-remote/src/main/webapp/WEB-INF/datasources/example.cdmlibrary/use-A-set.sh -text
-cdmlib-remote/src/main/webapp/WEB-INF/datasources/example.cdmlibrary/use-B-set.sh -text
-cdmlib-remote/src/main/webapp/WEB-INF/datasources/p6spy.xml -text
-cdmlib-remote/src/main/webapp/WEB-INF/datasources/routing-datasource.xml -text
-cdmlib-remote/src/main/webapp/WEB-INF/jsonConfigurations.xml -text
-cdmlib-remote/src/main/webapp/WEB-INF/views.xml -text
-cdmlib-remote/src/main/webapp/WEB-INF/web.xml -text
-cdmlib-remote/src/main/webapp/favicon.ico -text svneol=unset#unset
-cdmlib-remote/src/main/webapp/index.html -text
-cdmlib-remote/src/main/webapp/index.jsp -text
-cdmlib-remote/src/main/webapp/js/jquery.js -text
-cdmlib-remote/src/main/webapp/js/jquery.min.js -text
-cdmlib-remote/src/main/webapp/jsp/datasources/list.jsp -text
-cdmlib-remote/src/main/webapp/jsp/index.jsp -text
-cdmlib-remote/src/main/webapp/robots.txt -text
-cdmlib-remote/src/main/webapp/server.css -text
-cdmlib-remote/src/main/webapp/style.css -text
-cdmlib-remote/src/site/site.xml -text
 cdmlib-remote/src/test/java/eu/etaxonomy/cdm/remote/dto/assembler/lsid/AssemblerTest.java -text
 cdmlib-remote/src/test/java/eu/etaxonomy/cdm/remote/service/AuthorityControllerTest.java -text
 cdmlib-remote/src/test/java/eu/etaxonomy/cdm/remote/service/DataControllerTest.java -text
@@ -2490,6 +2880,13 @@ cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/application/eclipse/EclipseRc
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/application/eclipse/EclipseRcpSavePathMatchingResourcePatternResolver.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/conversation/ConversationHolder.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/conversation/IConversationEnabled.java -text
+cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacade.java -text
+cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeCacheStrategy.java -text
+cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeConfigurator.java -text
+cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeNotSupportedException.java -text
+cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/facade/MethodNotSupportedByDerivedUnitTypeException.java -text
+cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/AbstractCategoricalDescriptionBuilder.java -text
+cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/AbstractQuantitativeDescriptionBuilder.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/AbstractStringComparator.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/AgentServiceImpl.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/AnnotatableServiceBase.java -text
@@ -2498,7 +2895,12 @@ cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/AuditEventService.jav
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/CollectionServiceImpl.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/CommonServiceImpl.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DatabaseServiceHibernateImpl.java -text
+cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DefaultCategoricalDescriptionBuilder.java -text
+cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DefaultQuantitativeDescriptionBuilder.java -text
+cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DescriptionBuilder.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DescriptionServiceImpl.java -text
+cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DistributionNodeComparator.java -text
+cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DistributionTree.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/FeatureTreeServiceImpl.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IAgentService.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IAnnotatableService.java -text
@@ -2512,12 +2914,15 @@ 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
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonNodeComparator.java -text
+cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonNodeService.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonService.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonTreeService.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITermService.java -text
@@ -2526,15 +2931,21 @@ cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IVersionableService.j
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IVocabularyService.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IWorkingSetService.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IdentifiableServiceBase.java -text
+cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IdentificationKeyGenerator.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/NamedAreaNodeComparator.java -text
+cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NamedAreaTree.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
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ServiceImpl.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeByNameComparator.java -text
+cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImpl.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonServiceImpl.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonTreeServiceImpl.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TermServiceImpl.java -text
@@ -2584,9 +2995,14 @@ cdmlib-services/src/main/resources/wsdl/LSIDDataServiceHTTPBindings.wsdl -text
 cdmlib-services/src/main/resources/wsdl/LSIDDataServiceSOAPBindings.wsdl -text
 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/facade/DerivedUnitFacadeCacheStrategyTest.java -text
+cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeTest.java -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/IdentifiableServiceBaseTest.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/NaturalLanguageGeneratorTest.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
 cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonTreeServiceImplTest.java -text
@@ -2597,6 +3013,7 @@ cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/lsid/LSIDDataServiceT
 cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/lsid/LSIDMetadataServiceTest.java -text
 cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/lsid/LSIDRegistryTest.java -text
 cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/pager/PagerTest.java -text
+cdmlib-services/src/test/java/eu/etaxonomy/cdm/scripts/FixMultipleTextDataInImageGalleries.java -text
 cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/Datasource.java -text
 cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/TestAgentService.java -text
 cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/TestC3P0Configuration.java -text
@@ -2621,6 +3038,11 @@ 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/IdentifiableServiceBaseTest.testUpdateTitleCache-result.xml -text
+cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/IdentifiableServiceBaseTest.xml -text
+cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/MediaDaoImplTest.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
@@ -2639,259 +3061,13 @@ cdmlib-services/src/test/resources/eu/etaxonomy/cdm/validation/ValidationTest.xm
 cdmlib-services/src/test/resources/log4j.properties -text
 cdmlib-services/src/test/resources/override.properties -text
 cdmlib-services/src/test/resources/unitils.properties -text
-eclipse-feature-source/.project -text
-eclipse-feature-source/build.properties -text
-eclipse-feature-source/feature.xml -text
-eclipse-feature/.classpath -text
-eclipse-feature/.project -text
-eclipse-feature/build.properties -text
-eclipse-feature/feature.xml -text
-eclipse-plugin/.classpath -text
-eclipse-plugin/.project -text
-eclipse-plugin/META-INF/MANIFEST.MF -text
-eclipse-plugin/_makeSources.bat -text
-eclipse-plugin/_makeSources.sh -text
-eclipse-plugin/activation-1.1.jar -text
-eclipse-plugin/activation-1.1src.zip -text
-eclipse-plugin/antlr-2.7.6.jar -text
-eclipse-plugin/aopalliance-1.0.jar -text
-eclipse-plugin/asm-attrs.jar -text
-eclipse-plugin/asm.jar -text
-eclipse-plugin/aspectjrt-1.6.3.jar -text
-eclipse-plugin/aspectjtools-1.6.3.jar -text
-eclipse-plugin/aspectjweaver-1.5.4.jar -text
-eclipse-plugin/aspectjweaver-1.6.3.jar -text
-eclipse-plugin/build.properties -text
-eclipse-plugin/build_ant.xml -text
-eclipse-plugin/cglib-2.1.3.jar -text
-eclipse-plugin/commons-beanutils-1.7.0.jar -text
-eclipse-plugin/commons-beanutils-1.7.0src.zip -text
-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-lang-2.4.jar -text
-eclipse-plugin/commons-logging-1.0.4.jar -text
-eclipse-plugin/commons-pool-1.3.jar -text
-eclipse-plugin/commons-pool-1.3src.zip -text
-eclipse-plugin/dom4j-1.6.1.jar -text
-eclipse-plugin/ehcache-1.2.3.jar -text
-eclipse-plugin/ejb3-persistence.jar -text
-eclipse-plugin/h2-1.1.115.jar -text
-eclipse-plugin/hibernate-3.2.6.ga.jar -text
-eclipse-plugin/hibernate-3.2.6.gasrc.zip -text
-eclipse-plugin/hibernate-annotations-3.4.0-SNAPSHOT.jar -text
-eclipse-plugin/hibernate-annotations-3.4.0-SNAPSHOTsrc.zip -text
-eclipse-plugin/hibernate-commons-annotations-3.4.0-SNAPSHOT.jar -text
-eclipse-plugin/hibernate-commons-annotations-3.4.0-SNAPSHOTsrc.zip -text
-eclipse-plugin/hibernate-core-3.4.0-SNAPSHOT.jar -text
-eclipse-plugin/hibernate-core-3.4.0-SNAPSHOTsrc.zip -text
-eclipse-plugin/hibernate-envers-3.4.0-SNAPSHOT.jar -text
-eclipse-plugin/hibernate-envers-3.4.0-SNAPSHOTsrc.zip -text
-eclipse-plugin/hibernate-search-3.0.1.GA.jar -text
-eclipse-plugin/hibernate-search-3.1.0.GA.jar -text
-eclipse-plugin/hibernate-search-3.1.0.GAsrc.zip -text
-eclipse-plugin/hibernate-tools-3.2.0.ga.jar -text
-eclipse-plugin/hibernate-validator-3.1.0.GA.jar -text
-eclipse-plugin/hibernate-validator-4.0.0.CR1.jar -text
-eclipse-plugin/hibernate-validator-4.0.0.CR1src.zip -text
-eclipse-plugin/hibernate-validator.jar -text
-eclipse-plugin/hibernate3.jar -text
-eclipse-plugin/hibernate3src.zip -text
-eclipse-plugin/hsqldb.jar -text
-eclipse-plugin/javassist.jar -text
-eclipse-plugin/jaxb-api-2.1.6.jar -text
-eclipse-plugin/jaxb-impl-2.1.6-sources.jar -text
-eclipse-plugin/jaxb-impl-2.1.6.jar -text
-eclipse-plugin/jdbc-1.2.jar -text
-eclipse-plugin/jdbc2_0-stdext.jar -text
-eclipse-plugin/jdom-1.0.jar -text
-eclipse-plugin/joda-time-1.5.jar -text
-eclipse-plugin/joda-time-1.5src.zip -text
-eclipse-plugin/joda-time-hibernate-1.0.jar -text
-eclipse-plugin/jsr250-api-1.0.jar -text
-eclipse-plugin/jsr250-api-1.0src.zip -text
-eclipse-plugin/jta.jar -text
-eclipse-plugin/jtds-1.2.2.jar -text
-eclipse-plugin/junit-4.4.jar -text
-eclipse-plugin/log4j-1.2.14.jar -text
-eclipse-plugin/log4j-1.2.14src.zip -text
-eclipse-plugin/lsid-client-1.1.2.jar -text
-eclipse-plugin/lsid-server-1.1.2.jar -text
-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/msbase-2000.3.jar -text
-eclipse-plugin/mssqlserver-2000.3.jar -text
-eclipse-plugin/msutil-2000.3.jar -text
-eclipse-plugin/mysql-connector-java-3.1.14-bin.jar -text
-eclipse-plugin/opencsv-1.8.jar -text
-eclipse-plugin/org.apache.commons.codec-1.3.0.jar -text
-eclipse-plugin/org.springframework.aop-3.0.0.RC1.jar -text
-eclipse-plugin/org.springframework.aop-3.0.0.RC1src.zip -text
-eclipse-plugin/org.springframework.asm-3.0.0.RC1.jar -text
-eclipse-plugin/org.springframework.asm-3.0.0.RC1src.zip -text
-eclipse-plugin/org.springframework.aspects-3.0.0.RC1.jar -text
-eclipse-plugin/org.springframework.aspects-3.0.0.RC1src.zip -text
-eclipse-plugin/org.springframework.beans-3.0.0.RC1.jar -text
-eclipse-plugin/org.springframework.beans-3.0.0.RC1src.zip -text
-eclipse-plugin/org.springframework.context-3.0.0.RC1.jar -text
-eclipse-plugin/org.springframework.context-3.0.0.RC1src.zip -text
-eclipse-plugin/org.springframework.core-3.0.0.RC1.jar -text
-eclipse-plugin/org.springframework.core-3.0.0.RC1src.zip -text
-eclipse-plugin/org.springframework.expression-3.0.0.RC1.jar -text
-eclipse-plugin/org.springframework.expression-3.0.0.RC1src.zip -text
-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.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
-eclipse-plugin/org.springframework.transaction-3.0.0.RC1src.zip -text
-eclipse-plugin/plugin.xml -text
-eclipse-plugin/poi-3.1-FINAL.jar -text
-eclipse-plugin/pom.xml -text
-eclipse-plugin/postgresql-8.2-504.jdbc4.jar -text
-eclipse-plugin/sanselan-0.94-incubator.jar -text
-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.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-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/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
-eclipse-plugin/xercesImpl.jar -text
-eclipse-plugin/xml-apis.jar -text
-eclipse-plugin/xml-resolver-1.2.jar -text
-eclipse-plugin/xml-resolver-1.2src.zip -text
-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
+cdmlib-updateSite/.project -text
+cdmlib-updateSite/index.html -text
+cdmlib-updateSite/site.xml -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