remove deprecated clojure.contrib.string

Since clojure.contrib.string is used by other submodules, some changes
were required:

- gen-html-docs and prxml needed changes because of functions were
  renamed or arguments reordered when promoted to clojure.string.
- jmx, json, miglayout, prxml and sql gained a private one-argument
  implementation of as-str.
- repl-utils gained a private copy of c.c.string/partition, named
  spartition.
- repl-utils replaced a call to c.c.string/substring? with a call to
  the java String method '.contains' (with swapped argument order).

Signed-off-by: Stuart Sierra <mail@stuartsierra.com>

1 files changed, 12 insertions, 6 deletions

diff --git a/modules/prxml/src/main/clojure/clojure/contrib/prxml.clj b/modules/prxml/src/main/clojure/clojure/contrib/prxml.clj
index 2c2ec761..a680c773 100644
--- a/modules/prxml/src/main/clojure/clojure/contrib/prxml.clj
+++ b/modules/prxml/src/main/clojure/clojure/contrib/prxml.clj
@@ -27,7 +27,7 @@
      :doc "Compact syntax for generating XML. See the documentation of \"prxml\" 
 for details."}
   clojure.contrib.prxml
-  (:use [clojure.contrib.string :only (escape as-str)]))
+  (:use [clojure.string :only (escape)]))
 
 (def
  ^{:doc "If true, empty tags will have a space before the closing />"}
@@ -43,11 +43,17 @@ for details."}
 (def ^{:private true} print-xml)  ; forward declaration
 
 (defn- escape-xml [s]
-  (escape {\< "&lt;"
-           \> "&gt;"
-           \& "&amp;"
-           \' "&apos;"
-           \" "&quot;"} s))
+  (escape s {\< "&lt;"
+             \> "&gt;"
+             \& "&amp;"
+             \' "&apos;"
+             \" "&quot;"}))
+
+(defn- as-str
+  [x]
+  (if (instance? clojure.lang.Named x)
+    (name x)
+    (str x)))
 
 (defn- prxml-attribute [name value]
   (print " ")