BGBM BDI Projects / cdmlib.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
using embedded jetty in launcher
[cdmlib.git] / .gitattributes
diff --git a/.gitattributes b/.gitattributes
index 7f235cb88f451823a08f650c7c62b3e91f2135c0..eb4f9c3d7dabf4dd1b7ee0934936c7ff2ac6915f 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
@@ -1861,81 +1871,12 @@ cdmlib-remote-webapp/pom.xml -text
 cdmlib-remote-webapp/src/main/java/eu/etaxonomy/cdm/remote/config/CdmSpringMVCConfig.java -text
 cdmlib-remote-webapp/src/main/java/eu/etaxonomy/cdm/remote/config/PreloadedBeans.java -text
 cdmlib-remote-webapp/src/main/resources/log4j.properties -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/gwt-unitCache/gwt-unitCache-0000014A4DACD127 -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/gwt-unitCache/gwt-unitCache-0000014A58D67754 -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/gwt-unitCache/gwt-unitCache-0000014A58D6A191 -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/WEB-INF/deploy/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/rpcPolicyManifest/manifest.txt -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/WEB-INF/deploy/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/symbolMaps/5D867271428560C221935655FD89F614.symbolMap -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/WEB-INF/deploy/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/symbolMaps/7B06DE6C81C6D02B83551187BC9FB440.symbolMap -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/WEB-INF/deploy/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/symbolMaps/8EAF8BC4B710E055798590BE82D1B638.symbolMap -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/WEB-INF/deploy/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/symbolMaps/E2E7F4C75FA77CC20DE616E18CF5D282.symbolMap -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/WEB-INF/deploy/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/symbolMaps/F9A27CA4D4BC3384210BCA8A325397CC.symbolMap -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/WEB-INF/deploy/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/symbolMaps/FB764CD477028BF26906BBDC9DEAE188.symbolMap -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/5D867271428560C221935655FD89F614.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/7B06DE6C81C6D02B83551187BC9FB440.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/8EAF8BC4B710E055798590BE82D1B638.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/E2E7F4C75FA77CC20DE616E18CF5D282.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/F9A27CA4D4BC3384210BCA8A325397CC.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/FB764CD477028BF26906BBDC9DEAE188.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/clear.cache.gif -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/compilation-mappings.txt -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/5D867271428560C221935655FD89F614/1.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/5D867271428560C221935655FD89F614/2.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/5D867271428560C221935655FD89F614/3.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/5D867271428560C221935655FD89F614/4.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/5D867271428560C221935655FD89F614/5.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/5D867271428560C221935655FD89F614/6.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/5D867271428560C221935655FD89F614/7.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/5D867271428560C221935655FD89F614/8.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/7B06DE6C81C6D02B83551187BC9FB440/1.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/7B06DE6C81C6D02B83551187BC9FB440/2.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/7B06DE6C81C6D02B83551187BC9FB440/3.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/7B06DE6C81C6D02B83551187BC9FB440/4.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/7B06DE6C81C6D02B83551187BC9FB440/5.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/7B06DE6C81C6D02B83551187BC9FB440/6.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/7B06DE6C81C6D02B83551187BC9FB440/7.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/7B06DE6C81C6D02B83551187BC9FB440/8.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/8EAF8BC4B710E055798590BE82D1B638/1.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/8EAF8BC4B710E055798590BE82D1B638/2.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/8EAF8BC4B710E055798590BE82D1B638/3.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/8EAF8BC4B710E055798590BE82D1B638/4.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/8EAF8BC4B710E055798590BE82D1B638/5.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/8EAF8BC4B710E055798590BE82D1B638/6.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/8EAF8BC4B710E055798590BE82D1B638/7.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/8EAF8BC4B710E055798590BE82D1B638/8.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/E2E7F4C75FA77CC20DE616E18CF5D282/1.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/E2E7F4C75FA77CC20DE616E18CF5D282/2.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/E2E7F4C75FA77CC20DE616E18CF5D282/3.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/E2E7F4C75FA77CC20DE616E18CF5D282/4.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/E2E7F4C75FA77CC20DE616E18CF5D282/5.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/E2E7F4C75FA77CC20DE616E18CF5D282/6.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/E2E7F4C75FA77CC20DE616E18CF5D282/7.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/E2E7F4C75FA77CC20DE616E18CF5D282/8.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/F9A27CA4D4BC3384210BCA8A325397CC/1.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/F9A27CA4D4BC3384210BCA8A325397CC/2.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/F9A27CA4D4BC3384210BCA8A325397CC/3.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/F9A27CA4D4BC3384210BCA8A325397CC/4.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/F9A27CA4D4BC3384210BCA8A325397CC/5.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/F9A27CA4D4BC3384210BCA8A325397CC/6.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/F9A27CA4D4BC3384210BCA8A325397CC/7.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/F9A27CA4D4BC3384210BCA8A325397CC/8.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/FB764CD477028BF26906BBDC9DEAE188/1.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/FB764CD477028BF26906BBDC9DEAE188/2.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/FB764CD477028BF26906BBDC9DEAE188/3.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/FB764CD477028BF26906BBDC9DEAE188/4.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/FB764CD477028BF26906BBDC9DEAE188/5.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/FB764CD477028BF26906BBDC9DEAE188/6.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/FB764CD477028BF26906BBDC9DEAE188/7.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/deferredjs/FB764CD477028BF26906BBDC9DEAE188/8.cache.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet.devmode.js -text
-cdmlib-remote-webapp/src/main/webapp/VAADIN/widgetsets/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet/eu.etaxonomy.cdm.remote.vaadin.widgetset.AppWidgetSet.nocache.js -text
 cdmlib-remote-webapp/src/main/webapp/WEB-INF/applicationContext.views.xml -text
 cdmlib-remote-webapp/src/main/webapp/WEB-INF/applicationContext.xml -text
 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