From c3764a0774f109da45d262ba5f4562585ff4b89a Mon Sep 17 00:00:00 2001 From: Jeremias Maerki Date: Thu, 27 Apr 2006 07:24:31 +0000 Subject: [PATCH] Bugzilla #39416: Fixed classpath for the embedding example. Removed all build.* scripts following Ant best practices. Removed a deprecation warning in ExampleConcat. git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@397464 13f79535-47bb-0310-9956-ffa450edef68 --- examples/embedding/README | 6 +- examples/embedding/build.bat | 50 ---------------- examples/embedding/build.sh | 60 ------------------- examples/embedding/build.xml | 11 ++-- .../embedding/intermediate/ExampleConcat.java | 5 +- examples/mathml/build.bat | 50 ---------------- examples/mathml/build.sh | 60 ------------------- examples/plan/build.bat | 50 ---------------- examples/plan/build.sh | 60 ------------------- 9 files changed, 11 insertions(+), 341 deletions(-) delete mode 100755 examples/embedding/build.bat delete mode 100644 examples/embedding/build.sh delete mode 100755 examples/mathml/build.bat delete mode 100644 examples/mathml/build.sh delete mode 100755 examples/plan/build.bat delete mode 100644 examples/plan/build.sh diff --git a/examples/embedding/README b/examples/embedding/README index d3bb7682d..d82649e2b 100644 --- a/examples/embedding/README +++ b/examples/embedding/README @@ -2,12 +2,12 @@ FOP Embedding Examples Readme This directory contains several examples on using FOP in Java. -To compile the examples you can use the build.bat/build.sh scripts. +To compile the examples you can call "ant" from the directory where +build.xml is found. (Apache Ant must be installed!) You can also directly run the individual examples with these scripts. Just call -Windows: build -projecthelp -Unix: ./build.sh -projecthelp +ant -projecthelp for a listing of all available examples. diff --git a/examples/embedding/build.bat b/examples/embedding/build.bat deleted file mode 100755 index 37630ae2e..000000000 --- a/examples/embedding/build.bat +++ /dev/null @@ -1,50 +0,0 @@ -@echo off -REM Copyright 1999-2004 The Apache Software Foundation -REM -REM Licensed under the Apache License, Version 2.0 (the "License"); -REM you may not use this file except in compliance with the License. -REM You may obtain a copy of the License at -REM -REM http://www.apache.org/licenses/LICENSE-2.0 -REM -REM Unless required by applicable law or agreed to in writing, software -REM distributed under the License is distributed on an "AS IS" BASIS, -REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -REM See the License for the specific language governing permissions and -REM limitations under the License. -REM -REM $Id: build.bat,v 1.2 2004/02/27 19:32:25 jeremias Exp $ - -echo Apache FOP: Build System -echo -------------------------- - -if "%JAVA_HOME%" == "" goto no_java_home -if "%ANT_HOME%" == "" goto no_ant_home - -call %ANT_HOME%\bin\ant.bat %1 %2 %3 %4 %5 %6 %7 %8 - -goto end - -:no_java_home -echo ERROR: JAVA_HOME not found in your environment. -echo Please, set the JAVA_HOME variable in your environment to match the -echo location of the Java Virtual Machine you want to use. -goto end - -:no_ant_home -echo ERROR: ANT_HOME not found in your environment. -echo Please install Apache Ant first. FOP uses Ant as its build system. -echo You can download Apache Ant from http://ant.apache.org -echo 1. Download and install Ant -echo 2. Set the ANT_HOME environment variable to the directory where you've -echo placed Ant. -echo 3. Add "%%ANT_HOME%%\bin" to your PATH so the "ant.bat" batch file -echo can be executed from wherever needed. -echo 4. (optional) Download JUnit and place junit-*.jar in %%ANT_HOME%%\lib. -echo This enables the JUnit test cases. -echo You will now be directed to the Apache Ant website... -pause -start http://ant.apache.org -goto end - -:end diff --git a/examples/embedding/build.sh b/examples/embedding/build.sh deleted file mode 100644 index 3841d4b05..000000000 --- a/examples/embedding/build.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh -# Copyright 1999-2004 The Apache Software Foundation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# $Id: build.sh,v 1.2 2004/02/27 19:32:25 jeremias Exp $ - -# This file should be executable. - -echo -echo "Apache FOP: Build System" -echo "--------------------------" -echo - -if [ "$JAVA_HOME" = "" ] ; then - echo "ERROR: JAVA_HOME not found in your environment." - echo - echo "Please, set the JAVA_HOME variable in your environment to match the" - echo "location of the Java Virtual Machine you want to use." - exit 1 -fi - -if [ "$ANT_HOME" = "" ] ; then - echo "ERROR: ANT_HOME not found in your environment." - echo - echo "Please install Apache Ant first. FOP uses Ant as its build system." - echo "You can download Apache Ant from http://ant.apache.org" - echo "1. Download and install Ant" - echo "2. Set the ANT_HOME environment variable to the directory where you've" - echo " placed Ant." - echo "3. Add "\$ANT_HOME/bin" to your PATH so the "ant" script file" - echo " can be be executed from wherever needed." - echo "4. (optional) Download JUnit and place junit-*.jar in \$ANT_HOME/lib." - echo " This enables the JUnit test cases." - exit 1 -fi - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false; -case "`uname`" in - CYGWIN*) cygwin=true ;; -esac - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$ANT_HOME" ] && - ANT_HOME=`cygpath --unix "$ANT_HOME"` -fi -"$ANT_HOME"/bin/ant "$@" - diff --git a/examples/embedding/build.xml b/examples/embedding/build.xml index 11d803c09..42fcbfd95 100644 --- a/examples/embedding/build.xml +++ b/examples/embedding/build.xml @@ -1,6 +1,6 @@ - + - @@ -40,6 +39,7 @@ + @@ -50,9 +50,8 @@ - - - + + diff --git a/examples/embedding/java/embedding/intermediate/ExampleConcat.java b/examples/embedding/java/embedding/intermediate/ExampleConcat.java index 61af4cf65..93fd1c10f 100644 --- a/examples/embedding/java/embedding/intermediate/ExampleConcat.java +++ b/examples/embedding/java/embedding/intermediate/ExampleConcat.java @@ -104,8 +104,9 @@ public class ExampleConcat { OutputStream out = new java.io.FileOutputStream(intermediate); out = new java.io.BufferedOutputStream(out); try { - // Construct fop (the MIME type here is unimportant due to the override on the user agent) - Fop fop = new Fop(MimeConstants.MIME_FOP_AREA_TREE, userAgent, out); + // Construct fop (the MIME type here is unimportant due to the override + // on the user agent) + Fop fop = fopFactory.newFop(null, userAgent, out); // Setup XSLT TransformerFactory factory = TransformerFactory.newInstance(); diff --git a/examples/mathml/build.bat b/examples/mathml/build.bat deleted file mode 100755 index 7378db43e..000000000 --- a/examples/mathml/build.bat +++ /dev/null @@ -1,50 +0,0 @@ -@echo off -REM Copyright 1999-2004 The Apache Software Foundation -REM -REM Licensed under the Apache License, Version 2.0 (the "License"); -REM you may not use this file except in compliance with the License. -REM You may obtain a copy of the License at -REM -REM http://www.apache.org/licenses/LICENSE-2.0 -REM -REM Unless required by applicable law or agreed to in writing, software -REM distributed under the License is distributed on an "AS IS" BASIS, -REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -REM See the License for the specific language governing permissions and -REM limitations under the License. -REM -REM $Id$ - -echo Apache FOP: Build System for MathML extension -echo ----------------------------------------------- - -if "%JAVA_HOME%" == "" goto no_java_home -if "%ANT_HOME%" == "" goto no_ant_home - -call %ANT_HOME%\bin\ant.bat %1 %2 %3 %4 %5 %6 %7 %8 - -goto end - -:no_java_home -echo ERROR: JAVA_HOME not found in your environment. -echo Please, set the JAVA_HOME variable in your environment to match the -echo location of the Java Virtual Machine you want to use. -goto end - -:no_ant_home -echo ERROR: ANT_HOME not found in your environment. -echo Please install Apache Ant first. FOP uses Ant as its build system. -echo You can download Apache Ant from http://ant.apache.org -echo 1. Download and install Ant -echo 2. Set the ANT_HOME environment variable to the directory where you've -echo placed Ant. -echo 3. Add "%%ANT_HOME%%\bin" to your PATH so the "ant.bat" batch file -echo can be executed from wherever needed. -echo 4. (optional) Download JUnit and place junit-*.jar in %%ANT_HOME%%\lib. -echo This enables the JUnit test cases. -echo You will now be directed to the Apache Ant website... -pause -start http://ant.apache.org -goto end - -:end diff --git a/examples/mathml/build.sh b/examples/mathml/build.sh deleted file mode 100644 index c0a108825..000000000 --- a/examples/mathml/build.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh -# Copyright 1999-2004 The Apache Software Foundation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# $Id$ - -# This file should be executable. - -echo -echo "Apache FOP: Build System for MathML extension" -echo "-----------------------------------------------" -echo - -if [ "$JAVA_HOME" = "" ] ; then - echo "ERROR: JAVA_HOME not found in your environment." - echo - echo "Please, set the JAVA_HOME variable in your environment to match the" - echo "location of the Java Virtual Machine you want to use." - exit 1 -fi - -if [ "$ANT_HOME" = "" ] ; then - echo "ERROR: ANT_HOME not found in your environment." - echo - echo "Please install Apache Ant first. FOP uses Ant as its build system." - echo "You can download Apache Ant from http://ant.apache.org" - echo "1. Download and install Ant" - echo "2. Set the ANT_HOME environment variable to the directory where you've" - echo " placed Ant." - echo "3. Add "\$ANT_HOME/bin" to your PATH so the "ant" script file" - echo " can be be executed from wherever needed." - echo "4. (optional) Download JUnit and place junit-*.jar in \$ANT_HOME/lib." - echo " This enables the JUnit test cases." - exit 1 -fi - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false; -case "`uname`" in - CYGWIN*) cygwin=true ;; -esac - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$ANT_HOME" ] && - ANT_HOME=`cygpath --unix "$ANT_HOME"` -fi -"$ANT_HOME"/bin/ant "$@" - diff --git a/examples/plan/build.bat b/examples/plan/build.bat deleted file mode 100755 index 3b0db54ff..000000000 --- a/examples/plan/build.bat +++ /dev/null @@ -1,50 +0,0 @@ -@echo off -REM Copyright 1999-2004 The Apache Software Foundation -REM -REM Licensed under the Apache License, Version 2.0 (the "License"); -REM you may not use this file except in compliance with the License. -REM You may obtain a copy of the License at -REM -REM http://www.apache.org/licenses/LICENSE-2.0 -REM -REM Unless required by applicable law or agreed to in writing, software -REM distributed under the License is distributed on an "AS IS" BASIS, -REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -REM See the License for the specific language governing permissions and -REM limitations under the License. -REM -REM $Id$ - -echo Apache FOP: Build System for plan extension -echo --------------------------------------------- - -if "%JAVA_HOME%" == "" goto no_java_home -if "%ANT_HOME%" == "" goto no_ant_home - -call %ANT_HOME%\bin\ant.bat %1 %2 %3 %4 %5 %6 %7 %8 - -goto end - -:no_java_home -echo ERROR: JAVA_HOME not found in your environment. -echo Please, set the JAVA_HOME variable in your environment to match the -echo location of the Java Virtual Machine you want to use. -goto end - -:no_ant_home -echo ERROR: ANT_HOME not found in your environment. -echo Please install Apache Ant first. FOP uses Ant as its build system. -echo You can download Apache Ant from http://ant.apache.org -echo 1. Download and install Ant -echo 2. Set the ANT_HOME environment variable to the directory where you've -echo placed Ant. -echo 3. Add "%%ANT_HOME%%\bin" to your PATH so the "ant.bat" batch file -echo can be executed from wherever needed. -echo 4. (optional) Download JUnit and place junit-*.jar in %%ANT_HOME%%\lib. -echo This enables the JUnit test cases. -echo You will now be directed to the Apache Ant website... -pause -start http://ant.apache.org -goto end - -:end diff --git a/examples/plan/build.sh b/examples/plan/build.sh deleted file mode 100644 index 4225ac51e..000000000 --- a/examples/plan/build.sh +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh -# Copyright 1999-2004 The Apache Software Foundation -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# $Id$ - -# This file should be executable. - -echo -echo "Apache FOP: Build System for plan extension" -echo "---------------------------------------------" -echo - -if [ "$JAVA_HOME" = "" ] ; then - echo "ERROR: JAVA_HOME not found in your environment." - echo - echo "Please, set the JAVA_HOME variable in your environment to match the" - echo "location of the Java Virtual Machine you want to use." - exit 1 -fi - -if [ "$ANT_HOME" = "" ] ; then - echo "ERROR: ANT_HOME not found in your environment." - echo - echo "Please install Apache Ant first. FOP uses Ant as its build system." - echo "You can download Apache Ant from http://ant.apache.org" - echo "1. Download and install Ant" - echo "2. Set the ANT_HOME environment variable to the directory where you've" - echo " placed Ant." - echo "3. Add "\$ANT_HOME/bin" to your PATH so the "ant" script file" - echo " can be be executed from wherever needed." - echo "4. (optional) Download JUnit and place junit-*.jar in \$ANT_HOME/lib." - echo " This enables the JUnit test cases." - exit 1 -fi - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false; -case "`uname`" in - CYGWIN*) cygwin=true ;; -esac - -# For Cygwin, ensure paths are in UNIX format before anything is touched -if $cygwin ; then - [ -n "$ANT_HOME" ] && - ANT_HOME=`cygpath --unix "$ANT_HOME"` -fi -"$ANT_HOME"/bin/ant "$@" - -- 2.39.5