X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/blobdiff_plain/15dd2597fd069c521e9e188e2e6cde4bdabfe43c..ba935ead58b219dfbe9e17e5b3b6575348bab0a5:/.gitattributes diff --git a/.gitattributes b/.gitattributes index d9ce581dbc..f666616753 100644 --- a/.gitattributes +++ b/.gitattributes @@ -275,12 +275,13 @@ cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/reference/IRef cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/reference/ReferenceDaoHibernateImpl.java -text cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/taxon/ITaxonDao.java -text cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/taxon/TaxonDaoHibernateImpl.java -text -cdmlib-persistence/src/main/resources/cdm-hsql-datasource.xml -text -cdmlib-persistence/src/main/resources/cdm-jdbc-datasource.xml -text -cdmlib-persistence/src/main/resources/cdm-persistence.xml -text +cdmlib-persistence/src/main/resources/eu/etaxonomy/cdm/hsql-datasource.xml -text +cdmlib-persistence/src/main/resources/eu/etaxonomy/cdm/jdbc-datasource.xml -text +cdmlib-persistence/src/main/resources/eu/etaxonomy/cdm/persistence.xml -text cdmlib-persistence/src/main/resources/log4j.properties -text cdmlib-persistence/src/site/apt/index.apt -text cdmlib-persistence/src/site/site.xml -text +cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/database/CdmDataSourceTest.java -text cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/database/DatabaseEnumTest.java -text cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/common/CdmEntityDaoBaseTest.java -text cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/persistence/dao/common/DaoBaseTest.java -text @@ -293,8 +294,8 @@ cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/function/TestPersistence. cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/function/TestSessionFactory.java -text cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/suite/CdmTestSuite.java -text cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/unit/CdmUnitTestBase.java -text -cdmlib-persistence/src/test/resources/applicationContext.xml -text -cdmlib-persistence/src/test/resources/db.properties -text +cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/applicationContext.xml -text +cdmlib-persistence/src/test/resources/eu/etaxonomy/cdm/cdm.datasource.xml -text cdmlib-remote/README.TXT -text cdmlib-remote/pom.xml -text cdmlib-remote/src/main/java/carbonfive/spring/web/pathparameter/ParameterizedPathFilter.java -text @@ -345,7 +346,6 @@ cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/view/XmlView.java -text cdmlib-remote/src/main/resources/log4j.properties -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/sessionfactory.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/index.jsp -text @@ -353,6 +353,7 @@ cdmlib-remote/src/site/apt/index.apt -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/NameSTOAssemblerTest.java -text +cdmlib-remote/src/test/java/eu/etaxonomy/cdm/remote/service/CdmServiceImplTestSupport.java -text cdmlib-services/README.TXT -text cdmlib-services/pom.xml -text cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationController.java -text @@ -374,7 +375,7 @@ cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ReferenceServiceImpl. cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ServiceBase.java -text cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonServiceImpl.java -text cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TermServiceImpl.java -text -cdmlib-services/src/main/resources/annotated.xml -text +cdmlib-services/src/main/resources/eu/etaxonomy/cdm/services.xml -text cdmlib-services/src/main/resources/log4j.properties -text cdmlib-services/src/site/apt/index.apt -text cdmlib-services/src/site/site.xml -text @@ -386,11 +387,8 @@ cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/TestService.java -t cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/integration/TermLoaderIntegrationTest.java -text cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/suite/CdmTestSuite.java -text cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/unit/CdmUnitTestBase.java -text -cdmlib-services/src/test/resources/appInitContext.xml -text -cdmlib-services/src/test/resources/applicationContext-test.xml -text -cdmlib-services/src/test/resources/hibernate.properties -text -cdmlib-services/src/test/resources/settings.xml -text -cdmlib-services/src/test/resources/test.cdm.datasource.xml -text +cdmlib-services/src/test/resources/eu/etaxonomy/cdm/applicationContext.xml -text +cdmlib-services/src/test/resources/eu/etaxonomy/cdm/cdm.datasource.xml -text eclipse-feature/.classpath -text eclipse-feature/.project -text eclipse-feature/build.properties -text @@ -454,6 +452,11 @@ eclipse-plugin/spring-tx-2.5.jar -text eclipse-plugin/src/test/java/eu/etaxonomy/cdm/aspectj/PropertyChangeTest.java -text eclipse-plugin/xercesImpl.jar -text eclipse-plugin/xml-apis.jar -text +eclipse-updateSite/.project -text +eclipse-updateSite/features/eu.etaxonomy.cdmLibrary_0.4.7.6.jar -text +eclipse-updateSite/index.html -text +eclipse-updateSite/plugins/eu.etaxonomy.cdmLibrary_0.4.7.6.jar -text +eclipse-updateSite/site.xml -text libraryTesterApplication/.classpath -text libraryTesterApplication/.project -text libraryTesterApplication/cdmResources/applicationContext.xml -text