Merge branch 'hotfix/3.12.4' into develop

[taxeditor.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 123b9a2f354c1407739b4092124a752e1c6ddfc4..5c35255b29d741587a0483d22cc1a0b621079313 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,79 +1,52 @@
-eu.etaxonomy.taxeditor.application/.classpath
-eu.etaxonomy.taxeditor.application/.project
+/.project
+eu.etaxonomy.taxeditor.cdmlib/src/main/resources/etc/jetty/*
 eu.etaxonomy.taxeditor.application/.settings
-eu.etaxonomy.taxeditor.application/bin
 eu.etaxonomy.taxeditor.application/target
-eu.etaxonomy.taxeditor.bulkeditor/.classpath
-eu.etaxonomy.taxeditor.bulkeditor/.project
 eu.etaxonomy.taxeditor.bulkeditor/.settings
 eu.etaxonomy.taxeditor.bulkeditor/target
-eu.etaxonomy.taxeditor.cdmlib/.classpath
-eu.etaxonomy.taxeditor.cdmlib/.project
+eu.etaxonomy.taxeditor.cdmlib/.directory
 eu.etaxonomy.taxeditor.cdmlib/.settings
 eu.etaxonomy.taxeditor.cdmlib/cdmlib-*.jar
 eu.etaxonomy.taxeditor.cdmlib/cdmlib-*.zip
-eu.etaxonomy.taxeditor.cdmlib/cdmlib-commons-1.3.jar
-eu.etaxonomy.taxeditor.cdmlib/cdmlib-commons-1.3src.zip
-eu.etaxonomy.taxeditor.cdmlib/cdmlib-commons-2.0.jar
-eu.etaxonomy.taxeditor.cdmlib/cdmlib-commons-2.0src.zip
-eu.etaxonomy.taxeditor.cdmlib/cdmlib-ext-2.0.jar
-eu.etaxonomy.taxeditor.cdmlib/cdmlib-ext-2.0src.zip
-eu.etaxonomy.taxeditor.cdmlib/cdmlib-io-1.3.jar
-eu.etaxonomy.taxeditor.cdmlib/cdmlib-io-1.3src.zip
-eu.etaxonomy.taxeditor.cdmlib/cdmlib-io-2.0.jar
-eu.etaxonomy.taxeditor.cdmlib/cdmlib-io-2.0src.zip
-eu.etaxonomy.taxeditor.cdmlib/cdmlib-model-1.3.jar
-eu.etaxonomy.taxeditor.cdmlib/cdmlib-model-1.3src.zip
-eu.etaxonomy.taxeditor.cdmlib/cdmlib-model-2.0.jar
-eu.etaxonomy.taxeditor.cdmlib/cdmlib-model-2.0src.zip
-eu.etaxonomy.taxeditor.cdmlib/cdmlib-persistence-1.3.jar
-eu.etaxonomy.taxeditor.cdmlib/cdmlib-persistence-1.3src.zip
-eu.etaxonomy.taxeditor.cdmlib/cdmlib-persistence-2.0.jar
-eu.etaxonomy.taxeditor.cdmlib/cdmlib-persistence-2.0src.zip
-eu.etaxonomy.taxeditor.cdmlib/cdmlib-services-1.3.jar
-eu.etaxonomy.taxeditor.cdmlib/cdmlib-services-1.3src.zip
-eu.etaxonomy.taxeditor.cdmlib/cdmlib-services-2.0.jar
-eu.etaxonomy.taxeditor.cdmlib/cdmlib-services-2.0src.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.cdmlib/target
-eu.etaxonomy.taxeditor.editor/.classpath
-eu.etaxonomy.taxeditor.editor/.project
 eu.etaxonomy.taxeditor.editor/.settings
 eu.etaxonomy.taxeditor.editor/target
-eu.etaxonomy.taxeditor.feature.platform/.classpath
-eu.etaxonomy.taxeditor.feature.platform/.project
 eu.etaxonomy.taxeditor.feature.platform/.settings
+eu.etaxonomy.taxeditor.feature.platform/bin
 eu.etaxonomy.taxeditor.feature.platform/target
-eu.etaxonomy.taxeditor.feature/.classpath
-eu.etaxonomy.taxeditor.feature/.project
 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/.classpath
-eu.etaxonomy.taxeditor.help/.project
 eu.etaxonomy.taxeditor.help/.settings
-eu.etaxonomy.taxeditor.navigation/.classpath
-eu.etaxonomy.taxeditor.navigation/.project
+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/.classpath
-eu.etaxonomy.taxeditor.printpublisher/.project
 eu.etaxonomy.taxeditor.printpublisher/.settings
 eu.etaxonomy.taxeditor.printpublisher/target
-eu.etaxonomy.taxeditor.store/.classpath
-eu.etaxonomy.taxeditor.store/.project
 eu.etaxonomy.taxeditor.store/.settings
 eu.etaxonomy.taxeditor.store/hibernate.log
 eu.etaxonomy.taxeditor.store/target
 eu.etaxonomy.taxeditor.test/screenshots/*.jpeg
-eu.etaxonomy.taxeditor/.classpath
-eu.etaxonomy.taxeditor/.project
+eu.etaxonomy.taxeditor.test/src/test/resources/.cdm-server-ehcache
+eu.etaxonomy.taxeditor.test/src/test/resources/.cdmLibrary/remote-webapp
+eu.etaxonomy.taxeditor.test/target
+eu.etaxonomy.taxeditor.webapp/lib/cdmlib-remote-webapp.war
 eu.etaxonomy.taxeditor/.settings
 eu.etaxonomy.taxeditor/target
 /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
+