Updated FOP Servlet build

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

diff --git a/contrib/servlet/build.bat b/contrib/servlet/build.bat
index 9547eaf94caec5673adaf732953c571676749511..12219144fad06cc520273ae966a5025341e0e34a 100755 (executable)
--- a/contrib/servlet/build.bat
+++ b/contrib/servlet/build.bat
@@ -1,12 +1,16 @@
 @echo off
 
-echo Fop Build System
-echo ----------------
+echo Fop Servlet Build System
+echo --------------------------
 
 if "%JAVA_HOME%" == "" goto error
 
 set LIBDIR=../../lib
-set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;%LIBDIR%\ant.jar;%LIBDIR%\ant-1.3-optional.jar;%LIBDIR%\buildtools.jar;%LIBDIR%\xerces-1.4.3.jar;%LIBDIR%\xalan-2.2D11.jar
+set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\ant.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xml-apis.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xercesImpl-2.2.1.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xalan-2.4.1.jar
 
 set ANT_HOME=%LIBDIR%
 

diff --git a/contrib/servlet/build.sh b/contrib/servlet/build.sh
index a8a5abe6b8abe2ad86f431b57a33df885f193c63..7baa6052e126297740893d06154c933800d42b03 100755 (executable)
--- a/contrib/servlet/build.sh
+++ b/contrib/servlet/build.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 # This file should be executable.
 echo
-echo "Fop Build System"
-echo "----------------"
+echo "Fop Servlet Build System"
+echo "--------------------------"
 echo
 
 if [ "$JAVA_HOME" = "" ] ; then
@@ -13,8 +13,11 @@ if [ "$JAVA_HOME" = "" ] ; then
   exit 1
 fi
 LIBDIR=../../lib
-LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip:$LIBDIR/ant.jar:$LIBDIR/ant-1.3-optional.jar:$LIBDIR/buildtools.jar:$LIBDIR/xerces-1.4.3.jar:$LIBDIR/xalan-2.2D11.jar
-
+LOCALCLASSPATH=$JAVA_HOME/lib/tools.jar:$JAVA_HOME/lib/classes.zip
+LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/ant.jar
+LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/xml-apis.jar
+LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/xercesImpl-2.2.1.jar
+LOCALCLASSPATH=$LOCALCLASSPATH:$LIBDIR/xalan-2.4.1.jar
 ANT_HOME=$LIBDIR
 
 echo

diff --git a/contrib/servlet/build.xml b/contrib/servlet/build.xml
index ccb4f8cde2096d6fb93136f85ee54b509898fc4a..36025f376472ce7ec871a9c63f7b4586b066929b 100644 (file)
--- a/contrib/servlet/build.xml
+++ b/contrib/servlet/build.xml
@@ -1,86 +1,92 @@
 <?xml version="1.0"?>
 <project default="package" basedir=".">
-       <property name="Name" value="Fop Servlet"/>
-       <property name="name" value="fopservlet"/>
-       <property name="version" value="0.2cvs"/>
-       <!-- compiler switches -->
-       <property name="build.compiler" value="classic"/>
-       <property name="debug" value="off"/>
-       <property name="optimize" value="on"/>
-       <property name="deprecation" value="off"/>
-       <!-- directories -->
-       <property name="src.dir" value="./src"/>
-       <property name="conf.dir" value="./conf"/>
-       <property name="fop.lib.dir" value="../../lib"/>
-       <property name="lib.dir" value="./lib"/>
-       <property name="build.dir" value="./build"/>
-       <property name="build.src" value="./build/src"/>
-       <property name="build.dest" value="./build/classes"/>
-       <property name="build.war" value="./build/war"/>
-       <!-- stuff -->
-       <property name="servlet.jar" value="servlet.jar"/>
-       <property name="avalon-framework.jar" value="avalon-framework-cvs-20020806.jar"/>
-       <path id="project.class.path">
-               <pathelement location="${lib.dir}/${servlet.jar}"/>
-               <pathelement location="${fop.lib.dir}/${avalon-framework.jar}"/>
-               <pathelement location="${fop.lib.dir}/../build/fop.jar"/>
-               <pathelement location="${fop.lib.dir}/batik.jar"/>
-       </path>
-       <!-- =================================================================== -->
-       <!-- Initialization target                                               -->
-       <!-- =================================================================== -->
-       <target name="init">
-               <tstamp/>
-               <filter token="version" value="${version}"/>
-               <property name="year" value="1999-2002"/>
-               <echo message="------------------- ${Name} ${version} [${year}] ----------------"/>
-               <available property="servlet.present" file="${lib.dir}/${servlet.jar}"/>
-       </target>
-       <target name="servlet-check" depends="init" unless="servlet.present">
-               <echo message="============================================================================="/>
-               <echo message="servlet.jar is missing in the lib directory. Please get one and put it there."/>
-               <echo message="============================================================================="/>
-       </target>
-       <!-- =================================================================== -->
-       <!-- Prepares the build directory                                        -->
-       <!-- =================================================================== -->
-       <target name="prepare" depends="init, servlet-check">
-               <!-- create directories -->
-               <echo message="Preparing the build directories"/>
-               <mkdir dir="${build.dir}"/>
-               <mkdir dir="${build.dest}"/>
-       </target>
-       <!-- =================================================================== -->
-       <!-- Compiles the source directory                                       -->
-       <!-- =================================================================== -->
-       <target name="compile" depends="prepare">
-               <echo message="Compiling the sources "/>
-               <javac srcdir="${src.dir}" destdir="${build.dest}" debug="${debug}" deprecation="${deprecation}" optimize="${optimize}">
-                       <classpath refid="project.class.path"/>
-               </javac>
-       </target>
-       <!-- =================================================================== -->
-       <!-- Creates the class package                                           -->
-       <!-- =================================================================== -->
-       <target name="package" depends="compile">
-               <echo message="Creating the WAR file"/>
-               <war warfile="${build.dir}/fop.war" webxml="${conf.dir}/web.xml">
-                       <lib dir="${fop.lib.dir}">
-                               <include name="${avalon-framework.jar}"/>
-                               <include name="batik.jar"/>
-                       </lib>
-                       <lib dir="${fop.lib.dir}/../build">
-                               <include name="fop.jar"/>
-                       </lib>
-                       <classes dir="${build.dest}"/>
-               </war>
-       </target>
-       <target name="all" depends="package"/>
-       <!-- "all" target for us Makefile converts ;-) -->
-       <!-- =================================================================== -->
-       <!-- Clean targets                                                       -->
-       <!-- =================================================================== -->
-       <target name="clean" depends="init">
-               <delete dir="${build.dir}"/>
-       </target>
+  <property name="Name" value="Fop Servlet"/>
+  <property name="name" value="fopservlet"/>
+  <property name="version" value="0.2cvs"/>
+  <!-- compiler switches -->
+  <property name="build.compiler" value="classic"/>
+  <property name="debug" value="off"/>
+  <property name="optimize" value="on"/>
+  <property name="deprecation" value="off"/>
+  <!-- directories -->
+  <property name="src.dir" value="./src"/>
+  <property name="conf.dir" value="./conf"/>
+  <property name="fop.lib.dir" value="../../lib"/>
+  <property name="lib.dir" value="./lib"/>
+  <property name="build.dir" value="./build"/>
+  <property name="build.src" value="./build/src"/>
+  <property name="build.dest" value="./build/classes"/>
+  <property name="build.war" value="./build/war"/>
+  <!-- stuff -->
+  <property name="servlet.jar" value="servlet.jar"/>
+  <path id="project.class.path">
+    <fileset dir="${lib.dir}">
+      <include name="*.jar"/>
+    </fileset>
+    <fileset dir="${fop.lib.dir}">
+      <include name="avalon-framework*.jar"/>
+      <include name="batik*.jar"/>
+    </fileset>
+    <fileset dir="${fop.lib.dir}/../build">
+      <include name="fop.jar"/>
+    </fileset>
+  </path>
+  <!-- =================================================================== -->
+  <!-- Initialization target                                               -->
+  <!-- =================================================================== -->
+  <target name="init">
+    <tstamp/>
+    <filter token="version" value="${version}"/>
+    <property name="year" value="1999-2002"/>
+    <echo message="------------------- ${Name} ${version} [${year}] ----------------"/>
+    <available property="servlet.present" classname="javax.servlet.Servlet" classpathref="project.class.path"/>
+  </target>
+  <target name="servlet-check" depends="init" unless="servlet.present">
+    <echo message="============================================================================="/>
+    <echo message="servlet.jar is missing in the lib directory. Please get one and put it there."/>
+    <echo message="============================================================================="/>
+    <fail message="Dependecy check failed."/>
+  </target>
+  <!-- =================================================================== -->
+  <!-- Prepares the build directory                                        -->
+  <!-- =================================================================== -->
+  <target name="prepare" depends="init, servlet-check">
+    <!-- create directories -->
+    <echo message="Preparing the build directories"/>
+    <mkdir dir="${build.dir}"/>
+    <mkdir dir="${build.dest}"/>
+  </target>
+  <!-- =================================================================== -->
+  <!-- Compiles the source directory                                       -->
+  <!-- =================================================================== -->
+  <target name="compile" depends="prepare">
+    <echo message="Compiling the sources "/>
+    <javac srcdir="${src.dir}" destdir="${build.dest}" debug="${debug}" deprecation="${deprecation}" optimize="${optimize}">
+      <classpath refid="project.class.path"/>
+    </javac>
+  </target>
+  <!-- =================================================================== -->
+  <!-- Creates the class package                                           -->
+  <!-- =================================================================== -->
+  <target name="package" depends="compile">
+    <echo message="Creating the WAR file"/>
+    <war warfile="${build.dir}/fop.war" webxml="${conf.dir}/web.xml">
+      <lib dir="${fop.lib.dir}">
+        <include name="avalon-framework*.jar"/>
+        <include name="batik*.jar"/>
+      </lib>
+      <lib dir="${fop.lib.dir}/../build">
+        <include name="fop.jar"/>
+      </lib>
+      <classes dir="${build.dest}"/>
+    </war>
+  </target>
+  <target name="all" depends="package"/>
+  <!-- "all" target for us Makefile converts ;-) -->
+  <!-- =================================================================== -->
+  <!-- Clean targets                                                       -->
+  <!-- =================================================================== -->
+  <target name="clean" depends="init">
+    <delete dir="${build.dir}"/>
+  </target>
 </project>