*** nbexec	Fri Apr 24 11:42:28 2009
--- nbexec.new	Fri Apr 24 11:41:14 2009
***************
*** 148,156 ****
  
      case "`uname`" in
          Darwin*)
!         if [ -x /System/Library/Frameworks/JavaVM.framework/Versions/1.5/Home/bin/java ] ; then
!             jdkhome=/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Home
!         fi
          ;;
          *) javac=`which javac`
          if [ -z "$javac" ] ; then
--- 148,172 ----
  
      case "`uname`" in
          Darwin*)
!         jdkhome="/System/Library/Frameworks/JavaVM.framework/Versions/1.5/Home"
!         java_bin=`which java 2>&1`
!         if [ $? -ne 0 ] || [ -n "`echo \"$java_bin\" | grep \"no java in\"`" ] ; then
!             # no java in path... strange
!             java_bin=/usr/bin/java
!         fi
!         if [ -f "$java_bin" ] ; then
!             java_version=`"$java_bin" -fullversion 2>&1`
!             if [ $? -eq 0 ] && [ -n "`echo \"$java_version\" | grep 1.5.0`" ] ; then
!                 # don`t use Developer Preview versions
!                 if [ -z "`echo \"$java_version\" | grep \"1.6.0_b\|1.6.0-b\|1.6.0_01\|1.6.0_04\|-dp\"`" ] ; then
!                     if [ -f "/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home/bin/java" ] ; then
!                         jdkhome="/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Home"
!                     elif [ -f "/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home/bin/java" ] ; then
!                         jdkhome="/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Home"
!                     fi
!                 fi
!             fi
!         fi     
          ;;
          *) javac=`which javac`
          if [ -z "$javac" ] ; then