removing deprecated DTOs
[cdmlib.git] / .gitattributes
index ffb9bc12b8c41b77b2163b2ae473ba2a7d76e59b..b7ca3835172c57dfdcced55227629da4ba2a7598 100644 (file)
@@ -1,6 +1,7 @@
 * text=auto !eol
 /INSTALL.TXT -text
 /LICENSE.TXT -text
+app-import/build.xml -text
 app-import/pom.xml -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/abcdImport/SpecimenImport.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/abcdImport/SynthesysCacheActivator.java -text
@@ -14,11 +15,13 @@ app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/SalvadorExport.j
 app-import/src/main/java/eu/etaxonomy/cdm/app/berlinModelImport/TreeCreator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/common/CdmDestinations.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/common/ImportUtils.java -text
+app-import/src/main/java/eu/etaxonomy/cdm/app/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/faunaEuropaea/FaunaEuropaeaActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/faunaEuropaea/FaunaEuropaeaSources.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
 app-import/src/main/java/eu/etaxonomy/cdm/app/jaxb/CdmDiffActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/jaxb/CdmExportImportActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/sdd/CicadActivator.java -text
@@ -44,23 +47,28 @@ 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/CichorieaeDistributionActivator.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/DipteraDistributionParser.java -text
+app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/diptera/DipteraImageActivator.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/PalmaeImageActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/palmae/PalmaeProtologueActivator.java -text
+app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/palmae/PalmaeProtologueImportActivator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/palmae/PalmaeTaxonXImportActivator.java -text
+app-import/src/main/java/eu/etaxonomy/cdm/app/wp6/palmae/config/PalmaeProtologueImportConfigurator.java -text
 app-import/src/main/java/eu/etaxonomy/cdm/io/CichorieaeImageImport.java -text
+app-import/src/main/java/eu/etaxonomy/cdm/io/DipteraImageImport.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/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/distribution/distribution_cich.xls -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
 app-import/src/main/resources/images/palmae/KPALM00000043.jpg -text
 app-import/src/main/resources/images/palmae/KPALM00000073.jpg -text
@@ -73,6 +81,189 @@ app-import/src/main/resources/sdd/SDD-Test-Simple.xml -text
 app-import/src/main/resources/sdd/Val-Rosandra-FRIDA-Key.sdd11.xml -text
 app-import/src/main/resources/specimenABCD/CDMtabular9c04a474e2_23_09_08.xls -text
 app-import/src/main/resources/specimenABCD/multiABCD.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_100446.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_101019.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_101287.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_101295.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_101351.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_102413.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_102642.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_102676.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_103166.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_105083.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_105167.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_105169.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_105173.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_105863.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_105914.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_106367.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_106701.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_106704.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_108905.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_109359.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_109603.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_110815.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_110849.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_112116.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_112570.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_114902.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_115065.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_115241.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_116121.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_119698.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_120771.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_122002.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_122220.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_122253.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_122270.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_123199.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_126597.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_12685.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_131903.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_133080.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_133540.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_134019.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_134356.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_135133.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_135689.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_136182.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_138042.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_140139.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_140153.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_141946.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_141976.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_14408.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_14493.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_14659.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_147488.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_149554.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_152639.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_152643.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_152713.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_152723.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_155739.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_155960.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_156062.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_156343.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_157807.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_157840.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_1609.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_161845.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_162076.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_163210.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_165270.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_165517.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_165577.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_166471.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_170755.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_170802.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_17421.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_17492.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_176695.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_177006.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_177113.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_17758.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_177584.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_177949.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_177951.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_178275.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_178298.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_179836.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_180131.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_181009.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_181786.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_185415.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_185418.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_18728.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_187844.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_188757.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_190785.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_192762.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_192897.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_192921.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_19406.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_19820.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_198777.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_199010.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_19957.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_202015.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_20299.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_203942.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_20600.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_207154.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_209200.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_212028.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_212847.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_213983.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_214124.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_214248.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_214384.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_214563.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_2146.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_214627.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_214813.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_215915.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_22256.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_22996.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_22999.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_24003.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_24320.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_2569.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_2736.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_2777.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_28121.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_28142.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_29331.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_32653.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_32719.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_32761.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_3314.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_34259.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_343990.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_34557.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_34756.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_351386.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_351388.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_36861.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_37246.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_37467.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_37774.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_38307.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_38888.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_40337.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_43720.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_43722.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_44368.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_44568.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_46332.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_46675.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_48218.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_5086.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_51852.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_53831.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_53854.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_53859.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_54901.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_55678.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_56719.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_60346.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_6141.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_61471.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_61490.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_64716.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_65391.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_66335.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_66392.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_70689.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_74204.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_8016.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_83031.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_88903.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_89268.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_93397.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_97874.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_98254.xml -text
+app-import/src/main/resources/taxonX/genus/palm_tc_98846.xml -text
 app-import/src/main/resources/taxonX/palm_tc_101020.xml -text
 app-import/src/main/resources/taxonX/palm_tc_101021.xml -text
 app-import/src/main/resources/taxonX/palm_tc_101023.xml -text
@@ -634,6 +825,8 @@ cdmlib-ext/LICENSE.TXT -text
 cdmlib-ext/README.TXT -text
 cdmlib-ext/pom.xml -text
 cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/EditGeoService.java -text
+cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/EditGeoServiceUtilities.java -text
+cdmlib-ext/src/main/java/eu/etaxonomy/cdm/ext/IEditGeoService.java -text
 cdmlib-ext/src/site/site.xml -text
 cdmlib-ext/src/test/java/eu/etaxonomy/cdm/ext/EditGeoServiceTest.java -text
 cdmlib-ext/src/test/java/eu/etaxonomy/cdm/test/suite/CdmTestSuite.java -text
@@ -647,28 +840,35 @@ cdmlib-io/README.TXT -text
 cdmlib-io/pom.xml -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/abcd206/AbcdIO.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/abcd206/SpecimenImportConfigurator.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/abcd206/SpecimenImportState.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/abcd206/SpecimenIoBase.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/abcd206/UnitsGatheringArea.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/abcd206/UnitsGatheringEvent.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelAuthorImport.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelAuthorTeamImport.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelCommonNamesImport.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelFactsImport.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelImportBase.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelImportConfigurator.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelNameFactsImport.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelNameStatusImport.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelOccurrenceImport.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelReferenceImport.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTaxonImport.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTaxonNameImport.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTaxonNameRelationImport.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTaxonRelationImport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTransformer.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTypesImport.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/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/BerlinModelTaxonNameImport.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/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
@@ -681,20 +881,26 @@ cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/BerlinModelReference
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/BerlinModelTaxonExport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/BerlinModelTaxonNameExport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/BerlinModelTaxonRelationExport.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/BerlinModelTaxonomicTreeExport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/CollectionExportMapping.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/DbExportState.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/IoState.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/mapper/CreatedAndNotesMapper.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/mapper/DbAnnotationMapper.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/mapper/DbBooleanMapper.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/mapper/DbClobMapper.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/mapper/DbConstantMapper.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/mapper/DbDateMapper.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/mapper/DbExportMapperBase.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/mapper/DbExtensionMapper.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/mapper/DbIntegerAnnotationMapper.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/mapper/DbIntegerExtensionMapper.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/mapper/DbMarkerMapper.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/mapper/DbNullMapper.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/mapper/DbObjectMapper.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/mapper/DbSequenceMapper.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/mapper/DbSingleAttributeExportMapperBase.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/mapper/DbStringMapper.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/mapper/DbTimePeriodMapper.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/mapper/DbUserMapper.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/mapper/FactCategoryMapper.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/mapper/IDbExportMapper.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/out/mapper/IdMapper.java -text
@@ -705,30 +911,45 @@ cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CdmApplicationAwareDefaultExp
 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/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/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
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ICdmExport.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ICdmExporter.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ICdmIO.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ICdmImport.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ICdmImporter.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/IExportConfigurator.java -text
 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/IXmlMapper.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ImportConfiguratorBase.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ImportHelper.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ImportStateBase.java -text
 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/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/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
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/distribution/DistributionImport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/distribution/DistributionImportConfigurator.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/distribution/DistributionImporter.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/taxa/NormalExplicitImport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/taxa/NormalExplicitImportConfigurator.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/taxa/NormalExplicitRow.java -text
@@ -737,7 +958,13 @@ cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaAuthorImp
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaDistributionImport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaImportBase.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaImportConfigurator.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaImportState.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaNameImport.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaRefImport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaReferenceImport.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaRelShipImport.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaRelTaxonIncludeImport.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaRelationshipImport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaTaxon.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaTaxonImport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaTransformer.java -text
@@ -749,8 +976,10 @@ 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/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
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/JaxbImport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/jaxb/JaxbImportConfigurator.java -text
+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
@@ -759,9 +988,12 @@ cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDDataSet.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDDescriptionIO.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDDocumentBuilder.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/sdd/SDDExportConfigurator.java -text
+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/synthesys/SpecimenImportConfigurator.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/synthesys/SpecimenImportState.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/synthesys/SpecimenIoBase.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/synthesys/SynthesysIO.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/synthesys/UnitsGatheringArea.java -text
@@ -769,6 +1001,8 @@ cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/synthesys/UnitsGatheringEvent.java -
 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
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/taxonx/TaxonXImportState.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/taxonx/TaxonXModsImport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/taxonx/TaxonXNomenclatureImport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/taxonx/TaxonXTransformer.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsrdf/CdmOneToManyXmlMapper.java -text
@@ -777,25 +1011,30 @@ cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsrdf/CdmTextElementMapper.java -te
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsrdf/CdmUnclearMapper.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsrdf/TcsRdfImportBase.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsrdf/TcsRdfImportConfigurator.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsrdf/TcsRdfImportState.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsrdf/TcsRdfReferenceImport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsrdf/TcsRdfTaxonImport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsrdf/TcsRdfTaxonNameImport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsrdf/TcsRdfTaxonNameRelationsImport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsrdf/TcsRdfTaxonRelationsImport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsrdf/TcsRdfTransformer.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/CdmTcsXmlImport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/DefaultTcsXmlPlaceholders.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/ITcsXmlPlaceholderClass.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/TcsXmlImportBase.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/TcsXmlImportConfigurator.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/TcsXmlMetaDataImport.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/TcsXmlPublicationsImport.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/TcsXmlSpecimensImport.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/TcsXmlTaxonImport.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/TcsXmlTaxonNameImport.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/TcsXmlTaxonNameRelationsImport.java -text
-cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/TcsXmlTaxonRelationsImport.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/TcsXmlTransformer.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/in/CdmTcsXmlImport.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/in/TcsXmlImportBase.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/in/TcsXmlImportConfigurator.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/in/TcsXmlImportState.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/in/TcsXmlMetaDataImport.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/in/TcsXmlPublicationsImport.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/in/TcsXmlSpecimensImport.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/in/TcsXmlTaxonImport.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/in/TcsXmlTaxonNameImport.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/in/TcsXmlTaxonNameRelationsImport.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/in/TcsXmlTaxonRelationsImport.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/out/TcsXmlExportBase.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/out/TcsXmlExportConfigurator.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsxml/out/TcsXmlExportState.java -text
 cdmlib-io/src/main/resources/CatalogManager.properties -text
 cdmlib-io/src/main/resources/catalog.xml -text
 cdmlib-io/src/main/resources/defaultIoApplicationContext.xml -text
@@ -953,7 +1192,7 @@ cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/TimePeriod.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/UUIDUserType.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/User.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/VersionableEntity.java -text
-cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/VocabularyType.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/VocabularyEnum.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/WSDLDefinitionUserType.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/WrongTermTypeException.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/init/ITermInitializer.java -text
@@ -1094,7 +1333,7 @@ cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Thesis.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/WebPage.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/package-info.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/package.html -text
-cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/AlternativeViewRoot.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/AlternativeTreeRoot.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/Synonym.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/SynonymRelationship.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/SynonymRelationshipType.java -text
@@ -1104,7 +1343,7 @@ cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonComparator.java -te
 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
-cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonomicView.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonomicTree.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/package-info.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/package.html -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/view/AuditEvent.java -text
@@ -1142,17 +1381,19 @@ cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/reference/IReferenceB
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/reference/JournalDefaultCacheStrategy.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/reference/NomRefDefaultCacheStrategyBase.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/reference/StrictReferenceBaseDefaultCacheStrategy.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/reference/ThesisDefaultCacheStrategy.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/taxon/TaxonBaseDefaultCacheStrategy.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/exceptions/StringNotParsableException.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/exceptions/UnknownCdmTypeException.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/parser/INonViralNameParser.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/parser/NonViralNameParserImpl.java -text
-cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/taxon/TaxonBaseDefaultCacheStrategy.java -text
 cdmlib-model/src/main/resources/log4j.properties -text
 cdmlib-model/src/main/resources/terms/AbsenceTerm.csv -text
 cdmlib-model/src/main/resources/terms/AnnotationType.csv -text
 cdmlib-model/src/main/resources/terms/Continent.csv -text
 cdmlib-model/src/main/resources/terms/DerivationEventType.csv -text
 cdmlib-model/src/main/resources/terms/DeterminationModifier.csv -text
+cdmlib-model/src/main/resources/terms/ExtensionType.csv -text
 cdmlib-model/src/main/resources/terms/Feature.csv -text
 cdmlib-model/src/main/resources/terms/HybridRelationshipType.csv -text
 cdmlib-model/src/main/resources/terms/Language.csv -text
@@ -1203,6 +1444,7 @@ cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/AnnotationTest.java -te
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/CdmBaseTest.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
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/IdentifiableEntityTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/MarkerTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/MarkerTypeTest.java -text
@@ -1216,6 +1458,7 @@ cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/PresenceAbsenceTer
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/TextDataTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/location/TdwgAreaTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/BotanicalNameTest.java -text
+cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/HomotypicalGroupTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/NameTypeDesignationStatusTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/NameTypeDesignationTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/NomenclaturalStatusTypeTest.java -text
@@ -1229,7 +1472,7 @@ cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/TaxonBaseTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/TaxonComparatorTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/TaxonNodeTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/TaxonTest.java -text
-cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/taxon/TaxonomicViewTest.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/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
@@ -1248,6 +1491,7 @@ cdmlib-model/src/test/java/eu/etaxonomy/cdm/test/unit/EntityTestBase.java -text
 cdmlib-model/src/test/resources/log4j.properties -text
 cdmlib-persistence/LICENSE.TXT -text
 cdmlib-persistence/README.TXT -text
+cdmlib-persistence/build.xml -text
 cdmlib-persistence/pom.xml -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationUtils.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/CdmDataSource.java -text
@@ -1352,6 +1596,8 @@ cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/occu
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/reference/ReferenceDaoHibernateImpl.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonAlternativeSpellingSuggestionParser.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImpl.java -text
+cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImpl.java -text
+cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonomicTreeDaoHibernateImpl.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/view/AuditEventDao.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/media/IMediaDao.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/media/IMediaRepresentationDao.java -text
@@ -1364,6 +1610,8 @@ cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/occurrence/ICo
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/occurrence/IOccurrenceDao.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/reference/IReferenceDao.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/taxon/ITaxonDao.java -text
+cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/taxon/ITaxonNodeDao.java -text
+cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/taxon/ITaxonomicTreeDao.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/fetch/CdmFetch.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/CacheStrategyGenerator.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/CdmDataChangeEvent.java -text
@@ -1371,12 +1619,10 @@ cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/CdmDataC
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/CdmHibernateInterceptor.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/CdmPostDataChangeObservableListener.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/ICdmPostDataChangeObserver.java -text
-cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/MergeEntityListener.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/SaveEntityListener.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/UpdateEntityListener.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/OrderHint.java -text
-cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/query/SelectMode.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/view/IAuditEventDao.java -text
 cdmlib-persistence/src/main/java/org/hibernate/dialect/H2CorrectedDialect.java -text
 cdmlib-persistence/src/main/java/org/hibernate/dialect/HSQLCorrectedDialect.java -text
@@ -1423,6 +1669,7 @@ cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/name
 cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/name/TypeDesignationDaoHibernateImplTest.java -text
 cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/reference/ReferenceDaoHibernateImplTest.java -text
 cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.java -text
+cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImplTest.java -text
 cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/hibernate/CacheStrategyGeneratorTest.java -text
 cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/function/Datasource.java -text
 cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/function/TestCdmApplicationUtils.java -text
@@ -1497,7 +1744,9 @@ cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate
 cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.testDelete-result.xml -text
 cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.testFind.xml -text
 cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.testFindDeleted.xml -text
+cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.testGetTaxaByNameAndArea.xml -text
 cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.xml -text
+cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImplTest.xml -text
 cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/hibernate/CacheStrategyGeneratorTest.testOnSaveOrUpdate-result.xml -text
 cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/hibernate/CacheStrategyGeneratorTest.xml -text
 cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/override.properties -text
@@ -1513,6 +1762,7 @@ cdmlib-remote/src/main/java/carbonfive/spring/web/pathparameter/ParameterizedPat
 cdmlib-remote/src/main/java/carbonfive/spring/web/pathparameter/ParameterizedPathMatcher.java -text
 cdmlib-remote/src/main/java/carbonfive/spring/web/pathparameter/ParameterizedPathMatcherException.java -text
 cdmlib-remote/src/main/java/carbonfive/spring/web/pathparameter/ParameterizedUrlHandlerMapping.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/AbstractController.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/AbstractListController.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/AgentController.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/AgentListController.java -text
@@ -1521,10 +1771,12 @@ cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/BaseController.ja
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/BaseListController.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/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/FeatureTreeListController.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/FeatureTreeListPortalController.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/HttpStatusMessage.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ManagementController.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/MediaController.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/MediaListController.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/NameController.java -text
@@ -1538,64 +1790,14 @@ cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ReferencePortalCo
 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/TaxonPortalController.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonomyController.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/TermListController.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/dto/AnnotationElementSTO.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/AnnotationSTO.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/AnnotationTO.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/AssociationFeatureSTO.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/BaseSTO.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/BaseTO.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/DescriptionElementSTO.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/DescriptionTO.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/DistributionSTO.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/FeatureNodeTO.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/FeatureSTO.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/FeatureTO.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/FeatureTreeSTO.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/FeatureTreeTO.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/HomotypicTaxonGroupSTO.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/IBaseSTO.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/IReferenceSTO.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/IdentifiedString.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/InteractionFeatureSTO.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/LocalisedTermSTO.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/MediaRepresenationPartSTO.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/MediaRepresentationSTO.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/MediaSTO.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/MediaTO.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/NameRelationshipTO.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/NameSTO.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/NameTO.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/NameTypeDesignationSTO.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/ReferenceSTO.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/ReferenceTO.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/ReferencedEntityBaseSTO.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/ResultSetPageSTO.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/RightsSTO.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/SpecimenSTO.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/SpecimenTypeDesignationSTO.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/SynonymRelationshipTO.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/TaxonRelationshipTO.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/TaxonSTO.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/TaxonTO.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/TreeNode.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/TypeDesignationSTO.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/assembler/AnnotationAssembler.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/assembler/AssemblerBase.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/assembler/DescriptionAssembler.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/assembler/DozerBeanMapperFactoryBean.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/assembler/LocalisedTermAssembler.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/assembler/MediaAssembler.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/assembler/NameAssembler.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/assembler/ReferenceAssembler.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/assembler/SpecimenAssembler.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/assembler/TaxonAssembler.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/assembler/TypeDesignationAssembler.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/assembler/converter/DateTimeConverter.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/assembler/converter/HibernateProxyFieldMapper.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/assembler/converter/HibernateProxyNullSafeDeepConverter.java -text
@@ -1621,6 +1823,7 @@ 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/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/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/UUIDPropertyEditor.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/exception/CdmExceptionResolver.java -text
@@ -1636,9 +1839,12 @@ cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/processor/HibernateJSON
 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/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
@@ -1647,12 +1853,8 @@ cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/json/util/InitializedHiberna
 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
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/service/CdmObjectNonExisting.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/service/CdmServiceImpl.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/service/DataController.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/service/ICdmService.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/service/ManagementController.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/service/MetadataController.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/service/RestController.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/service/Utils.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/view/BaseView.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/view/HtmlView.java -text
@@ -1667,30 +1869,28 @@ cdmlib-remote/src/main/resources/eu/etaxonomy/cdm/remote.xml -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/log4j.properties -text
+cdmlib-remote/src/main/resources/log4j.properties -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-bgbm24-import.xml -text
 cdmlib-remote/src/main/webapp/WEB-INF/datasources/datasources-local.xml -text
-cdmlib-remote/src/main/webapp/WEB-INF/datasources/datasources-wp7virtual-import.xml -text
-cdmlib-remote/src/main/webapp/WEB-INF/datasources/datasources-wp7virtual-production-A.xml -text
-cdmlib-remote/src/main/webapp/WEB-INF/datasources/datasources-wp7virtual-production-B.xml -text
-cdmlib-remote/src/main/webapp/WEB-INF/datasources/empty-default-datasource-wp7virtual.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.jsp -text
-cdmlib-remote/src/main/webapp/jsp/error.jsp -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/site/site.xml -text
-cdmlib-remote/src/test/java/eu/etaxonomy/cdm/remote/dto/ResultSetPageSTOTest.java -text
-cdmlib-remote/src/test/java/eu/etaxonomy/cdm/remote/dto/assembler/AssemblerTestBase.java -text
-cdmlib-remote/src/test/java/eu/etaxonomy/cdm/remote/dto/assembler/NameSTOAssemblerTest.java -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
@@ -1715,6 +1915,7 @@ 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/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
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/AnnotationService.java -text
@@ -1736,6 +1937,7 @@ cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/INameService.java -te
 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/ITaxonService.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITermService.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IUserService.java -text
@@ -1748,6 +1950,7 @@ cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceImpl
 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/TaxonServiceImpl.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TermServiceImpl.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/UserService.java -text
@@ -1790,6 +1993,7 @@ 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/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/NameServiceImplTest2.java -text
 cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/TaxonServiceImplTest.java -text
@@ -1816,6 +2020,7 @@ cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/integration/TestTaxonService
 cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/suite/CdmTestSuite.java -text
 cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/unit/CdmUnitTestBase.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/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
@@ -1872,11 +2077,13 @@ eclipse-plugin/cglib-2.1.3.jar -text
 eclipse-plugin/commons-collections-2.1.1.jar -text
 eclipse-plugin/commons-collections-3.2-sources.jar -text
 eclipse-plugin/commons-collections-3.2.jar -text
+eclipse-plugin/commons-lang-2.4.jar -text
 eclipse-plugin/commons-logging-1.0.4.jar -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.0.73.jar -text
+eclipse-plugin/h2-1.1.115.jar -text
 eclipse-plugin/hibernate-3.2.6.ga-sources.jar -text
 eclipse-plugin/hibernate-3.2.6.ga.jar -text
 eclipse-plugin/hibernate-annotations-3.3.1.GA.jar -text
@@ -1903,6 +2110,7 @@ eclipse-plugin/javassist.jar -text
 eclipse-plugin/jaxb-api.jar -text
 eclipse-plugin/jaxb-impl-2.0-sources.jar -text
 eclipse-plugin/jaxb-impl-2.0.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-sources.jar -text
@@ -1926,6 +2134,7 @@ 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/plugin.xml -text
 eclipse-plugin/poi-3.1-FINAL.jar -text
 eclipse-plugin/pom.xml -text
@@ -2086,6 +2295,18 @@ pluginTesterApplication/src/plugintesterapplication/View.java -text
 pluginTesterApplication/src/test/testClass.java -text
 /pom.xml -text
 /settings.xml -text
+src/docbkx/ReferenceDocumentation.xml -text
+src/docbkx/annotation-and-markers.xml -text
+src/docbkx/base-classes.xml -text
+src/docbkx/basic-persistence.xml -text
+src/docbkx/identifiable-entities.xml -text
+src/docbkx/resources/css/html.css -text
+src/docbkx/resources/images/ModelOverview20.gif -text
+src/docbkx/resources/images/cdmlib-arch3.png -text
+src/docbkx/resources/images/logo.png -text
+src/docbkx/resources/xsl/cdmlib.xsl -text
+src/docbkx/resources/xsl/fopdf.xsl -text
+src/docbkx/resources/xsl/html_chunk.xsl -text
 src/site/resources/images/logos/logo_edit.png -text
 src/site/resources/images/logos/logo_edit2.png -text
 src/site/site.xml -text