--- Isabelle2013-orig/lib/Tools/java	2013-02-13 00:31:02.000000000 +1100
+++ Isabelle2013/lib/Tools/java	2015-04-17 12:16:04.734716358 +1000
@@ -6,5 +6,5 @@
 
 CLASSPATH="$(jvmpath "$CLASSPATH")"
 isabelle_jdk java -Dfile.encoding=UTF-8 -server \
-  "-Djava.ext.dirs=$(jvmpath "$ISABELLE_JAVA_EXT:$ISABELLE_HOME/lib/classes/ext")" "$@"
+  "-Djava.ext.dirs=$(jvmpath "$ISABELLE_JAVA_EXT:$ISABELLE_HOME/lib/classes/ext:$(java-config -p scala-2.10 | sed 's@\([^:]*\)/[^:]*:.*@\1@')")" "$@"
 
--- Isabelle2013-orig/lib/Tools/scala	2013-02-13 00:31:02.000000000 +1100
+++ Isabelle2013/lib/Tools/scala	2015-04-17 12:12:21.606890256 +1000
@@ -8,4 +8,4 @@
 
 CLASSPATH="$(jvmpath "$CLASSPATH")"
 isabelle_scala scala -Dfile.encoding=UTF-8 \
-  "-Djava.ext.dirs=$(jvmpath "$ISABELLE_JAVA_EXT:$ISABELLE_HOME/lib/classes/ext")" "$@"
+  "-Djava.ext.dirs=$(jvmpath "$ISABELLE_JAVA_EXT:$ISABELLE_HOME/lib/classes/ext:$(java-config -p scala-2.10 | sed 's@\([^:]*\)/[^:]*:.*@\1@')")" "$@"
--- Isabelle2013-orig/lib/Tools/scalac	2013-02-13 00:31:02.000000000 +1100
+++ Isabelle2013/lib/Tools/scalac	2015-04-17 12:12:36.895871214 +1000
@@ -8,5 +8,5 @@
 
 CLASSPATH="$(jvmpath "$CLASSPATH")"
 isabelle_scala scalac -Dfile.encoding=UTF-8 \
-  "-Djava.ext.dirs=$(jvmpath "$ISABELLE_JAVA_EXT:$ISABELLE_HOME/lib/classes/ext")" "$@"
+  "-Djava.ext.dirs=$(jvmpath "$ISABELLE_JAVA_EXT:$ISABELLE_HOME/lib/classes/ext:$(java-config -p scala-2.10 | sed 's@\([^:]*\)/[^:]*:.*@\1@')")" "$@"
 
--- Isabelle2013-orig/src/Pure/build-jars	2013-02-13 00:31:15.000000000 +1100
+++ Isabelle2013/src/Pure/build-jars	2013-08-18 12:55:51.400924000 +1000
@@ -133,7 +133,7 @@
 declare -a JFREECHART_JARS=()
 for NAME in $JFREECHART_JAR_NAMES
 do
-  JFREECHART_JARS["${#JFREECHART_JARS[@]}"]="$JFREECHART_HOME/lib/$NAME"
+  JFREECHART_JARS["${#JFREECHART_JARS[@]}"]="$NAME"
 done
 
 
--- Isabelle2013-orig/src/Tools/jEdit/lib/Tools/jedit	2013-02-13 00:31:16.000000000 +1100
+++ Isabelle2013/src/Tools/jEdit/lib/Tools/jedit	2013-08-18 16:39:15.495244000 +1000
@@ -214,97 +214,11 @@
 declare -a JFREECHART_JARS=()
 for NAME in $JFREECHART_JAR_NAMES
 do
-  JFREECHART_JARS["${#JFREECHART_JARS[@]}"]="$JFREECHART_HOME/lib/$NAME"
+  JFREECHART_JARS["${#JFREECHART_JARS[@]}"]="$NAME"
 done
 
-
-# target
-
-TARGET="dist/jars/Isabelle-jEdit.jar"
-
-declare -a UPDATED=()
-
-if [ "$BUILD_JARS" = jars_fresh ]; then
-  OUTDATED=true
-else
-  OUTDATED=false
-  if [ ! -e "$TARGET" ]; then
-    OUTDATED=true
-  else
-    if [ -n "$ISABELLE_JEDIT_BUILD_HOME" ]; then
-      declare -a DEPS=(
-        "$JEDIT_JAR" "${JEDIT_JARS[@]}" "${JFREECHART_JARS[@]}"
-        "$PURE_JAR" "$GRAPHVIEW_JAR" "${SOURCES[@]}" "${RESOURCES[@]}"
-      )
-    elif [ -e "$ISABELLE_HOME/Admin/build" ]; then
-      declare -a DEPS=("$PURE_JAR" "$GRAPHVIEW_JAR" "${SOURCES[@]}" "${RESOURCES[@]}")
-    else
-      declare -a DEPS=()
-    fi
-    for DEP in "${DEPS[@]}"
-    do
-      [ ! -e "$DEP" ] && fail "Missing file: $DEP"
-      [ "$DEP" -nt "$TARGET" ] && {
-        OUTDATED=true
-        UPDATED["${#UPDATED[@]}"]="$DEP"
-      }
-    done
-  fi
-fi
-
-
-# build
-
-if [ "$OUTDATED" = true ]
-then
-  echo "### Building Isabelle/jEdit ..."
-
-  [ "${#UPDATED[@]}" -gt 0 ] && {
-    echo "Changed files:"
-    for FILE in "${UPDATED[@]}"
-    do
-      echo "  $FILE"
-    done
-  }
-
-  [ -z "$ISABELLE_JEDIT_BUILD_HOME" ] && \
-    fail "Unknown ISABELLE_JEDIT_BUILD_HOME -- missing auxiliary component"
-
-  rm -rf dist || failed
-  mkdir -p dist dist/classes || failed
-
-  cp -p -R -f "$ISABELLE_JEDIT_BUILD_HOME/contrib/$ISABELLE_JEDIT_BUILD_VERSION/." dist/.
-  cp -p -R -f "${RESOURCES[@]}" dist/classes/.
-  cp src/jEdit.props dist/properties/.
-  cp -p -R -f src/modes/. dist/modes/.
-
-  perl -i -e 'while (<>) {
-    if (m/NAME="javacc"/) {
-      print qq,<MODE NAME="isabelle" FILE="isabelle.xml" FILE_NAME_GLOB="*.thy"/>\n\n,;
-      print qq,<MODE NAME="isabelle-options" FILE="isabelle-options.xml"/>\n\n,;
-      print qq,<MODE NAME="isabelle-root" FILE="isabelle-root.xml" FILE_NAME_GLOB="ROOT"/>\n\n,; }
-    print; }' dist/modes/catalog
-
-  cp -p -R -f "${JEDIT_JARS[@]}" dist/jars/. || failed
-  (
-    for JAR in "$JEDIT_JAR" "${JEDIT_JARS[@]}" "${JFREECHART_JARS[@]}" "$PURE_JAR" \
-      "$GRAPHVIEW_JAR" "$SCALA_HOME/lib/scala-compiler.jar"
-    do
-      CLASSPATH="$CLASSPATH:$JAR"
-    done
-    CLASSPATH="$(jvmpath "$CLASSPATH")"
-    exec "$SCALA_HOME/bin/scalac" $ISABELLE_SCALA_BUILD_OPTIONS -d dist/classes "${SOURCES[@]}"
-  ) || fail "Failed to compile sources"
-
-  cd dist/classes
-  isabelle_jdk jar cf "../jars/Isabelle-jEdit.jar" * || failed
-  cd ../..
-  rm -rf dist/classes
-fi
-
 popd >/dev/null
 
-
 ## main
 
 if [ "$BUILD_ONLY" = false ]; then
--- Isabelle2013-orig/contrib/jfreechart-1.0.14/etc/settings	2012-12-09 07:23:53.000000000 +1100
+++ Isabelle2013/contrib/jfreechart-1.0.14/etc/settings	2013-08-18 16:18:10.244698000 +1000
@@ -1,7 +1,5 @@
 # -*- shell-script -*- :mode=shellscript:
 
 JFREECHART_HOME="$COMPONENT"
-JFREECHART_JAR_NAMES="iText-2.1.5.jar jcommon-1.0.18.jar jfreechart-1.0.14.jar"
-
-ISABELLE_JAVA_EXT="$ISABELLE_JAVA_EXT:$JFREECHART_HOME/lib"
+JFREECHART_JAR_NAMES="$(java-config -p itext | sed -e 's@:@ @g') $(java-config -p jcommon-1.0 | sed -e 's@:@ @g') $(java-config -p jfreechart-1.0 | sed -e 's@:@ @g')"