From 4cd17db5232308262316fd94d8cb1cb8deb38ea5 Mon Sep 17 00:00:00 2001
From: Andrew Phillips <demobox1@yahoo.co.uk>
Date: Fri, 3 Jun 2011 03:07:21 +0200
Subject: [PATCH] Added a 'tweetstore.instance' identifier to fetch the correct
 jclouds.properties remote resource bundle

---
 demos/tweetstore/gae-tweetstore-spring/pom.xml | 4 ++++
 demos/tweetstore/gae-tweetstore/pom.xml        | 4 ++++
 demos/tweetstore/pom.xml                       | 3 ++-
 demos/tweetstore/runatcloud-tweetstore/pom.xml | 4 ++++
 4 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/demos/tweetstore/gae-tweetstore-spring/pom.xml b/demos/tweetstore/gae-tweetstore-spring/pom.xml
index 229e937bcc..7098814889 100644
--- a/demos/tweetstore/gae-tweetstore-spring/pom.xml
+++ b/demos/tweetstore/gae-tweetstore-spring/pom.xml
@@ -209,6 +209,10 @@
         
         <profile>
             <id>deploy</id>
+            <properties>
+                <!-- classifier to choose the correct jclouds.properties file -->
+                <tweetstore.instance>gae-tweetstore-spring</tweetstore.instance>
+            </properties>
             <build>
                 <plugins>
                     <plugin>
diff --git a/demos/tweetstore/gae-tweetstore/pom.xml b/demos/tweetstore/gae-tweetstore/pom.xml
index 77042cfd5a..142189e77b 100644
--- a/demos/tweetstore/gae-tweetstore/pom.xml
+++ b/demos/tweetstore/gae-tweetstore/pom.xml
@@ -195,6 +195,10 @@
         
         <profile>
             <id>deploy</id>
+            <properties>
+                <!-- classifier to choose the correct jclouds.properties file -->
+                <tweetstore.instance>gae-tweetstore</tweetstore.instance>
+            </properties>
             <build>
                 <plugins>
                     <plugin>
diff --git a/demos/tweetstore/pom.xml b/demos/tweetstore/pom.xml
index 404c2441a6..2b9bb2dda9 100644
--- a/demos/tweetstore/pom.xml
+++ b/demos/tweetstore/pom.xml
@@ -168,7 +168,8 @@
                                 </goals>
                                 <configuration>
                                     <resourceBundles>
-                                        <resourceBundle>org.jclouds:jclouds-properties:${project.version}</resourceBundle>
+                                        <!-- tweetstore.instance is set in child projects -->
+                                        <resourceBundle>${project.groupId}:jclouds-demos-tweetstore-jclouds-properties:${project.version}.${tweetstore.instance}</resourceBundle>
                                     </resourceBundles>
                                 </configuration>
                             </execution>          
diff --git a/demos/tweetstore/runatcloud-tweetstore/pom.xml b/demos/tweetstore/runatcloud-tweetstore/pom.xml
index 913462f58e..0a2031c9dc 100644
--- a/demos/tweetstore/runatcloud-tweetstore/pom.xml
+++ b/demos/tweetstore/runatcloud-tweetstore/pom.xml
@@ -190,6 +190,10 @@
         
         <profile>
             <id>deploy</id>
+            <properties>
+                <!-- classifier to choose the correct jclouds.properties file -->
+                <tweetstore.instance>runatcloud-tweetstore</tweetstore.instance>
+            </properties>
             <pluginRepositories>
                 <pluginRepository>
                     <id>bees-plugins-snapshots</id>