From 54bf6c846bec583039417d640503e469d0575fb8 Mon Sep 17 00:00:00 2001
From: Rob Winch <rwinch@vmware.com>
Date: Thu, 8 Aug 2013 16:29:43 -0500
Subject: [PATCH] SEC-2097: Remove configure() blocks from gradle/*.gradle

---
 build.gradle                  |  7 +++++--
 gradle/ide-integration.gradle | 37 -----------------------------------
 gradle/javaprojects.gradle    | 29 +++++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 39 deletions(-)
 delete mode 100644 gradle/ide-integration.gradle

diff --git a/build.gradle b/build.gradle
index 71db3764fa..bba2e402ac 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,6 +21,9 @@ apply plugin: 'base'
 description = 'Spring Security'
 
 allprojects {
+    apply plugin: 'idea'
+    apply plugin: 'eclipse'
+
     ext.releaseBuild = version.endsWith('RELEASE')
     ext.snapshotBuild = version.endsWith('SNAPSHOT')
 
@@ -30,6 +33,8 @@ allprojects {
        maven { url "http://repo.springsource.org/libs-release" }
        maven { url "http://repo.springsource.org/plugins-release" }
     }
+
+    eclipse.project.name = "${project.name}-3.2.x"
 }
 
 sonarRunner {
@@ -157,8 +162,6 @@ artifacts {
     archives project(':docs').schemaZip
 }
 
-apply from: "$rootDir/gradle/ide-integration.gradle"
-
 task wrapper(type: Wrapper) {
     gradleVersion = '1.6'
 }
diff --git a/gradle/ide-integration.gradle b/gradle/ide-integration.gradle
deleted file mode 100644
index 9b55608454..0000000000
--- a/gradle/ide-integration.gradle
+++ /dev/null
@@ -1,37 +0,0 @@
-    import org.gradle.plugins.ide.eclipse.model.SourceFolder
-
-configure(allprojects) {
-    apply plugin: 'idea'
-    apply plugin: 'eclipse'
-
-    eclipse.project.name = "${project.name}-3.2.x"
-}
-
-configure(javaProjects) {
-    eclipse.classpath.downloadSources = true
-
-    // http://forums.gradle.org/gradle/topics/eclipse_wtp_deploys_testcode_to_server_example_provided
-    eclipse.classpath {
-        defaultOutputDir = file('bin/main')
-        file.whenMerged { cp ->
-            cp.entries.findAll { it instanceof SourceFolder && (it.path.contains("test") || it.path.contains("Test")) }*.output = "bin/test"
-        }
-    }
-
-    // GRADLE-1422
-    project.eclipseClasspath.doFirst {
-       // delay adding whenMerged till the entryAttributes are added (must be the last whenMerged)
-       project.eclipse.classpath.file.whenMerged { classpath ->
-           def includeDeps = project.configurations.getByName('runtime').collect {f -> f.absolutePath } as Set
-           classpath.entries.each { cp ->
-               if(cp instanceof org.gradle.plugins.ide.eclipse.model.Library) {
-                   def include = includeDeps.contains(cp.path)
-                   def attr = 'org.eclipse.jst.component.dependency'
-                   if(!include) {
-                       cp.entryAttributes.remove(attr)
-                   }
-               }
-           }
-       }
-    }
-}
\ No newline at end of file
diff --git a/gradle/javaprojects.gradle b/gradle/javaprojects.gradle
index de96ed9503..107ba975bd 100644
--- a/gradle/javaprojects.gradle
+++ b/gradle/javaprojects.gradle
@@ -1,3 +1,5 @@
+import org.gradle.plugins.ide.eclipse.model.SourceFolder
+
 apply plugin: 'java'
 apply plugin: 'eclipse-wtp'
 apply plugin: 'propdeps'
@@ -154,6 +156,33 @@ javadoc {
     }
 }
 
+eclipse.classpath.downloadSources = true
+
+// http://forums.gradle.org/gradle/topics/eclipse_wtp_deploys_testcode_to_server_example_provided
+eclipse.classpath {
+    defaultOutputDir = file('bin/main')
+    file.whenMerged { cp ->
+        cp.entries.findAll { it instanceof SourceFolder && (it.path.contains("test") || it.path.contains("Test")) }*.output = "bin/test"
+    }
+}
+
+// GRADLE-1422
+project.eclipseClasspath.doFirst {
+   // delay adding whenMerged till the entryAttributes are added (must be the last whenMerged)
+   project.eclipse.classpath.file.whenMerged { classpath ->
+       def includeDeps = project.configurations.getByName('runtime').collect {f -> f.absolutePath } as Set
+       classpath.entries.each { cp ->
+           if(cp instanceof org.gradle.plugins.ide.eclipse.model.Library) {
+               def include = includeDeps.contains(cp.path)
+               def attr = 'org.eclipse.jst.component.dependency'
+               if(!include) {
+                   cp.entryAttributes.remove(attr)
+               }
+           }
+       }
+   }
+}
+
 task javadocJar(type: Jar) {
     classifier = 'javadoc'
     from javadoc