keiron 02/04/12 00:01:57
Modified: contrib/plan build.sh
contrib/servlet build.xml
contrib/servlet/src FopPrintServlet.java FopServlet.java
Log:
fixed compile errors
Revision Changes Path
1.3 +1 -1 xml-fop/contrib/plan/build.sh
Index: build.sh
===================================================================
RCS file: /home/cvs/xml-fop/contrib/plan/build.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.sh 8 Mar 2002 10:12:30 -0000 1.2
+++ build.sh 12 Apr 2002 07:01:57 -0000 1.3
@@ -12,7 +12,7 @@
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
1.2 +1 -1 xml-fop/contrib/servlet/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-fop/contrib/servlet/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 27 Mar 2002 11:55:52 -0000 1.1
+++ build.xml 12 Apr 2002 07:01:57 -0000 1.2
@@ -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"/>
1.2 +10 -11 xml-fop/contrib/servlet/src/FopPrintServlet.java
Index: FopPrintServlet.java
===================================================================
RCS file: /home/cvs/xml-fop/contrib/servlet/src/FopPrintServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FopPrintServlet.java 27 Mar 2002 11:55:52 -0000 1.1
+++ FopPrintServlet.java 12 Apr 2002 07:01:57 -0000 1.2
@@ -1,5 +1,5 @@
/*
- * $Id: FopPrintServlet.java,v 1.1 2002/03/27 11:55:52 keiron Exp $
+ * $Id: FopPrintServlet.java,v 1.2 2002/04/12 07:01:57 keiron Exp $
* Copyright (C) 2002 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -18,10 +18,10 @@
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 @@
HttpServletResponse response) throws ServletException {
if (log == null) {
log = new ConsoleLogger(ConsoleLogger.LEVEL_WARN);
- MessageHandler.setScreenLogger(log);
}
try {
@@ -185,17 +184,17 @@
}
}
- 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 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);
}
1.2 +1 -3 xml-fop/contrib/servlet/src/FopServlet.java
Index: FopServlet.java
===================================================================
RCS file: /home/cvs/xml-fop/contrib/servlet/src/FopServlet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FopServlet.java 27 Mar 2002 11:55:52 -0000 1.1
+++ FopServlet.java 12 Apr 2002 07:01:57 -0000 1.2
@@ -1,5 +1,5 @@
/*
- * $Id: FopServlet.java,v 1.1 2002/03/27 11:55:52 keiron Exp $
+ * $Id: FopServlet.java,v 1.2 2002/04/12 07:01:57 keiron Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -16,7 +16,6 @@
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 @@
HttpServletResponse response) throws ServletException {
if (log == null) {
log = new ConsoleLogger(ConsoleLogger.LEVEL_WARN);
- MessageHandler.setScreenLogger(log);
}
try {
String foParam = request.getParameter(FO_REQUEST_PARAM);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
