Permalink
Browse files

Change ns names for all renamed libs except str-utils

  • Loading branch information...
1 parent 6b68e48 commit ec6a7579d6b1c0bfa42e3666cfad196cffc966fe @stuartsierra stuartsierra committed Feb 1, 2010
Showing with 64 additions and 64 deletions.
  1. +1 −1 src/examples/clojure/clojure/contrib/pprint/examples/json.clj
  2. +1 −1 src/examples/clojure/clojure/contrib/pprint/examples/xml.clj
  3. +1 −1 src/main/clojure/clojure/contrib/command_line.clj
  4. +1 −1 src/main/clojure/clojure/contrib/condition.clj
  5. +1 −1 src/main/clojure/clojure/contrib/datalog/literals.clj
  6. +1 −1 src/main/clojure/clojure/contrib/datalog/softstrat.clj
  7. +1 −1 src/main/clojure/clojure/contrib/datalog/util.clj
  8. +7 −7 src/main/clojure/clojure/contrib/gen_html_docs.clj
  9. +3 −3 src/main/clojure/clojure/contrib/http/agent.clj
  10. +2 −2 src/main/clojure/clojure/contrib/http/connection.clj
  11. +2 −2 src/main/clojure/clojure/contrib/io.clj
  12. +3 −3 src/main/clojure/clojure/contrib/java.clj
  13. +1 −1 src/main/clojure/clojure/contrib/javadoc/browse.clj
  14. +1 −1 src/main/clojure/clojure/contrib/jmx.clj
  15. +1 −1 src/main/clojure/clojure/contrib/json.clj
  16. +1 −1 src/main/clojure/clojure/contrib/lazy_xml.clj
  17. +4 −4 src/main/clojure/clojure/contrib/load_all.clj
  18. +1 −1 src/main/clojure/clojure/contrib/miglayout/internal.clj
  19. +1 −1 src/main/clojure/clojure/contrib/mock.clj
  20. +5 −5 src/main/clojure/clojure/contrib/monadic_io_streams.clj
  21. +1 −1 src/main/clojure/clojure/contrib/repl_utils.clj
  22. +1 −1 src/main/clojure/clojure/contrib/seq.clj
  23. +1 −1 src/main/clojure/clojure/contrib/shell.clj
  24. +1 −1 src/main/clojure/clojure/contrib/sql.clj
  25. +2 −2 src/main/clojure/clojure/contrib/sql/internal.clj
  26. +3 −3 src/main/clojure/clojure/contrib/stream_utils.clj
  27. +2 −2 src/test/clojure/clojure/contrib/test_contrib/java_utils.clj
  28. +2 −2 src/test/clojure/clojure/contrib/test_contrib/seq_utils_test.clj
  29. +5 −5 src/test/clojure/clojure/contrib/test_contrib/shell_out.clj
  30. +6 −6 src/test/clojure/clojure/contrib/test_contrib/test_java_utils.clj
  31. +1 −1 src/test/clojure/clojure/contrib/test_contrib/with_ns_test.clj
@@ -19,7 +19,7 @@
This is an example of using a pretty printer dispatch function to generate JSON output",
:see-also [["http://json.org/", "JSON Home Page"]]}
clojure.contrib.pprint.examples.json
- (:require [clojure.contrib.java-utils :as j])
+ (:require [clojure.contrib.java :as j])
(:use [clojure.test :only (deftest- is)]
[clojure.contrib.pprint :only (write formatter-out)]))
@@ -20,7 +20,7 @@
:doc "A version of prxml that uses a pretty print dispatch function."}
clojure.contrib.pprint.examples.xml
(:use [clojure.contrib.lazy-xml :only (escape-xml)]
- [clojure.contrib.java-utils :only (as-str)]
+ [clojure.contrib.java :only (as-str)]
[clojure.contrib.pprint :only (formatter-out write)]
[clojure.contrib.pprint.utilities :only (prlabel)]))
@@ -12,7 +12,7 @@
#^{:author "Chris Houser",
:doc "Process command-line arguments according to a given cmdspec"}
clojure.contrib.command-line
- (:require (clojure.contrib [seq-utils :as su]))
+ (:require (clojure.contrib [seq :as su]))
(:use (clojure.contrib [str-utils :only (str-join)])))
(defn make-map [args cmdspec]
@@ -40,7 +40,7 @@ http://groups.google.com/group/clojure/browse_frm/thread/da1285c538f22bb5"}
clojure.lang.IPersistentMap)
(:use (clojure.contrib
[def :only (defvar)]
- [seq-utils :only (separate)])))
+ [seq :only (separate)])))
(defvar *condition*
"While a handler is running, bound to the condition being handled")
@@ -19,7 +19,7 @@
(:use clojure.contrib.datalog.database)
(:use [clojure.set :only (intersection)])
(:use [clojure.contrib.set :only (subset?)])
- (:use [clojure.contrib.seq-utils :only (flatten)]))
+ (:use [clojure.contrib.seq :only (flatten)]))
;;; Type Definitions
@@ -21,7 +21,7 @@
clojure.contrib.datalog.rules
clojure.contrib.datalog.magic)
(:use [clojure.set :only (union intersection difference)])
- (:use [clojure.contrib.seq-utils :only (indexed)])
+ (:use [clojure.contrib.seq :only (indexed)])
(:require [clojure.contrib.graph :as graph]))
@@ -15,7 +15,7 @@
(ns clojure.contrib.datalog.util
- (:use [clojure.contrib.seq-utils :only (separate)]))
+ (:use [clojure.contrib.seq :only (separate)]))
@@ -46,8 +46,8 @@
:doc "Generates a single HTML page that contains the documentation for
one or more Clojure libraries."}
clojure.contrib.gen-html-docs
- (:require [clojure.contrib.duck-streams :as duck-streams])
- (:use [clojure.contrib seq-utils str-utils repl-utils def prxml])
+ (:require [clojure.contrib.io :as io])
+ (:use [clojure.contrib seq str-utils repl-utils def prxml])
(:import [java.lang Exception]
[java.util.regex Pattern]))
@@ -457,7 +457,7 @@ libraries."
"Calls generate-documentation on the libraries named by libs and
emits the generated HTML to the path named by path."
[path libs]
- (duck-streams/spit path (generate-documentation libs)))
+ (io/spit path (generate-documentation libs)))
(comment
(generate-documentation-to-file
@@ -481,7 +481,7 @@ emits the generated HTML to the path named by path."
'clojure.contrib.complex-numbers
'clojure.contrib.cond
'clojure.contrib.def
- 'clojure.contrib.duck-streams
+ 'clojure.contrib.io
'clojure.contrib.enum
'clojure.contrib.error-kit
'clojure.contrib.except
@@ -507,9 +507,9 @@ emits the generated HTML to the path named by path."
'clojure.contrib.prxml
'clojure.contrib.repl-ln
'clojure.contrib.repl-utils
- 'clojure.contrib.seq-utils
+ 'clojure.contrib.seq
'clojure.contrib.server-socket
- 'clojure.contrib.shell-out
+ 'clojure.contrib.shell
'clojure.contrib.sql
'clojure.contrib.stream-utils
'clojure.contrib.str-utils
@@ -532,7 +532,7 @@ emits the generated HTML to the path named by path."
'clojure.contrib.test-clojure.printer
'clojure.contrib.test-clojure.reader
'clojure.contrib.test-clojure.sequences
- 'clojure.contrib.test-contrib.shell-out
+ 'clojure.contrib.test-contrib.shell
'clojure.contrib.test-contrib.str-utils
'clojure.contrib.zip-filter.xml
]))
@@ -52,7 +52,7 @@
And you could write the response directly to a file like this:
- (require '[clojure.contrib.duck-streams :as d])
+ (require '[clojure.contrib.io :as d])
(http-agent \"http...\"
:handler (fn [agnt]
@@ -65,7 +65,7 @@
clojure.contrib.http.agent
(:refer-clojure :exclude [bytes])
(:require [clojure.contrib.http.connection :as c]
- [clojure.contrib.duck-streams :as duck])
+ [clojure.contrib.io :as duck])
(:import (java.io InputStream ByteArrayOutputStream
ByteArrayInputStream)
(java.net HttpURLConnection)))
@@ -261,7 +261,7 @@
encoding.
If no encoding is given, uses the encoding specified in the server
- headers, or clojure.contrib.duck-streams/*default-encoding* if it is
+ headers, or clojure.contrib.io/*default-encoding* if it is
not specified."
([http-agnt]
(await http-agnt) ;; have to wait for Content-Encoding
@@ -13,8 +13,8 @@
(ns #^{:doc "Low-level HTTP client API around HttpURLConnection"}
clojure.contrib.http.connection
- (:require [clojure.contrib.duck-streams :as duck]
- [clojure.contrib.java-utils :as j])
+ (:require [clojure.contrib.io :as duck]
+ [clojure.contrib.java :as j])
(:import (java.net URI URL HttpURLConnection)
(java.io File InputStream Reader)))
@@ -29,7 +29,7 @@
;; May 13, 2009: added functions to open writers for appending
;;
;; May 3, 2009: renamed file to file-str, for compatibility with
-;; clojure.contrib.java-utils. reader/writer no longer use this
+;; clojure.contrib.java. reader/writer no longer use this
;; function.
;;
;; February 16, 2009: (lazy branch) fixed read-lines to work with lazy
@@ -57,7 +57,7 @@
Note: this is not really \"duck typing\" as implemented in languages
like Ruby. A better name would have been \"do-what-I-mean-streams\"
or \"just-give-me-a-stream\", but ducks are funnier."}
- clojure.contrib.duck-streams
+ clojure.contrib.io
(:import
(java.io Reader InputStream InputStreamReader PushbackReader
BufferedReader File PrintWriter OutputStream
@@ -54,14 +54,14 @@
If something in this module violates the principle of least surprise, please
let me (Stu) and the Clojure community know via the mailing list.
"}
- clojure.contrib.java-utils
+ clojure.contrib.java
(:import [java.io File FileOutputStream]
[java.util Properties]
[java.net URI URL]))
(defmulti relative-path-string
"Interpret a String or java.io.File as a relative path string.
- Building block for clojure.contrib.java-utils/file."
+ Building block for clojure.contrib.java/file."
class)
(defmethod relative-path-string String [#^String s]
@@ -74,7 +74,7 @@
(defmulti #^File as-file
"Interpret a String or a java.io.File as a File. Building block
- for clojure.contrib.java-utils/file, which you should prefer
+ for clojure.contrib.java/file, which you should prefer
in most cases."
class)
(defmethod as-file String [#^String s] (File. s))
@@ -13,7 +13,7 @@
#^{:author "Christophe Grand",
:doc "Start a web browser from Clojure"}
clojure.contrib.javadoc.browse
- (:require [clojure.contrib.shell-out :as sh])
+ (:require [clojure.contrib.shell :as sh])
(:import (java.net URI)))
(defn- macosx? []
@@ -72,7 +72,7 @@
clojure.contrib.jmx
(:refer-clojure :exclude [read])
(:use clojure.contrib.def
- [clojure.contrib.java-utils :only [as-str]]
+ [clojure.contrib.java :only [as-str]]
[clojure.stacktrace :only (root-cause)]
[clojure.walk :only [postwalk]])
(:import [clojure.lang Associative]
@@ -17,7 +17,7 @@
To write JSON, use json-str, write-json, or write-json.
To read JSON, use read-json."}
clojure.contrib.json
- (:require [clojure.contrib.java-utils :as j])
+ (:require [clojure.contrib.java :as j])
(:import (java.io PrintWriter PushbackReader StringWriter
StringReader Reader EOFException)))
@@ -13,7 +13,7 @@
:doc "Functions to parse xml lazily and emit back to text."}
clojure.contrib.lazy-xml
(:use [clojure.xml :as xml :only []]
- [clojure.contrib.seq-utils :only [fill-queue]])
+ [clojure.contrib.seq :only [fill-queue]])
(:import (org.xml.sax Attributes InputSource)
(org.xml.sax.helpers DefaultHandler)
(javax.xml.parsers SAXParserFactory)
@@ -37,7 +37,7 @@ command-line
complex-numbers
cond
def
-duck-streams
+io
error-kit
except
fcase
@@ -70,17 +70,17 @@ probabilities.random-numbers
prxml
repl-ln
repl-utils
-seq-utils
+seq
server-socket
set
-shell-out
+shell
sql
str-utils
str-utils2
stream-utils
swing-utils
test-contrib
-test-contrib.shell-out
+test-contrib.shell
test-contrib.str-utils
trace
types
@@ -21,7 +21,7 @@
[core :only (new-by-name)]
[except :only (throwf)]
[fcase :only (fcase)]
- [java-utils :only (as-str)])))
+ [java :only (as-str)])))
(def MigLayout "net.miginfocom.swing.MigLayout")
(def LayoutCallback "net.miginfocom.layout.LayoutCallback")
@@ -53,7 +53,7 @@
(ns clojure.contrib.mock
#^{:author "Matt Clark",
:doc "function mocking/expectations for Clojure" }
- (:use [clojure.contrib.seq-utils :only (positions)]
+ (:use [clojure.contrib.seq :only (positions)]
[clojure.contrib.def :only (defmacro-)]))
@@ -26,7 +26,7 @@
(:use [clojure.contrib.monads
:only (with-monad domonad state-m state-m-until)])
(:use [clojure.contrib.generic.functor :only (fmap)])
- (:use [clojure.contrib.duck-streams :only (reader writer)]))
+ (:use [clojure.contrib.io :only (reader writer)]))
;
; Wrap the state into a closure to make sure that "evil" code
@@ -82,15 +82,15 @@
(defn with-reader
"Create a reader from reader-spec, run the monadic I/O statement
on it, and close the reader. reader-spec can be any object accepted
- by clojure.contrib.duck-streams/reader."
+ by clojure.contrib.io/reader."
[reader-spec statement]
(with-open [r (reader reader-spec)]
(first (statement (lock r)))))
(defn with-writer
"Create a writer from writer-spec, run the monadic I/O statement
on it, and close the writer. writer-spec can be any object accepted
- by clojure.contrib.duck-streams/writer."
+ by clojure.contrib.io/writer."
[writer-spec statement]
(with-open [w (writer writer-spec)]
(first (statement (lock w)))))
@@ -101,8 +101,8 @@
a binding-like vector in which each stream is specified by
three element: a keyword by which the stream can be referred to,
the stream mode (:read or :write), and a stream specification as
- accepted by clojure.contrib.duck-streams/reader (mode :read) or
- clojure.contrib.duck-streams/writer (mode :write). The statement
+ accepted by clojure.contrib.io/reader (mode :read) or
+ clojure.contrib.io/writer (mode :write). The statement
is run on a state which is a map from keywords to corresponding
streams. Single-stream monadic I/O statements must be wrapped
with clojure.contrib.monads/with-state-field."
@@ -15,7 +15,7 @@
(:import (java.io File LineNumberReader InputStreamReader PushbackReader)
(java.lang.reflect Modifier Method Constructor)
(clojure.lang RT Compiler Compiler$C))
- (:use [clojure.contrib.seq-utils :only (indexed)]
+ (:use [clojure.contrib.seq :only (indexed)]
[clojure.contrib.javadoc.browse :only (browse-url)]
[clojure.contrib.str-utils :only (str-join re-sub re-partition)]))
@@ -24,7 +24,7 @@
(ns
#^{:author "Stuart Sierra (and others)",
:doc "Sequence utilities for Clojure"}
- clojure.contrib.seq-utils
+ clojure.contrib.seq
(:import (java.util.concurrent LinkedBlockingQueue TimeUnit)
(java.lang.ref WeakReference)))
@@ -15,7 +15,7 @@
#^{:author "Chris Houser",
:doc "Conveniently launch a sub-process providing to its stdin and
collecting its stdout"}
- clojure.contrib.shell-out
+ clojure.contrib.shell
(:import (java.io InputStreamReader OutputStreamWriter)))
(def *sh-dir* nil)
@@ -25,7 +25,7 @@
clojure.contrib.sql
(:use (clojure.contrib
[def :only (defalias)]
- [java-utils :only (as-str)])
+ [java :only (as-str)])
clojure.contrib.sql.internal))
(defalias find-connection find-connection*)
@@ -15,8 +15,8 @@
(:use
(clojure.contrib
[except :only (throwf throw-arg)]
- [java-utils :only (as-properties)]
- [seq-utils :only (indexed)]))
+ [java :only (as-properties)]
+ [seq :only (indexed)]))
(:import
(clojure.lang RT)
(java.sql BatchUpdateException DriverManager SQLException Statement)
@@ -59,7 +59,7 @@
(:use [clojure.contrib.types :only (deftype deftype-)])
(:use [clojure.contrib.monads :only (defmonad with-monad)])
(:use [clojure.contrib.def :only (defvar defvar-)])
- (:require [clojure.contrib.seq-utils])
+ (:require [clojure.contrib.seq])
(:require [clojure.contrib.generic.collection]))
@@ -112,7 +112,7 @@
(defn stream-seq
"Return a lazy seq on the stream. Also accessible via
- clojure.contrib.seq-utils/seq-on and
+ clojure.contrib.seq/seq-on and
clojure.contrib.generic.collection/seq for streams."
[s]
(lazy-seq
@@ -121,7 +121,7 @@
nil
(cons v (stream-seq ns))))))
-(defmethod clojure.contrib.seq-utils/seq-on stream-type
+(defmethod clojure.contrib.seq/seq-on stream-type
[s]
(stream-seq s))
@@ -1,5 +1,5 @@
-(ns clojure.contrib.test-contrib.java-utils
- (:use clojure.test clojure.contrib.java-utils))
+(ns clojure.contrib.test-contrib.java
+ (:use clojure.test clojure.contrib.java))
(deftest t-as-str
(is (= "foo" (as-str "foo")))
Oops, something went wrong.

0 comments on commit ec6a757

Please sign in to comment.