From caa152c54a9d45451c1d88d8b5a9a1346fb062e1 Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Thu, 29 Jul 2010 13:11:36 +0200
Subject: [PATCH] Support spring-amqp-core artifactId change

Commit 58de044 changed the Maven pom artifactId of the
spring-amqp-core module to 'spring-amqp' without changing the
name of the directory. This commit reflects that change within
the Gradle build, however the way it is done is not ideal.

See this comment on GRADLE-443 for how it will look against Gradle 1.0
http://bit.ly/bRCmBn
---
 build.gradle                           |  8 ++++----
 settings.gradle                        | 10 +++++++++-
 spring-amqp-samples/helloworld/pom.xml |  4 ++--
 spring-amqp-samples/stocks/pom.xml     | 12 ++++++------
 4 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/build.gradle b/build.gradle
index bf4acad4..0ff28ac1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -168,7 +168,7 @@ configure(sampleprojects) {
 
     // dependencies common ta all sample projects
     dependencies {
-        compile project(':spring-amqp-core')
+        compile project(':spring-amqp')
         compile project(':spring-rabbit')
         compile project(':spring-rabbit-admin')
         compile "com.rabbitmq:amqp-client:$rabbitVersion"
@@ -189,7 +189,7 @@ configure(sampleprojects) {
 //
 // @see configure(javaprojects) above for general config
 // -----------------------------------------------------------------------------
-project('spring-amqp-core') {
+project('spring-amqp') {
     dependencies {
         compile "org.springframework:spring-core:$springVersion"
         compile "org.springframework:spring-oxm:$springVersion"
@@ -208,7 +208,7 @@ project('spring-erlang') {
 
 project('spring-rabbit') {
     dependencies {
-        compile project(':spring-amqp-core')
+        compile project(':spring-amqp')
         compile "com.rabbitmq:amqp-client:$rabbitVersion"
         compile "org.springframework:spring-core:$springVersion"
         compile "org.springframework:spring-beans:$springVersion"
@@ -224,7 +224,7 @@ project('spring-rabbit-admin') {
     erlangLicense = true
 
     dependencies {
-        compile project(':spring-amqp-core')
+        compile project(':spring-amqp')
         compile project(':spring-erlang')
         compile project(':spring-rabbit')
         compile "com.rabbitmq:amqp-client:$rabbitVersion"
diff --git a/settings.gradle b/settings.gradle
index 8998cddd..3ba72aed 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -20,9 +20,17 @@
  * @see http://www.gradle.org/0.9-preview-3/docs/userguide/userguide_single.html#javaMultiProject
  */
 include 'docs',
-        'spring-amqp-core',
+        'spring-amqp',
         'spring-erlang',
         'spring-rabbit',
         'spring-rabbit-admin',
         'spring-amqp-samples:helloworld',
         'spring-amqp-samples:stocks'
+
+// In commit 58de044, Mark changed the Maven pom artifactId of the
+// spring-amqp-core module to 'spring-amqp', without changing the
+// name of the directory. This statement reflects that change, but
+// is not actually the most ideal way to do it. See the following
+// comment on GRADLE-443 to see how we'll be able to support this
+// better in Gradle 1.0: http://bit.ly/bRCmBn
+project(':spring-amqp').projectDir = new File(settingsDir, 'spring-amqp-core')
diff --git a/spring-amqp-samples/helloworld/pom.xml b/spring-amqp-samples/helloworld/pom.xml
index 71f52c6c..42fbdf63 100644
--- a/spring-amqp-samples/helloworld/pom.xml
+++ b/spring-amqp-samples/helloworld/pom.xml
@@ -40,13 +40,13 @@
     </dependency>
     <dependency>
       <groupId>org.springframework.amqp</groupId>
-      <artifactId>spring-amqp-core</artifactId>
+      <artifactId>spring-rabbit-admin</artifactId>
       <version>1.0.0.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.springframework.amqp</groupId>
-      <artifactId>spring-rabbit-admin</artifactId>
+      <artifactId>spring-amqp</artifactId>
       <version>1.0.0.BUILD-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
diff --git a/spring-amqp-samples/stocks/pom.xml b/spring-amqp-samples/stocks/pom.xml
index 2811d6a8..976882ca 100644
--- a/spring-amqp-samples/stocks/pom.xml
+++ b/spring-amqp-samples/stocks/pom.xml
@@ -38,12 +38,6 @@
       <version>1.5.4</version>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>org.springframework.amqp</groupId>
-      <artifactId>spring-amqp-core</artifactId>
-      <version>1.0.0.BUILD-SNAPSHOT</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.springframework.amqp</groupId>
       <artifactId>spring-rabbit-admin</artifactId>
@@ -56,6 +50,12 @@
       <version>3.0.3.RELEASE</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.amqp</groupId>
+      <artifactId>spring-amqp</artifactId>
+      <version>1.0.0.BUILD-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>log4j</groupId>
       <artifactId>log4j</artifactId>