Merge pull request #476 from csmith/master

Restructure to standard maven/gradle layout.

.gitignore

@@ -1,9 +1,13 @@
 /build
 */build
-*/generated
 /dist
 /dist-versioned
 /lib
 *.iml
 /.gradle
 /pmd
+
+# Generated files created by IDEA
+/*/src/*/generated
+/*/src/*/generated_tests
+

build.gradle

@@ -3,9 +3,18 @@ subprojects {
     apply plugin: 'java'
     apply plugin: 'findbugs'
     apply plugin: 'pmd'
+    apply plugin: 'idea'
 
     apply from: '../gradle/coverage.gradle'
 
+    idea {
+        module {
+             sourceDirs += file('src/main/generated')
+             testSourceDirs += file('src/test/generated_tests')
+             generatedSourceDirs = [file('src/main/generated'), file('src/test/generated_tests')]
+        }
+    }
+
     configurations {
         bundle
 
@@ -14,17 +23,6 @@ subprojects {
         }
     }
 
-    sourceSets {
-        main {
-            java.srcDirs = ['src']
-            resources.srcDirs = ['res']
-        }
-        test {
-            java.srcDirs = ['test']
-            resources.srcDirs = ['test-res']
-        }
-    }
-
     sourceCompatibility = 1.8
     targetCompatibility = 1.8