dataportal release v2.0

[cdmlib.git] / .gitattributes

diff --git a/.gitattributes b/.gitattributes
index 6b7f6569a99c1bb92e698108b1165d2a6b542883..0931c13b15c5bf581589f513b8e4af0ae3c9f99b 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1788,7 +1788,6 @@ cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/ReferencePortalCo
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonController.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonListController.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonPortalController.java -text
-cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonPortalListController.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TaxonomicTreeController.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/TermListController.java -text
 cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/interceptor/ContentNegociationHandlerInterceptor.java -text
@@ -1909,13 +1908,17 @@ cdmlib-remote/src/main/resources/eu/etaxonomy/cdm/remote.xml -text
 cdmlib-remote/src/main/resources/eu/etaxonomy/cdm/remote/dto/tdwg/mappings-deep.xml -text
 cdmlib-remote/src/main/resources/eu/etaxonomy/cdm/remote/dto/tdwg/mappings-shallow.xml -text
 cdmlib-remote/src/main/resources/eu/etaxonomy/cdm/remote/dto/tdwg/mappings.xml -text
-cdmlib-remote/src/main/resources/eu/etaxonomy/cdm/remote/log4j.properties -text
+cdmlib-remote/src/main/resources/log4j.properties -text
 cdmlib-remote/src/main/resources/spy.properties -text
 cdmlib-remote/src/main/webapp/WEB-INF/applicationContext.views.xml -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/datasources/datasources-local.xml -text
 cdmlib-remote/src/main/webapp/WEB-INF/datasources/empty-default-datasource.xml -text
+cdmlib-remote/src/main/webapp/WEB-INF/datasources/example.cdmlibrary/datasources-set-A.xml -text
+cdmlib-remote/src/main/webapp/WEB-INF/datasources/example.cdmlibrary/datasources-set-B.xml -text
+cdmlib-remote/src/main/webapp/WEB-INF/datasources/example.cdmlibrary/use-A-set.sh -text
+cdmlib-remote/src/main/webapp/WEB-INF/datasources/example.cdmlibrary/use-B-set.sh -text
 cdmlib-remote/src/main/webapp/WEB-INF/datasources/p6spy.xml -text
 cdmlib-remote/src/main/webapp/WEB-INF/datasources/routing-datasource.xml -text
 cdmlib-remote/src/main/webapp/WEB-INF/jsonConfigurations.xml -text
@@ -2113,11 +2116,13 @@ eclipse-plugin/cglib-2.1.3.jar -text
 eclipse-plugin/commons-collections-2.1.1.jar -text
 eclipse-plugin/commons-collections-3.2-sources.jar -text
 eclipse-plugin/commons-collections-3.2.jar -text
+eclipse-plugin/commons-lang-2.4.jar -text
 eclipse-plugin/commons-logging-1.0.4.jar -text
 eclipse-plugin/dom4j-1.6.1.jar -text
 eclipse-plugin/ehcache-1.2.3.jar -text
 eclipse-plugin/ejb3-persistence.jar -text
 eclipse-plugin/h2-1.0.73.jar -text
+eclipse-plugin/h2-1.1.115.jar -text
 eclipse-plugin/hibernate-3.2.6.ga-sources.jar -text
 eclipse-plugin/hibernate-3.2.6.ga.jar -text
 eclipse-plugin/hibernate-annotations-3.3.1.GA.jar -text
@@ -2168,6 +2173,7 @@ eclipse-plugin/mssqlserver-2000.3.jar -text
 eclipse-plugin/msutil-2000.3.jar -text
 eclipse-plugin/mysql-connector-java-3.1.14-bin.jar -text
 eclipse-plugin/opencsv-1.8.jar -text
+eclipse-plugin/org.apache.commons.codec-1.3.0.jar -text
 eclipse-plugin/plugin.xml -text
 eclipse-plugin/poi-3.1-FINAL.jar -text
 eclipse-plugin/pom.xml -text
@@ -2328,6 +2334,16 @@ pluginTesterApplication/src/plugintesterapplication/View.java -text
 pluginTesterApplication/src/test/testClass.java -text
 /pom.xml -text
 /settings.xml -text
+src/docbkx/ReferenceDocumentation.xml -text
+src/docbkx/base-classes.xml -text
+src/docbkx/basic-persistence.xml -text
+src/docbkx/resources/css/html.css -text
+src/docbkx/resources/images/ModelOverview20.gif -text
+src/docbkx/resources/images/cdmlib-arch3.png -text
+src/docbkx/resources/images/logo.png -text
+src/docbkx/resources/xsl/cdmlib.xsl -text
+src/docbkx/resources/xsl/fopdf.xsl -text
+src/docbkx/resources/xsl/html_chunk.xsl -text
 src/site/resources/images/logos/logo_edit.png -text
 src/site/resources/images/logos/logo_edit2.png -text
 src/site/site.xml -text