From 410a31162d87296a5556f54aeab9fddbf8d4d28f Mon Sep 17 00:00:00 2001
From: Tom Faulhaber <git_net@infolace.com>
Date: Thu, 28 Oct 2010 09:19:58 -0700
Subject: [PATCH] Use functions from clojure.java.shell

---
 src/autodoc/branches.clj   | 2 +-
 src/autodoc/build_html.clj | 4 ++--
 src/autodoc/doc_files.clj  | 4 ++--
 src/autodoc/git_tools.clj  | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/autodoc/branches.clj b/src/autodoc/branches.clj
index 6ea097a..2d2c136 100644
--- a/src/autodoc/branches.clj
+++ b/src/autodoc/branches.clj
@@ -1,8 +1,8 @@
 (ns autodoc.branches
   (:use [clojure.java.io :only [file reader]]
+        [clojure.java.shell :only [with-sh-dir sh]]
         [clojure.pprint :only [cl-format pprint]]
         [clojure.contrib.str-utils :only (re-split)]
-        [clojure.contrib.shell-out :only [with-sh-dir sh]]
         [autodoc.params :only (params)]
         [autodoc.build-html :only (branch-subdir)]
         [autodoc.doc-files :only (xform-tree)])
diff --git a/src/autodoc/build_html.clj b/src/autodoc/build_html.clj
index 108e0d4..b4e1d06 100644
--- a/src/autodoc/build_html.clj
+++ b/src/autodoc/build_html.clj
@@ -4,10 +4,10 @@
            [java.io File FileWriter BufferedWriter StringReader])
   (:require [clojure.contrib.str-utils :as str])
   (:use [net.cgrand.enlive-html :exclude (deftemplate)]
+        [clojure.java.io :only (file writer)]
+        [clojure.java.shell :only (sh)]
         [clojure.pprint :only (pprint cl-format)]
         [clojure.contrib.json :only (pprint-json)]
-        [clojure.java.io :only (file writer)]
-        [clojure.contrib.shell-out :only (sh)]
         [autodoc.collect-info :only (contrib-info)]
         [autodoc.params :only (params)]))
 
diff --git a/src/autodoc/doc_files.clj b/src/autodoc/doc_files.clj
index 5c11172..cd849ed 100644
--- a/src/autodoc/doc_files.clj
+++ b/src/autodoc/doc_files.clj
@@ -2,8 +2,8 @@
 ;  "Add any files in the projects doc/ directory to the output directory, transforming
 ;as necessary."
   (:use [autodoc.params :only [params]]
-        [clojure.contrib.shell-out :only [sh]]
-        [clojure.java.io :only [delete-file copy]])
+        [clojure.java.io :only [delete-file copy]]
+        [clojure.java.shell :only [sh]])
   (:import [java.io File]))
 
 ;; Brought in from clojure.contrib.java-utils since it's not making the migration to 1.2
diff --git a/src/autodoc/git_tools.clj b/src/autodoc/git_tools.clj
index e4848db..8fd3fef 100644
--- a/src/autodoc/git_tools.clj
+++ b/src/autodoc/git_tools.clj
@@ -1,6 +1,6 @@
 (ns autodoc.git-tools
-  (:use [clojure.pprint :only [cl-format]]
-        [clojure.contrib.shell-out :only [sh with-sh-dir]]
+  (:use [clojure.java.shell :only [sh with-sh-dir]]
+        [clojure.pprint :only [cl-format]]
         [autodoc.build-html :only [branch-subdir]])
   (:import [java.io File]))