fixed compile errors

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

4 files changed, 11 insertions, 14 deletions

diff --git a/contrib/plan/build.sh b/contrib/plan/build.sh
index e8f0cae7e..65f922a67 100755
--- 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/logkit-1.0.jar
+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-20020315.jar
 ANT_HOME=$LIBDIR
 
 echo
diff --git a/contrib/servlet/build.xml b/contrib/servlet/build.xml
index be58e29ab..86e525355 100644
--- a/contrib/servlet/build.xml
+++ b/contrib/servlet/build.xml
@@ -2,7 +2,7 @@
 <project default="package" basedir=".">
 	<property name="Name" value="Fop Servlet"/>
 	<property name="name" value="fopservlet"/>
-	<property name="version" value="0.20.4cvs"/>
+	<property name="version" value="0.2cvs"/>
 	<!-- compiler switches -->
 	<property name="build.compiler" value="classic"/>
 	<property name="debug" value="off"/>
diff --git a/contrib/servlet/src/FopPrintServlet.java b/contrib/servlet/src/FopPrintServlet.java
index 792a14d9c..a02c3984c 100644
--- a/contrib/servlet/src/FopPrintServlet.java
+++ b/contrib/servlet/src/FopPrintServlet.java
@@ -18,10 +18,10 @@ import org.xml.sax.InputSource;
 import org.xml.sax.XMLReader;
 
 import org.apache.fop.apps.Driver;
-import org.apache.fop.layout.Page;
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.area.PageViewport;
 import org.apache.fop.apps.Version;
 import org.apache.fop.apps.XSLTInputHandler;
-import org.apache.fop.messaging.MessageHandler;
 
 import org.apache.fop.render.awt.AWTRenderer ;
 
@@ -61,7 +61,6 @@ public class FopPrintServlet extends HttpServlet {
                       HttpServletResponse response) throws ServletException {
         if (log == null) {
             log = new ConsoleLogger(ConsoleLogger.LEVEL_WARN);
-            MessageHandler.setScreenLogger(log);
         }
 
         try {
@@ -185,17 +184,17 @@ public class FopPrintServlet extends HttpServlet {
             }
         }
 
-        public void stopRenderer(OutputStream outputStream)
+        public void stopRenderer()
         throws IOException {
-            super.stopRenderer(outputStream);
+            super.stopRenderer();
 
             if (endNumber == -1)
                 endNumber = getPageCount();
 
             Vector numbers = getInvalidPageNumbers();
             for (int i = numbers.size() - 1; i > -1; i--)
-                removePage(
-                  Integer.parseInt((String) numbers.elementAt(i)));
+                //removePage(
+                //  Integer.parseInt((String) numbers.elementAt(i)));
 
             try {
                 printerJob.print();
@@ -206,9 +205,9 @@ public class FopPrintServlet extends HttpServlet {
             }
         }
 
-        public void renderPage(Page page) {
-            pageWidth = (int)((float) page.getWidth() / 1000f);
-            pageHeight = (int)((float) page.getHeight() / 1000f);
+        public void renderPage(PageViewport page) throws IOException, FOPException {
+            pageWidth = (int)((float) page.getViewArea().getWidth() / 1000f);
+            pageHeight = (int)((float) page.getViewArea().getHeight() / 1000f);
             super.renderPage(page);
         }
 
diff --git a/contrib/servlet/src/FopServlet.java b/contrib/servlet/src/FopServlet.java
index d3043bd9d..28680e812 100644
--- a/contrib/servlet/src/FopServlet.java
+++ b/contrib/servlet/src/FopServlet.java
@@ -16,7 +16,6 @@ import org.xml.sax.XMLReader;
 import org.apache.fop.apps.Driver;
 import org.apache.fop.apps.Version;
 import org.apache.fop.apps.XSLTInputHandler;
-import org.apache.fop.messaging.MessageHandler;
 
 import org.apache.avalon.framework.logger.ConsoleLogger;
 import org.apache.avalon.framework.logger.Logger;
@@ -52,7 +51,6 @@ public class FopServlet extends HttpServlet {
                       HttpServletResponse response) throws ServletException {
         if (log == null) {
             log = new ConsoleLogger(ConsoleLogger.LEVEL_WARN);
-            MessageHandler.setScreenLogger(log);
         }
         try {
             String foParam = request.getParameter(FO_REQUEST_PARAM);