updated classpath, fixed some small errors

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@195109 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/contrib/mathml/build.sh b/contrib/mathml/build.sh
index 76426a9d1ffb3de81ca4fa81ab6ab3ea4dd67b50..e68eee93a0e474059a0c5e3e5648d01f1dfe450e 100755 (executable)
--- a/contrib/mathml/build.sh
+++ b/contrib/mathml/build.sh
@@ -12,7 +12,7 @@ if [ "$JAVA_HOME" = "" ] ; then
   exit 1
 fi
 LIBDIR=../../lib
-LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:$LIBDIR/ant.jar:$LIBDIR/batik.jar:$LIBDIR/buildtools.jar:$LIBDIR/xerces-1.4.3.jar:$LIBDIR/xalan-2.2D11.jar:../../build/fop.jar:$LIBDIR/avalon-framework-cvs-20020806.jar:lib/jeuclid.jar
+LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:$LIBDIR/ant.jar:$LIBDIR/batik.jar:$LIBDIR/buildtools.jar:$LIBDIR/xercesImpl-2.0.1.jar:$LIBDIR/xalan-2.2D11.jar:$LIBDIR/xml-apis.jar:../../build/fop.jar:$LIBDIR/avalon-framework-cvs-20020806.jar:lib/jeuclid.jar
 ANT_HOME=$LIBDIR
 
 echo

diff --git a/contrib/mathml/src/org/apache/fop/mathml/MathMLElement.java b/contrib/mathml/src/org/apache/fop/mathml/MathMLElement.java
index 2cfa76e9cfa1cec51a6f9ca85e8f78948a5b9356..066b7b54c24c5cc28b3d116ceca3e454062e494c 100644 (file)
--- a/contrib/mathml/src/org/apache/fop/mathml/MathMLElement.java
+++ b/contrib/mathml/src/org/apache/fop/mathml/MathMLElement.java
@@ -63,7 +63,7 @@ public class MathMLElement extends MathMLObj {
                 doc = svgDoc;
             }
         } catch (Throwable t) {
-            log.error("Could not convert MathML to SVG", t);
+            userAgent.getLogger().error("Could not convert MathML to SVG", t);
             width = 0;
             height = 0;
         }

diff --git a/contrib/plan/build.sh b/contrib/plan/build.sh
index 481da7369f52249f2d9bcccc93c99203c3e6a6ea..82972e6eb6f536aef8203a3a2bdbff9da5781396 100755 (executable)
--- a/contrib/plan/build.sh
+++ b/contrib/plan/build.sh
@@ -12,7 +12,7 @@ if [ "$JAVA_HOME" = "" ] ; then
   exit 1
 fi
 LIBDIR=../../lib
-LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:$LIBDIR/ant.jar:$LIBDIR/batik.jar:$LIBDIR/buildtools.jar:$LIBDIR/xerces-1.4.3.jar:$LIBDIR/xalan-2.2D11.jar:../../build/fop.jar:$LIBDIR/avalon-framework-cvs-20020806.jar
+LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:$LIBDIR/ant.jar:$LIBDIR/batik.jar:$LIBDIR/buildtools.jar:$LIBDIR/xercesImpl-2.0.1.jar:$LIBDIR/xalan-2.2D11.jar:$LIBDIR/xml-apis.jar:../../build/fop.jar:$LIBDIR/avalon-framework-cvs-20020806.jar
 ANT_HOME=$LIBDIR
 
 echo

diff --git a/contrib/plan/src/org/apache/fop/plan/SimplePlanDrawer.java b/contrib/plan/src/org/apache/fop/plan/SimplePlanDrawer.java
index e67ca944727ca6e3ff1b573dde31122209b051f7..237a587498034cdbbc816cf8d10d49e115c0b1ff 100644 (file)
--- a/contrib/plan/src/org/apache/fop/plan/SimplePlanDrawer.java
+++ b/contrib/plan/src/org/apache/fop/plan/SimplePlanDrawer.java
@@ -275,7 +275,7 @@ public class SimplePlanDrawer implements PlanDrawer {
         line = SVGUtilities.createLine(doc,
                                        (float)(200 + (currentDays + 0.5) * 300 / 35), graphTop,
                                        (float)(200 + (currentDays + 0.5) * 300 / 35), height);
-        line.setAttributeNS(null, "style", "fill:none;stroke:rgb(200,50,50);stroke-dasharray:5 5");
+        line.setAttributeNS(null, "style", "fill:none;stroke:rgb(200,50,50);stroke-dasharray:5,5");
         svgRoot.appendChild(line);