gtic package renamings:

 - clojure.contrib to clojure
 - clojure.test-is to test

5 files changed, 18 insertions, 18 deletions

diff --git a/src/clj/clojure/contrib/stacktrace.clj b/src/clj/clojure/stacktrace.clj
index 7330ef47..fcdf47f8 100644
--- a/src/clj/clojure/contrib/stacktrace.clj
+++ b/src/clj/clojure/stacktrace.clj
@@ -15,7 +15,7 @@
 (ns 
   #^{:author "Stuart Sierra",
      :doc "Print Clojure-centric stack traces"}
-  clojure.contrib.stacktrace)
+  clojure.stacktrace)
 
 (defn root-cause
   "Returns the last 'cause' Throwable in a chain of Throwables."
diff --git a/src/clj/clojure/contrib/template.clj b/src/clj/clojure/template.clj
index 748ad4a4..2515b04e 100644
--- a/src/clj/clojure/contrib/template.clj
+++ b/src/clj/clojure/template.clj
@@ -24,8 +24,8 @@
 
 (ns #^{:author "Stuart Sierra"
        :doc "Macros that expand to repeated copies of a template expression."}
-  clojure.contrib.template
-  (:require [clojure.contrib.walk :as walk]))
+  clojure.template
+  (:require [clojure.walk :as walk]))
 
 (defn apply-template
   "For use in macros.  argv is an argument list, as in defn.  expr is
diff --git a/src/clj/clojure/contrib/test_is.clj b/src/clj/clojure/test.clj
index 8138ce3e..601d2b4d 100644
--- a/src/clj/clojure/contrib/test_is.clj
+++ b/src/clj/clojure/test.clj
@@ -455,9 +455,9 @@ Chas Emerick, Allen Rohner, and Stuart Halloway",
 
    For additional event types, see the examples in the code.
 "}
-  clojure.contrib.test-is
-  (:require [clojure.contrib.template :as temp]
-            [clojure.contrib.stacktrace :as stack]))
+  clojure.test
+  (:require [clojure.template :as temp]
+            [clojure.stacktrace :as stack]))
 
 ;; Nothing is marked "private" here, so you can rebind things to plug
 ;; in your own testing or reporting frameworks.
@@ -746,7 +746,7 @@ Chas Emerick, Allen Rohner, and Stuart Halloway",
 
 (defmacro are
   "Checks multiple assertions with a template expression.
-  See clojure.contrib.template/do-template for an explanation of
+  See clojure.template/do-template for an explanation of
   templates.
 
   Example: (are [x y] (= x y)  
diff --git a/src/clj/clojure/contrib/test_is/tap.clj b/src/clj/clojure/test/tap.clj
index 47310d15..5963b1b9 100644
--- a/src/clj/clojure/contrib/test_is/tap.clj
+++ b/src/clj/clojure/test/tap.clj
@@ -1,4 +1,4 @@
-;;; test_is/tap.clj: Extension to test-is for TAP output
+;;; test_is/tap.clj: Extension to test for TAP output
 
 ;; by Stuart Sierra, http://stuartsierra.com/
 ;; March 31, 2009
@@ -18,7 +18,7 @@
 
 ;; DOCUMENTATION
 ;;
-;; This is an extension to clojure.contrib.test-is that adds support
+;; This is an extension to clojure.test that adds support
 ;; for the Test Anything Protocol (TAP).  
 ;;
 ;; TAP is a simple text-based syntax for reporting test results.  TAP
@@ -28,20 +28,20 @@
 ;; http://search.cpan.org/~petdance/TAP-1.0.0/TAP.pm
 ;;
 ;; To use this library, wrap any calls to
-;; clojure.contrib.test-is/run-tests in the with-tap-output macro,
+;; clojure.test/run-tests in the with-tap-output macro,
 ;; like this:
 ;;
-;;   (use 'clojure.contrib.test-is)
-;;   (use 'clojure.contrib.test-is.tap)
+;;   (use 'clojure.test)
+;;   (use 'clojure.test.tap)
 ;;
 ;;   (with-tap-output
 ;;    (run-tests 'my.cool.library))
 
 
 
-(ns clojure.contrib.test-is.tap
-  (:require [clojure.contrib.test-is :as t]
-            [clojure.contrib.stacktrace :as stack]))
+(ns clojure.test.tap
+  (:require [clojure.test :as t]
+            [clojure.stacktrace :as stack]))
 
 (defn print-tap-plan
   "Prints a TAP plan line like '1..n'.  n is the number of tests"
@@ -65,7 +65,7 @@
   [msg]
   (println "not ok" msg))
 
-;; This multimethod will override test-is/report
+;; This multimethod will override test/report
 (defmulti tap-report (fn [data] (:type data)))
 
 (defmethod tap-report :default [data]
@@ -105,7 +105,7 @@
 
 
 (defmacro with-tap-output
-  "Execute body with modified test-is reporting functions that produce
+  "Execute body with modified test reporting functions that produce
   TAP output"
   [& body]
   `(binding [t/report tap-report]
diff --git a/src/clj/clojure/contrib/walk.clj b/src/clj/clojure/walk.clj
index 525fe5a7..52927ca1 100644
--- a/src/clj/clojure/contrib/walk.clj
+++ b/src/clj/clojure/walk.clj
@@ -42,7 +42,7 @@ the examples.
 Note: \"walk\" supports all Clojure data structures EXCEPT maps
 created with sorted-map-by.  There is no (obvious) way to retrieve
 the sorting function."}
-  clojure.contrib.walk)
+  clojure.walk)
 
 (defn walk
   "Traverses form, an arbitrary data structure.  inner and outer are