Merge branch 'release/4.7.0'

[taxeditor.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 71532edf7732609b6990994a576be5adab2b21b9..8ba1a0ec2b79280e4939cf0f86f4ef4a4a4287c9 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,44 +1,38 @@
-/.project
-eu.etaxonomy.taxeditor.application/.settings
-eu.etaxonomy.taxeditor.application/target
-eu.etaxonomy.taxeditor.bulkeditor/.settings
-eu.etaxonomy.taxeditor.bulkeditor/target
-eu.etaxonomy.taxeditor.cdmlib/.settings
+.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.common-3.6.0.v20110523.jar
 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/lib/org.eclipse.osgi-3.7.1.R37x_v20110808-1106.jar
 eu.etaxonomy.taxeditor.cdmlib/log4j-1.2.14src.zip
-eu.etaxonomy.taxeditor.cdmlib/target
-eu.etaxonomy.taxeditor.editor/.settings
-eu.etaxonomy.taxeditor.editor/target
-eu.etaxonomy.taxeditor.feature.platform/.settings
 eu.etaxonomy.taxeditor.feature.platform/bin
-eu.etaxonomy.taxeditor.feature.platform/target
-eu.etaxonomy.taxeditor.feature/.settings
 eu.etaxonomy.taxeditor.feature/compile.eu.etaxonomy.taxeditor.product.feature.xml
 eu.etaxonomy.taxeditor.feature/plugin_customization.ini
-eu.etaxonomy.taxeditor.feature/target
-eu.etaxonomy.taxeditor.feature/workspace
-eu.etaxonomy.taxeditor.help/.settings
 eu.etaxonomy.taxeditor.help/original_document/~$xonomic_Editor_User_Manual_Version_4.doc
-eu.etaxonomy.taxeditor.help/target
-eu.etaxonomy.taxeditor.navigation/.settings
-eu.etaxonomy.taxeditor.navigation/target
-eu.etaxonomy.taxeditor.printpublisher/.settings
-eu.etaxonomy.taxeditor.printpublisher/target
-eu.etaxonomy.taxeditor.store/.settings
-eu.etaxonomy.taxeditor.store/hibernate.log
-eu.etaxonomy.taxeditor.store/target
+hibernate.log
 eu.etaxonomy.taxeditor.test/screenshots/*.jpeg
-eu.etaxonomy.taxeditor.test/target
-eu.etaxonomy.taxeditor/.settings
-eu.etaxonomy.taxeditor/target
+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
-/target
 /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