From d4fb1c8d636bf396f0d6cc38fa61e08ab7516b86 Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Wed, 21 Nov 2012 10:51:54 +0100
Subject: [PATCH] Refactor Gradle script naming and organization

 - inline test-mvc and tiles3 .gradle files for clarity
 - rename merge-dist.gradle to merge-artifacts.gradle
 - polish Javadoc for merge-artifacts.gradle
 - move merge-artifacts.gradle into gradle subdirectory
 - move publish-maven.gradle into gradle subdirectory
---
 build.gradle                                  |  9 ++++---
 .../merge-artifacts.gradle                    | 26 +++++++++----------
 .../publish-maven.gradle                      |  0
 spring-test-mvc/test-mvc.gradle               |  2 --
 spring-webmvc-tiles3/tiles3.gradle            |  2 --
 5 files changed, 19 insertions(+), 20 deletions(-)
 rename merge-dist.gradle => gradle/merge-artifacts.gradle (77%)
 rename publish-maven.gradle => gradle/publish-maven.gradle (100%)
 delete mode 100644 spring-test-mvc/test-mvc.gradle
 delete mode 100644 spring-webmvc-tiles3/tiles3.gradle

diff --git a/build.gradle b/build.gradle
index c3f2479a07..a54ec76fb2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,6 +21,7 @@ configure(allprojects) {
     ext.hsqldbVersion='1.8.0.10'
     ext.junitVersion = '4.11.20120805.1225' // temporary use of snapshot; spring-test
                                             // still builds against on 4.10
+    ext.gradleScriptDir = "${rootProject.projectDir}/gradle"
 
     [compileJava, compileTestJava]*.options*.compilerArgs = ['-Xlint:none']
 
@@ -55,7 +56,7 @@ configure(subprojects - project(":spring-test")) {
 }
 
 configure(subprojects) { subproject ->
-    apply from: "${rootProject.projectDir}/publish-maven.gradle"
+    apply from: "${gradleScriptDir}/publish-maven.gradle"
 
     jar {
         manifest.attributes['Created-By'] =
@@ -505,7 +506,8 @@ project('spring-webmvc') {
 
 project('spring-webmvc-tiles3') {
     description = 'Spring Framework Tiles3 Integration'
-    apply from: 'tiles3.gradle'
+    ext.mergeIntoProject = project(':spring-webmvc')
+    apply from: "${gradleScriptDir}/merge-artifacts.gradle"
     dependencies {
         compile project(":spring-context")
         compile project(":spring-webmvc").sourceSets.main.output
@@ -572,7 +574,8 @@ project('spring-test') {
 
 project('spring-test-mvc') {
     description = 'Spring Test MVC Framework'
-    apply from: 'test-mvc.gradle'
+    ext.mergeIntoProject = project(':spring-test')
+    apply from: "${gradleScriptDir}/merge-artifacts.gradle"
     dependencies {
         compile project(":spring-context")
         compile project(":spring-webmvc")
diff --git a/merge-dist.gradle b/gradle/merge-artifacts.gradle
similarity index 77%
rename from merge-dist.gradle
rename to gradle/merge-artifacts.gradle
index 8bce5a27e8..911b0af9c6 100644
--- a/merge-dist.gradle
+++ b/gradle/merge-artifacts.gradle
@@ -1,22 +1,22 @@
 import org.gradle.plugins.ide.eclipse.model.ProjectDependency
 
 /**
- * Will merge the distributions of the current project into mergeIntoProject. For
- * example, to bundle spring-test-mvc in spring-test's jars. This script will perform the
- * following steps:
- * <ul>
- *   <li>Ensure that jar tasks of the project being merged from will execute the tasks of
- *     the project being merged into</li>
- *   <li>Add the project being merged into to the classpath of the project being merged
- *     from</li>
- *   <li>Update the pom.xml of the project being merged into to contain the entries from
- *     the project being merged from</li>
- * </ul>
+ * Will merge the artifacts of the current project into mergeIntoProject. For example, to
+ * bundle spring-test-mvc in spring-test's jars. This script will perform the following
+ * steps:
+ *
+ * - Ensure that jar tasks of the project being merged from will execute the tasks of the
+ *   project being merged into
+ *
+ * - Add the project being merged into to the classpath of the project being merged from
+ *
+ * - Update the pom.xml of the project being merged into to contain the entries from the
+ *   project being merged from
  *
  * Example Usage:
  *
- * ext.mergeIntoProject = project(':spring-test')
- * apply from: "${rootProject.projectDir}/merge-dist.gradle"
+ *   ext.mergeIntoProject = project(':spring-test')
+ *   apply from: "${rootProject.projectDir}/gradle/merge-artifacts.gradle"
  */
 
 def mergeFromProject = project
diff --git a/publish-maven.gradle b/gradle/publish-maven.gradle
similarity index 100%
rename from publish-maven.gradle
rename to gradle/publish-maven.gradle
diff --git a/spring-test-mvc/test-mvc.gradle b/spring-test-mvc/test-mvc.gradle
deleted file mode 100644
index 6b1d12eac3..0000000000
--- a/spring-test-mvc/test-mvc.gradle
+++ /dev/null
@@ -1,2 +0,0 @@
-ext.mergeIntoProject = project(':spring-test')
-apply from: "${rootProject.projectDir}/merge-dist.gradle"
diff --git a/spring-webmvc-tiles3/tiles3.gradle b/spring-webmvc-tiles3/tiles3.gradle
deleted file mode 100644
index 519e150992..0000000000
--- a/spring-webmvc-tiles3/tiles3.gradle
+++ /dev/null
@@ -1,2 +0,0 @@
-ext.mergeIntoProject = project(':spring-webmvc')
-apply from: "${rootProject.projectDir}/merge-dist.gradle"