From 5499f063ee608638e56040ced97a649bf6d3264a Mon Sep 17 00:00:00 2001
From: Erwan Loisant <eloisant@gmail.com>
Date: Tue, 7 Jun 2011 14:14:45 +0200
Subject: [PATCH] Cleanup gitignore

---
 .gitignore                    | 137 ++++++----------------------------
 modules/grizzly/.gitignore    |   2 +
 modules/testrunner/.gitignore |   1 +
 samples-and-tests/.gitignore  |  10 +++
 4 files changed, 34 insertions(+), 116 deletions(-)
 create mode 100644 modules/grizzly/.gitignore
 create mode 100644 modules/testrunner/.gitignore
 create mode 100644 samples-and-tests/.gitignore

diff --git a/.gitignore b/.gitignore
index 8bd3d683b3..e9b83146b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,136 +1,41 @@
-bin
+# General temp files
+.DS_Store
+*.ser
+*.pyc
+
+# Files related to Play build or usage
+id
+dist
 framework/classes
 framework/test-classes
+framework/tests-results
 framework/out
-framework/.idea
 framework/play.jar
-.DS_Store
-nbproject/genfiles.properties
-nbproject/jdk.xml
-nbproject/nbjdk.properties
-nbproject/nbjdk.xml
-nbproject/private
-framework/tests-results
 framework/src/version
 framework/src/play/version
-framework/src/play/version
-framework/src/play/version
 framework/tests/test-application/db
+framework/play-*.jar
+framework/docs
+
+# IDE and editors
+*~
+.idea
+nbproject
+eclipse
+.amateras
 .settings
 .classpath
 .project
-framework/tests/tmp
-id
-framework/tests-tmp
-framework/docs
-dist
-modules/bespin/lib/bespin.jar
-modules/ecss/lib/ecss.jar
-modules/test-runner/lib/test-runner.jar
-resources/catalog.xml
-resources/nbproject/private
-modules/gae/lib/gae.jar
-catalog.xml
-modules/gae/lib/gae.jar
-play-*.jar
-modules/gae/bin
-modules/gwt/lib/play-gwt.jar
-tmp
-test-result
-logs
-logs
-tmp
-# Cannot ignore 'db' - it blocks new files in framework/src/play/db and framework/test-src/play/db
-# db
-
-*.pyc
-test-result
-samples-and-tests/with-gwt/nbproject
-samples-and-tests/jobboard/db
-samples-and-tests/jobboard/tmp
-samples-and-tests/jobboard/test-result
-samples-and-tests/jobboard/attachments
-samples-and-tests/just-test-cases/tmp
-samples-and-tests/just-test-cases/test-result
-samples-and-tests/chat/tmp
-samples-and-tests/chat/logs
-.git
-modules/spring/lib/play-spring.jar
-modules/search/bin
-modules/search/lib/search.jar
-samples-and-tests/just-test-cases/data
-modules/siena/lib/play-siena.jar
-samples-and-tests/lists-with-gae/logs
-samples-and-tests/lists-with-gae/tmp
-samples-and-tests/lists-with-gae/war/WEB-INF/appengine-generated
-./.settings
-samples-and-tests/just-test-cases/.settings
-samples-and-tests/just-test-cases/eclipse
-framework/ecClasses
-documentation/api
-support/textmate
-samples-and-tests/yabe/logs
-samples-and-tests/yabe/test-result
-samples-and-tests/yabe/tmp
-*.ser
-modules/cobertura/lib
-modules/scala/lib/play-scala.jar
-samples-and-tests/with-scala/logs
-samples-and-tests/yabe-with-scala/logs
-samples-and-tests/yabe-with-scala/tmp
-samples-and-tests/yabe/.amateras
-samples-and-tests/yabe/.settings
-samples-and-tests/yabe/eclipse
-samples-and-tests/yabe/nbproject
-samples-and-tests/with-scala/.amateras
-samples-and-tests/with-scala/.externalToolBuilders
-samples-and-tests/with-scala/.manager
-samples-and-tests/with-scala/.settings
-samples-and-tests/with-scala/eclipse
-samples-and-tests/test-scala/tmp
-samples-and-tests/test-scala/logs
-samples-and-tests/i-am-a-developer/i-am-working-here
-samples-and-tests/i-am-a-developer/i-am-creating-jobs-here
-samples-and-tests/i-am-a-developer/i-am-testing-log-levels-here
-samples-and-tests/just-test-cases/attachments
-samples-and-tests/booking/logs
-samples-and-tests/booking/tmp
-samples-and-tests/twitter-oauth/.settings
-samples-and-tests/twitter-oauth/eclipse
-help
 *.iml
 *.ipr
 *.iws
-modules/router/lib/router.jar
-modules/grizzly/lib/play-grizzly.jar
-play.ipr
-play.iws
-*iml
-modules/router-head
-modules/gwt/samples-and-tests/logs
-modules/gwt/samples-and-tests/test-result
-modules/gwt/samples-and-tests/tmp
-modules/siena-1.0
-samples-and-tests/zencontact/logs
-samples-and-tests/zencontact/test-result
-samples-and-tests/zencontact/tmp
-modules/scala
+
+# modules/: exclude except for core modules
 modules/*
-build.classes
-modules/crud/nbproject
-nbproject
-samples-and-tests/jobboard/attachments
-samples-and-tests/jobboard/logs
-samples-and-tests/jobboard/test-result
-samples-and-tests/jobboard/tmp
-samples-and-tests/validation/logs
-samples-and-tests/zencontact/precompiled
 !modules/docviewer
 !modules/crud
 !modules/console
 !modules/grizzly
 !modules/secure
 !modules/testrunner
-!framework/src/play/db
-.idea
-*~
+
diff --git a/modules/grizzly/.gitignore b/modules/grizzly/.gitignore
new file mode 100644
index 0000000000..a5ce00a93a
--- /dev/null
+++ b/modules/grizzly/.gitignore
@@ -0,0 +1,2 @@
+play-grizzly.jar
+
diff --git a/modules/testrunner/.gitignore b/modules/testrunner/.gitignore
new file mode 100644
index 0000000000..dd492a6e86
--- /dev/null
+++ b/modules/testrunner/.gitignore
@@ -0,0 +1 @@
+play-testrunner.jar
diff --git a/samples-and-tests/.gitignore b/samples-and-tests/.gitignore
new file mode 100644
index 0000000000..3df3ca36d0
--- /dev/null
+++ b/samples-and-tests/.gitignore
@@ -0,0 +1,10 @@
+tmp
+logs
+db
+
+i-am-a-developer/i-am-working-here
+i-am-a-developer/i-am-creating-jobs-here
+i-am-a-developer/i-am-testing-log-levels-here
+
+samples-and-tests/just-test-cases/attachments
+