Cleaning up the java naming conventions

svn path=/nixpkgs/trunk/; revision=3871

pkgs/tools/text/xml/jing/jing-script.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, j2re, unzip} :
+{stdenv, fetchurl, jre, unzip} :
 
 stdenv.mkDerivation {
   name = "jing-tools-20030619";
@@ -8,5 +8,5 @@ stdenv.mkDerivation {
     inherit stdenv fetchurl unzip;
   };
 
-  inherit j2re;
+  inherit jre;
 }

pkgs/tools/text/xml/jing/script-builder.sh

@@ -5,10 +5,10 @@ mkdir -p $out/bin || exit 1
 cat >> $out/bin/jing <<EOF
 #! /bin/sh
 
-export JAVA_HOME=$j2re
+export JAVA_HOME=$jre
 export LANG="en_US"
 
-$j2re/bin/java -jar $jing/bin/jing.jar \$@
+$jre/bin/java -jar $jing/bin/jing.jar \$@
 EOF
 
 chmod a+x $out/bin/jing || exit 1