maven 1.0 work

2025-09-08 22:23:26 +02:00 · 2025-09-08 22:23:26 +02:00 · d689f8ef20
commit d689f8ef20
parent 964e15fd5e
63 changed files with 2357 additions and 15 deletions
--- a/ant/ant-optional_1_5_3.nix
+++ b/ant/ant-optional_1_5_3.nix
@ -0,0 +1,15 @@
+{stdenv, ant_1_5_3}: stdenv.mkDerivation rec {
+    pname = "ant-optional";
+    version = "1.5.3-1";
+    outJar = "lib/optional.jar";
+    org = "ant";
+
+    dontUnpack = true;
+    dontConfigure = true;
+    dontBuild = true;
+
+    installPhase = ''
+        mkdir -p $out/lib
+        ln -s ${ant_1_5_3}/lib/optional.jar $out/lib/optional.jar
+    '';
+}
--- a/ant/ant_1_5_3.nix
+++ b/ant/ant_1_5_3.nix
@ -0,0 +1,26 @@
+{stdenv, fetchzip, jdk6, ant_1_7}: stdenv.mkDerivation rec {
+    pname = "ant";
+    version = "1.5.3-1";
+    outJar = "lib/ant.jar";
+
+    src = fetchzip {
+        url = "https://archive.apache.org/dist/ant/source/apache-ant-1.5.3-1-src.zip";
+        hash = "sha256-W/PWppDModfTMZvfRhl7TXPGXclXYyRNJ3v78y6wbYM=";
+    };
+
+    patches = [./ant_1_5_3.patch];
+
+    nativeBuildInputs = [jdk6 ant_1_7];
+    env = {
+        JAVA_HOME="${jdk6}";
+    };
+
+    buildPhase = ''
+        ant
+    '';
+
+    installPhase = ''
+        mkdir $out
+        cp -r ./dist/* $out/
+    '';
+}
--- a/ant/ant_1_5_3.patch
+++ b/ant/ant_1_5_3.patch
@ -0,0 +1,15 @@
+diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java b/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java
+index 9e823cd..97dabbd 100644
+--- a/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/Javah.java
+@@ -347,8 +347,8 @@ public class Javah extends Task {
+             // dynamically. However, javah has a different interface and this
+             // makes it harder, so here's a simple alternative.
+             //------------------------------------------------------------------
+-            com.sun.tools.javah.Main main 
+-                = new com.sun.tools.javah.Main(cmd.getArguments());
+            com.sun.tools.javah.oldjavah.Main main
+                = new com.sun.tools.javah.oldjavah.Main(cmd.getArguments());
+             main.run();
+         } catch (Exception ex) {
+             if (ex instanceof BuildException) {
--- a/ant/ant_1_7.nix
+++ b/ant/ant_1_7.nix
@ -1,4 +1,4 @@
-{stdenv, fetchzip, jdk6, junit_4, breakpointHook}: stdenv.mkDerivation rec {
+{stdenv, fetchzip, jdk6, junit_4}: stdenv.mkDerivation rec {
    pname = "ant";
    version = "1.7.0";

@ -8,7 +8,7 @@
    };

    nativeBuildInputs = [jdk6];
-    buildInputs = [breakpointHook];
+
    env = {
        JAVA_HOME="${jdk6}";
        CLASSPATH="${junit_4}/junit-4.1.jar";
--- a/java/commons-beanutils_1_4.nix
+++ b/java/commons-beanutils_1_4.nix
@ -0,0 +1,29 @@
+{stdenv, fetchFromGitHub, jdk6, ant_1_7, commons-logging_1_0, commons-collections_2_0}: stdenv.mkDerivation rec {
+    pname = "commons-beanutils";
+    version = "1.4-dev";
+    outJar = "commons-beanutils.jar";
+
+    src = fetchFromGitHub {
+        owner = "apache";
+        repo = pname;
+        rev = "BEANUTILS_1_4";
+        hash = "sha256-cpMIFA1lcmtdZovZSba8GpXa2i8lVZO2eaxGzgPHzlM=";
+    };
+
+    nativeBuildInputs = [jdk6 ant_1_7];
+
+    env = {
+        JAVA_HOME="${jdk6}";
+        CLASSPATH="${commons-logging_1_0}/commons-logging.jar:${commons-collections_2_0}/commons-collections.jar";
+    };
+
+    buildPhase = ''
+        ln -s /build/source/LICENSE.txt /build/LICENSE
+        ant dist
+    '';
+
+    installPhase = ''
+        mkdir $out
+        cp -r ./dist/* $out/
+    '';
+}
--- a/java/commons-beanutils_1_5.nix
+++ b/java/commons-beanutils_1_5.nix
@ -0,0 +1,29 @@
+{stdenv, fetchFromGitHub, jdk6, ant_1_7, commons-logging_1_0, commons-collections_2_0}: stdenv.mkDerivation rec {
+    pname = "commons-beanutils";
+    version = "1.5";
+    outJar = "commons-beanutils.jar";
+
+    src = fetchFromGitHub {
+        owner = "apache";
+        repo = pname;
+        rev = "BEANUTILS_1_5";
+        hash = "sha256-a//pLu7PemkHpwO7TsAmREhhaR6HB3HQuFrWYQzpEnM=";
+    };
+
+    nativeBuildInputs = [jdk6 ant_1_7];
+
+    env = {
+        JAVA_HOME="${jdk6}";
+        CLASSPATH="${commons-logging_1_0}/commons-logging.jar:${commons-collections_2_0}/commons-collections.jar";
+    };
+
+    buildPhase = ''
+        ln -s /build/source/LICENSE.txt /build/LICENSE
+        ant dist
+    '';
+
+    installPhase = ''
+        mkdir $out
+        cp -r ./dist/* $out/
+    '';
+}
--- a/java/commons-beanutils_1_6.nix
+++ b/java/commons-beanutils_1_6.nix
@ -0,0 +1,28 @@
+{stdenv, fetchFromGitHub, jdk6, ant_1_7, commons-logging_1_0, commons-collections_2_0}: stdenv.mkDerivation rec {
+    pname = "commons-beanutils";
+    version = "1.6";
+    outJar = "commons-beanutils.jar";
+
+    src = fetchFromGitHub {
+        owner = "apache";
+        repo = pname;
+        rev = "BEANUTILS_1_6";
+        hash = "sha256-njTriHET/vCdl0VJRedoZPFnxD6ZNRy+Yc8N3LLN6So=";
+    };
+
+    nativeBuildInputs = [jdk6 ant_1_7];
+
+    env = {
+        JAVA_HOME="${jdk6}";
+        CLASSPATH="${commons-logging_1_0}/commons-logging.jar:${commons-collections_2_0}/commons-collections.jar";
+    };
+
+    buildPhase = ''
+        ant dist
+    '';
+
+    installPhase = ''
+        mkdir $out
+        cp -r ./dist/* $out/
+    '';
+}
--- a/java/commons-betwixt.nix
+++ b/java/commons-betwixt.nix
@ -0,0 +1,39 @@
+{stdenv, fetchFromGitHub, jdk6, ant_1_7, commons-logging_1_0_2, commons-collections_2_1, commons-beanutils_1_5,
+commons-digester_1_3, junit_3_8_1}: stdenv.mkDerivation rec {
+    pname = "commons-betwixt";
+    version = "1.0-beta-1.20030111.103454";
+    outJar = "commons-betwixt-1.0-beta-1.jar";
+
+    src = fetchFromGitHub {
+        owner = "ripdajacker";
+        repo = pname;
+        rev = "b1de472d6def58e7fe09ada90c75728742adca2c";
+        hash = "sha256-etb3aD+NCFVhCLCk2XO0V2EB7Et7bmjLaQZYRqytbpA=";
+    };
+
+    patches = [./commons-betwixt.patch];
+
+    nativeBuildInputs = [jdk6 ant_1_7];
+
+    env = {
+        JAVA_HOME="${jdk6}";
+    };
+
+    configurePhase = ''
+        mkdir lib
+        ln -s ${commons-logging_1_0_2}/commons-logging.jar lib/commons-logging-1.0.2.jar
+        ln -s ${commons-beanutils_1_5}/commons-beanutils.jar lib/commons-beanutils-1.5.jar
+        ln -s ${commons-collections_2_1}/commons-collections.jar lib/commons-collections-2.1.jar
+        ln -s ${commons-digester_1_3}/commons-digester.jar lib/commons-digester.jar
+        ln -s ${junit_3_8_1}/junit.jar lib/junit-3.8.1.jar
+    '';
+
+    buildPhase = ''
+        ant dist -Dnoget=true
+    '';
+
+    installPhase = ''
+        mkdir $out
+        cp -r ./dist/* $out/
+    '';
+}
--- a/java/commons-betwixt.patch
+++ b/java/commons-betwixt.patch
@ -0,0 +1,14 @@
+diff --git a/src/test/org/apache/commons/betwixt/xmlunit/rss-example.xml b/src/test/org/apache/commons/betwixt/xmlunit/rss-example.xml
+index 9f4b319..1b39e84 100644
+--- a/src/test/org/apache/commons/betwixt/xmlunit/rss-example.xml
+++ b/src/test/org/apache/commons/betwixt/xmlunit/rss-example.xml
+@@ -1,9 +1,5 @@
+ <?xml version="1.0"?>
+ 
+-<!DOCTYPE rss PUBLIC
+- "-//Netscape Communications//DTD RSS 0.91//EN"
+- "http://my.netscape.com/publish/formats/rss-0.91.dtd">
+-
+ <rss version="0.91">
+ 
+   <channel>
--- a/java/commons-cli-bootstrap.nix
+++ b/java/commons-cli-bootstrap.nix
@ -0,0 +1,29 @@
+{stdenv, fetchFromGitHub, jdk6, ant_1_7, commons-lang}: stdenv.mkDerivation rec {
+    pname = "commons-cli";
+    version = "1.0";
+    outJar = "commons-cli-1.0-beta-2-dev.jar";
+
+    src = fetchFromGitHub {
+        owner = "apache";
+        repo = pname;
+        rev = "CLI_1_0";
+        hash = "sha256-HwS1RdyGNuPZJoKWQX9X9KwNs013M1T5NBLSn4N9fKo=";
+    };
+
+    nativeBuildInputs = [jdk6 ant_1_7];
+
+    env = {
+        JAVA_HOME="${jdk6}";
+        CLASSPATH="${commons-lang}/commons-lang-2.0.jar";
+    };
+
+    buildPhase = ''
+        mkdir ./lib
+        ant dist -Dnoget=true
+    '';
+
+    installPhase = ''
+        mkdir $out
+        cp -r ./dist/* $out/
+    '';
+}
--- a/java/commons-cli.nix
+++ b/java/commons-cli.nix
@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, jdk6, ant_1_7, commons-lang}: stdenv.mkDerivation rec {
+{stdenv, fetchFromGitHub, jdk6, ant_1_7, maven, commons-lang}: stdenv.mkDerivation rec {
    pname = "commons-cli";
    version = "1.0";
    outJar = "commons-cli-1.0-beta-2-dev.jar";
@ -10,7 +10,7 @@
        hash = "sha256-HwS1RdyGNuPZJoKWQX9X9KwNs013M1T5NBLSn4N9fKo=";
    };

-    nativeBuildInputs = [jdk6 ant_1_7];
+    nativeBuildInputs = [jdk6 ant_1_7 maven];

    env = {
        JAVA_HOME="${jdk6}";
--- a/java/commons-collections_2_0.nix
+++ b/java/commons-collections_2_0.nix
@ -0,0 +1,29 @@
+{stdenv, fetchFromGitHub, jdk6, ant_1_7}: stdenv.mkDerivation rec {
+    pname = "commons-collections";
+    version = "2.0";
+    outJar = "commons-collections.jar";
+
+    src = fetchFromGitHub {
+        owner = "apache";
+        repo = pname;
+        rev = "collections-2.0";
+        hash = "sha256-pvtUdUjDkf7HESZJTzNVKAZStQYAN0oj1uWruaYhwks=";
+    };
+
+    patches = [./commons-collections_2_0.patch];
+
+    nativeBuildInputs = [jdk6 ant_1_7];
+
+    env = {
+        JAVA_HOME="${jdk6}";
+    };
+
+    buildPhase = ''
+        ant dist-jar
+    '';
+
+    installPhase = ''
+        mkdir $out
+        cp -r ./dist/* $out/
+    '';
+}
--- a/java/commons-collections_2_0.patch
+++ b/java/commons-collections_2_0.patch
@ -0,0 +1,24 @@
+diff --git a/build.xml b/build.xml
+index 9f56d4f..65fbe0a 100644
+--- a/build.xml
+++ b/build.xml
+@@ -203,7 +203,8 @@
+              classpath="${classpath}"
+              debug="false"
+              deprecation="true"
+-             optimize="true"/>
+             optimize="true"
+             target="1.4"/>
+    </target>
+ 
+    <target name="build-test" depends="init,build-java" if="available-src-test">
+@@ -213,7 +214,8 @@
+              classpath="${classpath}"
+              debug="false"
+              deprecation="true"
+-             optimize="true"/>
+             optimize="true"
+             target="1.4"/>
+    </target>
+ 
+    <!-- ######################################################### -->
--- a/java/commons-collections_2_1.nix
+++ b/java/commons-collections_2_1.nix
@ -0,0 +1,29 @@
+{stdenv, fetchFromGitHub, jdk6, ant_1_7}: stdenv.mkDerivation rec {
+    pname = "commons-collections";
+    version = "2.1";
+    outJar = "commons-collections.jar";
+
+    src = fetchFromGitHub {
+        owner = "apache";
+        repo = pname;
+        rev = "collections-2.1";
+        hash = "sha256-FwGHXUO8mm0gZRAmEN24GlSRJeAsLt8AtMeljhSxzsc=";
+    };
+
+    patches = [./commons-collections_2_0.patch];
+
+    nativeBuildInputs = [jdk6 ant_1_7];
+
+    env = {
+        JAVA_HOME="${jdk6}";
+    };
+
+    buildPhase = ''
+        ant dist-jar
+    '';
+
+    installPhase = ''
+        mkdir $out
+        cp -r ./dist/* $out/
+    '';
+}
--- a/java/commons-collections_3_1.nix
+++ b/java/commons-collections_3_1.nix
--- a/java/commons-digester_1_3.nix
+++ b/java/commons-digester_1_3.nix
@ -0,0 +1,29 @@
+{stdenv, fetchFromGitHub, jdk6, ant_1_7, commons-logging_1_0, commons-collections_2_0, commons-beanutils_1_4}: stdenv.mkDerivation rec {
+    pname = "commons-digester";
+    version = "1.3";
+    outJar = "commons-digester.jar";
+
+    src = fetchFromGitHub {
+        owner = "apache";
+        repo = pname;
+        rev = "DIGESTER_1_3";
+        hash = "sha256-tgmyaeAtC85ULH6mLPmH/ej2fqqL8oLAHV+sPpfY8ok=";
+    };
+
+    nativeBuildInputs = [jdk6 ant_1_7];
+
+    env = {
+        JAVA_HOME="${jdk6}";
+        CLASSPATH="${commons-logging_1_0}/commons-logging.jar:${commons-collections_2_0}/commons-collections.jar:${commons-beanutils_1_4}/commons-beanutils.jar";
+    };
+
+    buildPhase = ''
+        ln -s /build/source/LICENSE.txt /build/LICENSE
+        ant dist
+    '';
+
+    installPhase = ''
+        mkdir $out
+        cp -r ./dist/* $out/
+    '';
+}
--- a/java/commons-digester_1_4_1.nix
+++ b/java/commons-digester_1_4_1.nix
@ -0,0 +1,29 @@
+{stdenv, fetchFromGitHub, jdk6, ant_1_7, commons-logging_1_0, commons-collections_2_1, commons-beanutils_1_6}: stdenv.mkDerivation rec {
+    pname = "commons-digester";
+    version = "1.4.1";
+    outJar = "commons-digester.jar";
+
+    src = fetchFromGitHub {
+        owner = "apache";
+        repo = pname;
+        rev = "DIGESTER_1_4_1";
+        hash = "sha256-ciC6RDDLOPXSkinUeyaNmAXCx6+l6oRTMhTxEDLJ7tg=";
+    };
+
+    nativeBuildInputs = [jdk6 ant_1_7];
+
+    env = {
+        JAVA_HOME="${jdk6}";
+        CLASSPATH="${commons-logging_1_0}/commons-logging.jar:${commons-collections_2_1}/commons-collections.jar:${commons-beanutils_1_6}/commons-beanutils.jar";
+    };
+
+    buildPhase = ''
+        ln -s /build/source/LICENSE.txt /build/LICENSE
+        ant dist
+    '';
+
+    installPhase = ''
+        mkdir $out
+        cp -r ./dist/* $out/
+    '';
+}
--- a/java/commons-discovery.nix
+++ b/java/commons-discovery.nix
@ -0,0 +1,30 @@
+{stdenv, fetchsvn, jdk6, ant_1_7, commons-logging_1_0_3}: stdenv.mkDerivation rec {
+    pname = "commons-discovery";
+    version = "20030211.213356";
+    outJar = "commons-discovery.jar";
+
+    src = fetchsvn {
+        url = "https://svn.apache.org/repos/asf/commons/dormant/discovery/tags/DISCOVERY_0_2";
+        rev = "1928317";
+        hash = "sha256-3UOP9Bj1XvA7CtWZRgVDfcYaOrS2Drn8//KUG/sb49U=";
+    };
+
+    patches = [./commons-discovery.patch];
+
+    nativeBuildInputs = [jdk6 ant_1_7];
+
+    env = {
+        JAVA_HOME="${jdk6}";
+        CLASSPATH="${commons-logging_1_0_3}/commons-logging.jar";
+    };
+
+    buildPhase = ''
+        ln -s /build/discovery-DISCOVERY_0_2-r1928317/LICENSE.txt /build/LICENSE
+        ant dist
+    '';
+
+    installPhase = ''
+        mkdir $out
+        cp -r ./dist/* $out/
+    '';
+}
--- a/java/commons-discovery.patch
+++ b/java/commons-discovery.patch
@ -0,0 +1,24 @@
+diff --git a/build.xml b/build.xml
+index 5847aa0..504c5c4 100644
+--- a/build.xml
+++ b/build.xml
+@@ -120,7 +120,8 @@
+            destdir="${build.home}/classes"
+              debug="${compile.debug}"
+        deprecation="${compile.deprecation}"
+-          optimize="${compile.optimize}">
+          optimize="${compile.optimize}"
+           target="1.4">
+       <classpath refid="compile.classpath"/>
+     </javac>
+     <copy    todir="${build.home}/classes" filtering="on">
+@@ -180,7 +181,8 @@
+            destdir="${build.home}/test"
+              debug="${compile.debug}"
+        deprecation="${compile.deprecation}"
+-          optimize="${compile.optimize}">
+          optimize="${compile.optimize}"
+           target="1.4">
+       <classpath refid="test.classpath"/>
+     </javac>
+     <copy    todir="${build.home}/test" filtering="on">
--- a/java/commons-grant.nix
+++ b/java/commons-grant.nix
@ -0,0 +1,28 @@
+{stdenv, fetchsvn, jdk6, ant_1_7}: stdenv.mkDerivation rec {
+    pname = "commons-grant";
+    version = "1.0-beta-4";
+    outJar = "commons-grant-1.0-beta-4.jar";
+
+    src = fetchsvn {
+        url = "https://svn.apache.org/repos/asf/commons/dormant/grant/tags/COMMONS_GRANT_1_0_BETA_4";
+        rev = "1928317";
+        hash = "sha256-oRJOeSTOHEBBvtfevMJIZol+c4oC0hCiOOs+KkTNgc0=";
+    };
+
+    patches = [./commons-grant.patch];
+
+    nativeBuildInputs = [jdk6 ant_1_7];
+
+    env = {
+        JAVA_HOME="${jdk6}";
+    };
+
+    buildPhase = ''
+        ant dist
+    '';
+
+    installPhase = ''
+        mkdir $out
+        cp -r ./dist/* $out/
+    '';
+}
--- a/java/commons-grant.patch
+++ b/java/commons-grant.patch
@ -0,0 +1,20 @@
+diff --git a/build.xml b/build.xml
+index ae67eac..b1ec57d 100644
+--- a/build.xml
+++ b/build.xml
+@@ -28,7 +28,7 @@
+   <target name="compile" description="o Compile the code" depends="get-deps">
+     <mkdir dir="${classesdir}">
+     </mkdir>
+-    <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
+    <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html" target="1.4">
+       <src>
+         <pathelement location="src/java">
+         </pathelement>
+@@ -111,4 +111,4 @@
+     <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
+     </unjar>
+   </target>
+-</project>
+\ No newline at end of file
+</project>
--- a/java/commons-httpclient_2.nix
+++ b/java/commons-httpclient_2.nix
@ -0,0 +1,27 @@
+{stdenv, fetchzip, jdk6, ant_1_7, commons-logging_1_0_3}: stdenv.mkDerivation rec {
+    pname = "commons-httpclient";
+    version = "2.0";
+    outJar = "commons-httpclient.jar";
+
+    src = fetchzip {
+        url = "https://archive.apache.org/dist/httpcomponents/commons-httpclient/2.0/source/commons-httpclient-2.0-src.tar.gz";
+        hash = "sha256-Ki+el2L9NeHbCfARkDmmTJ5UE0yY2FlGbkWVhN9ilio=";
+    };
+
+    nativeBuildInputs = [jdk6 ant_1_7];
+
+    env = {
+        JAVA_HOME="${jdk6}";
+        CLASSPATH="${commons-logging_1_0_3}/commons-logging.jar";
+    };
+
+    buildPhase = ''
+        mkdir ./lib
+        ant dist
+    '';
+
+    installPhase = ''
+        mkdir $out
+        cp -r ./dist/* $out/
+    '';
+}
--- a/java/commons-jexl.nix
+++ b/java/commons-jexl.nix
@ -0,0 +1,30 @@
+{stdenv, fetchFromGitHub, jdk6, ant_1_7, commons-logging_1_0, junit_3_8_1}: stdenv.mkDerivation rec {
+    pname = "commons-jexl";
+    version = "1.0-beta-1";
+    outJar = "commons-jexl-1.0-beta-1.jar";
+
+    src = fetchFromGitHub {
+        owner = "apache";
+        repo = pname;
+        rev = "2719b21d4d6c7a537caff8cd85d15d9f49ec4c64";
+        hash = "sha256-WTNrr/ETHzc+68L0Zf87ursmfoodjuc7F02p4MIc7mQ=";
+    };
+
+    patches = [./commons-jexl.patch];
+
+    nativeBuildInputs = [jdk6 ant_1_7];
+
+    env = {
+        JAVA_HOME="${jdk6}";
+        CLASSPATH="${commons-logging_1_0}/commons-logging.jar:${junit_3_8_1}/junit.jar";
+    };
+
+    buildPhase = ''
+        ant dist
+    '';
+
+    installPhase = ''
+        mkdir $out
+        cp -r ./dist/* $out/
+    '';
+}
--- a/java/commons-jexl.patch
+++ b/java/commons-jexl.patch
@ -0,0 +1,29 @@
+diff --git a/build.xml b/build.xml
+index be52d2c..24e06f9 100644
+--- a/build.xml
+++ b/build.xml
+@@ -28,7 +28,7 @@
+   <target name="compile" description="o Compile the code" depends="get-deps">
+     <mkdir dir="${classesdir}">
+     </mkdir>
+-    <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
+    <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html" target="1.4">
+       <src>
+         <pathelement location="src/java">
+         </pathelement>
+@@ -131,7 +131,7 @@
+   <target name="compile-tests" depends="compile">
+     <mkdir dir="${testclassesdir}">
+     </mkdir>
+-    <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
+    <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html" target="1.4">
+       <src>
+         <pathelement location="src/test">
+         </pathelement>
+@@ -186,4 +186,4 @@
+     <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
+     </unjar>
+   </target>
+-</project>
+\ No newline at end of file
+</project>
--- a/java/commons-logging.patch
+++ b/java/commons-logging.patch
@ -0,0 +1,34 @@
+diff --git a/build.xml b/build.xml
+index 2c5334b..22070c4 100644
+--- a/build.xml
+++ b/build.xml
+@@ -162,7 +162,8 @@
+            destdir="${build.home}/classes"
+            debug="${compile.debug}"
+            deprecation="${compile.deprecation}"
+-           optimize="${compile.optimize}">
+           optimize="${compile.optimize}"
+           target="1.4">
+       <classpath refid="compile.classpath"/>
+       <exclude name="org/apache/commons/logging/impl/Jdk14Logger.java"
+                unless="jdk.1.4.present"/>
+@@ -197,7 +198,8 @@
+            destdir="${build.home}/tests"
+              debug="${compile.debug}"
+        deprecation="${compile.deprecation}"
+-          optimize="${compile.optimize}">
+          optimize="${compile.optimize}"
+           target="1.4">
+       <classpath refid="test.classpath"/>
+     </javac>
+     <copy    todir="${build.home}/tests" filtering="on">
+@@ -230,7 +232,8 @@
+                 version="true"
+                doctitle="&lt;h1&gt;${component.title} (Version ${component.version})&lt;/h1&gt;"
+             windowtitle="${component.title} (Version ${component.version})"
+-                 bottom="Copyright (c) 2002 - Apache Software Foundation">
+                 bottom="Copyright (c) 2002 - Apache Software Foundation"
+               source="1.4">
+       <classpath refid="test.classpath"/>
+     </javadoc>
+   </target>
--- a/java/commons-logging_1_0.nix
+++ b/java/commons-logging_1_0.nix
@ -0,0 +1,30 @@
+{stdenv, fetchFromGitHub, jdk6, ant_1_7}: stdenv.mkDerivation rec {
+    pname = "commons-logging";
+    version = "1.0";
+    outJar = "commons-logging.jar";
+
+    src = fetchFromGitHub {
+        owner = "apache";
+        repo = pname;
+        rev = "LOGGING_1_0";
+        hash = "sha256-szbZTjeYCHRTVutQeaz2JXb7gv3Qnva4vNqmde26uMw=";
+    };
+
+    patches = [./commons-logging_1_0.patch];
+
+    nativeBuildInputs = [jdk6 ant_1_7];
+
+    env = {
+        JAVA_HOME="${jdk6}";
+    };
+
+    buildPhase = ''
+        touch /build/LICENSE
+        ant dist
+    '';
+
+    installPhase = ''
+        mkdir $out
+        cp -r ./dist/* $out/
+    '';
+}
--- a/java/commons-logging_1_0.patch
+++ b/java/commons-logging_1_0.patch
@ -0,0 +1,34 @@
+diff --git a/build.xml b/build.xml
+index 698105c..7a5ebe6 100644
+--- a/build.xml
+++ b/build.xml
+@@ -156,7 +156,8 @@
+            destdir="${build.home}/classes"
+            debug="${compile.debug}"
+            deprecation="${compile.deprecation}"
+-           optimize="${compile.optimize}">
+           optimize="${compile.optimize}"
+           target="1.4">
+       <classpath refid="compile.classpath"/>
+       <exclude name="org/apache/commons/logging/impl/Jdk14Logger.java"
+                unless="jdk.1.4.present"/>
+@@ -179,7 +180,8 @@
+            destdir="${build.home}/tests"
+              debug="${compile.debug}"
+        deprecation="${compile.deprecation}"
+-          optimize="${compile.optimize}">
+          optimize="${compile.optimize}"
+           target="1.4">
+       <classpath refid="test.classpath"/>
+     </javac>
+     <copy    todir="${build.home}/tests" filtering="on">
+@@ -212,7 +214,8 @@
+                 version="true"
+                doctitle="&lt;h1&gt;${component.title}&lt;/h1&gt;"
+             windowtitle="${component.title} (Version ${component.version})"
+-                 bottom="Copyright (c) 2001 - Apache Software Foundation">
+                 bottom="Copyright (c) 2001 - Apache Software Foundation"
+               source="1.4">
+       <classpath refid="test.classpath"/>
+     </javadoc>
+   </target>
--- a/java/commons-logging_1_0_2.nix
+++ b/java/commons-logging_1_0_2.nix
@ -0,0 +1,30 @@
+{stdenv, fetchFromGitHub, jdk6, ant_1_7}: stdenv.mkDerivation rec {
+    pname = "commons-logging";
+    version = "1.0.2";
+    outJar = "commons-logging.jar";
+
+    src = fetchFromGitHub {
+        owner = "apache";
+        repo = pname;
+        rev = "LOGGING_1_0_2";
+        hash = "sha256-qHq2kvXlWU8IAn+ojb5C08NVq539B/IcmCYBj9A4X5A=";
+    };
+
+    patches = [./commons-logging.patch];
+
+    nativeBuildInputs = [jdk6 ant_1_7];
+
+    env = {
+        JAVA_HOME="${jdk6}";
+    };
+
+    buildPhase = ''
+        ln -s /build/source/LICENSE.txt /build/LICENSE
+        ant dist
+    '';
+
+    installPhase = ''
+        mkdir $out
+        cp -r ./dist/* $out/
+    '';
+}
--- a/java/commons-logging_1_0_3.nix
+++ b/java/commons-logging_1_0_3.nix
@ -0,0 +1,27 @@
+{stdenv, fetchurl, fetchFromGitHub, jdk6, ant_1_7}: stdenv.mkDerivation rec {
+    pname = "commons-logging";
+    version = "1.0.3";
+    outJar = "commons-logging.jar";
+
+    src = fetchFromGitHub {
+        owner = "apache";
+        repo = pname;
+        rev = "LOGGING_1_0_3";
+        hash = "sha256-+acvWKFRD2jSpnLl5i3EJUDD4V+SyVP0ydcxG8HQ+JY=";
+    };
+
+    nativeBuildInputs = [jdk6 ant_1_7];
+
+    env = {
+        JAVA_HOME="${jdk6}";
+    };
+
+    buildPhase = ''
+        ant dist
+    '';
+
+    installPhase = ''
+        mkdir $out
+        cp -r ./dist/* $out/
+    '';
+}
--- a/java/commons-vfs.nix
+++ b/java/commons-vfs.nix
@ -1,4 +1,4 @@
-{stdenv, fetchzip, jdk6, ant_1_7, mavenDep, commons-logging_1_0_4, commons-httpclient_2_0_2, commons-collections,
+{stdenv, fetchzip, jdk6, ant_1_7, mavenDep, commons-logging_1_0_4, commons-httpclient_2_0_2, commons-collections_3_1,
 commons-net, jsch_0_1_23}: stdenv.mkDerivation rec {
    pname = "commons-vfs";
    version = "1.0";
@ -12,7 +12,7 @@ commons-net, jsch_0_1_23}: stdenv.mkDerivation rec {
    nativeBuildInputs = [jdk6 ant_1_7
     (mavenDep commons-logging_1_0_4 {})
     (mavenDep commons-httpclient_2_0_2 {})
-     (mavenDep commons-collections {})
+     (mavenDep commons-collections_3_1 {})
     (mavenDep commons-net {})
     (mavenDep jsch_0_1_23 {})];

--- a/java/dom4j.nix
+++ b/java/dom4j.nix
@ -0,0 +1,29 @@
+{stdenv, fetchFromGitHub, jdk6, ant_1_7}: stdenv.mkDerivation rec {
+    pname = "dom4j";
+    version = "1.6.1";
+    outJar = "dom4j.jar";
+
+    src = fetchFromGitHub {
+        owner = pname;
+        repo = pname;
+        rev = "dom4j_1_6_1";
+        hash = "sha256-GvNX85s1bA2v/6aoC8Sph4+aIvFrL7rY0hgd9wY2jdI=";
+    };
+
+    patches = [./dom4j.patch];
+
+    nativeBuildInputs = [jdk6 ant_1_7];
+
+    env = {
+        JAVA_HOME="${jdk6}";
+    };
+
+    buildPhase = ''
+        ant package
+    '';
+
+    installPhase = ''
+        mkdir $out
+        cp -r ./build/dom4j.jar $out/dom4j.jar
+    '';
+}
--- a/java/dom4j.patch
+++ b/java/dom4j.patch
@ -0,0 +1,752 @@
+diff --git a/src/java/org/dom4j/dom/DOMAttribute.java b/src/java/org/dom4j/dom/DOMAttribute.java
+index 7c9a7c0..d2d05bf 100644
+--- a/src/java/org/dom4j/dom/DOMAttribute.java
+++ b/src/java/org/dom4j/dom/DOMAttribute.java
+@@ -167,6 +167,54 @@ public class DOMAttribute extends DefaultAttribute implements org.w3c.dom.Attr {
+         return DOMNodeHelper.hasAttributes(this);
+     }
+ 
+    public Object getUserData(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public Object setUserData(String s, Object o, org.w3c.dom.UserDataHandler handler) {
+        throw new UnsupportedOperationException();
+    }
+
+    public Object getFeature(String s, String s2)  {
+        throw new UnsupportedOperationException();
+    }
+
+    public boolean isEqualNode(org.w3c.dom.Node node) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String lookupNamespaceURI(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public boolean isDefaultNamespace(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String lookupPrefix(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public boolean isSameNode(org.w3c.dom.Node node) {
+        throw new UnsupportedOperationException();
+    }
+
+    public void setTextContent(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String getTextContent() {
+        throw new UnsupportedOperationException();
+    }
+
+    public short compareDocumentPosition(org.w3c.dom.Node node) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String getBaseURI() {
+        throw new UnsupportedOperationException();
+    }
+
+     // org.w3c.dom.Attr interface
+     // -------------------------------------------------------------------------
+     // public String getName();
+@@ -179,6 +227,15 @@ public class DOMAttribute extends DefaultAttribute implements org.w3c.dom.Attr {
+     public org.w3c.dom.Element getOwnerElement() {
+         return DOMNodeHelper.asDOMElement(getParent());
+     }
+
+    public boolean isId() {
+        throw new UnsupportedOperationException();
+    }
+
+    public org.w3c.dom.TypeInfo getSchemaTypeInfo() {
+        throw new UnsupportedOperationException();
+    }
+
+ }
+ 
+ /*
+diff --git a/src/java/org/dom4j/dom/DOMCDATA.java b/src/java/org/dom4j/dom/DOMCDATA.java
+index 21456e3..4d92b59 100644
+--- a/src/java/org/dom4j/dom/DOMCDATA.java
+++ b/src/java/org/dom4j/dom/DOMCDATA.java
+@@ -155,6 +155,54 @@ public class DOMCDATA extends DefaultCDATA implements org.w3c.dom.CDATASection {
+         return DOMNodeHelper.hasAttributes(this);
+     }
+ 
+    public Object getUserData(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public Object setUserData(String s, Object o, org.w3c.dom.UserDataHandler handler) {
+        throw new UnsupportedOperationException();
+    }
+
+    public Object getFeature(String s, String s2)  {
+        throw new UnsupportedOperationException();
+    }
+
+    public boolean isEqualNode(org.w3c.dom.Node node) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String lookupNamespaceURI(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public boolean isDefaultNamespace(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String lookupPrefix(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public boolean isSameNode(org.w3c.dom.Node node) {
+        throw new UnsupportedOperationException();
+    }
+
+    public void setTextContent(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String getTextContent() {
+        throw new UnsupportedOperationException();
+    }
+
+    public short compareDocumentPosition(org.w3c.dom.Node node) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String getBaseURI() {
+        throw new UnsupportedOperationException();
+    }
+
+     // org.w3c.dom.CharacterData interface
+     // -------------------------------------------------------------------------
+     public String getData() throws DOMException {
+@@ -220,6 +268,18 @@ public class DOMCDATA extends DefaultCDATA implements org.w3c.dom.CDATASection {
+         }
+     }
+ 
+    public String getWholeText() {
+        throw new UnsupportedOperationException();
+    }
+
+    public org.w3c.dom.Text replaceWholeText(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public boolean isElementContentWhitespace() {
+        throw new UnsupportedOperationException();
+    }
+
+     // Implementation methods
+     // -------------------------------------------------------------------------
+     protected CDATA createCDATA(String text) {
+diff --git a/src/java/org/dom4j/dom/DOMComment.java b/src/java/org/dom4j/dom/DOMComment.java
+index ffb33e6..4807d0f 100644
+--- a/src/java/org/dom4j/dom/DOMComment.java
+++ b/src/java/org/dom4j/dom/DOMComment.java
+@@ -58,6 +58,54 @@ public class DOMComment extends DefaultComment implements org.w3c.dom.Comment {
+         return "#comment";
+     }
+ 
+    public Object getUserData(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public Object setUserData(String s, Object o, org.w3c.dom.UserDataHandler handler) {
+        throw new UnsupportedOperationException();
+    }
+
+    public Object getFeature(String s, String s2)  {
+        throw new UnsupportedOperationException();
+    }
+
+    public boolean isEqualNode(org.w3c.dom.Node node) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String lookupNamespaceURI(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public boolean isDefaultNamespace(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String lookupPrefix(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public boolean isSameNode(org.w3c.dom.Node node) {
+        throw new UnsupportedOperationException();
+    }
+
+    public void setTextContent(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String getTextContent() {
+        throw new UnsupportedOperationException();
+    }
+
+    public short compareDocumentPosition(org.w3c.dom.Node node) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String getBaseURI() {
+        throw new UnsupportedOperationException();
+    }
+
+     // already part of API
+     //
+     // public short getNodeType();
+diff --git a/src/java/org/dom4j/dom/DOMDocument.java b/src/java/org/dom4j/dom/DOMDocument.java
+index 6d023a7..820f11f 100644
+--- a/src/java/org/dom4j/dom/DOMDocument.java
+++ b/src/java/org/dom4j/dom/DOMDocument.java
+@@ -193,6 +193,54 @@ public class DOMDocument extends DefaultDocument implements Document {
+         return DOMNodeHelper.hasAttributes(this);
+     }
+ 
+    public Object getUserData(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public Object setUserData(String s, Object o, org.w3c.dom.UserDataHandler handler) {
+        throw new UnsupportedOperationException();
+    }
+
+    public Object getFeature(String s, String s2)  {
+        throw new UnsupportedOperationException();
+    }
+
+    public boolean isEqualNode(org.w3c.dom.Node node) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String lookupNamespaceURI(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public boolean isDefaultNamespace(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String lookupPrefix(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public boolean isSameNode(org.w3c.dom.Node node) {
+        throw new UnsupportedOperationException();
+    }
+
+    public void setTextContent(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String getTextContent() {
+        throw new UnsupportedOperationException();
+    }
+
+    public short compareDocumentPosition(org.w3c.dom.Node node) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String getBaseURI() {
+        throw new UnsupportedOperationException();
+    }
+
+     // org.w3c.dom.Document interface
+     // -------------------------------------------------------------------------
+     public NodeList getElementsByTagName(String name) {
+@@ -292,6 +340,62 @@ public class DOMDocument extends DefaultDocument implements Document {
+         return DOMNodeHelper.asDOMElement(elementByID(elementId));
+     }
+ 
+    public org.w3c.dom.Node renameNode(org.w3c.dom.Node node, String s, String s2) {
+        throw new UnsupportedOperationException();
+    }
+
+    public void normalizeDocument() {
+        throw new UnsupportedOperationException();
+    }
+
+    public org.w3c.dom.DOMConfiguration getDomConfig() {
+        throw new UnsupportedOperationException();
+    }
+
+    public org.w3c.dom.Node adoptNode(org.w3c.dom.Node node) {
+        throw new UnsupportedOperationException();
+    }
+
+    public void setDocumentURI(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String getDocumentURI() {
+        throw new UnsupportedOperationException();
+    }
+
+    public void setStrictErrorChecking(boolean b) {
+        throw new UnsupportedOperationException();
+    }
+
+    public boolean getStrictErrorChecking() {
+        throw new UnsupportedOperationException();
+    }
+
+    public void setXmlVersion(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String getXmlVersion() {
+        throw new UnsupportedOperationException();
+    }
+
+    public void setXmlStandalone(boolean b) {
+        throw new UnsupportedOperationException();
+    }
+
+    public boolean getXmlStandalone() {
+        throw new UnsupportedOperationException();
+    }
+
+    public String getXmlEncoding() {
+        throw new UnsupportedOperationException();
+    }
+
+    public String getInputEncoding() {
+        throw new UnsupportedOperationException();
+    }
+
+     // Implementation methods
+     // -------------------------------------------------------------------------
+     protected DocumentFactory getDocumentFactory() {
+diff --git a/src/java/org/dom4j/dom/DOMDocumentFactory.java b/src/java/org/dom4j/dom/DOMDocumentFactory.java
+index cd601a3..800805c 100644
+--- a/src/java/org/dom4j/dom/DOMDocumentFactory.java
+++ b/src/java/org/dom4j/dom/DOMDocumentFactory.java
+@@ -174,6 +174,10 @@ public class DOMDocumentFactory extends DocumentFactory implements
+                     docType.getPublicId(), docType.getSystemId());
+         }
+     }
+
+    public Object getFeature(String s, String s2)  {
+        throw new UnsupportedOperationException();
+    }
+ }
+ 
+ 
+@@ -213,4 +217,4 @@ public class DOMDocumentFactory extends DocumentFactory implements
+  * POSSIBILITY OF SUCH DAMAGE.
+  * 
+  * Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
+- */
+\ No newline at end of file
+ */
+diff --git a/src/java/org/dom4j/dom/DOMDocumentType.java b/src/java/org/dom4j/dom/DOMDocumentType.java
+index aad5354..3c272b4 100644
+--- a/src/java/org/dom4j/dom/DOMDocumentType.java
+++ b/src/java/org/dom4j/dom/DOMDocumentType.java
+@@ -156,6 +156,54 @@ public class DOMDocumentType extends DefaultDocumentType implements
+         return DOMNodeHelper.hasAttributes(this);
+     }
+ 
+    public Object getUserData(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public Object setUserData(String s, Object o, org.w3c.dom.UserDataHandler handler) {
+        throw new UnsupportedOperationException();
+    }
+
+    public Object getFeature(String s, String s2)  {
+        throw new UnsupportedOperationException();
+    }
+
+    public boolean isEqualNode(org.w3c.dom.Node node) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String lookupNamespaceURI(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public boolean isDefaultNamespace(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String lookupPrefix(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public boolean isSameNode(org.w3c.dom.Node node) {
+        throw new UnsupportedOperationException();
+    }
+
+    public void setTextContent(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String getTextContent() {
+        throw new UnsupportedOperationException();
+    }
+
+    public short compareDocumentPosition(org.w3c.dom.Node node) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String getBaseURI() {
+        throw new UnsupportedOperationException();
+    }
+
+     // org.w3c.dom.DocumentType interface
+     // -------------------------------------------------------------------------
+     public NamedNodeMap getEntities() {
+diff --git a/src/java/org/dom4j/dom/DOMElement.java b/src/java/org/dom4j/dom/DOMElement.java
+index 7c9cb87..9caea9f 100644
+--- a/src/java/org/dom4j/dom/DOMElement.java
+++ b/src/java/org/dom4j/dom/DOMElement.java
+@@ -176,6 +176,54 @@ public class DOMElement extends DefaultElement implements org.w3c.dom.Element {
+         return DOMNodeHelper.hasAttributes(this);
+     }
+ 
+    public Object getUserData(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public Object setUserData(String s, Object o, org.w3c.dom.UserDataHandler handler) {
+        throw new UnsupportedOperationException();
+    }
+
+    public Object getFeature(String s, String s2)  {
+        throw new UnsupportedOperationException();
+    }
+
+    public boolean isEqualNode(org.w3c.dom.Node node) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String lookupNamespaceURI(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public boolean isDefaultNamespace(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String lookupPrefix(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public boolean isSameNode(org.w3c.dom.Node node) {
+        throw new UnsupportedOperationException();
+    }
+
+    public void setTextContent(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String getTextContent() {
+        throw new UnsupportedOperationException();
+    }
+
+    public short compareDocumentPosition(org.w3c.dom.Node node) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String getBaseURI() {
+        throw new UnsupportedOperationException();
+    }
+
+     // org.w3c.dom.Element interface
+     // -------------------------------------------------------------------------
+     public String getTagName() {
+@@ -328,6 +376,22 @@ public class DOMElement extends DefaultElement implements org.w3c.dom.Element {
+         return attribute(namespaceURI, localName) != null;
+     }
+ 
+    public void setIdAttributeNode(org.w3c.dom.Attr attr, boolean b) {
+        throw new UnsupportedOperationException();
+    }
+
+    public void setIdAttributeNS(String s, String s2, boolean b) {
+        throw new UnsupportedOperationException();
+    }
+
+    public void setIdAttribute(String s, boolean b) {
+        throw new UnsupportedOperationException();
+    }
+
+    public org.w3c.dom.TypeInfo getSchemaTypeInfo() {
+        throw new UnsupportedOperationException();
+    }
+
+     // Implementation methods
+     // -------------------------------------------------------------------------
+     protected DocumentFactory getDocumentFactory() {
+diff --git a/src/java/org/dom4j/dom/DOMEntityReference.java b/src/java/org/dom4j/dom/DOMEntityReference.java
+index fae9cf5..0b7affa 100644
+--- a/src/java/org/dom4j/dom/DOMEntityReference.java
+++ b/src/java/org/dom4j/dom/DOMEntityReference.java
+@@ -166,6 +166,54 @@ public class DOMEntityReference extends DefaultEntity implements
+     public boolean hasAttributes() {
+         return DOMNodeHelper.hasAttributes(this);
+     }
+
+    public Object getUserData(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public Object setUserData(String s, Object o, org.w3c.dom.UserDataHandler handler) {
+        throw new UnsupportedOperationException();
+    }
+
+    public Object getFeature(String s, String s2)  {
+        throw new UnsupportedOperationException();
+    }
+
+    public boolean isEqualNode(org.w3c.dom.Node node) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String lookupNamespaceURI(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public boolean isDefaultNamespace(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String lookupPrefix(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public boolean isSameNode(org.w3c.dom.Node node) {
+        throw new UnsupportedOperationException();
+    }
+
+    public void setTextContent(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String getTextContent() {
+        throw new UnsupportedOperationException();
+    }
+
+    public short compareDocumentPosition(org.w3c.dom.Node node) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String getBaseURI() {
+        throw new UnsupportedOperationException();
+    }
+ }
+ 
+ /*
+diff --git a/src/java/org/dom4j/dom/DOMNamespace.java b/src/java/org/dom4j/dom/DOMNamespace.java
+index 89fcbb1..ab90a98 100644
+--- a/src/java/org/dom4j/dom/DOMNamespace.java
+++ b/src/java/org/dom4j/dom/DOMNamespace.java
+@@ -140,6 +140,54 @@ public class DOMNamespace extends DefaultNamespace implements org.w3c.dom.Node {
+     public boolean hasAttributes() {
+         return DOMNodeHelper.hasAttributes(this);
+     }
+
+    public Object getUserData(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public Object setUserData(String s, Object o, org.w3c.dom.UserDataHandler handler) {
+        throw new UnsupportedOperationException();
+    }
+
+    public Object getFeature(String s, String s2)  {
+        throw new UnsupportedOperationException();
+    }
+
+    public boolean isEqualNode(org.w3c.dom.Node node) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String lookupNamespaceURI(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public boolean isDefaultNamespace(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String lookupPrefix(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public boolean isSameNode(org.w3c.dom.Node node) {
+        throw new UnsupportedOperationException();
+    }
+
+    public void setTextContent(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String getTextContent() {
+        throw new UnsupportedOperationException();
+    }
+
+    public short compareDocumentPosition(org.w3c.dom.Node node) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String getBaseURI() {
+        throw new UnsupportedOperationException();
+    }
+ }
+ 
+ /*
+diff --git a/src/java/org/dom4j/dom/DOMProcessingInstruction.java b/src/java/org/dom4j/dom/DOMProcessingInstruction.java
+index 27db3a1..9f1f5f5 100644
+--- a/src/java/org/dom4j/dom/DOMProcessingInstruction.java
+++ b/src/java/org/dom4j/dom/DOMProcessingInstruction.java
+@@ -66,6 +66,54 @@ public class DOMProcessingInstruction extends DefaultProcessingInstruction
+         return getName();
+     }
+ 
+    public Object getUserData(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public Object setUserData(String s, Object o, org.w3c.dom.UserDataHandler handler) {
+        throw new UnsupportedOperationException();
+    }
+
+    public Object getFeature(String s, String s2) {
+        throw new UnsupportedOperationException();
+    }
+
+    public boolean isEqualNode(org.w3c.dom.Node node) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String lookupNamespaceURI(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public boolean isDefaultNamespace(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String lookupPrefix(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public boolean isSameNode(org.w3c.dom.Node node) {
+        throw new UnsupportedOperationException();
+    }
+
+    public void setTextContent(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String getTextContent() {
+        throw new UnsupportedOperationException();
+    }
+
+    public short compareDocumentPosition(org.w3c.dom.Node node) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String getBaseURI() {
+        throw new UnsupportedOperationException();
+    }
+
+     // already part of API
+     //
+     // public short getNodeType();
+diff --git a/src/java/org/dom4j/dom/DOMText.java b/src/java/org/dom4j/dom/DOMText.java
+index 906943a..979c9cf 100644
+--- a/src/java/org/dom4j/dom/DOMText.java
+++ b/src/java/org/dom4j/dom/DOMText.java
+@@ -154,6 +154,54 @@ public class DOMText extends DefaultText implements org.w3c.dom.Text {
+         return DOMNodeHelper.hasAttributes(this);
+     }
+ 
+    public Object getUserData(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public Object setUserData(String s, Object o, org.w3c.dom.UserDataHandler handler) {
+        throw new UnsupportedOperationException();
+    }
+
+    public Object getFeature(String s, String s2)  {
+        throw new UnsupportedOperationException();
+    }
+
+    public boolean isEqualNode(org.w3c.dom.Node node) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String lookupNamespaceURI(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public boolean isDefaultNamespace(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String lookupPrefix(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public boolean isSameNode(org.w3c.dom.Node node) {
+        throw new UnsupportedOperationException();
+    }
+
+    public void setTextContent(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String getTextContent() {
+        throw new UnsupportedOperationException();
+    }
+
+    public short compareDocumentPosition(org.w3c.dom.Node node) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String getBaseURI() {
+        throw new UnsupportedOperationException();
+    }
+
+     // org.w3c.dom.CharacterData interface
+     // -------------------------------------------------------------------------
+     public String getData() throws DOMException {
+@@ -219,6 +267,18 @@ public class DOMText extends DefaultText implements org.w3c.dom.Text {
+         }
+     }
+ 
+    public String getWholeText() {
+        throw new UnsupportedOperationException();
+    }
+
+    public org.w3c.dom.Text replaceWholeText(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public boolean isElementContentWhitespace() {
+        throw new UnsupportedOperationException();
+    }
+
+     // Implementation methods
+     // -------------------------------------------------------------------------
+     protected Text createText(String text) {
--- a/java/groovy.nix
+++ b/java/groovy.nix
@ -1,4 +1,4 @@
-{stdenv, fetchFromGitHub, jdk6, ant_1_7}: stdenv.mkDerivation rec {
+{stdenv, fetchFromGitHub, jdk6, ant_1_7, maven}: stdenv.mkDerivation rec {
    pname = "groovy";
    version = "1.5.5";
    outJar = "commons-collections-3.1.jar";
@ -12,7 +12,7 @@

    #patches = [./commons-collections.patch];

-    nativeBuildInputs = [jdk6 ant_1_7];
+    nativeBuildInputs = [jdk6 ant_1_7 maven];

    env = {
        JAVA_HOME="${jdk6}";
--- a/java/jaxen.nix
+++ b/java/jaxen.nix
@ -0,0 +1,30 @@
+{stdenv, fetchFromGitHub, jdk6, ant_1_7, saxpath, dom4j}: stdenv.mkDerivation rec {
+    pname = "jaxen";
+    version = "1.0-FCS";
+    outJar = "jaxen-full.jar";
+
+    src = fetchFromGitHub {
+        owner = "jaxen-xpath";
+        repo = pname;
+        rev = "ee2979fd9af70414aaf4cae7673182cbbf25b116";
+        hash = "sha256-803bPAE2MAnlLjdr4EySQlDd0RGKTjQ7monkfwaM5d4=";
+    };
+
+    patches = [./jaxen.patch];
+
+    nativeBuildInputs = [jdk6 ant_1_7];
+
+    env = {
+        JAVA_HOME="${jdk6}";
+        CLASSPATH="${saxpath}/saxpath.jar:${dom4j}/dom4j.jar";
+    };
+
+    buildPhase = ''
+        ant dist
+    '';
+
+    installPhase = ''
+        mkdir $out
+        cp -r ./dist/tmp/jaxen-1.0-FCS/* $out/
+    '';
+}
--- a/java/jaxen.patch
+++ b/java/jaxen.patch
@ -0,0 +1,93 @@
+diff --git a/build.xml b/build.xml
+index bdb1903..ca97d2e 100644
+--- a/build.xml
+++ b/build.xml
+@@ -234,7 +234,8 @@
+     <javac destdir="${build.dest.main}"
+            debug="${debug}"
+            optimize="${optimize}"
+-           deprecation="${deprecation}">
+           deprecation="${deprecation}"
+           target="1.4">
+         <src path="${build.src.main}"/>
+         <patternset refid="jaxen.${object.model}"/>
+     </javac>
+@@ -244,7 +245,8 @@
+     <javac destdir="${build.dest.test}"
+            debug="${debug}"
+            optimize="${optimize}"
+-           deprecation="${deprecation}">
+           deprecation="${deprecation}"
+           target="1.4">
+         <src path="${build.src.test}"/>
+         <classpath path="${build.dest.test}"/>
+         <classpath path="${build.dest.main}"/>
+@@ -256,7 +258,8 @@
+     <javac destdir="${build.dest.samples}"
+            debug="${debug}"
+            optimize="${optimize}"
+-           deprecation="${deprecation}">
+           deprecation="${deprecation}"
+           target="1.4">
+         <src path="${build.src.samples}"/>
+         <classpath path="${build.dest.samples}"/>
+         <classpath path="${build.dest.main}"/>
+diff --git a/src/java/main/org/jaxen/dom/NamespaceNode.java b/src/java/main/org/jaxen/dom/NamespaceNode.java
+index 42fc619..832b248 100644
+--- a/src/java/main/org/jaxen/dom/NamespaceNode.java
+++ b/src/java/main/org/jaxen/dom/NamespaceNode.java
+@@ -493,6 +493,54 @@ public class NamespaceNode implements Node
+ 			       "Namespace node may not be modified");
+     }
+ 
+    public Object getUserData(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public Object setUserData(String s, Object o, org.w3c.dom.UserDataHandler handler) {
+        throw new UnsupportedOperationException();
+    }
+
+    public Object getFeature(String s, String s2)  {
+        throw new UnsupportedOperationException();
+    }
+
+    public boolean isEqualNode(org.w3c.dom.Node node) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String lookupNamespaceURI(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public boolean isDefaultNamespace(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String lookupPrefix(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public boolean isSameNode(org.w3c.dom.Node node) {
+        throw new UnsupportedOperationException();
+    }
+
+    public void setTextContent(String s) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String getTextContent() {
+        throw new UnsupportedOperationException();
+    }
+
+    public short compareDocumentPosition(org.w3c.dom.Node node) {
+        throw new UnsupportedOperationException();
+    }
+
+    public String getBaseURI() {
+        throw new UnsupportedOperationException();
+    }
+
+ 
+ 
+     ////////////////////////////////////////////////////////////////////
--- a/java/jelly/commons-jelly-tags-ant.nix
+++ b/java/jelly/commons-jelly-tags-ant.nix
@ -0,0 +1,38 @@
+{stdenv, fetchurl, fetchFromGitHub, jdk6, ant_1_7, commons-jelly, commons-logging_1_0_3, commons-beanutils_1_6,
+commons-grant, dom4j}: stdenv.mkDerivation rec {
+    pname = "commons-jelly-tags-ant";
+    version = "1.0";
+    outJar = "commons-jelly-tags-ant-1.0-SNAPSHOT.jar";
+    org = "commons-jelly";
+
+    src = fetchFromGitHub {
+        owner = "apache";
+        repo = pname;
+        rev = "717379e1b4db3edcc1404bd33242d6342530ad88";
+        hash = "sha256-FACLrmbwn7Z0eYc7vb54O35Lu9j/a+7dB0+Jv6/xDUk=";
+    };
+
+    patches = [./commons-jelly-tags-ant.patch];
+
+    nativeBuildInputs = [jdk6 ant_1_7];
+
+    env = {
+        JAVA_HOME="${jdk6}";
+        CLASSPATH="${commons-jelly}/commons-jelly-1.0-beta-4-SNAPSHOT.jar:${commons-logging_1_0_3}/commons-logging.jar:${commons-beanutils_1_6}/commons-beanutils.jar:${dom4j}/dom4j.jar";
+    };
+
+    buildPhase = ''
+        cd jelly-tags/ant
+
+        mkdir -p target/lib
+        cp ${commons-grant}/commons-grant-1.0-beta-4.jar /build/source/jelly-tags/ant/target/lib/commons-grant-1.0-beta-4.jar
+        chmod 777 /build/source/jelly-tags/ant/target/lib/commons-grant-1.0-beta-4.jar
+
+        ant dist
+    '';
+
+    installPhase = ''
+        mkdir $out
+        cp -r ./dist/* $out/
+    '';
+}
--- a/java/jelly/commons-jelly-tags-ant.patch
+++ b/java/jelly/commons-jelly-tags-ant.patch
@ -0,0 +1,20 @@
+diff --git a/jelly-tags/ant/build.xml b/jelly-tags/ant/build.xml
+index 18e44a3..d09845a 100644
+--- a/jelly-tags/ant/build.xml
+++ b/jelly-tags/ant/build.xml
+@@ -65,7 +65,7 @@
+       </fileset>
+     </copy>
+   </target>
+-  <target name="jar" description="o Create the jar" depends="compile,test">
+  <target name="jar" description="o Create the jar" depends="compile">
+     <jar jarfile="target/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}">
+     </jar>
+   </target>
+@@ -199,4 +199,4 @@
+     <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
+     </unjar>
+   </target>
+-</project>
+\ No newline at end of file
+</project>
--- a/java/jelly/commons-jelly-tags-define.nix
+++ b/java/jelly/commons-jelly-tags-define.nix
@ -0,0 +1,32 @@
+{stdenv, fetchurl, fetchFromGitHub, jdk6, ant_1_7, commons-jelly, commons-logging_1_0_3, commons-beanutils_1_6, junit_3_8_1, dom4j,
+commons-jelly-tags-junit, commons-collections_2_1, commons-jexl, commons-jelly-tags-log, commons-jelly-tags-xml, jaxen, saxpath,
+commons-jelly-tags-dynabean}: stdenv.mkDerivation rec {
+    pname = "commons-jelly-tags-define";
+    version = "20030211.142932";
+    outJar = "commons-jelly-tags-define-1.0-SNAPSHOT.jar";
+    org = "commons-jelly";
+
+    src = fetchFromGitHub {
+        owner = "apache";
+        repo = pname;
+        rev = "717379e1b4db3edcc1404bd33242d6342530ad88";
+        hash = "sha256-FACLrmbwn7Z0eYc7vb54O35Lu9j/a+7dB0+Jv6/xDUk=";
+    };
+
+    nativeBuildInputs = [jdk6 ant_1_7];
+
+    env = {
+        JAVA_HOME="${jdk6}";
+        CLASSPATH="${commons-jelly}/commons-jelly-1.0-beta-4-SNAPSHOT.jar:${commons-logging_1_0_3}/commons-logging.jar:${commons-beanutils_1_6}/commons-beanutils.jar:${junit_3_8_1}/junit.jar:${dom4j}/dom4j.jar:${commons-jelly-tags-junit}/commons-jelly-tags-junit-1.0-SNAPSHOT.jar:${commons-collections_2_1}/commons-collections.jar:${commons-jexl}/commons-jexl-1.0-beta-1.jar:${commons-jelly-tags-log}/commons-jelly-tags-log-1.0-SNAPSHOT.jar:${commons-jelly-tags-xml}/commons-jelly-tags-xml-1.0-SNAPSHOT.jar:${jaxen}/jaxen-full.jar:${saxpath}/saxpath.jar:${commons-jelly-tags-dynabean}/commons-jelly-tags-dynabean-1.0-SNAPSHOT.jar";
+    };
+
+    buildPhase = ''
+        cd jelly-tags/define
+        ant dist
+    '';
+
+    installPhase = ''
+        mkdir $out
+        cp -r ./dist/* $out/
+    '';
+}
--- a/java/jelly/commons-jelly-tags-dynabean.nix
+++ b/java/jelly/commons-jelly-tags-dynabean.nix
@ -0,0 +1,30 @@
+{stdenv, fetchurl, fetchFromGitHub, jdk6, ant_1_7, commons-jelly, commons-logging_1_0_3, commons-beanutils_1_6, junit_3_8_1,
+commons-jelly-tags-junit, dom4j, commons-collections_2_1, commons-jexl}: stdenv.mkDerivation rec {
+    pname = "commons-jelly-tags-dynabean";
+    version = "1.0";
+    outJar = "commons-jelly-tags-dynabean-1.0-SNAPSHOT.jar";
+
+    src = fetchFromGitHub {
+        owner = "apache";
+        repo = pname;
+        rev = "717379e1b4db3edcc1404bd33242d6342530ad88";
+        hash = "sha256-FACLrmbwn7Z0eYc7vb54O35Lu9j/a+7dB0+Jv6/xDUk=";
+    };
+
+    nativeBuildInputs = [jdk6 ant_1_7];
+
+    env = {
+        JAVA_HOME="${jdk6}";
+        CLASSPATH="${commons-jelly}/commons-jelly-1.0-beta-4-SNAPSHOT.jar:${commons-logging_1_0_3}/commons-logging.jar:${commons-beanutils_1_6}/commons-beanutils.jar:${junit_3_8_1}/junit.jar:${commons-jelly-tags-junit}/commons-jelly-tags-junit-1.0-SNAPSHOT.jar:${dom4j}/dom4j.jar:${commons-collections_2_1}/commons-collections.jar:${commons-jexl}/commons-jexl-1.0-beta-1.jar";
+    };
+
+    buildPhase = ''
+        cd jelly-tags/dynabean
+        ant dist
+    '';
+
+    installPhase = ''
+        mkdir $out
+        cp -r ./dist/* $out/
+    '';
+}
--- a/java/jelly/commons-jelly-tags-junit.nix
+++ b/java/jelly/commons-jelly-tags-junit.nix
@ -0,0 +1,30 @@
+{stdenv, fetchurl, fetchFromGitHub, jdk6, ant_1_7, commons-jelly, commons-logging_1_0_3, junit_3_8_1, jaxen, saxpath,
+dom4j, commons-collections_2_1, commons-beanutils_1_6, commons-jexl}: stdenv.mkDerivation rec {
+    pname = "commons-jelly-tags-junit";
+    version = "20030902.160215";
+    outJar = "commons-jelly-tags-junit-1.0-SNAPSHOT.jar";
+
+    src = fetchFromGitHub {
+        owner = "apache";
+        repo = pname;
+        rev = "717379e1b4db3edcc1404bd33242d6342530ad88";
+        hash = "sha256-FACLrmbwn7Z0eYc7vb54O35Lu9j/a+7dB0+Jv6/xDUk=";
+    };
+
+    nativeBuildInputs = [jdk6 ant_1_7];
+
+    env = {
+        JAVA_HOME="${jdk6}";
+        CLASSPATH="${commons-jelly}/commons-jelly-1.0-beta-4-SNAPSHOT.jar:${commons-logging_1_0_3}/commons-logging.jar:${junit_3_8_1}/junit.jar:${jaxen}/jaxen-full.jar:${saxpath}/saxpath.jar:${dom4j}/dom4j.jar:${commons-collections_2_1}/commons-collections.jar:${commons-beanutils_1_6}/commons-beanutils.jar:${commons-jexl}/commons-jexl-1.0-beta-1.jar";
+    };
+
+    buildPhase = ''
+        cd jelly-tags/junit
+        ant dist
+    '';
+
+    installPhase = ''
+        mkdir $out
+        cp -r ./dist/* $out/
+    '';
+}
--- a/java/jelly/commons-jelly-tags-log.nix
+++ b/java/jelly/commons-jelly-tags-log.nix
@ -0,0 +1,32 @@
+{stdenv, fetchurl, fetchFromGitHub, jdk6, ant_1_7, commons-jelly, commons-logging_1_0_3, junit_3_8_1, commons-jelly-tags-junit,
+dom4j, commons-collections_2_1, commons-beanutils_1_6, commons-jexl}: stdenv.mkDerivation rec {
+    pname = "commons-jelly-tags-log";
+    version = "1.0";
+    outJar = "commons-jelly-tags-log-1.0-SNAPSHOT.jar";
+
+    src = fetchFromGitHub {
+        owner = "apache";
+        repo = pname;
+        rev = "717379e1b4db3edcc1404bd33242d6342530ad88";
+        hash = "sha256-FACLrmbwn7Z0eYc7vb54O35Lu9j/a+7dB0+Jv6/xDUk=";
+    };
+
+    #patches = [./commons-jelly-tags-util.patch];
+
+    nativeBuildInputs = [jdk6 ant_1_7];
+
+    env = {
+        JAVA_HOME="${jdk6}";
+        CLASSPATH="${commons-jelly}/commons-jelly-1.0-beta-4-SNAPSHOT.jar:${commons-logging_1_0_3}/commons-logging.jar:${junit_3_8_1}/junit.jar:${commons-jelly-tags-junit}/commons-jelly-tags-junit-1.0-SNAPSHOT.jar:${dom4j}/dom4j.jar:${commons-collections_2_1}/commons-collections.jar:${commons-beanutils_1_6}/commons-beanutils.jar:${commons-jexl}/commons-jexl-1.0-beta-1.jar";
+    };
+
+    buildPhase = ''
+        cd jelly-tags/log
+        ant dist
+    '';
+
+    installPhase = ''
+        mkdir $out
+        cp -r ./dist/* $out/
+    '';
+}
--- a/java/jelly/commons-jelly-tags-util.nix
+++ b/java/jelly/commons-jelly-tags-util.nix
@ -0,0 +1,33 @@
+{stdenv, fetchurl, fetchFromGitHub, jdk6, ant_1_7, commons-jelly, commons-logging_1_0_3, commons-beanutils_1_6, dom4j, junit_3_8_1,
+commons-jelly-tags-junit, commons-collections_2_1, commons-jexl, jaxen, saxpath}: stdenv.mkDerivation rec {
+    pname = "commons-jelly-tags-util";
+    version = "20030211.141939";
+    outJar = "commons-jelly-tags-util-1.0-SNAPSHOT.jar";
+    org = "commons-jelly";
+
+    src = fetchFromGitHub {
+        owner = "apache";
+        repo = pname;
+        rev = "717379e1b4db3edcc1404bd33242d6342530ad88";
+        hash = "sha256-FACLrmbwn7Z0eYc7vb54O35Lu9j/a+7dB0+Jv6/xDUk=";
+    };
+
+    patches = [./commons-jelly-tags-util.patch];
+
+    nativeBuildInputs = [jdk6 ant_1_7];
+
+    env = {
+        JAVA_HOME="${jdk6}";
+        CLASSPATH="${commons-jelly}/commons-jelly-1.0-beta-4-SNAPSHOT.jar:${commons-logging_1_0_3}/commons-logging.jar:${junit_3_8_1}/junit.jar:${commons-jelly-tags-junit}/commons-jelly-tags-junit-1.0-SNAPSHOT.jar:${dom4j}/dom4j.jar:${commons-collections_2_1}/commons-collections.jar:${commons-beanutils_1_6}/commons-beanutils.jar:${commons-jexl}/commons-jexl-1.0-beta-1.jar:${jaxen}/jaxen-full.jar:${saxpath}/saxpath.jar";
+    };
+
+    buildPhase = ''
+        cd jelly-tags/util
+        ant dist
+    '';
+
+    installPhase = ''
+        mkdir $out
+        cp -r ./dist/* $out/
+    '';
+}
--- a/java/jelly/commons-jelly-tags-util.patch
+++ b/java/jelly/commons-jelly-tags-util.patch
@ -0,0 +1,29 @@
+diff --git a/jelly-tags/util/build.xml b/jelly-tags/util/build.xml
+index aeff61c..9232708 100644
+--- a/jelly-tags/util/build.xml
+++ b/jelly-tags/util/build.xml
+@@ -28,7 +28,7 @@
+   <target name="compile" description="o Compile the code" depends="get-deps">
+     <mkdir dir="${classesdir}">
+     </mkdir>
+-    <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
+    <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html" target="1.4">
+       <src>
+         <pathelement location="src/java">
+         </pathelement>
+@@ -120,7 +120,7 @@
+   <target name="compile-tests" depends="compile">
+     <mkdir dir="${testclassesdir}">
+     </mkdir>
+-    <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
+    <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html" target="1.4">
+       <src>
+         <pathelement location="src/test">
+         </pathelement>
+@@ -189,4 +189,4 @@
+     <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
+     </unjar>
+   </target>
+-</project>
+\ No newline at end of file
+</project>
--- a/java/jelly/commons-jelly-tags-xml.nix
+++ b/java/jelly/commons-jelly-tags-xml.nix
@ -0,0 +1,31 @@
+{stdenv, fetchurl, fetchFromGitHub, jdk6, ant_1_7, commons-jelly, commons-logging_1_0_3, dom4j, jaxen, saxpath, junit_3_8_1,
+commons-jelly-tags-junit, commons-collections_2_1, commons-beanutils_1_6, commons-jexl}: stdenv.mkDerivation rec {
+    pname = "commons-jelly-tags-xml";
+    version = "20040613.030723";
+    outJar = "commons-jelly-tags-xml-1.0-SNAPSHOT.jar";
+    org = "commons-jelly";
+
+    src = fetchFromGitHub {
+        owner = "apache";
+        repo = pname;
+        rev = "717379e1b4db3edcc1404bd33242d6342530ad88";
+        hash = "sha256-FACLrmbwn7Z0eYc7vb54O35Lu9j/a+7dB0+Jv6/xDUk=";
+    };
+
+    nativeBuildInputs = [jdk6 ant_1_7];
+
+    env = {
+        JAVA_HOME="${jdk6}";
+        CLASSPATH="${commons-jelly}/commons-jelly-1.0-beta-4-SNAPSHOT.jar:${commons-logging_1_0_3}/commons-logging.jar:${dom4j}/dom4j.jar:${jaxen}/jaxen-full.jar:${saxpath}/saxpath.jar:${junit_3_8_1}/junit.jar:${commons-jelly-tags-junit}/commons-jelly-tags-junit-1.0-SNAPSHOT.jar:${commons-collections_2_1}/commons-collections.jar:${commons-beanutils_1_6}/commons-beanutils.jar:${commons-jexl}/commons-jexl-1.0-beta-1.jar";
+    };
+
+    buildPhase = ''
+        cd jelly-tags/xml
+        ant dist
+    '';
+
+    installPhase = ''
+        mkdir $out
+        cp -r ./dist/* $out/
+    '';
+}
--- a/java/jelly/commons-jelly.nix
+++ b/java/jelly/commons-jelly.nix
@ -0,0 +1,37 @@
+{stdenv, fetchurl, fetchFromGitHub, jdk6, ant_1_7, commons-logging_1_0_3, commons-cli-bootstrap, dom4j, commons-collections_2_1,
+commons-beanutils_1_6, commons-jexl, commons-discovery, jaxen, saxpath, junit_3_7}: stdenv.mkDerivation rec {
+    pname = "commons-jelly";
+    version = "20030902.160215";
+    outJar = "commons-jelly-1.0-beta-4-SNAPSHOT.jar";
+
+    src = fetchFromGitHub {
+        owner = "apache";
+        repo = pname;
+        rev = "717379e1b4db3edcc1404bd33242d6342530ad88";
+        hash = "sha256-FACLrmbwn7Z0eYc7vb54O35Lu9j/a+7dB0+Jv6/xDUk=";
+    };
+
+    servletApi = fetchurl {
+        url = "https://repo1.maven.org/maven2/servletapi/servletapi/2.3/servletapi-2.3.jar";
+        hash = "sha256-hHi5AtCBXtBm24YPsUzF1ARUjUtjSKuTC0YnD83eumg=";
+    };
+
+    patches = [./commons-jelly.patch];
+
+    nativeBuildInputs = [jdk6 ant_1_7];
+
+    env = {
+        JAVA_HOME="${jdk6}";
+        CLASSPATH="${servletApi}:${commons-logging_1_0_3}/commons-logging.jar:${commons-cli-bootstrap}/commons-cli-1.0-beta-2-dev.jar:${dom4j}/dom4j.jar:${commons-collections_2_1}/commons-collections.jar:${commons-beanutils_1_6}/commons-beanutils.jar:${commons-jexl}/commons-jexl-1.0-beta-1.jar:${commons-discovery}/commons-discovery.jar:${jaxen}/jaxen-full.jar:${saxpath}/saxpath.jar:${junit_3_7}/junit.jar";
+    };
+
+    buildPhase = ''
+        #ln -s /build/source/LICENSE.txt /build/LICENSE
+        ant dist
+    '';
+
+    installPhase = ''
+        mkdir $out
+        cp -r ./dist/* $out/
+    '';
+}
--- a/java/jelly/commons-jelly.patch
+++ b/java/jelly/commons-jelly.patch
@ -0,0 +1,29 @@
+diff --git a/build.xml b/build.xml
+index f051c28..b57538d 100644
+--- a/build.xml
+++ b/build.xml
+@@ -28,7 +28,7 @@
+   <target name="compile" description="o Compile the code" depends="get-deps">
+     <mkdir dir="${classesdir}">
+     </mkdir>
+-    <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
+    <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html" target="1.4">
+       <src>
+         <pathelement location="src/java">
+         </pathelement>
+@@ -120,7 +120,7 @@
+   <target name="compile-tests" depends="compile">
+     <mkdir dir="${testclassesdir}">
+     </mkdir>
+-    <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
+    <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html" target="1.4">
+       <src>
+         <pathelement location="src/test">
+         </pathelement>
+@@ -203,4 +203,4 @@
+     <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
+     </unjar>
+   </target>
+-</project>
+\ No newline at end of file
+</project>
--- a/java/junit_3_7.nix
+++ b/java/junit_3_7.nix
@ -0,0 +1,28 @@
+{stdenv, fetchFromGitHub, jdk6, ant_1_7}: stdenv.mkDerivation rec {
+    pname = "junit";
+    version = "3.7";
+    outJar = "junit.jar";
+
+    src = fetchFromGitHub {
+        owner = "junit-team";
+        repo = pname;
+        rev = "8076b782f8c9ac1df6569bbfa479db2da9e6cbcf";
+        hash = "sha256-qVAvDhUEu7L/vNDrebr6aQZ/VtMruhNO0YmtcwkLucU=";
+    };
+
+    patches = [./junit_3_7.patch];
+
+    nativeBuildInputs = [jdk6 ant_1_7];
+    env = {
+        JAVA_HOME="${jdk6}";
+    };
+
+    buildPhase = ''
+        ant
+    '';
+
+    installPhase = ''
+        mkdir $out
+        cp -r ./junit3.7/* $out/
+    '';
+}
--- a/java/junit_3_7.patch
+++ b/java/junit_3_7.patch
@ -0,0 +1,12 @@
+diff --git a/build.xml b/build.xml
+index 7fe5ad1..b6b12d0 100644
+--- a/build.xml
+++ b/build.xml
+@@ -23,6 +23,7 @@
+ 			srcdir="."
+ 			destdir="."
+ 			debug="on"
+			target="1.3"
+   		/>	
+ 	</target>
+ 
--- a/java/junit_3_8_1.nix
+++ b/java/junit_3_8_1.nix
@ -1,6 +1,7 @@
 {stdenv, fetchFromGitHub, jdk6, ant_1_7}: stdenv.mkDerivation rec {
    pname = "junit";
    version = "3.8.1";
+    outJar = "junit.jar";

    src = fetchFromGitHub {
        owner = "junit-team";
--- a/java/saxpath.nix
+++ b/java/saxpath.nix
@ -0,0 +1,29 @@
+{stdenv, fetchzip, jdk6, ant_1_7, commons-logging_1_0, commons-collections_2_0, commons-beanutils_1_4}: stdenv.mkDerivation rec {
+    pname = "saxpath";
+    version = "1.0-FCS";
+    outJar = "saxpath.jar";
+
+    src = fetchzip {
+        url = "https://master.dl.sourceforge.net/project/saxpath/saxpath/1.0%20FCS/saxpath-1.0.tar.gz";
+        hash = "sha256-GFi0wklvtvbuv0CIogsrgvtbs4O6o9cR/xfIpFL4JO0=";
+    };
+
+    nativeBuildInputs = [jdk6 ant_1_7];
+
+    env = {
+        JAVA_HOME="${jdk6}";
+        #CLASSPATH="${commons-logging_1_0}/commons-logging.jar:${commons-collections_2_0}/commons-collections.jar:${commons-beanutils_1_4}/commons-beanutils.jar";
+    };
+
+    buildPhase = ''
+        rm saxpath.jar
+        mkdir /build/source/src/conf
+        touch /build/source/src/conf/MANIFEST.MF
+        ant package
+    '';
+
+    installPhase = ''
+        mkdir $out
+        cp -r ./build/saxpath.jar $out/saxpath.jar
+    '';
+}
--- a/maven/maven-bootstrap-2.nix
+++ b/maven/maven-bootstrap-2.nix
@ -0,0 +1,38 @@
+{stdenv, fetchFromGitHub, jdk6}: stdenv.mkDerivation rec {
+    pname = "maven";
+    version = "2.0.0-SNAPSHOT";
+
+    src = fetchFromGitHub {
+        owner = "apache";
+        repo = pname;
+        rev = "441108375c3d2bb41da59c0cbacabb831165204b";
+        hash = "sha256-+M6Yo6Au11VvwRyu79Q/eA2sQFSY5+ZGz6+M49bLYJ8=";
+    };
+
+    #patches = [./maven_2.patch];
+
+    settings = ./settings.xml;
+
+    nativeBuildInputs = [jdk6];
+
+    env = {
+        JAVA_HOME="${jdk6}";
+        #M2_HOME="/build/mvn-bootstrap";
+        MAVEN_OPTS="-Dmaven.online=false";
+    };
+
+    configurePhase = ''
+        #mkdir /build/.m2
+        #ln -s ${settings} /build/.m2/settings.xml
+    '';
+
+    buildPhase = ''
+        chmod +x m2-bootstrap-all.sh
+        ./m2-bootstrap-all.sh
+    '';
+
+    installPhase = ''
+        mkdir $out
+        cp -r ./dist/* $out/
+    '';
+}
--- a/maven/maven-bootstrap.nix
+++ b/maven/maven-bootstrap.nix
@ -0,0 +1,39 @@
+{stdenv, fetchFromGitHub, jdk6, mavenDep, junit_3_8_1, maven_1}: stdenv.mkDerivation rec {
+    pname = "maven";
+    version = "2.0.0-SNAPSHOT";
+
+    src = fetchFromGitHub {
+        owner = "apache";
+        repo = pname;
+        rev = "fbaa75cd2103a8afcee2039a433ab5006c1580f2";
+        hash = "sha256-4YjRQNLpMmrOXVhlAwOnyClDGh2he/5Bw/6quiynUnc=";
+    };
+
+    #patches = [./maven_2.patch];
+
+    settings = ./maven.properties;
+
+    nativeBuildInputs = [jdk6 maven_1
+    (mavenDep junit_3_8_1 {})];
+
+    env = {
+        JAVA_HOME="${jdk6}";
+        #M2_HOME="/build/mvn-bootstrap";
+        #MAVEN_OPTS="-Dmaven.online=false";
+    };
+
+    configurePhase = ''
+        #mkdir /build/.m2
+        ln -s ${settings} /build/maven.properties
+    '';
+
+    buildPhase = ''
+        chmod +x m2-bootstrap-all.sh
+        ./m2-bootstrap-all.sh
+    '';
+
+    installPhase = ''
+        mkdir $out
+        cp -r ./dist/* $out/
+    '';
+}
--- a/maven/maven.nix
+++ b/maven/maven.nix
@ -0,0 +1,34 @@
+{stdenv, fetchFromGitHub, jdk6, maven_2}: stdenv.mkDerivation rec {
+    pname = "maven";
+    version = "2.0.8";
+
+    src = fetchFromGitHub {
+        owner = "apache";
+        repo = pname;
+        rev = "14a3ddb228af67b7ae1dbcfd871a43f972fbc85d";
+        hash = "sha256-IraSjdx5MFy+aOxeVP4wKb63a1jzK4nbsGuJEwtdJHU=";
+    };
+
+    settings = ./settings.xml;
+
+    nativeBuildInputs = [jdk6 maven_2];
+
+    env = {
+        JAVA_HOME="${jdk6}";
+        MAVEN_OPTS="-Dmaven.online=false";
+    };
+
+    configurePhase = ''
+        mkdir /build/.m2
+        ln -s ${settings} /build/.m2/settings.xml
+    '';
+
+    buildPhase = ''
+        ./bootstrap.sh
+    '';
+
+    installPhase = ''
+        mkdir $out
+        cp -r ./dist/* $out/
+    '';
+}
--- a/maven/maven.properties
+++ b/maven/maven.properties
@ -0,0 +1 @@
+maven.repo.local = /build/.maven/repository
--- a/maven/mavenDep.nix
+++ b/maven/mavenDep.nix
--- a/maven/mavenDepHook.nix
+++ b/maven/mavenDepHook.nix
--- a/maven/mavenDepHook.sh
+++ b/maven/mavenDepHook.sh
--- a/maven/maven_1.nix
+++ b/maven/maven_1.nix
@ -0,0 +1,38 @@
+{stdenv, fetchsvn, jdk6, mavenDep, ant_1_7, dom4j, jaxen}: stdenv.mkDerivation rec {
+    pname = "maven";
+    version = "1.1";
+
+    src = fetchsvn {
+        url = "https://svn.apache.org/repos/asf/maven/maven-1/trunks";
+        rev = "1928317";
+        hash = "sha256-5nrPj6llsagYWZiuzwPjsCuyzioMew6AzHXACBzFvtI=";
+    };
+
+    #patches = [./maven_2.patch];
+
+    settings = ./settings.xml;
+
+    nativeBuildInputs = [jdk6 ant_1_7
+    (mavenDep dom4j {})];
+
+    env = {
+        JAVA_HOME="${jdk6}";
+        MAVEN_HOME="/build/mvn";
+        #MAVEN_OPTS="-Dmaven.online=false";
+    };
+
+    configurePhase = ''
+        mkdir -p /build/.maven/repository/maven/jars
+        ln -s /build/.maven/repository/dom4j/jars/dom4j-1.6.1.jar /build/.maven/repository/maven/jars/dom4j-1.7-20060614.jar
+    '';
+
+    buildPhase = ''
+        cd core
+        ant -f build-bootstrap.xml
+    '';
+
+    installPhase = ''
+        mkdir $out
+        cp -r ./dist/* $out/
+    '';
+}
--- a/maven/maven_1_0_2.nix
+++ b/maven/maven_1_0_2.nix
@ -0,0 +1,51 @@
+{stdenv, fetchsvn, jdk6, mavenDep, ant_1_7, commons-lang, commons-logging_1_0_3, commons-httpclient_2,
+dom4j, ant_1_5_3, ant-optional_1_5_3, commons-betwixt, commons-digester_1_4_1, commons-jelly, commons-jelly-tags-ant,
+commons-jelly-tags-define, commons-jelly-tags-util, commons-jelly-tags-xml}: stdenv.mkDerivation rec {
+    pname = "maven";
+    version = "1.0.2";
+
+    src = fetchsvn {
+        url = "https://svn.apache.org/repos/asf/maven/maven-1/core/tags/MAVEN_1_0_2";
+        rev = "1928317";
+        hash = "sha256-fueknKeqmPn0ouJrEU6PNA97JvJMuB4P013c5eyjUK8=";
+    };
+
+    #patches = [./maven_2.patch];
+
+    settings = ./settings.xml;
+
+    nativeBuildInputs = [jdk6 ant_1_7
+    (mavenDep commons-lang {})
+    (mavenDep commons-httpclient_2 {})
+    (mavenDep commons-logging_1_0_3 {})
+    (mavenDep dom4j {})
+    (mavenDep ant_1_5_3 {})
+    (mavenDep ant-optional_1_5_3 {})
+    (mavenDep commons-betwixt {})
+    (mavenDep commons-digester_1_4_1 {})
+    (mavenDep commons-jelly {})
+    (mavenDep commons-jelly-tags-ant {})
+    (mavenDep commons-jelly-tags-define {})
+    (mavenDep commons-jelly-tags-util {})
+    (mavenDep commons-jelly-tags-xml {})];
+
+    env = {
+        JAVA_HOME="${jdk6}";
+        MAVEN_HOME="/build/mvn";
+        #MAVEN_OPTS="-Dmaven.online=false";
+    };
+
+    configurePhase = ''
+        #mkdir -p /build/.maven/repository/maven/jars
+        ln -s /build/.maven/repository/dom4j/jars/dom4j-1.6.1.jar /build/.maven/repository/dom4j/jars/dom4j-1.4-dev-8.jar
+    '';
+
+    buildPhase = ''
+        ant -f build-bootstrap.xml
+    '';
+
+    installPhase = ''
+        mkdir $out
+        cp -r ./dist/* $out/
+    '';
+}
--- a/maven/maven_2.nix
+++ b/maven/maven_2.nix
@ -0,0 +1,37 @@
+{stdenv, fetchFromGitHub, jdk6}: stdenv.mkDerivation rec {
+    pname = "maven";
+    version = "2.0.0";
+
+    src = fetchFromGitHub {
+        owner = "apache";
+        repo = pname;
+        rev = "d783c5fc419c365d8c8799148db122122727212a";
+        hash = "sha256-9hFBvjn7DqDik3IhIi43Ryf5+TkCtoYTDl+2I6SGjeQ=";
+    };
+
+    patches = [./maven_2.patch];
+
+    settings = ./settings.xml;
+
+    nativeBuildInputs = [jdk6];
+
+    env = {
+        JAVA_HOME="${jdk6}";
+        M2_HOME="/build/mvn-bootstrap";
+        #MAVEN_OPTS="-Dmaven.online=false";
+    };
+
+    configurePhase = ''
+        mkdir /build/.m2
+        ln -s ${settings} /build/.m2/settings.xml
+    '';
+
+    buildPhase = ''
+        ./m2-bootstrap-all.sh
+    '';
+
+    installPhase = ''
+        mkdir $out
+        cp -r ./dist/* $out/
+    '';
+}
--- a/maven/maven_2.patch
+++ b/maven/maven_2.patch
@ -0,0 +1,19 @@
+diff --git a/maven-mboot2/pom.xml b/maven-mboot2/pom.xml
+index c4ffb28..7b142ff 100644
+--- a/maven-mboot2/pom.xml
+++ b/maven-mboot2/pom.xml
+@@ -3,12 +3,12 @@
+   <parent>
+     <artifactId>maven</artifactId>
+     <groupId>org.apache.maven</groupId>
+-    <version>2.0-beta-4-SNAPSHOT</version>
+    <version>2.0</version>
+   </parent>
+   <modelVersion>4.0.0</modelVersion>
+   <groupId>org.apache.maven</groupId>
+   <artifactId>maven-mboot</artifactId>
+-  <version>2.0-beta-4-SNAPSHOT</version>
+  <version>2.0</version>
+   <name>Maven MBoot</name>
+   <description>Tool used to bootstrap m2.</description>
+   <dependencies>
--- a/maven/settings.xml
+++ b/maven/settings.xml
@ -0,0 +1,3 @@
+<settings>
+    <localRepository>/build/mvn</localRepository>
+</settings>
--- a/overlay.nix
+++ b/overlay.nix
@ -154,26 +154,86 @@ bommels = pkgs.lib.makeScope pkgs.newScope (self: rec {
  junit_4 = self.callPackage ./java/junit_4.nix { inherit ant_1_6_5 jdk6; };
  ant_1_7 = self.callPackage ./ant/ant_1_7.nix { inherit jdk6 junit_4; };

+  junit_3_8_1 = self.callPackage ./java/junit_3_8_1.nix { inherit jdk6 ant_1_7; };
+
+  commons-lang = self.callPackage ./java/commons-lang.nix { inherit jdk6 ant_1_7; };
+  commons-logging_1_0 = self.callPackage ./java/commons-logging_1_0.nix { inherit jdk6 ant_1_7; };
+  commons-collections_2_0 = self.callPackage ./java/commons-collections_2_0.nix { inherit jdk6 ant_1_7; };
+  commons-collections_2_1 = self.callPackage ./java/commons-collections_2_1.nix { inherit jdk6 ant_1_7; };
+
+  #maven_2 = self.callPackage ./maven/maven_2.nix { inherit jdk6; };
+  dom4j = self.callPackage ./java/dom4j.nix { inherit jdk6 ant_1_7; };
+  commons-logging_1_0_3 = self.callPackage ./java/commons-logging_1_0_3.nix { inherit jdk6 ant_1_7; };
+  commons-httpclient_2 = self.callPackage ./java/commons-httpclient_2.nix { inherit jdk6 ant_1_7 commons-logging_1_0_3; };
+  ant_1_5_3 = self.callPackage ./ant/ant_1_5_3.nix { inherit jdk6 ant_1_7; };
+  ant-optional_1_5_3 = self.callPackage ./ant/ant-optional_1_5_3.nix { inherit ant_1_5_3; };
+
+  commons-logging_1_0_2 = self.callPackage ./java/commons-logging_1_0_2.nix { inherit jdk6 ant_1_7; };
+  commons-beanutils_1_5 = self.callPackage ./java/commons-beanutils_1_5.nix { inherit jdk6 ant_1_7 commons-logging_1_0
+    commons-collections_2_0; };
+  commons-beanutils_1_4 = self.callPackage ./java/commons-beanutils_1_4.nix { inherit jdk6 ant_1_7 commons-logging_1_0
+    commons-collections_2_0; };
+  commons-digester_1_3 = self.callPackage ./java/commons-digester_1_3.nix { inherit jdk6 ant_1_7 commons-logging_1_0 commons-collections_2_0
+    commons-beanutils_1_4; };
+  commons-betwixt = self.callPackage ./java/commons-betwixt.nix { inherit jdk6 ant_1_7 commons-logging_1_0_2 commons-beanutils_1_5
+    commons-collections_2_1 commons-digester_1_3 junit_3_8_1; };
+
+  commons-beanutils_1_6 = self.callPackage ./java/commons-beanutils_1_6.nix { inherit jdk6 ant_1_7 commons-logging_1_0
+    commons-collections_2_0; };
+  commons-digester_1_4_1 = self.callPackage ./java/commons-digester_1_4_1.nix { inherit jdk6 ant_1_7 commons-logging_1_0
+  commons-collections_2_1 commons-beanutils_1_6; };
+  junit_3_7 = self.callPackage ./java/junit_3_7.nix { inherit jdk6 ant_1_7; };
+
+  commons-cli-bootstrap = self.callPackage ./java/commons-cli-bootstrap.nix { inherit jdk6 ant_1_7 commons-lang; };
+  commons-jexl = self.callPackage ./java/commons-jexl.nix { inherit jdk6 ant_1_7 commons-logging_1_0 junit_3_8_1; };
+  commons-discovery = self.callPackage ./java/commons-discovery.nix { inherit jdk6 ant_1_7 commons-logging_1_0_3; };
+  saxpath = self.callPackage ./java/saxpath.nix { inherit jdk6 ant_1_7; };
+  jaxen = self.callPackage ./java/jaxen.nix { inherit jdk6 ant_1_7 saxpath dom4j; };
+  commons-jelly = self.callPackage ./java/jelly/commons-jelly.nix { inherit jdk6 ant_1_7 commons-logging_1_0_3 commons-cli-bootstrap
+    dom4j commons-collections_2_1 commons-beanutils_1_6 commons-jexl commons-discovery jaxen saxpath junit_3_7; };
+  commons-grant = self.callPackage ./java/commons-grant.nix { inherit jdk6 ant_1_7; };
+  commons-jelly-tags-junit = self.callPackage ./java/jelly/commons-jelly-tags-junit.nix { inherit jdk6 ant_1_7 commons-jelly
+    commons-logging_1_0_3 junit_3_8_1 jaxen saxpath dom4j commons-collections_2_1 commons-beanutils_1_6 commons-jexl ; };
+  commons-jelly-tags-util = self.callPackage ./java/jelly/commons-jelly-tags-util.nix { inherit jdk6 ant_1_7 commons-jelly
+    commons-logging_1_0_3 commons-beanutils_1_6 dom4j junit_3_8_1 commons-jelly-tags-junit commons-collections_2_1 commons-jexl
+    jaxen saxpath; };
+  commons-jelly-tags-ant = self.callPackage ./java/jelly/commons-jelly-tags-ant.nix { inherit jdk6 ant_1_7 commons-jelly
+    commons-logging_1_0_3 commons-beanutils_1_6 commons-grant dom4j; };
+  commons-jelly-tags-log = self.callPackage ./java/jelly/commons-jelly-tags-log.nix { inherit jdk6 ant_1_7 commons-jelly
+    commons-logging_1_0_3 junit_3_8_1 commons-jelly-tags-junit dom4j commons-collections_2_1 commons-beanutils_1_6 commons-jexl; };
+  commons-jelly-tags-xml = self.callPackage ./java/jelly/commons-jelly-tags-xml.nix { inherit jdk6 ant_1_7 commons-jelly
+    commons-logging_1_0_3 dom4j jaxen saxpath junit_3_8_1 commons-jelly-tags-junit commons-collections_2_1 commons-beanutils_1_6
+    commons-jexl; };
+  commons-jelly-tags-dynabean = self.callPackage ./java/jelly/commons-jelly-tags-dynabean.nix { inherit jdk6 ant_1_7 commons-jelly
+    commons-logging_1_0_3 commons-beanutils_1_6 junit_3_8_1 commons-jelly-tags-junit dom4j commons-collections_2_1 commons-jexl; };
+  commons-jelly-tags-define = self.callPackage ./java/jelly/commons-jelly-tags-define.nix { inherit jdk6 ant_1_7 commons-jelly
+    commons-logging_1_0_3 commons-beanutils_1_6 junit_3_8_1 dom4j commons-jelly-tags-junit commons-collections_2_1 commons-jexl
+    commons-jelly-tags-log commons-jelly-tags-xml jaxen saxpath commons-jelly-tags-dynabean; };
+
+  maven_1 = self.callPackage ./maven/maven_1_0_2.nix { inherit jdk6 ant_1_7 commons-lang commons-logging_1_0_3
+    commons-httpclient_2 dom4j ant_1_5_3 ant-optional_1_5_3 commons-betwixt commons-digester_1_4_1 commons-jelly commons-jelly-tags-ant
+    commons-jelly-tags-define commons-jelly-tags-util commons-jelly-tags-xml; };
+  maven_2 = self.callPackage ./maven/maven-bootstrap.nix { inherit jdk6 junit_3_8_1 maven_1; };
+  maven = self.callPackage ./maven/maven.nix { inherit jdk6 maven_2; };
+
  ivyDepHook = self.callPackage ./ant/ivyDepHook.nix { };
  ivyDep = dep: args: (import ./ant/ivyDep.nix { inherit ivyDepHook; stdenv = pkgs.stdenv; }) dep args;
-  mavenDepHook = self.callPackage ./ant/mavenDepHook.nix { };
-  mavenDep = dep: args: (import ./ant/mavenDep.nix { inherit mavenDepHook; stdenv = pkgs.stdenv; }) dep args;
+  mavenDepHook = self.callPackage ./maven/mavenDepHook.nix { };
+  mavenDep = dep: args: (import ./maven/mavenDep.nix { inherit mavenDepHook; stdenv = pkgs.stdenv; }) dep args;

  ant_1_6 = self.callPackage ./ant/ant_1_6.nix { inherit jdk6 ant_1_7; };
-  commons-lang = self.callPackage ./java/commons-lang.nix { inherit jdk6 ant_1_7; };
-  commons-cli = self.callPackage ./java/commons-cli.nix { inherit jdk6 ant_1_7 commons-lang; };
-  junit_3_8_1 = self.callPackage ./java/junit_3_8_1.nix { inherit jdk6 ant_1_7; };
+  commons-cli = self.callPackage ./java/commons-cli.nix { inherit jdk6 ant_1_7 maven commons-lang; };
  commons-logging_1_1 = self.callPackage ./java/commons-logging_1_1.nix { inherit jdk6 ant_1_7 junit_3_8_1; };
  commons-codec = self.callPackage ./java/commons-codec.nix { inherit jdk6 ant_1_7; };
  commons-httpclient_3 = self.callPackage ./java/commons-httpclient_3.nix { inherit jdk6 ant_1_7 commons-logging_1_1 commons-codec; };
  oro = self.callPackage ./java/oro.nix { inherit jdk6 ant_1_7; };
  commons-logging_1_0_4 = self.callPackage ./java/commons-logging_1_0_4.nix { inherit jdk6 ant_1_7; };
  commons-httpclient_2_0_2 = self.callPackage ./java/commons-httpclient_2_0_2.nix { inherit jdk6 ant_1_7 commons-logging_1_0_4; };
-  commons-collections = self.callPackage ./java/commons-collections.nix { inherit jdk6 ant_1_7; };
+  commons-collections_3_1 = self.callPackage ./java/commons-collections_3_1.nix { inherit jdk6 ant_1_7; };
  commons-net = self.callPackage ./java/commons-net.nix { inherit jdk6 ant_1_7 oro; };
  jsch_0_1_23 = self.callPackage ./java/jsch_0_1_23.nix { inherit jdk6 ant_1_7; };
  commons-vfs = self.callPackage ./java/commons-vfs.nix { inherit jdk6 ant_1_7 commons-logging_1_0_4
-    commons-httpclient_2_0_2 commons-collections commons-net jsch_0_1_23; };
+    commons-httpclient_2_0_2 commons-collections_3_1 commons-net jsch_0_1_23; };
  jsch_0_1_25 = self.callPackage ./java/jsch_0_1_25.nix { inherit jdk6 ant_1_7; };
  junit_3_8_2 = self.callPackage ./java/junit_3_8_2.nix { inherit jdk6 ant_1_7; };
  xerces = self.callPackage ./java/xerces.nix { inherit jdk6 ant_1_7; };