fix #804 implemeting required test - fixing eclipse auto import issue

[cdmlib.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index c982d850108ffc33e2be4617118f09665be6fe20..256b0278083ac2080d2f11aee81006b7c6adbecf 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,4 +1,14 @@
 * 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
@@ -94,7 +104,6 @@ cdmlib-ext/src/test/java/eu/etaxonomy/cdm/ext/occurrence/gbif/GbifQueryServiceWr
 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
@@ -107,6 +116,7 @@ cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/berlinModel/BerlinModelTransformer.j
 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
@@ -122,6 +132,8 @@ cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/common/DbImportBase.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
@@ -584,9 +596,11 @@ cdmlib-io/src/test/java/eu/etaxonomy/cdm/io/tcsxml/TcsXmlImportConfiguratorTest.
 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-io/src/test/resources/eu/etaxonomy/cdm/io/ClearDB_with_Terms_DataSet.xml -text
+cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/TermsDataSet-with_auditing_info.xml -text
 cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/dwca/in/DwcaZipToStreamConverterTest-input.zip -text
 cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/dwca/in/coreTax.txt -text
 cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/dwca/in/description.txt -text
@@ -659,6 +673,7 @@ cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/specimen/abcd206/in/Campanula_B
 cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/specimen/abcd206/in/Campanula_variety.xml -text
 cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/specimen/abcd206/in/MultipleIdentificationsPreferredFlag.xml -text
 cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/specimen/abcd206/in/SpecimenImportConfiguratorTest.doInvoke2.xml -text
+cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/specimen/abcd206/in/SpecimenImportConfiguratorTest.testIgnoreAuthorship.xml -text
 cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/specimen/abcd206/in/campanula_abietina_subspecies.xml -text
 cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/specimen/abcd206/in/db6.xml -text
 cdmlib-io/src/test/resources/eu/etaxonomy/cdm/io/specimen/excel/in/ExcelImportConfiguratorTest-input.xls -text
@@ -725,6 +740,7 @@ cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/CdmAssignableTypeFilter.java -
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/CdmBaseType.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/CdmTypeScanner.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/ICdmCacher.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/ICdmUuidCacher.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Address.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/AgentBase.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/agent/Contact.java -text
@@ -808,7 +824,6 @@ cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/common/VocabularyEnum.java -te
 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/MockCdmCacher.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
@@ -970,11 +985,11 @@ cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/SynonymRelationshipType.
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/Taxon.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonBase.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonComparator.java -text
-cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonComparatorSearch.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/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
@@ -1036,6 +1051,7 @@ cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/cache/reference/SectionDefa
 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
@@ -1048,6 +1064,7 @@ cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/match/IMatchable.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/match/Match.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/match/MatchException.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/match/MatchMode.java -text
+cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/match/MatchStrategyConfigurator.java -text
 cdmlib-model/src/main/java/eu/etaxonomy/cdm/strategy/match/Matching.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
@@ -1145,6 +1162,7 @@ cdmlib-model/src/main/resources/terms/Stage.csv -text
 cdmlib-model/src/main/resources/terms/State.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/TaxonNodeAgentRelationType.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/TextFormat.csv -text
@@ -1293,11 +1311,11 @@ cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/ICdmDataSource.java -
 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/main/java/eu/etaxonomy/cdm/database/WrappedCdmDataSource.java -text
+cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/database/data/FullCoverageDataGenerator.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
@@ -1581,6 +1599,7 @@ cdmlib-persistence/src/main/java/org/hibernate/dialect/HSQLCorrectedDialect.java
 cdmlib-persistence/src/main/java/org/hibernate/dialect/MySQL5InnoDBUtf8Dialect.java -text
 cdmlib-persistence/src/main/java/org/hibernate/dialect/MySQL5MyISAMUtf8Dialect.java -text
 cdmlib-persistence/src/main/java/org/hibernate/envers/synchronization/work/CollectionChangeWorkUnit.java -text
+cdmlib-persistence/src/main/java/org/hibernate/type/EntityType.java -text
 cdmlib-persistence/src/main/resources/META-INF/services/org.hibernate.integrator.spi.Integrator -text
 cdmlib-persistence/src/main/resources/c3p0-config.xml -text
 cdmlib-persistence/src/main/resources/eu/etaxonomy/cdm/cdm.datasources.xml -text
@@ -1606,7 +1625,6 @@ cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/database/types/SqlServer2000Da
 cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/database/types/SqlServer2005DatabaseTypeTest.java -text
 cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/database/types/SybaseDatabaseTypeTest.java -text
 cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/database/update/CdmUpdaterTest.java -text
-cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/datagenerator/FullCoverageDataGenerator.java -text
 cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/datagenerator/TaxonGenerator.java -text
 cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/BeanInitializerIntegration.java -text
 cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/MethodCacheImplTest.java -text
@@ -1683,7 +1701,6 @@ cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/unitils/DdlCreator.java -
 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
@@ -1856,7 +1873,6 @@ cdmlib-remote-webapp/src/main/webapp/WEB-INF/cdmlib-remote-servlet.xml -text
 cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/configurable.xml -text
 cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/datasources-local.xml -text
 cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/empty-default-datasource.xml -text
-cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/p6spy.xml -text
 cdmlib-remote-webapp/src/main/webapp/WEB-INF/datasources/routing-datasource.xml -text
 cdmlib-remote-webapp/src/main/webapp/WEB-INF/json-views.xml -text
 cdmlib-remote-webapp/src/main/webapp/WEB-INF/oai-views.xml -text
@@ -2305,6 +2321,7 @@ cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/MicroFormatCategorica
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/MicroFormatQuantitativeDescriptionBuilder.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/NaturalLanguageGenerator.java -text
+cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/NodeSortMode.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/OccurrenceServiceImpl.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/PolytomousKeyNodeServiceImpl.java -text
 cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/PolytomousKeyServiceImpl.java -text
@@ -2334,6 +2351,7 @@ cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/config/IncludedTaxonC
 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
@@ -2425,7 +2443,6 @@ cdmlib-services/src/main/resources/wsdl/LSIDDataServiceSOAPBindings.wsdl -text
 cdmlib-services/src/main/resources/wsdl/LSIDPortTypes.wsdl -text
 cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/application/FirstDataInserterTest.java -text
 cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/cache/CdmCacherTest.java -text
-cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/cache/MockCdmCacher.java -text
 cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeCacheStrategyTest.java -text
 cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeFieldUnitCacheStrategyTest.java -text
 cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/facade/DerivedUnitFacadeTest.java -text
@@ -2493,7 +2510,6 @@ cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/suite/TestsShouldNotFailInSu
 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