From: Jani Laakso <jani.laakso@itmill.com>
Date: Fri, 5 Oct 2007 13:52:11 +0000 (+0000)
Subject: Temporary solution for moving old build.xml away, but still retaining it for using... 
X-Git-Tag: 6.7.0.beta1~5900
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=56cf5897f3847d8206d3e0ba17682613beb6ea5c;p=vaadin-framework.git

Temporary solution for moving old build.xml away, but still retaining it for using to build manual.

svn changeset:2446/svn branch:trunk
---

diff --git a/build/build.xml b/build/build.xml
deleted file mode 100644
index a406f11f5a..0000000000
--- a/build/build.xml
+++ /dev/null
@@ -1,455 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="IT Mill Toolkit" basedir="../" default="package">
-
-	<!-- Package creation - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-	<target name="package" depends="clean-all,libs,themes,demo,docs,license" description="Build public release">
-		<zip zipfile="build/result/${package-file-name}">
-			<fileset dir="build/result">
-				<patternset>
-					<include name="${product-file}-${version}/**" />
-				</patternset>
-			</fileset>
-		</zip>
-	</target>
-
-	<!-- As release, but no docbook tasks -->
-	<target name="package-without-manual" depends="clean-all,libs,themes,demo,package-docs,license" description="Build testing package without manual">
-		<zip zipfile="build/result/TESTING-${package-file-name}">
-			<fileset dir="build/result">
-				<patternset>
-					<include name="${product-file}-${version}/**" />
-				</patternset>
-			</fileset>
-		</zip>
-	</target>
-
-	<!-- Initialization - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-	<target name="init">
-
-		<!-- Create result dir unless already exists -->
-		<mkdir dir="build/result" />
-
-		<property file="build/VERSION" />
-		<property name="product-file" value="itmill-toolkit" />
-		<property name="product-name" value="IT Mill Toolkit" />
-		<property name="toolkit-package" value="com/itmill/toolkit" />
-
-		<property file="build/html-style.properties" />
-
-		<!-- Destination files -->
-		<property name="package-file-name" value="${product-file}-${version}.zip" />
-		<property name="lib-bin-jar-name" value="${product-file}-${version}.jar" />
-		<property name="demo-lib-jar-name" value="${product-file}-demo-${version}.jar" />
-		<property name="lib-src-jar-name" value="${product-file}-src-${version}.jar" />
-		<property name="themes-jar-name" value="${product-file}-themes-${version}.jar" />
-		<property name="demo-war-name" value="${product-file}-demo-${version}.war" />
-
-		<echo message="Prepared to build ${product-file} version ${version} packages" />
-
-		<!-- Output directory -->
-		<property name="output-dir" value="build/result/${product-file}-${version}" />
-		<mkdir dir="${output-dir}" />
-
-		<!-- Create Output Directory Hierarchy -->
-		<mkdir dir="${output-dir}/doc/manual" />
-		<mkdir dir="${output-dir}/doc/api" />
-		<mkdir dir="${output-dir}/lib" />
-		<mkdir dir="${output-dir}/demo" />
-
-	</target>
-
-	<!-- License - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-	<target name="license" depends="init">
-		<copy todir="${output-dir}/lib">
-			<fileset dir="WebContent/WEB-INF">
-				<exclude name="**/.svn" />
-				<include name="itmill-toolkit-license.xml" />
-			</fileset>
-		</copy>
-	</target>
-
-	<!-- Themes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-	<target name="themes" depends="init">
-
-		<copy todir="build/result/themes">
-			<fileset dir="WebContent/WEB-INF/lib/themes">
-				<exclude name="**/.svn" />
-				<include name="corporate/**/*" />
-				<include name="demo/**/*" />
-				<include name="base/**/*" />
-				<include name="example/**/*" />
-				<include name="readme.txt" />
-			</fileset>
-		</copy>
-
-		<fixcrlf srcdir="build/result/themes" includes="**/*.js **/*.css" eol="lf" eof="remove">
-			<!-- ignore these because multiple character encodings are used -->
-			<exclude name="base/ext/jscalendar/lang/*.js" />
-		</fixcrlf>
-
-		<!-- Add unoptimized (not obfuscated) themes -->
-		<copy todir="${output-dir}/lib/themes">
-			<fileset dir="build/result/themes" />
-		</copy>
-
-		<!-- Brokes CSS, do not use
-		<echo>CSS syntax check and optimizing.</echo>
-		<for param="file">
-			<path>
-				<fileset dir="${output-dir}/lib/themes">
-					<include name="**/*.css" />
-				</fileset>
-			</path>
-			<sequential>
-				<echo>@{file}</echo>
-				<exec dir="build" executable="cmd.exe" os="Windows 2000, Windows XP" failonerror="true">
-					<arg line="/c bin\csstidy-win.exe @{file} @{file}" />
-				</exec>
-				<exec dir="build" executable="bin/csstidy-osx.sh" os="Mac OS X" failonerror="true">
-					<arg line="@{file}" />
-				</exec>
-				<exec dir="build" executable="bin/csstidy-linux.sh" os="Linux" failonerror="true">
-					<arg line="@{file}" />
-				</exec>
-			</sequential>
-		</for>
-		-->
-
-		<echo>JavaScript syntax check, optimizing and obfuscation.</echo>
-		<for param="file">
-			<path>
-				<fileset dir="build/result/themes">
-					<include name="**/*.js" />
-					<!-- ignore these because multiple character encodings are used -->
-					<exclude name="base/ext/jscalendar/lang/*.js" />
-				</fileset>
-			</path>
-			<sequential>
-				<echo>@{file}</echo>
-				<java dir="build/result/themes" jar="build/lib/custom_rhino.jar" fork="true" failonerror="true" maxmemory="64m" output="@{file}">
-					<!-- note: you could set rhino's encoding with <jvmarg value="-Dfile.encoding=UTF-8" /> -->
-					<arg value="-c" />
-					<arg value="@{file}" />
-				</java>
-			</sequential>
-		</for>
-
-		<!-- add optimized themes -->
-		<jar jarfile="${output-dir}/lib/${themes-jar-name}" compress="false">
-			<fileset dir="build/result/themes">
-				<patternset>
-					<include name="corporate/**/*" />
-					<include name="base/**/*" />
-				</patternset>
-			</fileset>
-		</jar>
-	</target>
-
-	<!-- Libs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-	<!-- Copy and preprocess sources for packaging -->
-	<target name="preprocess-src" depends="init">
-		<mkdir dir="build/result/src" />
-
-		<copy todir="build/result/src">
-			<filterset>
-				<filter token="VERSION" value="${version}" />
-			</filterset>
-			<fileset dir="src">
-				<patternset>
-					<include name="**/*.java" />
-					<include name="**/*.html" />
-				</patternset>
-			</fileset>
-		</copy>
-
-		<!-- Convert to CRLF's and tabs -->
-		<fixcrlf srcdir="build/result/src" eol="crlf" tablength="4" tab="remove" includes="**/*.java" />
-
-		<!-- Un-Filtered files -->
-		<copy todir="build/result/src">
-			<fileset dir="src">
-				<patternset>
-					<include name="**/*.gif" />
-					<include name="**/*.jpg" />
-					<include name="**/*.swf" />
-					<include name="**/*.png" />
-				</patternset>
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="compile-java" depends="preprocess-src">
-		<!-- Compile -->
-		<mkdir dir="build/result/classes" />
-		<javac source="1.4" target="1.4" srcdir="build/result/src" destdir="build/result/classes" classpath="build/lib/servlet-api.jar" includes="${toolkit-package}/**" debug="true" />
-	</target>
-
-	<target name="libs" depends="compile-java">
-		<!-- Create binary JAR -->
-		<jar jarfile="${output-dir}/lib/${lib-bin-jar-name}" compress="true" includes="${toolkit-package}/**" basedir="build/result/classes" excludes="${toolkit-package}/demo/**" />
-		<!-- Create source JAR -->
-		<jar jarfile="${output-dir}/lib/${lib-src-jar-name}" compress="true">
-			<fileset dir="build/result/src">
-				<patternset>
-					<include name="${toolkit-package}/**/*.java" />
-					<exclude name="${toolkit-package}/demo/**/*.java" />
-				</patternset>
-			</fileset>
-		</jar>
-	</target>
-
-	<!-- Demo  - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-	<target name="demo" depends="libs,compile-java,themes,javadoc">
-		<echo>Building demo</echo>
-		<java2html srcdir="build/result/src/${toolkit-package}/demo" destdir="build/result/src/${toolkit-package}/demo" includes="**/*.java" style="eclipse" showLineNumbers="false" showFileName="true" showTableBorder="false" />
-		<!-- have to use "temp" dir for some reason here. Overwrite does not work, at least on Linux Eclipse 3.2.2 -->
-		<copy todir="build/result/srcTemp" overwrite="true">
-			<filterchain>
-				<expandproperties />
-				<replacetokens begintoken="&lt;" endtoken=">">
-					<token key="body" value="${html.body.tag}${html.body.start1}${product-name}${html.body.start2}" />
-					<token key="/body" value="${html.body.end}${html.body.endtag}" />
-					<token key="head" value="${html.head.tag}${html.head.style}" />
-				</replacetokens>
-			</filterchain>
-			<fileset dir="build/result/src">
-				<exclude name="**/.svn" />
-				<include name="**/*.html" />
-			</fileset>
-		</copy>
-		<!-- Create demo binary JAR, including pictures -->
-		<mkdir dir="build/result/lib" />
-		<jar jarfile="build/result/lib/${demo-lib-jar-name}" includes="${toolkit-package}/demo/**" basedir="build/result/classes" compress="true">
-			<fileset dir="build/result/src">
-				<patternset>
-					<include name="${toolkit-package}/demo/**/*.swf" />
-					<include name="${toolkit-package}/demo/**/*.jpg" />
-					<include name="${toolkit-package}/demo/**/*.png" />
-					<include name="${toolkit-package}/demo/**/*.gif" />
-				</patternset>
-			</fileset>
-		</jar>
-
-		<!-- Copy demo directory (Jetty) -->
-		<copy todir="${output-dir}/demo">
-			<fileset dir="build/demo">
-				<exclude name="**/.svn" />
-			</fileset>
-		</copy>
-
-		<!-- Create demo WAR -->
-		<war warfile="${output-dir}/demo/${product-file}.war" webxml="WebContent/WEB-INF/web.xml">
-			<!-- WebContent: htmls, styles, license-->
-			<fileset dir="WebContent">
-				<exclude name="**/.svn" />
-				<exclude name="WEB-INF/web.xml" />
-				<exclude name="WEB-INF/lib/themes/**/*" />
-				<exclude name="WEB-INF/classes" />
-				<exclude name="WEB-INF/classes/**/*" />
-				<include name="**/*" />
-			</fileset>
-			<!-- Toolkit package and themes -->
-			<lib dir="${output-dir}/lib">
-				<include name="${lib-bin-jar-name}" />
-				<include name="${themes-jar-name}" />
-			</lib>
-			<!-- Demo package and themes -->
-			<lib dir="build/result/lib">
-				<include name="${demo-lib-jar-name}" />
-			</lib>
-			<lib dir="${output-dir}/lib">
-				<include name="themes/demo/**/*" />
-				<include name="themes/example/**/*" />
-			</lib>
-			<!-- All demo source and html source -->
-			<fileset dir="build/result">
-				<include name="src/${toolkit-package}/demo/**/*" />
-			</fileset>
-			<!-- All javadoc (demos link to these)-->
-			<fileset dir="${output-dir}">
-				<include name="doc/api/**/*" />
-			</fileset>
-			<!-- Add themes (not optimized) (demos link to these) -->
-			<fileset dir="${output-dir}/lib">
-				<include name="themes/**/*" />
-			</fileset>
-		</war>
-
-		<!-- Sources -->
-		<copy todir="${output-dir}/demo/src">
-			<fileset dir="build/result/src">
-				<include name="src/${toolkit-package}/demo/**/*" />
-			</fileset>
-		</copy>
-
-	</target>
-
-	<!-- Documentation- - - - - - - - - - - - - - - - - - - - - - - - - -->
-
-	<target name="docs" depends="javadoc,manual-pdf,manual-html,package-docs">
-	</target>
-
-	<target name="package-docs" depends="init">
-		<copy todir="${output-dir}">
-			<filterchain>
-				<expandproperties />
-				<replacetokens begintoken="&lt;" endtoken=">">
-					<token key="body" value="${html.body.tag}${html.body.start1}${product-name}${html.body.start2}" />
-					<token key="/body" value="${html.body.end}${html.body.endtag}" />
-				</replacetokens>
-			</filterchain>
-			<fileset dir="">
-				<exclude name="**/.svn" />
-				<exclude name="ReleaseNotes.html" />
-				<include name="*.html" />
-				<include name="*.txt" />
-			</fileset>
-		</copy>
-		<copy todir="${output-dir}">
-			<fileset dir="">
-				<filename name="*.pdf" />
-			</fileset>
-		</copy>
-		<copy todir="${output-dir}">
-			<fileset dir="">
-				<filename name="ReleaseNotes.html" />
-			</fileset>
-		</copy>
-		<copy todir="${output-dir}/doc/manual/html-style">
-			<fileset dir="doc/manual/html-style">
-				<exclude name="**/.svn" />
-				<exclude name="**/test.html" />
-			</fileset>
-		</copy>
-		<copy todir="${output-dir}/doc">
-			<fileset dir="doc">
-				<exclude name="**/.svn" />
-				<include name="dtd/**/*.dtd" />
-			</fileset>
-		</copy>
-	</target>
-
-	<target name="javadoc" depends="preprocess-src">
-		<javadoc destdir="${output-dir}/doc/api" author="true" version="true" use="true" windowtitle="${product-name}" classpath="build/lib/servlet-api.jar">
-			<packageset dir="build/result/src">
-				<include name="${toolkit-package}/**" />
-				<exclude name="${toolkit-package}/demo/**" />
-			</packageset>
-			<doctitle>${javadoc.doctitle}</doctitle>
-			<!-- <header><![CDATA[<script type="text/javascript" src=".html-style/style.js"></script>]]></header> -->
-			<bottom>${javadoc.bottom}</bottom>
-			<link offline="true" href="http://java.sun.com/j2se/1.5.0/docs/api/" packagelistLoc="build/javadoc/j2se-1.5.0" />
-			<link offline="true" href="http://java.sun.com/j2ee/1.4/docs/api/" packagelistLoc="build/javadoc/j2ee-1.4" />
-		</javadoc>
-	</target>
-
-	<target name="book-part2" depends="dbdoclet">
-		<!-- TODO Add XSLT to transform dbdoclet results to book part 2 -->
-	</target>
-
-	<target name="dbdoclet" depends="preprocess-src">
-		<javadoc access="public" charset="UTF-8" docencoding="UTF-8" encoding="ISO-8859-15" failonerror="yes" classpath="build/lib/servlet-api.jar" maxmemory="512m" source="1.5">
-			<packageset dir="build/result/src">
-				<include name="${toolkit-package}/**" />
-				<exclude name="${toolkit-package}/demo/**" />
-			</packageset>
-			<doclet name="org.dbdoclet.doclet.docbook.DocBookDoclet" path="build/lib/jdk${java.specification.version}/dbdoclet.jar">
-				<param name="-d" value="result/docbook" />
-			</doclet>
-		</javadoc>
-	</target>
-
-	<target name="manual-fo" depends="init">
-		<path id="docbook-xsl.classpath">
-			<pathelement path="build/lib/fserializer.jar" />
-			<pathelement path="build/lib/xalan.jar" />
-			<pathelement path="build/lib/xercesImpl.jar" />
-			<pathelement path="build/lib/xml-apis.jar" />
-		</path>
-		<java classname="org.apache.xalan.xslt.Process" failonerror="yes" fork="yes" maxmemory="1300m">
-			<arg value="-in" />
-			<arg value="doc/manual/book.xml" />
-			<arg value="-xsl" />
-			<arg value="build/docbook/conf/custom-fo-docbook.xsl" />
-			<arg value="-out" />
-			<arg value="${output-dir}/doc/manual/book.fo" />
-			<arg value="-param" />
-			<arg value="section.autolabel" />
-			<arg value="1" />
-			<arg value="-param" />
-			<arg value="section.label.includes.component.label" />
-			<arg value="1" />
-			<arg value="-param" />
-			<arg value="section.autolabel.max.depth" />
-			<arg value="2" />
-			<classpath refid="docbook-xsl.classpath" />
-		</java>
-	</target>
-
-	<target name="manual-pdf" depends="init">
-		<!-- property name="xep" location="/opt/RenderX/XEP/xep"/ -->
-		<exec executable="/opt/RenderX/XEP/xep" input="${output-dir}/doc/manual/book.fo" output="${output-dir}/doc/manual/book.pdf" error="xep.err">
-		</exec>
-	</target>
-
-	<target name="manual-html" depends="init">
-		<delete file="build/docbook/conf/temp.xsl" />
-		<copy file="build/docbook/conf/custom-html-docbook.xsl" tofile="build/docbook/conf/temp.xsl">
-			<filterchain>
-				<replacetokens>
-					<token key="BODYHEADER" value="${html.body.start1}${docbook.head.title}${html.body.start2}" />
-					<token key="BODYFOOTER" value="${html.body.end}" />
-				</replacetokens>
-			</filterchain>
-		</copy>
-		<path id="docbook-xsl.classpath">
-			<pathelement path="build/lib/fserializer.jar" />
-			<pathelement path="build/lib/xalan.jar" />
-			<pathelement path="build/lib/xercesImpl.jar" />
-			<pathelement path="build/lib/xml-apis.jar" />
-		</path>
-		<java classname="org.apache.xalan.xslt.Process" failonerror="yes" fork="yes" maxmemory="1300m">
-			<arg value="-in" />
-			<arg value="doc/manual/book.xml" />
-			<arg value="-xsl" />
-			<arg value="build/docbook/conf/temp.xsl" />
-			<arg value="-out" />
-			<arg value="${output-dir}/doc/manual/index.html" />
-			<arg value="-param" />
-			<arg value="use.extensions" />
-			<arg value="1" />
-			<classpath refid="docbook-xsl.classpath" />
-		</java>
-		<delete file="build/docbook/conf/temp.xsl" />
-		<copy todir="${output-dir}/doc/manual/img">
-			<fileset dir="doc/manual/img">
-				<exclude name="**/.svn" />
-			</fileset>
-		</copy>
-	</target>
-
-	<!-- Clean results - - - - - - - - - - - - - - - - - - - - - - - - - -->
-	<target name="clean-all" depends="">
-		<delete includeemptydirs="true" defaultexcludes="false">
-			<fileset dir="build/result" includes="**/*" />
-		</delete>
-		<delete file="build/docbook/conf/temp.xsl" />
-	</target>
-
-	<!-- ant contrib required for flow control (for loop) -->
-	<taskdef resource="net/sf/antcontrib/antlib.xml">
-		<classpath>
-			<pathelement location="build/lib/ant-contrib-1.0b3.jar" />
-		</classpath>
-	</taskdef>
-
-	<!-- java2html converter -->
-	<taskdef name="java2html" classname="de.java2html.anttasks.Java2HtmlTask" classpath="build/lib/java2html.jar" />
-
-
-</project>
diff --git a/build/old-build.xml b/build/old-build.xml
new file mode 100644
index 0000000000..a406f11f5a
--- /dev/null
+++ b/build/old-build.xml
@@ -0,0 +1,455 @@
+<?xml version="1.0"?>
+
+<project name="IT Mill Toolkit" basedir="../" default="package">
+
+	<!-- Package creation - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+	<target name="package" depends="clean-all,libs,themes,demo,docs,license" description="Build public release">
+		<zip zipfile="build/result/${package-file-name}">
+			<fileset dir="build/result">
+				<patternset>
+					<include name="${product-file}-${version}/**" />
+				</patternset>
+			</fileset>
+		</zip>
+	</target>
+
+	<!-- As release, but no docbook tasks -->
+	<target name="package-without-manual" depends="clean-all,libs,themes,demo,package-docs,license" description="Build testing package without manual">
+		<zip zipfile="build/result/TESTING-${package-file-name}">
+			<fileset dir="build/result">
+				<patternset>
+					<include name="${product-file}-${version}/**" />
+				</patternset>
+			</fileset>
+		</zip>
+	</target>
+
+	<!-- Initialization - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+	<target name="init">
+
+		<!-- Create result dir unless already exists -->
+		<mkdir dir="build/result" />
+
+		<property file="build/VERSION" />
+		<property name="product-file" value="itmill-toolkit" />
+		<property name="product-name" value="IT Mill Toolkit" />
+		<property name="toolkit-package" value="com/itmill/toolkit" />
+
+		<property file="build/html-style.properties" />
+
+		<!-- Destination files -->
+		<property name="package-file-name" value="${product-file}-${version}.zip" />
+		<property name="lib-bin-jar-name" value="${product-file}-${version}.jar" />
+		<property name="demo-lib-jar-name" value="${product-file}-demo-${version}.jar" />
+		<property name="lib-src-jar-name" value="${product-file}-src-${version}.jar" />
+		<property name="themes-jar-name" value="${product-file}-themes-${version}.jar" />
+		<property name="demo-war-name" value="${product-file}-demo-${version}.war" />
+
+		<echo message="Prepared to build ${product-file} version ${version} packages" />
+
+		<!-- Output directory -->
+		<property name="output-dir" value="build/result/${product-file}-${version}" />
+		<mkdir dir="${output-dir}" />
+
+		<!-- Create Output Directory Hierarchy -->
+		<mkdir dir="${output-dir}/doc/manual" />
+		<mkdir dir="${output-dir}/doc/api" />
+		<mkdir dir="${output-dir}/lib" />
+		<mkdir dir="${output-dir}/demo" />
+
+	</target>
+
+	<!-- License - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+	<target name="license" depends="init">
+		<copy todir="${output-dir}/lib">
+			<fileset dir="WebContent/WEB-INF">
+				<exclude name="**/.svn" />
+				<include name="itmill-toolkit-license.xml" />
+			</fileset>
+		</copy>
+	</target>
+
+	<!-- Themes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+	<target name="themes" depends="init">
+
+		<copy todir="build/result/themes">
+			<fileset dir="WebContent/WEB-INF/lib/themes">
+				<exclude name="**/.svn" />
+				<include name="corporate/**/*" />
+				<include name="demo/**/*" />
+				<include name="base/**/*" />
+				<include name="example/**/*" />
+				<include name="readme.txt" />
+			</fileset>
+		</copy>
+
+		<fixcrlf srcdir="build/result/themes" includes="**/*.js **/*.css" eol="lf" eof="remove">
+			<!-- ignore these because multiple character encodings are used -->
+			<exclude name="base/ext/jscalendar/lang/*.js" />
+		</fixcrlf>
+
+		<!-- Add unoptimized (not obfuscated) themes -->
+		<copy todir="${output-dir}/lib/themes">
+			<fileset dir="build/result/themes" />
+		</copy>
+
+		<!-- Brokes CSS, do not use
+		<echo>CSS syntax check and optimizing.</echo>
+		<for param="file">
+			<path>
+				<fileset dir="${output-dir}/lib/themes">
+					<include name="**/*.css" />
+				</fileset>
+			</path>
+			<sequential>
+				<echo>@{file}</echo>
+				<exec dir="build" executable="cmd.exe" os="Windows 2000, Windows XP" failonerror="true">
+					<arg line="/c bin\csstidy-win.exe @{file} @{file}" />
+				</exec>
+				<exec dir="build" executable="bin/csstidy-osx.sh" os="Mac OS X" failonerror="true">
+					<arg line="@{file}" />
+				</exec>
+				<exec dir="build" executable="bin/csstidy-linux.sh" os="Linux" failonerror="true">
+					<arg line="@{file}" />
+				</exec>
+			</sequential>
+		</for>
+		-->
+
+		<echo>JavaScript syntax check, optimizing and obfuscation.</echo>
+		<for param="file">
+			<path>
+				<fileset dir="build/result/themes">
+					<include name="**/*.js" />
+					<!-- ignore these because multiple character encodings are used -->
+					<exclude name="base/ext/jscalendar/lang/*.js" />
+				</fileset>
+			</path>
+			<sequential>
+				<echo>@{file}</echo>
+				<java dir="build/result/themes" jar="build/lib/custom_rhino.jar" fork="true" failonerror="true" maxmemory="64m" output="@{file}">
+					<!-- note: you could set rhino's encoding with <jvmarg value="-Dfile.encoding=UTF-8" /> -->
+					<arg value="-c" />
+					<arg value="@{file}" />
+				</java>
+			</sequential>
+		</for>
+
+		<!-- add optimized themes -->
+		<jar jarfile="${output-dir}/lib/${themes-jar-name}" compress="false">
+			<fileset dir="build/result/themes">
+				<patternset>
+					<include name="corporate/**/*" />
+					<include name="base/**/*" />
+				</patternset>
+			</fileset>
+		</jar>
+	</target>
+
+	<!-- Libs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+	<!-- Copy and preprocess sources for packaging -->
+	<target name="preprocess-src" depends="init">
+		<mkdir dir="build/result/src" />
+
+		<copy todir="build/result/src">
+			<filterset>
+				<filter token="VERSION" value="${version}" />
+			</filterset>
+			<fileset dir="src">
+				<patternset>
+					<include name="**/*.java" />
+					<include name="**/*.html" />
+				</patternset>
+			</fileset>
+		</copy>
+
+		<!-- Convert to CRLF's and tabs -->
+		<fixcrlf srcdir="build/result/src" eol="crlf" tablength="4" tab="remove" includes="**/*.java" />
+
+		<!-- Un-Filtered files -->
+		<copy todir="build/result/src">
+			<fileset dir="src">
+				<patternset>
+					<include name="**/*.gif" />
+					<include name="**/*.jpg" />
+					<include name="**/*.swf" />
+					<include name="**/*.png" />
+				</patternset>
+			</fileset>
+		</copy>
+	</target>
+
+	<target name="compile-java" depends="preprocess-src">
+		<!-- Compile -->
+		<mkdir dir="build/result/classes" />
+		<javac source="1.4" target="1.4" srcdir="build/result/src" destdir="build/result/classes" classpath="build/lib/servlet-api.jar" includes="${toolkit-package}/**" debug="true" />
+	</target>
+
+	<target name="libs" depends="compile-java">
+		<!-- Create binary JAR -->
+		<jar jarfile="${output-dir}/lib/${lib-bin-jar-name}" compress="true" includes="${toolkit-package}/**" basedir="build/result/classes" excludes="${toolkit-package}/demo/**" />
+		<!-- Create source JAR -->
+		<jar jarfile="${output-dir}/lib/${lib-src-jar-name}" compress="true">
+			<fileset dir="build/result/src">
+				<patternset>
+					<include name="${toolkit-package}/**/*.java" />
+					<exclude name="${toolkit-package}/demo/**/*.java" />
+				</patternset>
+			</fileset>
+		</jar>
+	</target>
+
+	<!-- Demo  - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+	<target name="demo" depends="libs,compile-java,themes,javadoc">
+		<echo>Building demo</echo>
+		<java2html srcdir="build/result/src/${toolkit-package}/demo" destdir="build/result/src/${toolkit-package}/demo" includes="**/*.java" style="eclipse" showLineNumbers="false" showFileName="true" showTableBorder="false" />
+		<!-- have to use "temp" dir for some reason here. Overwrite does not work, at least on Linux Eclipse 3.2.2 -->
+		<copy todir="build/result/srcTemp" overwrite="true">
+			<filterchain>
+				<expandproperties />
+				<replacetokens begintoken="&lt;" endtoken=">">
+					<token key="body" value="${html.body.tag}${html.body.start1}${product-name}${html.body.start2}" />
+					<token key="/body" value="${html.body.end}${html.body.endtag}" />
+					<token key="head" value="${html.head.tag}${html.head.style}" />
+				</replacetokens>
+			</filterchain>
+			<fileset dir="build/result/src">
+				<exclude name="**/.svn" />
+				<include name="**/*.html" />
+			</fileset>
+		</copy>
+		<!-- Create demo binary JAR, including pictures -->
+		<mkdir dir="build/result/lib" />
+		<jar jarfile="build/result/lib/${demo-lib-jar-name}" includes="${toolkit-package}/demo/**" basedir="build/result/classes" compress="true">
+			<fileset dir="build/result/src">
+				<patternset>
+					<include name="${toolkit-package}/demo/**/*.swf" />
+					<include name="${toolkit-package}/demo/**/*.jpg" />
+					<include name="${toolkit-package}/demo/**/*.png" />
+					<include name="${toolkit-package}/demo/**/*.gif" />
+				</patternset>
+			</fileset>
+		</jar>
+
+		<!-- Copy demo directory (Jetty) -->
+		<copy todir="${output-dir}/demo">
+			<fileset dir="build/demo">
+				<exclude name="**/.svn" />
+			</fileset>
+		</copy>
+
+		<!-- Create demo WAR -->
+		<war warfile="${output-dir}/demo/${product-file}.war" webxml="WebContent/WEB-INF/web.xml">
+			<!-- WebContent: htmls, styles, license-->
+			<fileset dir="WebContent">
+				<exclude name="**/.svn" />
+				<exclude name="WEB-INF/web.xml" />
+				<exclude name="WEB-INF/lib/themes/**/*" />
+				<exclude name="WEB-INF/classes" />
+				<exclude name="WEB-INF/classes/**/*" />
+				<include name="**/*" />
+			</fileset>
+			<!-- Toolkit package and themes -->
+			<lib dir="${output-dir}/lib">
+				<include name="${lib-bin-jar-name}" />
+				<include name="${themes-jar-name}" />
+			</lib>
+			<!-- Demo package and themes -->
+			<lib dir="build/result/lib">
+				<include name="${demo-lib-jar-name}" />
+			</lib>
+			<lib dir="${output-dir}/lib">
+				<include name="themes/demo/**/*" />
+				<include name="themes/example/**/*" />
+			</lib>
+			<!-- All demo source and html source -->
+			<fileset dir="build/result">
+				<include name="src/${toolkit-package}/demo/**/*" />
+			</fileset>
+			<!-- All javadoc (demos link to these)-->
+			<fileset dir="${output-dir}">
+				<include name="doc/api/**/*" />
+			</fileset>
+			<!-- Add themes (not optimized) (demos link to these) -->
+			<fileset dir="${output-dir}/lib">
+				<include name="themes/**/*" />
+			</fileset>
+		</war>
+
+		<!-- Sources -->
+		<copy todir="${output-dir}/demo/src">
+			<fileset dir="build/result/src">
+				<include name="src/${toolkit-package}/demo/**/*" />
+			</fileset>
+		</copy>
+
+	</target>
+
+	<!-- Documentation- - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+	<target name="docs" depends="javadoc,manual-pdf,manual-html,package-docs">
+	</target>
+
+	<target name="package-docs" depends="init">
+		<copy todir="${output-dir}">
+			<filterchain>
+				<expandproperties />
+				<replacetokens begintoken="&lt;" endtoken=">">
+					<token key="body" value="${html.body.tag}${html.body.start1}${product-name}${html.body.start2}" />
+					<token key="/body" value="${html.body.end}${html.body.endtag}" />
+				</replacetokens>
+			</filterchain>
+			<fileset dir="">
+				<exclude name="**/.svn" />
+				<exclude name="ReleaseNotes.html" />
+				<include name="*.html" />
+				<include name="*.txt" />
+			</fileset>
+		</copy>
+		<copy todir="${output-dir}">
+			<fileset dir="">
+				<filename name="*.pdf" />
+			</fileset>
+		</copy>
+		<copy todir="${output-dir}">
+			<fileset dir="">
+				<filename name="ReleaseNotes.html" />
+			</fileset>
+		</copy>
+		<copy todir="${output-dir}/doc/manual/html-style">
+			<fileset dir="doc/manual/html-style">
+				<exclude name="**/.svn" />
+				<exclude name="**/test.html" />
+			</fileset>
+		</copy>
+		<copy todir="${output-dir}/doc">
+			<fileset dir="doc">
+				<exclude name="**/.svn" />
+				<include name="dtd/**/*.dtd" />
+			</fileset>
+		</copy>
+	</target>
+
+	<target name="javadoc" depends="preprocess-src">
+		<javadoc destdir="${output-dir}/doc/api" author="true" version="true" use="true" windowtitle="${product-name}" classpath="build/lib/servlet-api.jar">
+			<packageset dir="build/result/src">
+				<include name="${toolkit-package}/**" />
+				<exclude name="${toolkit-package}/demo/**" />
+			</packageset>
+			<doctitle>${javadoc.doctitle}</doctitle>
+			<!-- <header><![CDATA[<script type="text/javascript" src=".html-style/style.js"></script>]]></header> -->
+			<bottom>${javadoc.bottom}</bottom>
+			<link offline="true" href="http://java.sun.com/j2se/1.5.0/docs/api/" packagelistLoc="build/javadoc/j2se-1.5.0" />
+			<link offline="true" href="http://java.sun.com/j2ee/1.4/docs/api/" packagelistLoc="build/javadoc/j2ee-1.4" />
+		</javadoc>
+	</target>
+
+	<target name="book-part2" depends="dbdoclet">
+		<!-- TODO Add XSLT to transform dbdoclet results to book part 2 -->
+	</target>
+
+	<target name="dbdoclet" depends="preprocess-src">
+		<javadoc access="public" charset="UTF-8" docencoding="UTF-8" encoding="ISO-8859-15" failonerror="yes" classpath="build/lib/servlet-api.jar" maxmemory="512m" source="1.5">
+			<packageset dir="build/result/src">
+				<include name="${toolkit-package}/**" />
+				<exclude name="${toolkit-package}/demo/**" />
+			</packageset>
+			<doclet name="org.dbdoclet.doclet.docbook.DocBookDoclet" path="build/lib/jdk${java.specification.version}/dbdoclet.jar">
+				<param name="-d" value="result/docbook" />
+			</doclet>
+		</javadoc>
+	</target>
+
+	<target name="manual-fo" depends="init">
+		<path id="docbook-xsl.classpath">
+			<pathelement path="build/lib/fserializer.jar" />
+			<pathelement path="build/lib/xalan.jar" />
+			<pathelement path="build/lib/xercesImpl.jar" />
+			<pathelement path="build/lib/xml-apis.jar" />
+		</path>
+		<java classname="org.apache.xalan.xslt.Process" failonerror="yes" fork="yes" maxmemory="1300m">
+			<arg value="-in" />
+			<arg value="doc/manual/book.xml" />
+			<arg value="-xsl" />
+			<arg value="build/docbook/conf/custom-fo-docbook.xsl" />
+			<arg value="-out" />
+			<arg value="${output-dir}/doc/manual/book.fo" />
+			<arg value="-param" />
+			<arg value="section.autolabel" />
+			<arg value="1" />
+			<arg value="-param" />
+			<arg value="section.label.includes.component.label" />
+			<arg value="1" />
+			<arg value="-param" />
+			<arg value="section.autolabel.max.depth" />
+			<arg value="2" />
+			<classpath refid="docbook-xsl.classpath" />
+		</java>
+	</target>
+
+	<target name="manual-pdf" depends="init">
+		<!-- property name="xep" location="/opt/RenderX/XEP/xep"/ -->
+		<exec executable="/opt/RenderX/XEP/xep" input="${output-dir}/doc/manual/book.fo" output="${output-dir}/doc/manual/book.pdf" error="xep.err">
+		</exec>
+	</target>
+
+	<target name="manual-html" depends="init">
+		<delete file="build/docbook/conf/temp.xsl" />
+		<copy file="build/docbook/conf/custom-html-docbook.xsl" tofile="build/docbook/conf/temp.xsl">
+			<filterchain>
+				<replacetokens>
+					<token key="BODYHEADER" value="${html.body.start1}${docbook.head.title}${html.body.start2}" />
+					<token key="BODYFOOTER" value="${html.body.end}" />
+				</replacetokens>
+			</filterchain>
+		</copy>
+		<path id="docbook-xsl.classpath">
+			<pathelement path="build/lib/fserializer.jar" />
+			<pathelement path="build/lib/xalan.jar" />
+			<pathelement path="build/lib/xercesImpl.jar" />
+			<pathelement path="build/lib/xml-apis.jar" />
+		</path>
+		<java classname="org.apache.xalan.xslt.Process" failonerror="yes" fork="yes" maxmemory="1300m">
+			<arg value="-in" />
+			<arg value="doc/manual/book.xml" />
+			<arg value="-xsl" />
+			<arg value="build/docbook/conf/temp.xsl" />
+			<arg value="-out" />
+			<arg value="${output-dir}/doc/manual/index.html" />
+			<arg value="-param" />
+			<arg value="use.extensions" />
+			<arg value="1" />
+			<classpath refid="docbook-xsl.classpath" />
+		</java>
+		<delete file="build/docbook/conf/temp.xsl" />
+		<copy todir="${output-dir}/doc/manual/img">
+			<fileset dir="doc/manual/img">
+				<exclude name="**/.svn" />
+			</fileset>
+		</copy>
+	</target>
+
+	<!-- Clean results - - - - - - - - - - - - - - - - - - - - - - - - - -->
+	<target name="clean-all" depends="">
+		<delete includeemptydirs="true" defaultexcludes="false">
+			<fileset dir="build/result" includes="**/*" />
+		</delete>
+		<delete file="build/docbook/conf/temp.xsl" />
+	</target>
+
+	<!-- ant contrib required for flow control (for loop) -->
+	<taskdef resource="net/sf/antcontrib/antlib.xml">
+		<classpath>
+			<pathelement location="build/lib/ant-contrib-1.0b3.jar" />
+		</classpath>
+	</taskdef>
+
+	<!-- java2html converter -->
+	<taskdef name="java2html" classname="de.java2html.anttasks.Java2HtmlTask" classpath="build/lib/java2html.jar" />
+
+
+</project>