Merge branch 'abrenk-build'

4 files changed, 328 insertions, 18 deletions

diff --git a/modules/complete/pom.xml b/modules/complete/pom.xml
index 94c0d0eb..ca9b97c0 100644
--- a/modules/complete/pom.xml
+++ b/modules/complete/pom.xml
@@ -8,7 +8,7 @@
     <relativePath>../parent</relativePath>
   </parent>
   <artifactId>complete</artifactId>
-  <packaging>pom</packaging>
+  <packaging>jar</packaging>
   <dependencies>
     <dependency>
       <groupId>org.clojure.contrib</groupId>
diff --git a/modules/complete/src/main/assemblies/bin.xml b/modules/complete/src/main/assemblies/bin.xml
deleted file mode 100644
index 607ac863..00000000
--- a/modules/complete/src/main/assemblies/bin.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" 
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-  <id>bin</id>
-  <formats>
-    <format>jar</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <dependencySets>
-    <dependencySet>
-      <unpack>true</unpack>
-      <excludes>
-	<exclude>org.clojure:clojure</exclude>
-      </excludes>
-    </dependencySet>
-  </dependencySets>
-</assembly>
\ No newline at end of file
diff --git a/modules/standalone/pom.xml b/modules/standalone/pom.xml
new file mode 100644
index 00000000..bfddc333
--- /dev/null
+++ b/modules/standalone/pom.xml
@@ -0,0 +1,323 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <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>standalone</artifactId>
+  <packaging>jar</packaging>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <configuration>
+          <outputDirectory>${project.build.outputDirectory}</outputDirectory>
+          <artifactItems>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>accumulators</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>agent-utils</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>base64</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>classpath</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>combinatorics</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>command-line</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>complex-numbers</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>cond</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>condition</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>core</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>dataflow</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>datalog</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>def</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>error-kit</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>except</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>fcase</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>find-namespaces</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>fnmap</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>gen-html-docs</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>generic</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>graph</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>greatest-least</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>import-static</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>jar</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>jmx</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>json</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>lazy-seqs</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>lazy-xml</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>logging</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>macro-utils</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>macros</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>map-utils</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>math</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>miglayout</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>mmap</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>mock</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>monadic-io-streams</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>monads</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>ns-utils</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>priority-map</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>probabilities</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>profile</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>prxml</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>reflect</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>repl-ln</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>repl-utils</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>seq</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>server-socket</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>set</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>singleton</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>sql</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>stream-utils</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>strint</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>swing-utils</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>trace</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>types</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>with-ns</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+            <artifactItem>
+              <groupId>org.clojure.contrib</groupId>
+              <artifactId>zip-filter</artifactId>
+              <version>1.3.0-SNAPSHOT</version>
+            </artifactItem>
+          </artifactItems>
+        </configuration>
+        <executions>
+          <execution>
+            <id>standalone</id>
+            <phase>prepare-package</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/pom.xml b/pom.xml
index 01302b67..4ca26545 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,6 +19,9 @@
     <!-- The complete module depends on all other modules. -->
     <module>modules/complete</module>
 
+    <!-- The standalone module packages all other modules. -->
+    <module>modules/standalone</module>
+
     <module>modules/accumulators</module>
     <module>modules/agent-utils</module>
     <module>modules/base64</module>
@@ -90,6 +93,7 @@
       </plugin>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.2-beta-5</version>
         <configuration>
           <descriptors>
             <descriptor>src/main/assembly/dist.xml</descriptor>