You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by sm...@apache.org on 2011/09/12 02:03:17 UTC

svn commit: r1169586 - /pivot/jenkins/build.xml

Author: smartini
Date: Mon Sep 12 00:03:17 2011
New Revision: 1169586

URL: http://svn.apache.org/viewvc?rev=1169586&view=rev
Log:
some changes to build from jenkins, but to make this work I need to commit even pivot build files (updated)

Modified:
    pivot/jenkins/build.xml

Modified: pivot/jenkins/build.xml
URL: http://svn.apache.org/viewvc/pivot/jenkins/build.xml?rev=1169586&r1=1169585&r2=1169586&view=diff
==============================================================================
--- pivot/jenkins/build.xml (original)
+++ pivot/jenkins/build.xml Mon Sep 12 00:03:17 2011
@@ -16,41 +16,21 @@ See the License for the specific languag
 limitations under the License.
 -->
 
-<project name="pivot" default="compile"
-    xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-    <path id="classpath.javalib">
-        <fileset dir="${java.home}/lib" includes="**/*.jar"/>
-    </path>
-
-    <!-- Properties that affect the directories that are created as part of the build -->
-    <property name="folder.src" value="src"/>
-    <property name="folder.bin" value="ant-bin"/>
-    <property name="folder.dist" value="dist"/>
-    <property name="folder.doc" value="doc"/>
-    <property name="folder.install" value="install"/>
-    <property name="folder.lib" value="lib"/>
-    <property name="folder.deploy" value="deploy"/>
-
-    <!-- Keystore properties -->
-    <property name="keystore.location" value="etc/pivot.keystore"/>
-    <property name="keystore.alias" value="pivot"/>
-    <property name="keystore.passwd" value="apache"/>
-
-    <!-- Compiler properties -->
-    <property name="compiler.deprecation" value="true"/>
-    <property name="compiler.debug" value="true"/>
-    <property name="compiler.target" value="1.6"/>
-    <property name="compiler.encoding" value="UTF-8"/>
-    <property name="compiler.indexJars" value="true"/>
-    <property name="compiler.arg" value="-Xlint"/>
-
-    <!-- Test properties -->
-    <property name="test.verbose" value="false"/>
-    <property name="test.out.dir" value="${basedir}/tests-out"/>
+<project name="pivot_build_by_jenkins" default="check" basedir="./pivot_trunk"
+    xmlns:artifact="antlib:org.apache.maven.artifact.ant"
+>
 
     <!-- Dynamic properties -->
     <property file="build.properties"/>
 
+    <!-- Import Pivot build file -->
+	<import file="./pivot_trunk/build.xml"/>
+
+    <path id="classpath.javalib">
+        <fileset dir="${java.home}/lib" includes="**/*.jar"/>
+        <fileset dir="../ci-builds-on-jenkins/lib" includes="**/*.jar"/>
+    </path>
+
     <!-- Set version from jenkins or not -->
     <condition property="version" value="${base.version}-${jenkins.build}">
       <isset property="jenkins.job"/>
@@ -61,61 +41,34 @@ limitations under the License.
       </not>
     </condition>
 
-    <property name="release" value="apache-${ant.project.name}-${version}"/>
-
-    <!-- Jar file names -->
-    <property name="jar.charts" value="${ant.project.name}-charts-${version}.jar" />
-    <property name="jar.core" value="${ant.project.name}-core-${version}.jar" />
-    <property name="jar.demos" value="${ant.project.name}-demos-${version}.jar" />
-    <property name="jar.demos-server" value="${ant.project.name}-demos-server-${version}.jar" />
-    <property name="jar.tutorials" value="${ant.project.name}-tutorials-${version}.jar" />
-    <property name="jar.tutorials-server" value="${ant.project.name}-tutorials-server-${version}.jar" />
-    <property name="jar.web" value="${ant.project.name}-web-${version}.jar" />
-    <property name="jar.web-server" value="${ant.project.name}-web-server-${version}.jar" />
-    <property name="jar.wtk" value="${ant.project.name}-wtk-${version}.jar" />
-    <property name="jar.wtk-terra" value="${ant.project.name}-wtk-terra-${version}.jar" />
-
-    <!-- Maven Sources Jar file names -->
-    <property name="jar.charts.sources" value="${ant.project.name}-charts-${version}-sources.jar" />
-    <property name="jar.core.sources" value="${ant.project.name}-core-${version}-sources.jar" />
-    <property name="jar.web.sources" value="${ant.project.name}-web-${version}-sources.jar" />
-    <property name="jar.web-server.sources" value="${ant.project.name}-web-server-${version}-sources.jar" />
-    <property name="jar.wtk.sources" value="${ant.project.name}-wtk-${version}-sources.jar" />
-    <property name="jar.wtk-terra.sources" value="${ant.project.name}-wtk-terra-${version}-sources.jar" />
-
-    <!-- Maven Javadoc Jar file names -->
-    <property name="jar.charts.javadoc" value="${ant.project.name}-charts-${version}-javadoc.jar" />
-    <property name="jar.core.javadoc" value="${ant.project.name}-core-${version}-javadoc.jar" />
-    <property name="jar.web.javadoc" value="${ant.project.name}-web-${version}-javadoc.jar" />
-    <property name="jar.web-server.javadoc" value="${ant.project.name}-web-server-${version}-javadoc.jar" />
-    <property name="jar.wtk.javadoc" value="${ant.project.name}-wtk-${version}-javadoc.jar" />
-    <property name="jar.wtk-terra.javadoc" value="${ant.project.name}-wtk-terra-${version}-javadoc.jar" />
-
-    <!-- Base package, required by Maven Javadoc -->
-    <property name="src.package.base" value="org.apache.pivot" />
-
-    <!-- Ant version check -->
-    <fail>
-        <condition>
-            <not>
-                <or>
-                    <contains string="${ant.version}" substring="1.7"/>
-                    <contains string="${ant.version}" substring="1.8"/>
-                </or>
-            </not>
-        </condition>
-        <![CDATA[
-        Error:
-
-        Building Pivot requires Apache Ant 1.7 or greater. Please see the BUILD
-        file for more information.
-        ]]>
-    </fail>
-
-    <!-- Compile macro -->
-    <macrodef name="compile">
-        <attribute name="project"/>
-        <element name="project-lib" implicit="true" optional="true"/>
+    <!-- Help -->
+    <target name="help" description="Put some help to console" depends="">
+		<property name="classpath" refid="classpath.javalib"/>
+		<echo message="Using Classpath: ${classpath}"/>
+    </target>
+
+    <!-- Check -->
+    <target name="check" description="Check environment" depends="help">
+
+        <sequential>
+		    <!-- Ant version check -->
+		    <fail>
+		        <condition>
+		            <not>
+		                <or>
+		                    <contains string="${ant.version}" substring="1.7"/>
+        		            <contains string="${ant.version}" substring="1.8"/>
+		                </or>
+		            </not>
+		        </condition>
+		        <![CDATA[
+		        Error:
+
+		        Building Pivot requires Apache Ant 1.7 or greater. Please see the BUILD
+		        file for more information.
+		        ]]>
+		    </fail>
+        </sequential>
 
         <sequential>
             <!-- JDK version check -->
@@ -150,728 +103,8 @@ limitations under the License.
                 file for more information.
                 ]]>
             </fail>
-
-            <mkdir dir="@{project}/${folder.bin}"/>
-            <javac destDir="@{project}/${folder.bin}"
-                includejavaruntime="true"
-                includeantruntime="true"
-                deprecation="${compiler.deprecation}"
-                debug="${compiler.debug}"
-                target="${compiler.target}"
-                encoding="${compiler.encoding}"
-                failonerror="true">
-                <src>
-                    <dirset dir="@{project}">
-                        <include name="src"/>
-                        <include name="test"/>
-                    </dirset>
-                </src>
-                <compilerarg line="${compiler.arg}"/>
-                <classpath>
-                    <path refid="classpath.javalib"/>
-                    <dirset dir="${basedir}" includes="**/${folder.bin}"/>
-                    <fileset dir="@{project}" includes="lib/**/*.jar"/>
-                    <project-lib/>
-                </classpath>
-            </javac>
-        </sequential>
-    </macrodef>
-
-    <!-- Test macro -->
-    <macrodef name="test">
-        <attribute name="project"/>
-
-        <sequential>
-            <echo message="@{project}: Executing test cases..."/>
-
-            <condition property="test.formatter">
-                <istrue value="${test.verbose}"/>
-            </condition>
-
-            <junit fork="true">
-                <classpath>
-                    <path refid="classpath.javalib"/>
-                    <dirset dir="${basedir}" includes="**/${folder.bin}"/>
-                    <dirset dir="@{project}" includes="test"/>
-                    <fileset dir="@{project}" includes="lib/**/*.jar"/>
-                </classpath>
-
-                <formatter type="brief" usefile="false" if="test.formatter"/>
-                <formatter type="xml" usefile="true" if="jenkins.job"/>
-
-                <batchtest todir="${test.out.dir}">
-                    <fileset dir="@{project}/test" includes="**/*Test.java"/>
-                </batchtest>
-            </junit>
-        </sequential>
-    </macrodef>
-
-    <!-- Package macro -->
-    <macrodef name="package">
-        <attribute name="project"/>
-        <attribute name="jarFile"/>
-        <attribute name="title"/>
-
-        <sequential>
-            <mkdir dir="${folder.lib}"/>
-            <jar destfile="${folder.lib}/@{jarFile}" index="${compiler.indexJars}">
-                <metainf dir="${basedir}">
-                    <include name="LICENSE"/>
-                    <include name="NOTICE"/>
-                    <include name="README"/>
-                </metainf>
-                <manifest>
-                    <attribute name="Sealed" value="true"/>
-                    <attribute name="Implementation-Vendor-Id" value="org.apache"/>
-                    <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
-                    <attribute name="Implementation-Title" value="Apache Pivot @{title}"/>
-                    <attribute name="Implementation-Version" value="${version}"/>
-                </manifest>
-                <fileset dir="@{project}/${folder.bin}">
-                    <exclude name="**/test/**"/>
-                </fileset>
-                <fileset dir="@{project}/src">
-                    <exclude name="**/*.java"/>
-                    <exclude name="**/package.html"/>
-                </fileset>
-            </jar>
         </sequential>
-    </macrodef>
-
-    <!-- Package-maven-source-or-javadoc-jar macro -->
-    <macrodef name="package-maven-source-or-javadoc-jar">
-        <attribute name="project"/>
-        <attribute name="jarFile"/>
-        <attribute name="title"/>
-        <attribute name="jarFileset"/>
-
-        <sequential>
-            <mkdir dir="${folder.lib}"/>
-            <jar destfile="${folder.lib}/@{jarFile}" index="${compiler.indexJars}">
-                <metainf dir="${basedir}">
-                    <include name="LICENSE"/>
-                    <include name="NOTICE"/>
-                    <include name="README"/>
-                </metainf>
-                <manifest>
-                    <attribute name="Sealed" value="true"/>
-                    <attribute name="Implementation-Vendor-Id" value="org.apache"/>
-                    <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/>
-                    <attribute name="Implementation-Title" value="Apache Pivot @{title}"/>
-                    <attribute name="Implementation-Version" value="${version}"/>
-                </manifest>
-                <fileset dir="@{jarFileset}">
-                    <include name="LICENSE"/>
-                    <include name="NOTICE"/>
-                    <include name="README"/>
-                    <include name="RELEASE-NOTES"/>
-                    <include name="**/*.java"/>
-                    <include name="**/*.html"/>
-                    <include name="**/*.jsp"/>
-                    <include name="**/*.txt"/>
-                    <include name="**/*.properties"/>
-                    <include name="**/*.xml"/>
-                    <include name="**/*.bxml"/>
-                    <include name="**/*.json"/>
-                    <include name="**/*.jpg"/>
-                    <include name="**/*.png"/>
-                    <include name="**/*.svg"/>
-                    <exclude name="**/*.class"/>
-                </fileset>
-            </jar>
-        </sequential>
-    </macrodef>
-
-    <!-- Package-sources macro -->
-    <macrodef name="package-sources">
-        <attribute name="project"/>
-        <attribute name="jarFile"/>
-        <attribute name="title"/>
-
-        <sequential>
-            <mkdir dir="${folder.lib}"/>
-            <package-maven-source-or-javadoc-jar
-                project="@{project}"
-                jarFile="@{jarFile}"
-                title="@{title}"
-                jarFileset="@{project}/src"
-            />
-        </sequential>
-    </macrodef>
-
-    <!-- Package-javadoc macro -->
-    <macrodef name="package-javadoc">
-        <attribute name="project"/>
-        <attribute name="jarFile"/>
-        <attribute name="title"/>
-        <attribute name="package"/>
-
-        <sequential>
-            <mkdir dir="${folder.lib}"/>
-            <delete file="${folder.lib}/@{jarFile}" failonerror="false"/>
-            <delete dir="${folder.doc}/@{jarFile}" failonerror="false"/>
-
-            <javadoc packagenames="@{package}"
-                destdir="${folder.doc}/@{jarFile}"
-                author="true" version="true" use="true"
-                classpath="${java.class.path}">
-                <classpath>
-                    <path refid="classpath.javalib"/>
-                    <fileset dir="web-server/lib" includes="**/*.jar"/>
-                    <fileset dir="wtk/lib" includes="**/*.jar"/>
-
-                    <dirset dir="@{project}/../">
-                      <include name="charts/${folder.bin}"/>
-                      <include name="core/${folder.bin}"/>
-                      <include name="web/${folder.bin}"/>
-                      <include name="web-server/${folder.bin}"/>
-                      <include name="wtk/${folder.bin}"/>
-                      <include name="wtk-terra/${folder.bin}"/>
-                    </dirset>
-                </classpath>
-
-                <packageset dir="@{project}/src" includes="**/*"/>
-
-                <link href="http://download.oracle.com/javase/6/docs/api"/>
-                <link href="http://download.oracle.com/javaee/1.4/api/"/>
-            </javadoc>
-
-            <package-maven-source-or-javadoc-jar
-                project="@{project}"
-                jarFile="@{jarFile}"
-                title="@{title}"
-                jarFileset="${folder.doc}/@{jarFile}"
-            />
-        </sequential>
-    </macrodef>
-
-    <!-- Clean macro -->
-    <macrodef name="clean">
-        <attribute name="project"/>
-
-        <sequential>
-            <delete includeemptydirs="true">
-                <fileset dir="@{project}">
-                    <include name="${folder.bin}/**"/>
-                    <include name="${folder.deploy}/**"/>
-                </fileset>
-                <fileset dir="${basedir}">
-                    <include name="${folder.lib}/${ant.project.name}-@{project}-${version}.jar"/>
-                </fileset>
-            </delete>
-        </sequential>
-    </macrodef>
-
-    <!-- Compile all classes (tests included) -->
-    <target name="compile" description="Compiles all projects"
-        depends="charts, core, demos, demos-server, tests, tutorials, tutorials-server, web, web-server, wtk, wtk-terra"/>
-
-    <!-- Package JAR files -->
-    <target name="package" description="Packages all projects into JAR files" depends="compile">
-        <package project="charts" jarFile="${jar.charts}" title="Charts"/>
-        <package project="core" jarFile="${jar.core}" title="Core"/>
-        <package project="demos" jarFile="${jar.demos}" title="Demos"/>
-        <package project="demos-server" jarFile="${jar.demos-server}" title="Demos Server"/>
-        <package project="tutorials" jarFile="${jar.tutorials}" title="Tutorials"/>
-        <package project="tutorials-server" jarFile="${jar.tutorials-server}" title="Tutorials Server"/>
-        <package project="web" jarFile="${jar.web}" title="Web"/>
-        <package project="web-server" jarFile="${jar.web-server}" title="Web Server"/>
-        <package project="wtk" jarFile="${jar.wtk}" title="WTK"/>
-        <package project="wtk-terra" jarFile="${jar.wtk-terra}" title="WTK Terra Theme Provider"/>
-    </target>
-
-    <!-- Package Maven Sources JAR files -->
-    <target name="package-sources" description="Packages any project sources into a JAR file" depends="trim-whitespace, package">
-        <package-sources project="charts" jarFile="${jar.charts.sources}" title="Charts"/>
-        <package-sources project="core" jarFile="${jar.core.sources}" title="Core"/>
-        <package-sources project="web" jarFile="${jar.web.sources}" title="Web"/>
-        <package-sources project="web-server" jarFile="${jar.web-server.sources}" title="Web Server"/>
-        <package-sources project="wtk" jarFile="${jar.wtk.sources}" title="WTK"/>
-        <package-sources project="wtk-terra" jarFile="${jar.wtk-terra.sources}" title="WTK Terra Theme Provider"/>
-    </target>
 
-    <!-- Package Maven Javadoc JAR files -->
-    <target name="package-javadoc" description="Packages any project Javadoc into a JAR file" depends="package-sources">
-        <delete dir="${folder.doc}"/>
-        <package-javadoc project="charts" jarFile="${jar.charts.javadoc}" title="Charts" package="${src.package.base}.charts.*"/>
-        <package-javadoc project="core" jarFile="${jar.core.javadoc}" title="Core" package="${src.package.base}.*"/>
-        <package-javadoc project="web" jarFile="${jar.web.javadoc}" title="Web" package="${src.package.base}.web.*"/>
-        <package-javadoc project="web-server" jarFile="${jar.web-server.javadoc}" title="Web Server" package="${src.package.base}.web.server.*"/>
-        <package-javadoc project="wtk" jarFile="${jar.wtk.javadoc}" title="WTK" package="${src.package.base}.wtk.*"/>
-        <package-javadoc project="wtk-terra" jarFile="${jar.wtk-terra.javadoc}" title="WTK Terra Theme Provider" package="${src.package.base}.wtk.skin.terra.*"/>
-        <delete dir="${folder.doc}"/>
     </target>
 
-    <!-- Prepare folder for unit tests output from jenkins -->
-    <target name="make-tests-out" if="jenkins.job">
-      <mkdir dir="tests-out"/>
-    </target>
-
-    <!-- Run unit tests -->
-    <target name="test" description="Executes unit tests" depends="compile, make-tests-out">
-        <test project="charts"/>
-        <test project="core"/>
-        <test project="demos"/>
-        <test project="demos-server"/>
-        <test project="tests"/>
-        <test project="tutorials"/>
-        <test project="tutorials-server"/>
-        <test project="web"/>
-        <test project="web-server"/>
-        <test project="wtk"/>
-        <test project="wtk-terra"/>
-    </target>
-
-    <!-- Clean -->
-    <target name="clean" description="Removes all build artifacts">
-        <clean project="charts"/>
-        <clean project="core"/>
-        <clean project="demos"/>
-        <clean project="demos-server"/>
-        <clean project="tests"/>
-        <clean project="tutorials"/>
-        <clean project="tutorials-server"/>
-        <clean project="web"/>
-        <clean project="web-server"/>
-        <clean project="wtk"/>
-        <clean project="wtk-terra"/>
-        <delete dir="${folder.dist}"/>
-        <delete dir="${folder.doc}"/>
-        <delete dir="${folder.install}"/>
-        <delete dir="${folder.lib}"/>
-        <delete dir="${test.out.dir}"/>
-    </target>
-
-    <!-- Javadoc -->
-    <target name="doc" description="Generates API documentation in ${folder.doc}">
-        <javadoc packagenames="org.apache.pivot.*" destdir="${folder.doc}"
-            author="true" version="true" use="true"
-            classpath="${java.class.path}">
-            <classpath>
-                <path refid="classpath.javalib"/>
-                <fileset dir="web-server/lib" includes="**/*.jar"/>
-                <fileset dir="wtk/lib" includes="**/*.jar"/>
-            </classpath>
-
-            <packageset dir="charts/src" includes="**/*"/>
-            <packageset dir="core/src" includes="**/*"/>
-            <packageset dir="web/src" includes="**/*"/>
-            <packageset dir="web-server/src" includes="**/*"/>
-            <packageset dir="wtk/src" includes="**/*"/>
-            <packageset dir="wtk-terra/src" includes="**/*"/>
-
-            <link href="http://download.oracle.com/javase/6/docs/api"/>
-            <link href="http://download.oracle.com/javaee/1.4/api/"/>
-        </javadoc>
-    </target>
-
-    <!-- Individual compile targets resolve inter-project dependency -->
-    <target name="charts" depends="core, wtk">
-        <compile project="charts"/>
-    </target>
-
-    <target name="core">
-        <compile project="core"/>
-    </target>
-
-    <target name="demos" depends="core, wtk, wtk-terra, web">
-        <compile project="demos"/>
-    </target>
-
-    <target name="demos-server" depends="core, web, web-server">
-        <compile project="demos-server">
-            <fileset dir="web-server" includes="lib/**/*.jar"/>
-        </compile>
-    </target>
-
-    <target name="tests" depends="core, web, wtk, wtk-terra">
-        <compile project="tests"/>
-    </target>
-
-    <target name="tutorials" depends="core, wtk, web">
-        <compile project="tutorials"/>
-    </target>
-
-    <target name="tutorials-server" depends="core, web, web-server">
-        <compile project="tutorials-server">
-            <fileset dir="web-server" includes="lib/**/*.jar"/>
-        </compile>
-    </target>
-
-    <target name="web" depends="core">
-        <compile project="web"/>
-    </target>
-
-    <target name="web-server" depends="core, web">
-        <compile project="web-server"/>
-    </target>
-
-    <target name="wtk" depends="core">
-        <fail>
-            <condition>
-                <not>
-                    <available classname="netscape.javascript.JSObject"
-                        classpathref="classpath.javalib"/>
-                </not>
-            </condition>
-            <![CDATA[
-            Error:
-
-            LiveConnect was not found on your classpath. Please see the BUILD
-            file for more information.
-            ]]>
-        </fail>
-
-        <compile project="wtk"/>
-    </target>
-
-    <target name="wtk-terra" depends="core, wtk">
-        <compile project="wtk-terra"/>
-    </target>
-
-    <!-- Package source distribution -->
-    <target name="dist" description="Generates source release in ${folder.dist}"
-        depends="clean, trim-whitespace">
-        <mkdir dir="${folder.dist}/${release}-src"/>
-
-        <!-- Copy the source files to the release folder -->
-        <copy todir="${folder.dist}/${release}-src">
-            <fileset dir="${basedir}">
-                <include name="**/*"/>
-
-                <!-- Exclude hidden files and folders -->
-                <exclude name="**/.*/**"/>
-
-                <!-- Exclude folders containing compilation artifacts -->
-                <exclude name="**/${folder.bin}/**"/>
-                <exclude name="${folder.dist}/**"/>
-                <exclude name="${folder.doc}/**"/>
-                <exclude name="${folder.install}/**"/>
-                <exclude name="${folder.lib}/**"/>
-            </fileset>
-        </copy>
-
-        <!-- Create .zip archive -->
-        <zip destfile="${folder.dist}/${release}-src.zip" level="9">
-            <fileset dir="${folder.dist}" includes="${release}-src/**"/>
-        </zip>
-        <checksum file="${folder.dist}/${release}-src.zip" algorithm="md5"/>
-        <checksum file="${folder.dist}/${release}-src.zip" algorithm="sha"/>
-
-        <!-- Create .tar.gz archive -->
-        <tar destfile="${folder.dist}/${release}-src.tar" longfile="gnu">
-            <fileset dir="${folder.dist}" includes="${release}-src/**"/>
-        </tar>
-        <gzip src="${folder.dist}/${release}-src.tar"
-            destfile="${folder.dist}/${release}-src.tar.gz"/>
-        <delete file="${folder.dist}/${release}-src.tar"/>
-        <checksum file="${folder.dist}/${release}-src.tar.gz" algorithm="md5"/>
-        <checksum file="${folder.dist}/${release}-src.tar.gz" algorithm="sha"/>
-    </target>
-
-    <!-- Package binary distribution -->
-    <target name="install" description="Generates binary release in ${folder.install}"
-        depends="clean, package, doc, deploy">
-        <mkdir dir="${folder.install}/${release}/lib"/>
-        <mkdir dir="${folder.install}/${release}/doc"/>
-        <mkdir dir="${folder.install}/${release}/webapps"/>
-
-        <!-- Copy base files to the install folder -->
-        <copy todir="${folder.install}/${release}">
-            <fileset dir="${basedir}">
-                <include name="LICENSE"/>
-                <include name="NOTICE"/>
-                <include name="README"/>
-                <include name="RELEASE-NOTES"/>
-            </fileset>
-        </copy>
-
-        <!-- Copy release binaries -->
-        <copy todir="${folder.install}/${release}/lib">
-            <fileset dir="${folder.lib}">
-                <include name="${jar.charts}"/>
-                <include name="${jar.core}"/>
-                <include name="${jar.web}"/>
-                <include name="${jar.web-server}"/>
-                <include name="${jar.wtk}"/>
-                <include name="${jar.wtk-terra}"/>
-            </fileset>
-        </copy>
-
-        <!-- Copy documentation -->
-        <copy todir="${folder.install}/${release}/doc">
-            <fileset dir="${folder.doc}"/>
-        </copy>
-
-        <!-- Copy webapps -->
-        <copy todir="${folder.install}/${release}/webapps">
-            <fileset dir="${folder.lib}">
-                <include name="${ant.project.name}-demos.war"/>
-                <include name="${ant.project.name}-tutorials.war"/>
-            </fileset>
-        </copy>
-
-        <!-- Create .zip archive -->
-        <zip destfile="${folder.install}/${release}.zip" level="9">
-            <fileset dir="${folder.install}" includes="${release}/**"/>
-        </zip>
-        <checksum file="${folder.install}/${release}.zip" algorithm="md5"/>
-        <checksum file="${folder.install}/${release}.zip" algorithm="sha"/>
-
-        <!-- Create .tar.gz archive -->
-        <tar destfile="${folder.install}/${release}.tar" longfile="gnu">
-            <fileset dir="${folder.install}" includes="${release}/**"/>
-        </tar>
-        <gzip src="${folder.install}/${release}.tar" destfile="${folder.install}/${release}.tar.gz"/>
-        <delete file="${folder.install}/${release}.tar"/>
-        <checksum file="${folder.install}/${release}.tar.gz" algorithm="md5"/>
-        <checksum file="${folder.install}/${release}.tar.gz" algorithm="sha"/>
-    </target>
-
-    <!-- Generate deployment files -->
-    <target name="deploy" depends="package">
-        <!-- Copy library depenencies lib directory -->
-        <copy todir="${folder.lib}">
-            <fileset dir="wtk/lib">
-                <include name="*.jar"/>
-            </fileset>
-        </copy>
-
-        <!-- Sign JARS -->
-        <mkdir dir="${folder.lib}/signed"/>
-        <copy todir="${folder.lib}/signed">
-            <fileset dir="${folder.lib}">
-                <include name="*.jar"/>
-            </fileset>
-        </copy>
-
-        <signjar keystore="${keystore.location}" storepass="${keystore.passwd}"
-            alias="${keystore.alias}" preservelastmodified="true" lazy="true">
-            <path>
-                <fileset dir="${folder.lib}/signed" includes="*.jar" />
-            </path>
-        </signjar>
-
-        <copy todir="${folder.lib}">
-            <fileset dir="${folder.lib}/signed" includes="*.jar" />
-            <mapper type="glob" from="*.jar" to="*.signed.jar"/>
-        </copy>
-
-        <delete dir="${folder.lib}/signed"/>
-
-        <!-- Deploy demos -->
-        <mkdir dir="demos/${folder.deploy}/lib"/>
-        <copy todir="demos/${folder.deploy}/lib">
-            <fileset dir="${folder.lib}">
-                <include name="*.jar"/>
-                <exclude name="*-server*.jar"/>
-            </fileset>
-        </copy>
-
-        <!-- Transform demos index -->
-        <xslt basedir="demos/www"
-            destdir="demos/${folder.deploy}"
-            extension=".html"
-            force="true"
-            style="demos/xsl/index.xsl"
-            includes="index.xml"/>
-
-        <!-- Transform demos html -->
-        <xslt basedir="demos/www"
-            destdir="demos/${folder.deploy}"
-            extension=".html"
-            force="true"
-            style="demos/xsl/demo.html.xsl"
-            includes="*.xml"
-            excludes="index.xml">
-            <param name="version" expression="${version}"/>
-            <param name="root" expression="${ant.project.name}-demos"/>
-        </xslt>
-
-        <!-- Transform demos jnlp -->
-        <xslt basedir="demos/www"
-            destdir="demos/${folder.deploy}"
-            extension=".jnlp"
-            force="true"
-            style="demos/xsl/demo.jnlp.xsl"
-            includes="*.xml"
-            excludes="index.xml">
-            <param name="version" expression="${version}"/>
-            <param name="root" expression="${ant.project.name}-demos"/>
-        </xslt>
-
-        <!-- Copy static demo files to deploy folder -->
-        <copy todir="demos/${folder.deploy}">
-            <fileset dir="demos/www">
-                <exclude name="**/*.xml"/>
-                <exclude name="**/*.template.html"/>
-            </fileset>
-        </copy>
-
-        <copy todir="demos/${folder.deploy}">
-            <fileset dir="demos/www">
-                <include name="*.template.html"/>
-            </fileset>
-            <filterset>
-                <filter token="VERSION" value="${version}"/>
-            </filterset>
-            <globmapper from="*.template.html" to="*.html"/>
-        </copy>
-
-        <!-- Generate demos WAR -->
-        <war destfile="${folder.lib}/${ant.project.name}-demos.war" webxml="demos/web.xml">
-            <fileset dir="demos/${folder.deploy}"/>
-
-            <classes dir="demos-server/${folder.bin}"/>
-            <classes dir="demos-server/src">
-                <exclude name="**/*.java"/>
-                <exclude name="**/package.html"/>
-            </classes>
-            <lib dir="${folder.lib}">
-                <include name="${jar.core}"/>
-                <include name="${jar.web}"/>
-                <include name="${jar.web-server}"/>
-            </lib>
-        </war>
-
-        <!-- Deploy tutorials -->
-        <mkdir dir="tutorials/${folder.deploy}/lib"/>
-        <copy todir="tutorials/${folder.deploy}/lib">
-            <fileset dir="${folder.lib}">
-                <include name="*.jar"/>
-                <exclude name="*-demos*.jar"/>
-                <exclude name="*-server*.jar"/>
-            </fileset>
-        </copy>
-
-        <!-- Transform tutorials index -->
-        <xslt basedir="tutorials/www"
-            destdir="tutorials/${folder.deploy}"
-            extension=".html"
-            force="true"
-            style="tutorials/xsl/index.xsl"
-            includes="index.xml"/>
-
-        <!-- Transform tutorials html -->
-        <xslt basedir="tutorials/www"
-            destdir="tutorials/${folder.deploy}"
-            extension=".html"
-            force="true"
-            style="tutorials/xsl/tutorial.xsl"
-            includes="*.xml"
-            excludes="index.xml">
-            <param name="version" expression="${version}"/>
-        </xslt>
-
-        <!-- Copy static tutorial files to deploy folder -->
-        <copy todir="tutorials/${folder.deploy}">
-            <fileset dir="tutorials/www">
-                <exclude name="**/*.xml"/>
-                <exclude name="**/*.template.html"/>
-            </fileset>
-        </copy>
-
-        <copy todir="tutorials/${folder.deploy}">
-            <fileset dir="tutorials/www">
-                <include name="*.template.html"/>
-            </fileset>
-            <filterset>
-                <filter token="VERSION" value="${version}"/>
-            </filterset>
-            <globmapper from="*.template.html" to="*.html"/>
-        </copy>
-
-        <!-- Generate tutorials WAR -->
-        <war destfile="${folder.lib}/${ant.project.name}-tutorials.war" webxml="tutorials/web.xml">
-            <fileset dir="tutorials/${folder.deploy}"/>
-
-            <classes dir="tutorials-server/${folder.bin}"/>
-            <classes dir="tutorials-server/src">
-                <exclude name="**/*.java"/>
-                <exclude name="**/package.html"/>
-            </classes>
-            <lib dir="${folder.lib}">
-                <include name="${jar.core}"/>
-                <include name="${jar.web}"/>
-                <include name="${jar.web-server}"/>
-            </lib>
-        </war>
-    </target>
-
-    <!-- Installs JARs to local Maven repository -->
-    <target name="maven-install" depends="clean, package, package-sources, package-javadoc">
-        <mkdir dir="maven-install"/>
-
-        <copy todir="maven-install">
-            <fileset dir=".">
-                <include name="**/pom.xml"/>
-            </fileset>
-            <filterset>
-                <filter token="VERSION" value="${version}"/>
-            </filterset>
-        </copy>
-
-        <artifact:install file="maven-install/pom.xml">
-            <artifact:pom file="maven-install/pom.xml"/>
-        </artifact:install>
-        <artifact:install file="lib/${jar.core}">
-            <artifact:pom file="maven-install/core/pom.xml"/>
-            <attach file="lib/${jar.core.sources}" classifier="sources" />
-            <attach file="lib/${jar.core.javadoc}" classifier="javadoc" />
-        </artifact:install>
-        <artifact:install file="lib/${jar.web}">
-            <artifact:pom file="maven-install/web/pom.xml"/>
-            <attach file="lib/${jar.web.sources}" classifier="sources" />
-            <attach file="lib/${jar.web.javadoc}" classifier="javadoc" />
-        </artifact:install>
-        <artifact:install file="lib/${jar.web-server}">
-            <artifact:pom file="maven-install/web-server/pom.xml"/>
-            <attach file="lib/${jar.web-server.sources}" classifier="sources" />
-            <attach file="lib/${jar.web-server.javadoc}" classifier="javadoc" />
-        </artifact:install>
-        <artifact:install file="lib/${jar.wtk}">
-            <artifact:pom file="maven-install/wtk/pom.xml"/>
-            <attach file="lib/${jar.wtk.sources}" classifier="sources" />
-            <attach file="lib/${jar.wtk.javadoc}" classifier="javadoc" />
-        </artifact:install>
-        <artifact:install file="lib/${jar.wtk-terra}">
-            <artifact:pom file="maven-install/wtk-terra/pom.xml"/>
-            <attach file="lib/${jar.wtk-terra.sources}" classifier="sources" />
-            <attach file="lib/${jar.wtk-terra.javadoc}" classifier="javadoc" />
-        </artifact:install>
-        <artifact:install file="lib/${jar.charts}">
-            <artifact:pom file="maven-install/charts/pom.xml"/>
-            <attach file="lib/${jar.charts.sources}" classifier="sources" />
-            <attach file="lib/${jar.charts.javadoc}" classifier="javadoc" />
-        </artifact:install>
-
-        <delete dir="maven-install"/>
-    </target>
-
-    <!-- Remove trailing white space in all source files -->
-    <target name="trim-whitespace">
-        <fileset id="trimfiles" dir=".">
-            <include name="BUILD"/>
-            <include name="LICENSE"/>
-            <include name="NOTICE"/>
-            <include name="README"/>
-            <include name="RELEASE-NOTES"/>
-            <include name="**/*.java"/>
-            <include name="**/*.html"/>
-            <include name="**/*.jsp"/>
-            <include name="**/*.txt"/>
-            <include name="**/*.properties"/>
-            <include name="**/*.xml"/>
-            <include name="**/*.bxml"/>
-            <include name="**/*.json"/>
-            <include name="**/*.groovy"/>
-            <include name="**/*.scala"/>
-        </fileset>
-        <replaceregexp match="[\t]" replace="    " flags="gm" byline="true">
-            <fileset refid="trimfiles"/>
-        </replaceregexp>
-        <replaceregexp match="[\t ]+$" replace="" flags="gm" byline="true">
-            <fileset refid="trimfiles"/>
-        </replaceregexp>
-    </target>
 </project>