Merge branch 'master' of git://github.com/clojure/clojure-contrib

84 files changed, 546 insertions, 9005 deletions

diff --git a/README.txt b/README.txt
index 2753e4b8..3353397f 100644
--- a/README.txt
+++ b/README.txt
@@ -1,20 +1,20 @@
 = Clojure-contrib =
 
-The user contributions library, clojure.contrib, is a collection of
-namespaces each of which implements features that we believe may be
-useful to a large part of the Clojure community.
+The user contributions library, clojure-contrib, is a collection of
+namespaces implementing features that may be useful to a large part of
+the Clojure community.
 
 Clojure-contrib is open source under the Eclipse Public License and is
 copyrighted by Rich Hickey and the various contributors.
 
 Download releases from
-http://code.google.com/p/clojure-contrib/downloads
+http://clojure.org/downloads
 
 The official source repository for clojure-contrib is
-http://github.com/richhickey/clojure-contrib
+http://github.com/clojure/clojure-contrib
 
 Documentation and APIs are available at
-http://richhickey.github.com/clojure-contrib/
+http://clojure.github.com/clojure-contrib/
 
 Issues are maintained in the Assembla space at
 http://www.assembla.com/spaces/clojure-contrib
@@ -24,8 +24,9 @@ http://groups.google.com/group/clojure
 and developer discussions are in the Clojure Dev Google group at
 http://groups.google.com/group/clojure-dev
 
-Compiled JARs of development snapshots are available at
-http://build.clojure.org/
+Compiled JARs of released versions are available in the Maven
+repository http://build.clojure.org/releases and SNAPSHOT versions are
+available at http://build.clojure.org/snapshots
 
 
 
diff --git a/modules/apply-macro/pom.xml b/modules/apply-macro/pom.xml
deleted file mode 100644
index 23048791..00000000
--- a/modules/apply-macro/pom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http//www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
-                             http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.clojure.contrib</groupId>
-    <artifactId>parent</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
-    <relativePath>../parent</relativePath>
-  </parent>
-  <artifactId>apply-macro</artifactId>
-  <dependencies>
-  </dependencies>
-</project>
\ No newline at end of file
diff --git a/modules/apply-macro/src/main/clojure/clojure/contrib/apply_macro.clj b/modules/apply-macro/src/main/clojure/clojure/contrib/apply_macro.clj
deleted file mode 100644
index 9df85407..00000000
--- a/modules/apply-macro/src/main/clojure/clojure/contrib/apply_macro.clj
+++ /dev/null
@@ -1,45 +0,0 @@
-;;; apply_macro.clj: make macros behave like functions
-
-;; by Stuart Sierra, http://stuartsierra.com/
-;; January 28, 2009
-
-;; Copyright (c) Stuart Sierra, 2009. All rights reserved.  The use
-;; and distribution terms for this software are covered by the Eclipse
-;; Public License 1.0 (http://opensource.org/licenses/eclipse-1.0.php)
-;; which can be found in the file epl-v10.html at the root of this
-;; distribution.  By using this software in any fashion, you are
-;; agreeing to be bound by the terms of this license.  You must not
-;; remove this notice, or any other, from this software.
-
-
-;; Don't use this.  I mean it.  It's evil.  How evil?  You can't
-;; handle it, that's how evil it is.  That's right.  I did it so you
-;; don't have to, ok?  Look but don't touch.  Use this lib and you'll
-;; go blind.
-
-;; DEPRECATED in 1.2 with no replacement.
-
-(ns ^{:deprecated "1.2"}
-  clojure.contrib.apply-macro)
-
-;; Copied from clojure.core/spread, which is private.
-(defn- spread
-  "Flatten final argument list as in apply."
-  [arglist]
-  (cond
-   (nil? arglist) nil
-   (nil? (rest arglist)) (seq (first arglist))
-   :else (cons (first arglist) (spread (rest arglist)))))
-
-(defmacro apply-macro
-  "This is evil.  Don't ever use it.  It makes a macro behave like a
-  function.  Seriously, how messed up is that?
-
-  Evaluates all args, then uses them as arguments to the macro as with
-  apply.
-
-  (def things [true true false])
-  (apply-macro and things)
-  ;; Expands to:  (and true true false)"
-  [macro & args]
-  (cons macro (spread (map eval args))))
diff --git a/modules/command-line/pom.xml b/modules/command-line/pom.xml
index 8e2e01c9..224311a8 100644
--- a/modules/command-line/pom.xml
+++ b/modules/command-line/pom.xml
@@ -12,10 +12,5 @@
   </parent>
   <artifactId>command-line</artifactId>
   <dependencies>
-    <dependency>
-      <groupId>org.clojure.contrib</groupId>
-      <artifactId>string</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
-    </dependency>
   </dependencies>
 </project>
\ No newline at end of file
diff --git a/modules/command-line/src/main/clojure/clojure/contrib/command_line.clj b/modules/command-line/src/main/clojure/clojure/contrib/command_line.clj
index 47ee7849..6399c4fc 100644
--- a/modules/command-line/src/main/clojure/clojure/contrib/command_line.clj
+++ b/modules/command-line/src/main/clojure/clojure/contrib/command_line.clj
@@ -12,7 +12,7 @@
     ^{:author "Chris Houser", 
        :doc "Process command-line arguments according to a given cmdspec"}
     clojure.contrib.command-line
-    (:use     (clojure.contrib [string :only (join)])))
+    (:use     (clojure [string :only (join)])))
 
 (defn make-map [args cmdspec]
   (let [{spec true [rest-sym] false} (group-by vector? cmdspec)
diff --git a/modules/complete/pom.xml b/modules/complete/pom.xml
index d0eedfe0..fb6cd1c1 100644
--- a/modules/complete/pom.xml
+++ b/modules/complete/pom.xml
@@ -11,15 +11,16 @@
     <relativePath>../parent</relativePath>
   </parent>
   <artifactId>complete</artifactId>
+  <packaging>pom</packaging>
   <build>
     <plugins>
       <plugin>
 	<artifactId>maven-assembly-plugin</artifactId>
         <version>2.2-beta-5</version>
         <configuration>
-          <descriptorRefs>
-            <descriptorRef>jar-with-dependencies</descriptorRef>
-          </descriptorRefs>
+          <descriptors>
+            <descriptor>src/main/assemblies/bin.xml</descriptor>
+          </descriptors>
         </configuration>
 	<executions>
 	  <execution>
@@ -46,11 +47,6 @@
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
-      <artifactId>apply-macro</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.clojure.contrib</groupId>
       <artifactId>base64</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
@@ -106,11 +102,6 @@
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
-      <artifactId>duck-streams</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.clojure.contrib</groupId>
       <artifactId>error-kit</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
@@ -156,41 +147,16 @@
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
-      <artifactId>http-agent</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.clojure.contrib</groupId>
-      <artifactId>http-connection</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.clojure.contrib</groupId>
       <artifactId>import-static</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
-      <artifactId>io</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.clojure.contrib</groupId>
       <artifactId>jar</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
-      <artifactId>java-utils</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.clojure.contrib</groupId>
-      <artifactId>javadoc</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.clojure.contrib</groupId>
       <artifactId>jmx</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
@@ -266,11 +232,6 @@
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
-      <artifactId>pprint</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.clojure.contrib</groupId>
       <artifactId>priority-map</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
@@ -286,11 +247,6 @@
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
-      <artifactId>properties</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.clojure.contrib</groupId>
       <artifactId>prxml</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
@@ -316,11 +272,6 @@
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
-      <artifactId>seq-utils</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.clojure.contrib</groupId>
       <artifactId>server-socket</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
@@ -331,16 +282,6 @@
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
-      <artifactId>shell</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.clojure.contrib</groupId>
-      <artifactId>shell-out</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.clojure.contrib</groupId>
       <artifactId>singleton</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
@@ -351,26 +292,11 @@
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
-      <artifactId>str-utils</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.clojure.contrib</groupId>
-      <artifactId>str-utils2</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.clojure.contrib</groupId>
       <artifactId>stream-utils</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
-      <artifactId>string</artifactId>
-      <version>1.3.0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>org.clojure.contrib</groupId>
       <artifactId>strint</artifactId>
       <version>1.3.0-SNAPSHOT</version>
     </dependency>
@@ -381,11 +307,6 @@
     </dependency>
     <dependency>