From 6f3b067cd4d8f186ca73386c60886174be87a34b Mon Sep 17 00:00:00 2001
From: Toby Crawley <toby@tcrawley.org>
Date: Thu, 4 Apr 2013 17:26:02 -0400
Subject: [PATCH] Make s3-wagon-private available by default [IMMUTANT-252]

I've tested this manually, and it appears to work. I haven't created a
test for it since it requires s3 credentials.
---
 modules/bootstrap/pom.xml                                 | 6 ++++++
 .../src/main/clojure/immutant/runtime/bootstrap.clj       | 5 +++++
 modules/bootstrap/src/module/resources/module.xml         | 4 ++++
 pom.xml                                                   | 8 ++++++++
 4 files changed, 23 insertions(+)

diff --git a/modules/bootstrap/pom.xml b/modules/bootstrap/pom.xml
index 6331f7a4..956dcd5a 100644
--- a/modules/bootstrap/pom.xml
+++ b/modules/bootstrap/pom.xml
@@ -53,6 +53,12 @@
       <scope>compile</scope>
     </dependency>
 
+    <dependency>
+      <groupId>s3-wagon-private</groupId>
+      <artifactId>s3-wagon-private</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
   </dependencies>
 
   <build>
diff --git a/modules/bootstrap/src/main/clojure/immutant/runtime/bootstrap.clj b/modules/bootstrap/src/main/clojure/immutant/runtime/bootstrap.clj
index b2dcbf57..e1e3f0b9 100644
--- a/modules/bootstrap/src/main/clojure/immutant/runtime/bootstrap.clj
+++ b/modules/bootstrap/src/main/clojure/immutant/runtime/bootstrap.clj
@@ -98,6 +98,11 @@ to gracefully handle missing dependencies."
   [project]
   (when project
     (project/load-certificates project)
+    ;; trigger loading of s3-wagon-private, but don't load any other
+    ;; plugins, since load-plugins tries to add them to the current
+    ;; classloader, which will be the shared bootstrap classloader,
+    ;; not the application's CL, and we don't want that to happen.
+    (project/load-plugins project :no-plugins) 
     (try
       (->> (update-in project [:dependencies]
                       (fn [deps] (remove #(and
diff --git a/modules/bootstrap/src/module/resources/module.xml b/modules/bootstrap/src/module/resources/module.xml
index 1b2ebaf3..5e7db19e 100644
--- a/modules/bootstrap/src/module/resources/module.xml
+++ b/modules/bootstrap/src/module/resources/module.xml
@@ -52,6 +52,10 @@
         <resource-root path="wagon-provider-api.jar"/>
         <resource-root path="wagon-http.jar"/>
         <resource-root path="wagon-http-shared4.jar"/>
+        <resource-root path="s3-wagon-private.jar"/>
+        <resource-root path="org.springframework.build.aws.maven.jar"/>
+        <resource-root path="jets3t.jar"/>
+        <resource-root path="commons-httpclient.jar"/>
     </resources>
 
     <dependencies>
diff --git a/pom.xml b/pom.xml
index 7328f17a..cd732da8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -346,6 +346,13 @@
         <artifactId>clj-http</artifactId>
         <version>${version.clj-http}</version>
       </dependency>
+
+      <dependency>
+        <groupId>s3-wagon-private</groupId>
+        <artifactId>s3-wagon-private</artifactId>
+        <version>${version.s3-wagon-private}</version>
+      </dependency>
+
     </dependencies>
   </dependencyManagement>
 
@@ -383,6 +390,7 @@
     <version.codox>0.6.3</version.codox>
     <version.fntest>0.3.10</version.fntest>
     <version.clj-http>0.5.8</version.clj-http>
+    <version.s3-wagon-private>1.1.2</version.s3-wagon-private>
 
     <warn-on-reflection>false</warn-on-reflection>
   </properties>