From ac64ef22752f401b5aafcf8044ee28ce66efbd42 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Wed, 11 Nov 2009 15:52:26 +0000
Subject: [PATCH] Upgraded JBoss to 5.1.0

svn path=/nixpkgs/trunk/; revision=18329
---
 pkgs/servers/http/jboss/builder.sh  | 15 ---------------
 pkgs/servers/http/jboss/default.nix | 29 ++++++++++++++++++-----------
 pkgs/top-level/all-packages.nix     |  2 +-
 3 files changed, 19 insertions(+), 27 deletions(-)
 delete mode 100644 pkgs/servers/http/jboss/builder.sh

diff --git a/pkgs/servers/http/jboss/builder.sh b/pkgs/servers/http/jboss/builder.sh
deleted file mode 100644
index 33562000919..00000000000
--- a/pkgs/servers/http/jboss/builder.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-buildInputs="$jdk5"
-source $stdenv/setup
-
-export JDK_HOME=$jdk5
-export JAVA_HOME=$jdk5
-
-tar xfvz $src
-cd jboss-*
-cd build
-sh build.sh
-ensureDir $out
-cp -av output/jboss-*/* $out
-
-# Insert JAVA_HOME variable to make sure the latest JRE is used and not version 5
-sed -i -e "/GREP/aJAVA_HOME=$jdk" $out/bin/run.sh
diff --git a/pkgs/servers/http/jboss/default.nix b/pkgs/servers/http/jboss/default.nix
index 279e4bfae71..41eff4cf967 100644
--- a/pkgs/servers/http/jboss/default.nix
+++ b/pkgs/servers/http/jboss/default.nix
@@ -1,20 +1,27 @@
-{ stdenv, fetchurl, jdk5, jdk }:
+{ stdenv, fetchurl, unzip, jdk, lib }:
 
 stdenv.mkDerivation {
-  name = "jboss-4.2.2.GA";
-
-  builder = ./builder.sh;
-  src = 
-    fetchurl {
-      url = http://garr.dl.sourceforge.net/sourceforge/jboss/jboss-4.2.2.GA-src.tar.gz;
-      md5 = "2a626cdccabe712628555676d67ad44a";
-    };
-
-  inherit jdk5 jdk;
+  name = "jboss-5.1.0.GA";
+  src = fetchurl {
+    url = mirror://sourceforge/jboss/jboss-5.1.0.GA-jdk6.zip;
+    sha256 = "0wy5666h554x1qq4w0rzg3krp4rqrijq0ql7dkx6qgl3vpj9xr5y";
+  };
 
+  buildInputs = [ unzip ];
+      
+  buildPhase = ''
+    sed -i -e "/GREP/aJAVA_HOME=${jdk}" bin/run.sh
+  '';
+  
+  installPhase = ''
+    ensureDir $out
+    cp -av * $out
+  '';
+  
   meta = {
     homepage = "http://www.jboss.org/";
     description = "JBoss, Open Source J2EE application server";
     license = "GPL/LGPL";
+    maintainers = [ lib.maintainers.sander ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b919aab23c4..6d05c2da967 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5002,7 +5002,7 @@ let
   };
 
   jboss = import ../servers/http/jboss {
-    inherit fetchurl stdenv jdk5 jdk;
+    inherit fetchurl stdenv unzip jdk lib;
   };
 
   jboss_mysql_jdbc = import ../servers/http/jboss/jdbc/mysql {