X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/blobdiff_plain/75b497bde30b8e2c4b670d2699819cca6a8b3514..711a9309e1453f81b0964bd4475e15d7889ed2ae:/.gitattributes diff --git a/.gitattributes b/.gitattributes index 142d3c5c0f..50efa765f9 100644 --- a/.gitattributes +++ b/.gitattributes @@ -23,8 +23,8 @@ app-import/src/main/java/eu/etaxonomy/cdm/app/images/AbstractImageImporter.java app-import/src/main/java/eu/etaxonomy/cdm/app/images/ImageImportConfigurator.java -text app-import/src/main/java/eu/etaxonomy/cdm/app/images/ImageImportState.java -text app-import/src/main/java/eu/etaxonomy/cdm/app/jaxb/CdmDiffActivator.java -text -app-import/src/main/java/eu/etaxonomy/cdm/app/jaxb/CdmExportImportActivator.java -text app-import/src/main/java/eu/etaxonomy/cdm/app/jaxb/JaxbExportActivator.java -text +app-import/src/main/java/eu/etaxonomy/cdm/app/jaxb/JaxbImportActivator.java -text app-import/src/main/java/eu/etaxonomy/cdm/app/pilotOutputHtml/SimpleDescriptionOutput.java -text app-import/src/main/java/eu/etaxonomy/cdm/app/sdd/AnthuriumActivator.java -text app-import/src/main/java/eu/etaxonomy/cdm/app/sdd/CicadActivator.java -text @@ -952,9 +952,15 @@ cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/CdmUtils.java -text cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/DoubleResult.java -text cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/ExcelUtils.java -text cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/FileCopy.java -text -cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/MediaMetaData.java -text cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/ResultWrapper.java -text cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/XmlHelp.java -text +cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/mediaMetaData/AudioMetaData.java -text +cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/mediaMetaData/ImageMetaData.java -text +cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/mediaMetaData/JpegImageMetaData.java -text +cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/mediaMetaData/MediaMetaData.java -text +cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/mediaMetaData/MetaDataFactory.java -text +cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/mediaMetaData/MimeType.java -text +cdmlib-commons/src/main/java/eu/etaxonomy/cdm/common/mediaMetaData/TiffImageMetaData.java -text cdmlib-commons/src/main/resources/MUST-EXIST.txt -text cdmlib-commons/src/main/resources/log4j.properties -text cdmlib-commons/src/site/site.xml -text @@ -965,6 +971,8 @@ cdmlib-commons/src/test/java/eu/etaxonomy/cdm/common/XmlHelpTest.java -text cdmlib-commons/src/test/java/eu/etaxonomy/cdm/test/suite/CdmTestSuite.java -text cdmlib-commons/src/test/java/eu/etaxonomy/cdm/test/unit/CdmUnitTestBase.java -text cdmlib-commons/src/test/resources/images/OregonScientificDS6639-DSC_0307-small.jpg -text +cdmlib-commons/src/test/resources/images/OregonScientificDS6639-DSC_0307-small.tif -text +cdmlib-commons/src/test/resources/images/Thumbs.db -text cdmlib-ext/LICENSE.TXT -text cdmlib-ext/README.TXT -text cdmlib-ext/pom.xml -text @@ -1925,6 +1933,7 @@ cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/name cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/reference/ReferenceDaoHibernateImplTest.java -text cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.java -text cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImplTest.java -text +cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/hibernate/view/AuditEventDaoTest.java -text cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/hibernate/CacheStrategyGeneratorTest.java -text cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/hibernate/CdmDeleteListenerTest.java -text cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/function/Datasource.java -text @@ -2004,6 +2013,7 @@ cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.testGetTaxaByNameAndArea.xml -text cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImplTest.xml -text cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImplTest.xml -text +cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/dao/hibernate/view/AuditEventDaoTest.xml -text cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/hibernate/CacheStrategyGeneratorTest.testOnSaveOrUpdateAgents-result.xml -text cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/hibernate/CacheStrategyGeneratorTest.testOnSaveOrUpdateNames-result.xml -text cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/persistence/hibernate/CacheStrategyGeneratorTest.xml -text @@ -2338,6 +2348,8 @@ eclipse-plugin/.project -text eclipse-plugin/META-INF/MANIFEST.MF -text eclipse-plugin/_makeSources.bat -text eclipse-plugin/_makeSources.sh -text +eclipse-plugin/activation-1.1.jar -text +eclipse-plugin/activation-1.1src.zip -text eclipse-plugin/antlr-2.7.6.jar -text eclipse-plugin/aopalliance-1.0.jar -text eclipse-plugin/asm-attrs.jar -text @@ -2354,6 +2366,7 @@ eclipse-plugin/commons-beanutils-1.7.0src.zip -text eclipse-plugin/commons-collections-3.2.jar -text eclipse-plugin/commons-collections-3.2src.zip -text eclipse-plugin/commons-dbcp-1.2.2.jar -text +eclipse-plugin/commons-dbcp-1.2.2src.zip -text eclipse-plugin/commons-lang-2.4.jar -text eclipse-plugin/commons-logging-1.0.4.jar -text eclipse-plugin/commons-pool-1.3.jar -text @@ -2479,6 +2492,8 @@ eclipse-plugin/wsdl4j-1.6.1.jar -text eclipse-plugin/wsdl4j-1.6.1src.zip -text eclipse-plugin/xercesImpl.jar -text eclipse-plugin/xml-apis.jar -text +eclipse-plugin/xml-resolver-1.2.jar -text +eclipse-plugin/xml-resolver-1.2src.zip -text eclipse-plugin/yjp-controller-api-redist-8.0.1.jar -text eclipse-updateSite/.project -text eclipse-updateSite/index.html -text