BGBM BDI Projects / cdmlib.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
new controllers & improved JSON serialization
[cdmlib.git] / .gitattributes
diff --git a/.gitattributes b/.gitattributes
index 099a301895ef1ec478672a9dae57163ecdd03bf8..b853614a9a49d330344f4afb207949def9a021a1 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -54,7 +54,7 @@ app-import/src/main/java/eu/etaxonomy/cdm/io/PalmaeProtologueImport.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/Africa[!!-~]plus[!!-~]x.xls -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/palmae/KPALM00000001.jpg -text
 app-import/src/main/resources/images/palmae/KPALM00000043.jpg -text
@@ -645,8 +645,11 @@ cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/abcd206/SpecimenImportConfigurator.j
 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/BerlinModelAuthorExport.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/BerlinModelCommonNamesImport.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelExportBase.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelExportConfigurator.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
@@ -661,14 +664,16 @@ cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTaxonRelation
 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/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/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/CdmDefaultImport.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/CdmIoMapperBase.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/ExportConfiguratorBase.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/ICdmIO.java -text
@@ -676,6 +681,7 @@ cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/ICdmImport.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/ImportWrapper.java -text
@@ -721,7 +727,8 @@ cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/taxonx/TaxonXDescriptionImport.java
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/taxonx/TaxonXImportConfigurator.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/CdmIoXmlMapperBase.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsrdf/CdmOneToManyXmlMapper.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsrdf/CdmSingleAttributeXmlMapperBase.java -text
 cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/tcsrdf/CdmTextElementMapper.java -text
 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
@@ -778,6 +785,7 @@ cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/jaxb/SimpleMarshalTest.java -text
 cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/jaxb/SpecimenTest.java -text
 cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/jaxb/TaxonNameTest.java -text
 cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/jaxb/TaxonTest.java -text
+cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/jaxb/TermTest.java -text
 cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/jaxb/URIEncoder.java -text
 cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/sdd/SDDCdmExporterTest.java -text
 cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/sdd/SDDDescriptionIOTest.java -text
@@ -807,6 +815,7 @@ cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/jaxb/ReferenceTest.xml -text
 cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/jaxb/SpecimenTest.xml -text
 cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/jaxb/TaxonNameTest.xml -text
 cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/jaxb/TaxonTest.xml -text
+cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/jaxb/TermTest.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/taxonx/TaxonXImportConfiguratorTest-input.xml -text
@@ -845,6 +854,7 @@ cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/AnnotatableEntity.java
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Annotation.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/AnnotationType.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/CdmBase.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/Credit.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefaultTermInitializer.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/DefinedTermBase.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/EventBase.java -text
@@ -898,7 +908,6 @@ cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/WSDLDefinitionUserType.
 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
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/init/ITermLoader.java -text
-cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/init/IVocabularyStore.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/init/TermLoader.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/init/TermNotFoundException.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/package-info.java -text
@@ -974,15 +983,17 @@ cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/ITypeDesignation.java -te
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NameRelationship.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NameRelationshipType.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NameTypeDesignation.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NameTypeDesignationStatus.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NomenclaturalCode.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NomenclaturalStatus.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NomenclaturalStatusType.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/NonViralName.java -text
 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/TypeDesignationBase.java -text
-cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/TypeDesignationStatus.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
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/ZoologicalName.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/name/package-info.java -text
@@ -1025,6 +1036,7 @@ cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/PrintSeries.java -te
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/PrintedUnitBase.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Proceedings.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/PublicationBase.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Publisher.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/ReferenceBase.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Report.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/SectionBase.java -text
@@ -1039,8 +1051,10 @@ 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/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/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
@@ -1070,6 +1084,7 @@ cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/reference/ArticleDefa
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/reference/BibtexDefaultCacheStrategy.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
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/reference/CdDvdDefaultCacheStrategy.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/reference/GenericDefaultCacheStrategy.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/reference/INomenclaturalReferenceCacheStrategy.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/reference/IReferenceBaseCacheStrategy.java -text
@@ -1091,6 +1106,7 @@ cdmlib-model/src/main/resources/terms/HybridRelationshipType.csv -text
 cdmlib-model/src/main/resources/terms/Language.csv -text
 cdmlib-model/src/main/resources/terms/MarkerType.csv -text
 cdmlib-model/src/main/resources/terms/NameRelationshipType.csv -text
+cdmlib-model/src/main/resources/terms/NameTypeDesignationStatus.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/NomenclaturalCode.csv -text
@@ -1101,11 +1117,11 @@ cdmlib-model/src/main/resources/terms/README.TXT -text
 cdmlib-model/src/main/resources/terms/Rank.csv -text
 cdmlib-model/src/main/resources/terms/RightsTerm.csv -text
 cdmlib-model/src/main/resources/terms/Sex.csv -text
+cdmlib-model/src/main/resources/terms/SpecimenTypeDesignationStatus.csv -text
 cdmlib-model/src/main/resources/terms/StatisticalMeasure.csv -text
 cdmlib-model/src/main/resources/terms/SynonymRelationshipType.csv -text
 cdmlib-model/src/main/resources/terms/TaxonRelationshipType.csv -text
 cdmlib-model/src/main/resources/terms/TdwgArea.csv -text
-cdmlib-model/src/main/resources/terms/TypeDesignationStatus.csv -text
 cdmlib-model/src/main/resources/terms/WaterbodyOrCountry.csv -text
 cdmlib-model/src/site/resources/images/uml/Agent.png -text
 cdmlib-model/src/site/resources/images/uml/Base_classes.png -text
@@ -1148,14 +1164,20 @@ 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/NameTypeDesignationStatusTest.java -text
+cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/NomenclaturalStatusTypeTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/NonViralNameTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/RankTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/TaxonNameBaseTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/occurrence/SpecimenTest.java -text
+cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/reference/PublicationBaseTest.java -text
 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/strategy/cache/name/BotanicNameCacheStrategyTest.java -text
+cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/CdDvdDefaultCacheStrategyTest.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/parser/NonViralNameParserImplTest.java -text
@@ -1178,13 +1200,16 @@ cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/CdmDataSource.java -t
 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/DataSourceNotFoundException.java -text
+cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/DataSourceReloader.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/DatabaseTypeEnum.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/DbSchemaValidation.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/H2Mode.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/ICdmDataSource.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/LocalH2.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/LocalHsqldb.java -text
+cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/NamedContextHolder.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/PersistentTermInitializer.java -text
+cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/UpdatableRoutingDataSource.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/types/DatabaseTypeBase.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/types/Db2DatabaseType.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/types/H2DatabaseType.java -text
@@ -1197,6 +1222,8 @@ cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/types/PostgreSQLDatab
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/types/SqlServer2000DatabaseType.java -text
 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/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/QueryParseException.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/agent/IAgentDao.java -text
@@ -1229,6 +1256,8 @@ cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/description/IF
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/description/IFeatureTreeDao.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/description/IStatisticalMeasurementValueDao.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/AlternativeSpellingSuggestionParser.java -text
+cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/HibernateBeanInitializer.java -text
+cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/HibernateProxyHelperExtended.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/agent/AgentDaoImpl.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/AnnotatableDaoImpl.java -text
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/AnnotationDaoImpl.java -text
@@ -1281,8 +1310,15 @@ cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/reference/IRef
 cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/taxon/ITaxonDao.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
+cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/CdmDataChangeMap.java -text
 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/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/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
@@ -1322,7 +1358,9 @@ cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/comm
 cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/description/DescriptionDaoHibernateImplTest.java -text
 cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/media/MediaDaoImplTest.java -text
 cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/name/TaxonNameDaoHibernateImplTest.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/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
 cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/function/TestPersistence.java -text
@@ -1339,26 +1377,22 @@ cdmlib-persistence/src/test/resources/dbscripts/hibernate.cfg.xml -text
 cdmlib-persistence/src/test/resources/dbscripts/hibernate.properties -text
 cdmlib-persistence/src/test/resources/eu.etaxonomy.cdm.model.common.DefinedTermBase/segments.gen -text
 cdmlib-persistence/src/test/resources/eu.etaxonomy.cdm.model.common.DefinedTermBase/segments_1 -text
-cdmlib-persistence/src/test/resources/eu.etaxonomy.cdm.model.common.LanguageString/segments.gen -text
-cdmlib-persistence/src/test/resources/eu.etaxonomy.cdm.model.common.LanguageString/segments_1 -text
+cdmlib-persistence/src/test/resources/eu.etaxonomy.cdm.model.common.LanguageStringBase/segments.gen -text
+cdmlib-persistence/src/test/resources/eu.etaxonomy.cdm.model.common.LanguageStringBase/segments_1 -text
 cdmlib-persistence/src/test/resources/eu.etaxonomy.cdm.model.description.DescriptionBase/segments.gen -text
 cdmlib-persistence/src/test/resources/eu.etaxonomy.cdm.model.description.DescriptionBase/segments_1 -text
 cdmlib-persistence/src/test/resources/eu.etaxonomy.cdm.model.description.DescriptionElementBase/_0.cfs -text
+cdmlib-persistence/src/test/resources/eu.etaxonomy.cdm.model.description.DescriptionElementBase/_2.cfs -text
 cdmlib-persistence/src/test/resources/eu.etaxonomy.cdm.model.description.DescriptionElementBase/segments.gen -text
-cdmlib-persistence/src/test/resources/eu.etaxonomy.cdm.model.description.DescriptionElementBase/segments_3 -text
+cdmlib-persistence/src/test/resources/eu.etaxonomy.cdm.model.description.DescriptionElementBase/segments_5 -text
 cdmlib-persistence/src/test/resources/eu.etaxonomy.cdm.model.name.TaxonNameBase/segments.gen -text
 cdmlib-persistence/src/test/resources/eu.etaxonomy.cdm.model.name.TaxonNameBase/segments_1 -text
-cdmlib-persistence/src/test/resources/eu.etaxonomy.cdm.model.taxon.TaxonBase/_0.cfs -text
-cdmlib-persistence/src/test/resources/eu.etaxonomy.cdm.model.taxon.TaxonBase/_1.cfs -text
 cdmlib-persistence/src/test/resources/eu.etaxonomy.cdm.model.taxon.TaxonBase/_2.cfs -text
-cdmlib-persistence/src/test/resources/eu.etaxonomy.cdm.model.taxon.TaxonBase/_3.cfs -text
-cdmlib-persistence/src/test/resources/eu.etaxonomy.cdm.model.taxon.TaxonBase/_4.cfs -text
-cdmlib-persistence/src/test/resources/eu.etaxonomy.cdm.model.taxon.TaxonBase/_5.cfs -text
 cdmlib-persistence/src/test/resources/eu.etaxonomy.cdm.model.taxon.TaxonBase/segments.gen -text
-cdmlib-persistence/src/test/resources/eu.etaxonomy.cdm.model.taxon.TaxonBase/segments_d -text
+cdmlib-persistence/src/test/resources/eu.etaxonomy.cdm.model.taxon.TaxonBase/segments_4 -text
 cdmlib-persistence/src/test/resources/eu.etaxonomy.cdm.model.taxon.TaxonBase_spelling/_0.cfs -text
 cdmlib-persistence/src/test/resources/eu.etaxonomy.cdm.model.taxon.TaxonBase_spelling/segments.gen -text
-cdmlib-persistence/src/test/resources/eu.etaxonomy.cdm.model.taxon.TaxonBase_spelling/segments_3 -text
+cdmlib-persistence/src/test/resources/eu.etaxonomy.cdm.model.taxon.TaxonBase_spelling/segments_2 -text
 cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/applicationContext-test.xml -text
 cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/applicationContext-testPersistentDataSource.xml -text
 cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/applicationContext.xml -text
@@ -1390,11 +1424,14 @@ cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate
 cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/description/DescriptionDaoHibernateImplTest.xml -text
 cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/media/MediaDaoImplTest.xml -text
 cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/name/TaxonNameDaoHibernateImplTest.xml -text
+cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/reference/ReferenceDaoHibernateImplTest.xml -text
 cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.testAddChild-result.xml -text
 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.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
 cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/override.properties-testPersistentDataSource -text
 cdmlib-persistence/src/test/resources/log4j.properties -text
@@ -1408,6 +1445,35 @@ 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/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
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/AnnotatableController.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/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/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/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
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/NameListController.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/NamePortalController.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/OccurrenceController.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/OccurrenceListController.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ReferenceController.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ReferenceListController.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ReferencePortalController.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/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/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
@@ -1487,45 +1553,78 @@ 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/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
+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/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/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/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
 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/DateTimeJSONValueProcessor.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/view/HtmlView.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/view/JsonView.java -text
+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/processor/CalendarJSONValueProcessor.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/view/processor/DateTimeJSONValueProcessor.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/view/processor/InitializedHibernatePropertyFilter.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/view/processor/PartialJSONValueProcessor.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/view/processor/UUIDJSONValueProcessor.java -text
 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/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/log4j.properties -text
+cdmlib-remote/src/main/resources/eu/etaxonomy/cdm/remote/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/p6spy.xml -text
+cdmlib-remote/src/main/webapp/WEB-INF/datasources/routing-datasource.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/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/CdmServiceImplTest.java -text
 cdmlib-remote/src/test/java/eu/etaxonomy/cdm/remote/service/DataControllerTest.java -text
 cdmlib-remote/src/test/java/eu/etaxonomy/cdm/remote/service/MetadataControllerTest.java -text
 cdmlib-remote/src/test/java/eu/etaxonomy/cdm/remote/view/RdfViewTest.java -text
@@ -1546,19 +1645,24 @@ cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/application/ICdmApplicationCo
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/application/eclipse/EclipseRcpSaveFileSystemXmlApplicationContext.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/application/eclipse/EclipseRcpSaveGenericApplicationContext.java -text
 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/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
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/AuditEventService.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/DescriptionServiceImpl.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
+cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IAnnotationService.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IAuditEventService.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ICommonService.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IDatabaseService.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IDescriptionService.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IIdentifiableEntityService.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/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/IOccurrenceService.java -text
@@ -1568,6 +1672,7 @@ cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonService.java -t
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITermService.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/IVersionableService.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/LocationServiceImpl.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/OccurrenceServiceImpl.java -text
@@ -1578,8 +1683,11 @@ cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonServiceImpl.java
 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
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/VersionableServiceBase.java -text
+cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/config/IIdentifiableEntityServiceConfigurator.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/config/INameServiceConfigurator.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/config/ITaxonServiceConfigurator.java -text
+cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/config/IdentifiableServiceConfiguratorBase.java -text
+cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/config/impl/IdentifiableServiceConfiguratorImpl.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/config/impl/NameServiceConfiguratorImpl.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/config/impl/TaxonServiceConfiguratorImpl.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/lsid/LSIDAuthorityService.java -text
@@ -1618,14 +1726,18 @@ cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/NameServiceImplTest2.
 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/TermServiceImplTest.java -text
+cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/UserServiceImplTest.java -text
 cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/lsid/LSIDAuthorityServiceTest.java -text
 cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/lsid/LSIDDataServiceTest.java -text
 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/test/function/Datasource.java -text
+cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/TestConcurrentSession.java -text
+cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/TestConversationEnabled.java -text
 cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/TestDatabase.java -text
 cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/TestService.java -text
 cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/TestTaxonFunction.java -text
+cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/hibernate.cfg.xml -text
 cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/integration/CreateDataTest.java -text
 cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/integration/CreateDataTestNoUnit.java -text
 cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/integration/TermLoaderIntegrationTest.java -text
@@ -1634,6 +1746,8 @@ cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/suite/CdmTestSuite.java -tex
 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/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
 cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/lsid/LSIDAuthorityServiceTest.testGetAuthorityWSDL-result.wsdl -text
 cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/lsid/LSIDAuthorityServiceTest.testGetAvailableServices.xml -text
 cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/lsid/LSIDAuthorityServiceTest.testGetAvailableServicesWithKnownLSID-result.wsdl -text
@@ -1644,6 +1758,7 @@ cdmlib-services/src/test/resources/eu/etaxonomy/cdm/applicationContext.xml -text
 cdmlib-services/src/test/resources/eu/etaxonomy/cdm/cdm.datasources.xml -text
 cdmlib-services/src/test/resources/eu/etaxonomy/cdm/service/PUBLIC.xsd -text
 cdmlib-services/src/test/resources/eu/etaxonomy/cdm/service/dataset.xsd -text
+cdmlib-services/src/test/resources/eu/etaxonomy/cdm/test/function/ConcurrentSessionTest.xml -text
 cdmlib-services/src/test/resources/log4j.properties -text
 cdmlib-services/src/test/resources/unitils.properties -text
 eclipse-feature-sources/build.properties -text
@@ -1681,6 +1796,8 @@ eclipse-plugin/build.properties -text
 eclipse-plugin/build_ant.xml -text
 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-logging-1.0.4.jar -text
 eclipse-plugin/dom4j-1.6.1.jar -text
 eclipse-plugin/ehcache-1.2.3.jar -text
@@ -1689,9 +1806,21 @@ eclipse-plugin/h2-1.0.73.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
+eclipse-plugin/hibernate-annotations-3.4.0-SNAPSHOT-sources.jar -text
+eclipse-plugin/hibernate-annotations-3.4.0-SNAPSHOT.jar -text
 eclipse-plugin/hibernate-annotations.jar -text
+eclipse-plugin/hibernate-commons-annotations-3.4.0-SNAPSHOT-sources.jar -text
+eclipse-plugin/hibernate-commons-annotations-3.4.0-SNAPSHOT.jar -text
 eclipse-plugin/hibernate-commons-annotations.jar -text
+eclipse-plugin/hibernate-core-3.4.0-SNAPSHOT-sources.jar -text
+eclipse-plugin/hibernate-core-3.4.0-SNAPSHOT.jar -text
+eclipse-plugin/hibernate-envers-3.4.0-SNAPSHOT-sources.jar -text
+eclipse-plugin/hibernate-envers-3.4.0-SNAPSHOT.jar -text
 eclipse-plugin/hibernate-search-3.0.1.GA.jar -text
+eclipse-plugin/hibernate-search-3.1.0.GA-sources.jar -text
+eclipse-plugin/hibernate-search-3.1.0.GA.jar -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.jar -text
 eclipse-plugin/hibernate3.jar -text
 eclipse-plugin/hibernate3src.zip -text
@@ -1705,11 +1834,15 @@ eclipse-plugin/jdom-1.0.jar -text
 eclipse-plugin/joda-time-1.5-sources.jar -text
 eclipse-plugin/joda-time-1.5.jar -text
 eclipse-plugin/joda-time-hibernate-1.0.jar -text
+eclipse-plugin/jsr250-api-1.0-sources.jar -text
+eclipse-plugin/jsr250-api-1.0.jar -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-sources.jar -text
 eclipse-plugin/lucene-core-2.4.0.jar -text
 eclipse-plugin/lucene-spellchecker-2.4.0-sources.jar -text
@@ -1724,6 +1857,10 @@ 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-sources.jar -text
+eclipse-plugin/slf4j-api-1.5.2.jar -text
+eclipse-plugin/slf4j-log4j12-1.5.2-sources.jar -text
+eclipse-plugin/slf4j-log4j12-1.5.2.jar -text
 eclipse-plugin/spring-2.5.6-sources.jar -text
 eclipse-plugin/spring-2.5.6.jar -text
 eclipse-plugin/spring-2.5.jar -text
@@ -1771,17 +1908,12 @@ eclipse-plugin/spring-webmvc-2.5src.zip -text
 eclipse-plugin/src/test/java/eu/etaxonomy/cdm/aspectj/PropertyChangeTest.java -text
 eclipse-plugin/unitils-1.0-sources.jar -text
 eclipse-plugin/unitils-1.0.jar -text
+eclipse-plugin/wsdl4j-1.6.1-sources.jar -text
+eclipse-plugin/wsdl4j-1.6.1.jar -text
 eclipse-plugin/xercesImpl.jar -text
 eclipse-plugin/xml-apis.jar -text
 eclipse-updateSite/.project -text
-eclipse-updateSite/features/eu.etaxonomy.cdmLibrary_2.0.0.08.jar -text
-eclipse-updateSite/features/eu.etaxonomy.cdmLibrary_2.0.0.09.jar -text
-eclipse-updateSite/features/eu.etaxonomy.cdmLibrary_2.0.0.14.jar -text
-eclipse-updateSite/features/eu.etaxonomy.cdmLibrary_2.0.0.20.jar -text
-eclipse-updateSite/features/eu.etaxonomy.cdmLibrary_2.0.0.21.jar -text
 eclipse-updateSite/index.html -text
-eclipse-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.0.0.20.jar -text
-eclipse-updateSite/plugins/eu.etaxonomy.cdmLibrary_2.0.0.21.jar -text
 eclipse-updateSite/site.xml -text
 libraryTesterApplication/.classpath -text
 libraryTesterApplication/.project -text