* text=auto !eol
+pom.xml merge=ours
+cdmlib-print/pom.xml merge=ours
+cdmlib-test/pom.xml merge=ours
+cdmlib-io/pom.xml merge=ours
+cdmlib-ext/pom.xml merge=ours
+cdmlib-model/pom.xml merge=ours
+cdmlib-services/pom.xml merge=ours
+cdmlib-remote-webapp/pom.xml merge=ours
+cdmlib-remote/pom.xml merge=ours
+cdmlib-persistence/pom.xml merge=ours
/LICENSE.txt -text
/README.txt -text
cdmlib-commons/LICENSE.TXT -text
cdmlib-ext/src/test/java/eu/etaxonomy/cdm/ext/openurl/MobotOpenUrlServiceWrapperTest.java -text
cdmlib-ext/src/test/java/eu/etaxonomy/cdm/ext/sru/SruServiceWrapperTest.java -text
cdmlib-ext/src/test/java/eu/etaxonomy/cdm/test/suite/CdmTestSuite.java -text
-cdmlib-ext/src/test/resources/dbscripts/001-cdm.h2.sql -text
cdmlib-ext/src/test/resources/eu/etaxonomy/cdm/applicationContext-test.xml -text
cdmlib-ext/src/test/resources/eu/etaxonomy/cdm/ext/geo/cyprusdivs.csv -text
cdmlib-ext/src/test/resources/log4j.properties -text
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/package.info -text
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CacheUpdater.java -text
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CacheUpdaterConfigurator.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/CacheUpdaterWithNewCacheStrategy.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/CdmDefaultExport.java -text
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/DbImportConfiguratorBase.java -text
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/DbImportStateBase.java -text
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/DefaultImportState.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/DeleteNonReferencedReferencesConfigurator.java -text
+cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/DeleteNonReferencedreferencesUpdater.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/test/java/eu/etaxonomy/cdm/io/test/function/TestDatabase.java -text
cdmlib-io/src/test/java/eu/etaxonomy/cdm/test/integration/TestCdmDbComparator.java -text
cdmlib-io/src/test/java/eu/etaxonomy/cdm/test/suite/CdmTestSuite.java -text
-cdmlib-io/src/test/resources/dbscripts/001-cdm.h2.sql -text
cdmlib-io/src/test/resources/eu/etaxonomy/cdm/applicationContext-test.xml -text
cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/BlankDataSet.xml -text
cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/ClearDBDataSet.xml -text
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/Taxon.java -text
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonBase.java -text
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonComparator.java -text
-cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonComparatorSearch.java -text
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNaturalComparator.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/TaxonNodeAgentRelation.java -text
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNodeByNameComparator.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNodeComparator.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/package-info.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/reference/WebPageDefaultCacheStrategy.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/cache/taxon/TaxonBaseShortSecCacheStrategy.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/generate/PolytomousKeyGenerator.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/NomenclaturalCodeAwareDataSource.java -text
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/PermissionDeniedException.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/test/java/eu/etaxonomy/cdm/test/unitils/FlatFullXmlWriter.java -text
cdmlib-persistence/src/test/resources/META-INF/persistence_old.xml -text
cdmlib-persistence/src/test/resources/c3p0-config.xml -text
-cdmlib-persistence/src/test/resources/dbscripts/001-cdm.h2.sql -text
cdmlib-persistence/src/test/resources/dbscripts/hibernate.properties -text
cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/applicationContext-securityTest.xml -text
cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/applicationContext-test.common.xml -text
cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/configurable.xml -text
cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/datasources-local.xml -text
cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/empty-default-datasource.xml -text
-cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/p6spy.xml -text
cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/routing-datasource.xml -text
cdmlib-remote-webapp/src/main/webapp/WEB-INF/json-views.xml -text
cdmlib-remote-webapp/src/main/webapp/WEB-INF/oai-views.xml -text
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/config/MatchingTaxonConfigurator.java -text
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/config/NameDeletionConfigurator.java -text
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/config/SpecimenDeleteConfigurator.java -text
+cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/config/SwitchAgentConfigurator.java -text
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/config/SynonymDeletionConfigurator.java -text
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/config/TaxonBaseDeletionConfigurator.java -text
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/config/TaxonDeletionConfigurator.java -text
cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/suite/TestsShouldNotFailInSuite_s3.java -text
cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/suite/TestsShouldNotFailInSuite_s4.java -text
cdmlib-services/src/test/java/eu/etaxonomy/cdm/validation/ValidationTest.java -text
-cdmlib-services/src/test/resources/dbscripts/001-cdm.h2.sql -text
cdmlib-services/src/test/resources/dbscripts/hibernate.properties -text
cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/application/FirstDataInserterTest.testBlankDB-result.xml -text
cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/application/FirstDataInserterTest.testBlankDB.xml -text