(no commit message)

[cdmlib.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index b9d276e5e9fb34866e4b31bfa7e525e09a585e65..106d7f13e708bc2dd64abdd065c85eae10f1b499 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -275,9 +275,9 @@ 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
@@ -294,7 +294,6 @@ cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/function/TestSessionFacto
 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-remote/README.TXT -text
 cdmlib-remote/pom.xml -text
 cdmlib-remote/src/main/java/carbonfive/spring/web/pathparameter/ParameterizedPathFilter.java -text
@@ -345,7 +344,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/db.properties -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 +351,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 +373,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 +385,7 @@ 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/applicationContext.xml -text
 eclipse-feature/.classpath -text
 eclipse-feature/.project -text
 eclipse-feature/build.properties -text