nullSafeEqual in cdmlib-commons

[cdmlib.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 5889f0f07d4875b3aaa4620e4171cb973d47e050..a604a538177d831ddd5698fce9ac42c7707986c3 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -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
@@ -961,9 +962,9 @@ cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/faunaEuropaea/FaunaEuropaeaImportSta
 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/FaunaEuropaeaTaxImport.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
@@ -1001,6 +1002,7 @@ 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
@@ -1208,6 +1210,7 @@ cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Distribution.java
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/Feature.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/FeatureNode.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/FeatureTree.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/IIdentificationKey.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/IdentificationKey.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/IndividualsAssociation.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/MeasurementUnit.java -text
@@ -1324,6 +1327,7 @@ cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/Proceedings.java -te
 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/ReferenceIdentity.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
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/StrictReferenceBase.java -text
@@ -1380,11 +1384,17 @@ cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/reference/JournalDefa
 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/merge/DefaultMergeStrategy.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/merge/IMergable.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/merge/IMergeStrategy.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/merge/Merge.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/merge/MergeException.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/merge/MergeMode.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
@@ -1406,6 +1416,7 @@ cdmlib-model/src/main/resources/terms/PresenceTerm.csv -text
 cdmlib-model/src/main/resources/terms/PreservationMethod.csv -text
 cdmlib-model/src/main/resources/terms/README.TXT -text
 cdmlib-model/src/main/resources/terms/Rank.csv -text
+cdmlib-model/src/main/resources/terms/ReferenceSystem.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
@@ -1455,6 +1466,7 @@ cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/common/init/TermLoaderTest.jav
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/PresenceAbsenceTermBaseTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/description/TextDataTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/location/TdwgAreaTest.java -text
+cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/media/MediaTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/model/name/BotanicalNameTest.java -text
 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
@@ -1475,6 +1487,7 @@ cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/BotanicNameCache
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/NonViralNameDefaultCacheStrategyTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/name/ZoologicalNameCacheStrategyTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/cache/reference/CdDvdDefaultCacheStrategyTest.java -text
+cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/merge/DefaultMergeStrategyTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/strategy/parser/NonViralNameParserImplTest.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/test/function/TestFullReferenceParser.java -text
 cdmlib-model/src/test/java/eu/etaxonomy/cdm/test/function/TestModel.java -text
@@ -1489,6 +1502,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
@@ -1620,7 +1634,6 @@ cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/hibernate/SaveEnti
 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
@@ -1653,6 +1666,7 @@ cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/agen
 cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/AnnotationDaoTest.java -text
 cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmEntityDaoBaseTest.java -text
 cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmEntityDaoBaseTestClass.java -text
+cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmGenericDaoImplTest.java -text
 cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/DaoBaseTest.java -text
 cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/DefinedTermDaoImplTest.java -text
 cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/common/IdentifiableDaoBaseTest.java -text
@@ -1728,6 +1742,7 @@ cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate
 cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmEntityDaoBaseTest.testUpdate-result.xml -text
 cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmEntityDaoBaseTest.testUpdateWithAuthentication-result.xml -text
 cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmEntityDaoBaseTest.xml -text
+cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/common/CdmGenericDaoImplTest.xml -text
 cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/common/DefinedTermDaoImplTest.xml -text
 cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/common/IdentifiableDaoBaseTest.xml -text
 cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/common/TermVocabularyDaoImplTest.xml -text
@@ -1771,9 +1786,8 @@ cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionContro
 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
@@ -1783,59 +1797,16 @@ cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/OccurrenceControl
 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/TaxonPortalListController.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/TermListConroller.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/DozerBeanMapperFactoryBean.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
@@ -1860,8 +1831,10 @@ cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/tdwg/voc/TaxonConcept.ja
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/tdwg/voc/TaxonName.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/tdwg/voc/TaxonRelationshipTerm.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/dto/tdwg/voc/Team.java -text
+cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/editor/ClassPropertyEditor.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/editor/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
@@ -1892,7 +1865,6 @@ cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/l10n/LocaleContext.java -tex
 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/DataController.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/Utils.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/view/BaseView.java -text
@@ -1901,25 +1873,23 @@ 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/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/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
@@ -1927,7 +1897,8 @@ 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/assembler/lsid/AssemblerTest.java -text
@@ -2116,11 +2087,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
@@ -2171,6 +2144,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
@@ -2331,6 +2305,25 @@ 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/free-text-search.xml -text
+src/docbkx/guid-resolution.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/dao.png -text
+src/docbkx/resources/images/logo.png -text
+src/docbkx/resources/images/service.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/docbkx/security.xml -text
+src/docbkx/service.xml -text
+src/docbkx/versioning.xml -text
 src/site/resources/images/logos/logo_edit.png -text
 src/site/resources/images/logos/logo_edit2.png -text
 src/site/site.xml -text