From 3e5f3c77be51fa99bfc1802b900857cc598742ba Mon Sep 17 00:00:00 2001
From: Phil Hagelberg <technomancy@gmail.com>
Date: Tue, 21 Aug 2012 14:51:29 -0700
Subject: [PATCH] Rename resolve-symbol -> require-resolve.

---
 leiningen-core/src/leiningen/core/main.clj    |  3 +--
 leiningen-core/src/leiningen/core/project.clj |  4 ++--
 leiningen-core/src/leiningen/core/utils.clj   | 17 +++++++++--------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/leiningen-core/src/leiningen/core/main.clj b/leiningen-core/src/leiningen/core/main.clj
index 5e461f35..b4714819 100644
--- a/leiningen-core/src/leiningen/core/main.clj
+++ b/leiningen-core/src/leiningen/core/main.clj
@@ -118,8 +118,7 @@
 (defn resolve-task
   ([task not-found]
      (let [[task & pargs] (if (coll? task) task [task])]
-       (if-let [task-var (utils/resolve-symbol (symbol (str "leiningen." task)
-                                                       task))]
+       (if-let [task-var (utils/require-resolve (str "leiningen." task) task)]
          (with-meta
            (fn [project & args] (apply task-var project (concat pargs args)))
            (update-in (meta task-var) [:arglists] (drop-partial-args pargs)))
diff --git a/leiningen-core/src/leiningen/core/project.clj b/leiningen-core/src/leiningen/core/project.clj
index b8878606..7d557702 100755
--- a/leiningen-core/src/leiningen/core/project.clj
+++ b/leiningen-core/src/leiningen/core/project.clj
@@ -271,7 +271,7 @@
     (symbol (name ns) "project")))
 
 (defn- load-hook [hook-ns]
-  (when-let [hook (try (utils/resolve-symbol (symbol (name hook-ns) "activate"))
+  (when-let [hook (try (utils/require-resolve (name hook-ns) "activate")
                        (catch Throwable e
                          (utils/error "problem requiring" hook-ns "hook")
                          (throw e)))]
@@ -293,7 +293,7 @@
              (concat (plugin-middleware project)
                      (:middleware project))))
   ([project middleware-name]
-     (if-let [middleware (utils/resolve-symbol middleware-name)]
+     (if-let [middleware (utils/require-resolve middleware-name)]
        (middleware project)
        (utils/error "cannot resolve" middleware-name "middleware"))))
 
diff --git a/leiningen-core/src/leiningen/core/utils.clj b/leiningen-core/src/leiningen/core/utils.clj
index 28e34a62..1020c0b5 100644
--- a/leiningen-core/src/leiningen/core/utils.clj
+++ b/leiningen-core/src/leiningen/core/utils.clj
@@ -19,12 +19,13 @@
   (binding [*out* *err*]
     (apply println "Error:" args)))
 
-(defn resolve-symbol
+(defn require-resolve
   "Resolve a fully qualified symbol by first requiring its namespace."
-  [sym]
-  (when-let [ns (namespace sym)]
-    (when (ns-exists? ns)
-      (let [ns (symbol ns)]
-        (when-not (find-ns ns)
-          (require ns)))
-      (resolve sym))))
+  ([sym]
+     (when-let [ns (namespace sym)]
+       (when (ns-exists? ns)
+         (let [ns (symbol ns)]
+           (when-not (find-ns ns)
+             (require ns)))
+         (resolve sym))))
+  ([ns sym] (require-resolve (symbol ns sym))))