Merge branch 'owen' into felix

diff --combined jpctb
index c55f90cbb5c6df97094c5f1062034c404070825c,1356b396f57657a5ec1868d3fdb7ff26b3dcc947..fbc732adef64a539151dd88b22de17f9094fb7ad
--- 1/jpctb
--- 2/jpctb
+++ b/jpctb
@@@ -73,63 -73,15 +73,63 @@@ f
  
  yppdir="${yohoho%/*}"
  
 +cat <<END
 +jpctb:
 +   jpctb tree:         "$jpctbdir"
 +   yohoho:       "$yohoho"
 +END
 +
  if [ -x "$yppdir/java/bin/java" ]; then
 -      javadir="$yppdir/java"
 -elif [ x"$JAVA_HOME" != x ] && [ -x "$JAVA_HOME/bin/java" ]; then
 -      javadir="$JAVA_HOME"
 -else
 -      fail "could not find java runtime system"
 +      if [ test -d "$yppdir/java/jre" ]; then
 +              echo "   yohoho/java/bin and yohoho/java/jre exist, good"
 +              javadir="$yppdir/java"
 +      else
 +              absjava=`readlink -f "$javadir/bin/java"`
 +              cat <<END
 +   yohoho/java/bin exists but yohoho/java/jre does not
 +   abs. java:    "$absjava"
 +END
 +              case "$absjava" in
 +              */jre/bin/java)
 +                      echo "   found jre directory, good"
 +                      javadir="${absjava%/jre/bin/java}"
 +                      ;;
 +              *)
 +                      echo "   java binary not in jre dir as expected, hmm."
 +                      ;;
 +              esac
 +      fi
 +fi
 +
 +if [ "x$javadir" = x ] && [ x"$JAVA_HOME" != x ] && \
 +   [ -x "$JAVA_HOME/bin/java" ]; then
 +cat <<END
 +   yohoho/java/bin/java nonexistent or unsuitable, trying JAVA_HOME"
 +   JAVA_HOME:    "$JAVA_HOME"
 +END
 +      if [ -d "$JAVA_HOME/jre" ]; then
 +              javadir="$JAVA_HOME"
 +      else
 +              echo "   JAVA_HOME has no jre subdirectory, hmm."
 +      fi
 +fi
 +
 +openjdk=/usr/lib/jvm/java-6-openjdk
 +
 +if [ "x$javadir" = x ] && [ -x $openjdk/bin/java ]; then
 +      echo "  using openjdk, hopefully it will work with YPP!"
 +      javadir=$openjdk
 +fi
 +
 +if [ "x$javadir" = x ]; then
 +      fail "could not find java runtime system
 + please check that $yppdir/java points to your Java installation"
  fi
  
  case "$javadir" in
 +/usr) fail "javadir is still /usr (and even found /usr/jre!)
 + please make $yppdir/java point somewhere more sensible and/or
 + reinstall YPP not telling it your java is in /usr.  sorry." ;;
  /*)   ;;
  *)    javadir="$PWD/$javadir" ;;
  esac
@@@ -138,13 -90,13 +138,13 @@@ jtmp="$jpctbdir/tmp
  linkfarm="$jtmp/linkfarm"
  extdir="$jtmp/ext"
  
 +export JPCTB_JRE="$javadir/jre"
 +
  #---------- confirm for the user which paths we're using ----------
  
  cat <<END
 -jpctb:
 -   jpctb tree:         "$jpctbdir"
 -   yohoho:       "$yohoho"
     java:         "$javadir"
 +   JRE:          "$JPCTB_JRE"
     PCTB jars:    "$srcjardir"
     jpctb tmpdir: "$jtmp"
  END
@@@ -159,7 -111,7 +159,7 @@@ rm -rf -- "$jtmp
  mkdir -- "$jtmp" "$extdir" "$linkfarm"
  cp "$srcjardir"/PCTB*.jar "$extdir"
  
- lndir -silent "$javadir" "$linkfarm"
+ cp -Rs "$javadir"/. "$linkfarm"/.
  
  #---------- edit the linkfarm to have our jvm wrapper ----------
  
@@@ -167,6 -119,7 +167,6 @@@ wrapper="$linkfarm"/jre/bin/jav
  rm -- "$wrapper"
  
  export JPCTB_EXTDIR="$extdir"
 -export JPCTB_JRE="$javadir/jre"
  
  cat <<'END' >"$wrapper"
  #!/bin/bash