Merge branch 'release/4.11.0' into develop

[taxeditor.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 8f1906be0d5f825961ed99d87d84a0ede1eb303a..8ba1a0ec2b79280e4939cf0f86f4ef4a4a4287c9 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,82 +1,38 @@
-cdmlib-feature-source/.classpath
-cdmlib-feature-source/.settings
-cdmlib-feature-source/src
-cdmlib-feature/.settings
-cdmlib-plugin/.settings
-cdmlib-plugin/cdmlib-*.jar
-cdmlib-plugin/cdmlib-*.zip
-cdmlib-plugin/cdmlib-commons-1.3.jar
-cdmlib-plugin/cdmlib-commons-1.3src.zip
-cdmlib-plugin/cdmlib-commons-2.0.jar
-cdmlib-plugin/cdmlib-commons-2.0src.zip
-cdmlib-plugin/cdmlib-ext-2.0.jar
-cdmlib-plugin/cdmlib-ext-2.0src.zip
-cdmlib-plugin/cdmlib-io-1.3.jar
-cdmlib-plugin/cdmlib-io-1.3src.zip
-cdmlib-plugin/cdmlib-io-2.0.jar
-cdmlib-plugin/cdmlib-io-2.0src.zip
-cdmlib-plugin/cdmlib-model-1.3.jar
-cdmlib-plugin/cdmlib-model-1.3src.zip
-cdmlib-plugin/cdmlib-model-2.0.jar
-cdmlib-plugin/cdmlib-model-2.0src.zip
-cdmlib-plugin/cdmlib-persistence-1.3.jar
-cdmlib-plugin/cdmlib-persistence-1.3src.zip
-cdmlib-plugin/cdmlib-persistence-2.0.jar
-cdmlib-plugin/cdmlib-persistence-2.0src.zip
-cdmlib-plugin/cdmlib-services-1.3.jar
-cdmlib-plugin/cdmlib-services-1.3src.zip
-cdmlib-plugin/cdmlib-services-2.0.jar
-cdmlib-plugin/cdmlib-services-2.0src.zip
-cdmlib-plugin/dist
-cdmlib-plugin/lib/cdmlib-commons-2.5.jar
-cdmlib-plugin/lib/cdmlib-commons-2.5src.zip
-cdmlib-plugin/lib/cdmlib-ext-2.5.jar
-cdmlib-plugin/lib/cdmlib-ext-2.5src.zip
-cdmlib-plugin/lib/cdmlib-io-2.5.jar
-cdmlib-plugin/lib/cdmlib-io-2.5src.zip
-cdmlib-plugin/lib/cdmlib-model-2.5.jar
-cdmlib-plugin/lib/cdmlib-model-2.5src.zip
-cdmlib-plugin/lib/cdmlib-persistence-2.5.jar
-cdmlib-plugin/lib/cdmlib-persistence-2.5src.zip
-cdmlib-plugin/lib/cdmlib-print-2.5.jar
-cdmlib-plugin/lib/cdmlib-print-2.5src.zip
-cdmlib-plugin/lib/cdmlib-remote-2.5.jar
-cdmlib-plugin/lib/cdmlib-remote-2.5src.zip
-cdmlib-plugin/lib/cdmlib-services-2.5.jar
-cdmlib-plugin/lib/cdmlib-services-2.5src.zip
-cdmlib-plugin/log4j-1.2.14src.zip
-cdmlib-plugin/target
-taxeditor-annotatedlineeditor/.classpath
-taxeditor-annotatedlineeditor/.project
-taxeditor-annotatedlineeditor/.settings
-taxeditor-annotatedlineeditor/target
-taxeditor-application/.classpath
-taxeditor-application/.project
-taxeditor-application/.settings
-taxeditor-application/bin
-taxeditor-application/target
-taxeditor-bulkeditor/.classpath
-taxeditor-bulkeditor/.project
-taxeditor-bulkeditor/.settings
-taxeditor-bulkeditor/target
-taxeditor-editor/.classpath
-taxeditor-editor/.project
-taxeditor-editor/.settings
-taxeditor-editor/target
-taxeditor-feature-product/compile.eu.etaxonomy.taxeditor.product.feature.xml
-taxeditor-feature-product/plugin_customization.ini
-taxeditor-feature-product/workspace
-taxeditor-navigation/.classpath
-taxeditor-navigation/.project
-taxeditor-navigation/.settings
-taxeditor-navigation/target
-taxeditor-printpublisher/.classpath
-taxeditor-printpublisher/.project
-taxeditor-printpublisher/.settings
-taxeditor-printpublisher/target
-taxeditor-store/.classpath
-taxeditor-store/.project
-taxeditor-store/.settings
-taxeditor-store/hibernate.log
-taxeditor-store/target
+.project
+.classpath
+integration-test.log
+eu.etaxonomy.taxeditor.cdmlib/src/main/resources/etc/jetty/*
+.settings
+target
+.directory
+bin
+eu.etaxonomy.taxeditor.cdmlib/cdmlib-*.jar
+eu.etaxonomy.taxeditor.cdmlib/cdmlib-*.zip
+eu.etaxonomy.taxeditor.cdmlib/dist
+eu.etaxonomy.taxeditor.cdmlib/lib/cdm-server*
+eu.etaxonomy.taxeditor.cdmlib/lib/cdmlib*
+eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.servletbridge.extensionbundle-1.2.0.v20100503.jar
+eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.transforms.hook-1.0.300.v20100719.jar
+eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.weaving.hook-1.0.100.v20110502.jar
+eu.etaxonomy.taxeditor.cdmlib/log4j-1.2.14src.zip
+eu.etaxonomy.taxeditor.feature.platform/bin
+eu.etaxonomy.taxeditor.feature/compile.eu.etaxonomy.taxeditor.product.feature.xml
+eu.etaxonomy.taxeditor.feature/plugin_customization.ini
+eu.etaxonomy.taxeditor.help/original_document/~$xonomic_Editor_User_Manual_Version_4.doc
+hibernate.log
+eu.etaxonomy.taxeditor.test/screenshots/*.jpeg
+eu.etaxonomy.taxeditor.test/src/test/resources/.cdm-server-ehcache
+eu.etaxonomy.taxeditor.test/src/test/resources/.cdmLibrary/cdm_remote_servers.json
+eu.etaxonomy.taxeditor.test/src/test/resources/.cdmLibrary/remote-webapp
+eu.etaxonomy.taxeditor.test/src/test/resources/.cdmLibrary/writableResources/test.mgd.datasources.xml
+eu.etaxonomy.taxeditor.webapp/lib/cdmlib-remote-webapp.war
+/runtime-taxeditor.product
 /workspace
+/*.patch
+/eu.etaxonomy.taxeditor.webapp/.settings/org.eclipse.core.resources.prefs
+/eu.etaxonomy.taxeditor.webapp/.settings/org.eclipse.m2e.core.prefs
+/eu.etaxonomy.taxeditor.webapp/lib/
+
+/.ssh
+eu.etaxonomy.taxeditor.test/src/test/resources/eu/etaxonomy/cdm/database/schema/dataset.xsd
+eu.etaxonomy.taxeditor.test/src/test/resources/eu/etaxonomy/cdm/database/schema/PUBLIC.xsd