You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by tv...@apache.org on 2009/12/02 16:13:43 UTC
svn commit: r886171 - in /incubator/pivot/trunk: build.xml charts/lib/
demos/web.xml
Author: tvolkert
Date: Wed Dec 2 15:13:42 2009
New Revision: 886171
URL: http://svn.apache.org/viewvc?rev=886171&view=rev
Log:
Updated build.xml to reflect recent project separations, removed empty charts/lib folder, removed index.jsp from welcmoe file list in demos deployment descriptor file
Removed:
incubator/pivot/trunk/charts/lib/
Modified:
incubator/pivot/trunk/build.xml
incubator/pivot/trunk/demos/web.xml
Modified: incubator/pivot/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/build.xml?rev=886171&r1=886170&r2=886171&view=diff
==============================================================================
--- incubator/pivot/trunk/build.xml (original)
+++ incubator/pivot/trunk/build.xml Wed Dec 2 15:13:42 2009
@@ -27,6 +27,7 @@
<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"/>
@@ -46,19 +47,18 @@
<!-- Dynamic properties -->
<property file="build.properties"/>
- <property name="folder.release" value="apache-${ant.project.name}-${version}"/>
+ <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.web" value="${ant.project.name}-web-${version}.jar" />
- <property name="jar.web.server" value="${ant.project.name}-web-${version}.server.jar" />
- <property name="jar.wtk" value="${ant.project.name}-wtk-${version}.jar" />
- <property name="jar.wtk.terra" value="${ant.project.name}-wtk-${version}.terra.jar" />
- <property name="jar.wtk.obsidian" value="${ant.project.name}-wtk-${version}.obsidian.jar" />
- <property name="jar.tutorials" value="${ant.project.name}-tutorials-${version}.jar" />
<property name="jar.demos" value="${ant.project.name}-demos-${version}.jar" />
<property name="jar.tools" value="${ant.project.name}-tools-${version}.jar" />
+ <property name="jar.tutorials" value="${ant.project.name}-tutorials-${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" />
<!-- Ant version check -->
<fail message="Building Pivot requires Apache Ant 1.7 or greater.">
@@ -108,6 +108,7 @@
failonerror="true">
<compilerarg line="${compiler.arg}"/>
<classpath>
+ <path refid="classpath.javalib"/>
<classpath-elements/>
</classpath>
</javac>
@@ -129,7 +130,7 @@
<junit fork="true">
<classpath>
<classpath-elements/>
- </classpath>
+ </classpath>
<formatter type="brief" usefile="false" if="test.formatter"/>
@@ -142,9 +143,9 @@
<!-- Package macro -->
<macrodef name="package">
+ <attribute name="project"/>
<attribute name="jarFile"/>
<attribute name="title"/>
- <element name="jar-elements" implicit="true"/>
<sequential>
<mkdir dir="${folder.lib}"/>
@@ -161,7 +162,13 @@
<attribute name="Implementation-Title" value="Apache Pivot @{title}"/>
<attribute name="Implementation-Version" value="${version}"/>
</manifest>
- <jar-elements/>
+ <fileset dir="@{project}/${folder.bin}">
+ <exclude name="**/test/**"/>
+ </fileset>
+ <fileset dir="@{project}/src">
+ <exclude name="**/*.java"/>
+ <exclude name="**/package.html"/>
+ </fileset>
</jar>
</sequential>
</macrodef>
@@ -181,21 +188,21 @@
depends="compile-main, compile-test"/>
<target name="compile-main"
- depends="charts, core, web, wtk, tools, tutorials, demos"/>
+ depends="charts, core, demos, tools, tutorials, web, web-server, wtk, wtk-terra"/>
<target name="compile-test"
depends="core-test, web-test, wtk-test"/>
<target name="package"
- depends="clean, charts-package, core-package, web-package, wtk-package,
- tutorials-package, demos-package, tools-package"/>
+ depends="charts-package, core-package, demos-package, tools-package, tutorials-package,
+ web-package, web-server-package, wtk-package, wtk-terra-package"/>
<target name="test"
depends="core-test-run, web-test-run"/>
<target name="clean" description="Removes all build artifacts"
- depends="charts-clean, core-clean, web-clean, wtk-clean, tutorials-clean,
- demos-clean, tools-clean">
+ depends="charts-clean, core-clean, demos-clean, tools-clean, tutorials-clean, web-clean,
+ web-server-clean, wtk-clean, wtk-terra-clean">
<delete dir="${folder.dist}"/>
<delete dir="${folder.doc}"/>
<delete dir="${folder.install}"/>
@@ -208,22 +215,24 @@
author="true" version="true" use="true"
classpath="${java.class.path}">
<classpath>
- <fileset dir="charts/lib" includes="**/*.jar"/>
- <fileset dir="web/lib" includes="**/*.jar"/>
+ <fileset dir="web-server/lib" includes="**/*.jar"/>
<path refid="classpath.javalib"/>
</classpath>
<packageset dir="charts/src" includes="**/*"/>
<packageset dir="core/src" includes="**/*"/>
+ <packageset dir="tools/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://java.sun.com/javase/6/docs/api"/>
<link href="http://java.sun.com/j2ee/1.4/docs/api"/>
</javadoc>
</target>
- <!-- Charts -->
+ <!-- charts -->
<target name="charts" depends="core, wtk">
<compile project="charts">
<pathelement location="core/${folder.bin}"/>
@@ -232,13 +241,7 @@
</target>
<target name="charts-package" depends="charts">
- <package jarFile="${jar.charts}" title="Charts">
- <fileset dir="charts/${folder.bin}"/>
- <fileset dir="charts/src">
- <exclude name="**/*.java"/>
- <exclude name="**/package.html"/>
- </fileset>
- </package>
+ <package project="charts" jarFile="${jar.charts}" title="Charts"/>
</target>
<target name="charts-clean">
@@ -246,19 +249,13 @@
<delete file="${folder.lib}/${jar.charts}"/>
</target>
- <!-- Core -->
+ <!-- core -->
<target name="core">
<compile project="core"/>
</target>
<target name="core-package" depends="core">
- <package jarFile="${jar.core}" title="Core">
- <fileset dir="core/${folder.bin}"/>
- <fileset dir="core/src">
- <exclude name="**/*.java"/>
- <exclude name="**/package.html"/>
- </fileset>
- </package>
+ <package project="core" jarFile="${jar.core}" title="Core"/>
</target>
<target name="core-clean">
@@ -280,58 +277,112 @@
</test>
</target>
- <!-- Web -->
+ <!-- demos -->
+ <target name="demos" depends="core, wtk, web">
+ <compile project="demos">
+ <pathelement location="core/${folder.bin}"/>
+ <pathelement location="web/${folder.bin}"/>
+ <pathelement location="wtk/${folder.bin}"/>
+ </compile>
+ </target>
+
+ <target name="demos-package" depends="demos">
+ <package project="demos" jarFile="${jar.demos}" title="Demos"/>
+ </target>
+
+ <target name="demos-clean">
+ <delete dir="demos/${folder.bin}"/>
+ <delete dir="demos/${folder.deploy}"/>
+ <delete file="${folder.lib}/${jar.demos}"/>
+ </target>
+
+ <!-- tools -->
+ <target name="tools" depends="core, wtk, web">
+ <compile project="tools">
+ <pathelement location="core/${folder.bin}"/>
+ <pathelement location="web/${folder.bin}"/>
+ <pathelement location="wtk/${folder.bin}"/>
+ </compile>
+ </target>
+
+ <target name="tools-package" depends="tools">
+ <package project="tools" jarFile="${jar.tools}" title="Tools"/>
+ </target>
+
+ <target name="tools-clean">
+ <delete dir="tools/${folder.bin}"/>
+ <delete file="${folder.lib}/${jar.tools}"/>
+ </target>
+
+ <!-- tutorials -->
+ <target name="tutorials" depends="core, wtk, web, tools">
+ <compile project="tutorials">
+ <pathelement location="core/${folder.bin}"/>
+ <pathelement location="web/${folder.bin}"/>
+ <pathelement location="wtk/${folder.bin}"/>
+ <pathelement location="tools/${folder.bin}"/>
+ </compile>
+ </target>
+
+ <target name="tutorials-package" depends="tutorials">
+ <package project="tutorials" jarFile="${jar.tutorials}" title="Tutorials"/>
+ </target>
+
+ <target name="tutorials-clean">
+ <delete dir="tutorials/${folder.bin}"/>
+ <delete file="${folder.lib}/${jar.tutorials}"/>
+ <clean-www project="tutorials"/>
+ </target>
+
+ <!-- web -->
<target name="web" depends="core">
<compile project="web">
<pathelement location="core/${folder.bin}"/>
- <fileset dir="web/lib" includes="**/*.jar"/>
</compile>
</target>
<target name="web-package" depends="web">
- <package jarFile="${jar.web}" title="Web Queries">
- <fileset dir="web/${folder.bin}" excludes="org/apache/pivot/web/server/**"/>
- <fileset dir="web/src">
- <exclude name="org/apache/pivot/web/server/**"/>
- <exclude name="**/*.java"/>
- <exclude name="**/package.html"/>
- </fileset>
- </package>
-
- <package jarFile="${jar.web.server}" title="Web Queries Server">
- <fileset dir="web/${folder.bin}" includes="org/apache/pivot/web/server/*"/>
- <fileset dir="web/src">
- <include name="org/apache/pivot/web/server/**"/>
- <exclude name="**/*.java"/>
- <exclude name="**/package.html"/>
- </fileset>
- </package>
+ <package project="web" jarFile="${jar.web}" title="Web Queries"/>
</target>
<target name="web-clean">
<delete dir="web/${folder.bin}"/>
<delete file="${folder.lib}/${jar.web}"/>
- <delete file="${folder.lib}/${jar.web.server}"/>
- <clean-www project="web"/>
</target>
- <target name="web-test" depends="core, web, wtk">
+ <target name="web-test" depends="web">
<compile project="web" srcDir="test">
<pathelement location="core/${folder.bin}"/>
<pathelement location="web/${folder.bin}"/>
- <fileset dir="web/lib" includes="**/*.jar"/>
</compile>
</target>
- <target name="web-test-run" depends="core, wtk, web-test">
+ <target name="web-test-run" depends="web-test">
<test project="web">
<pathelement location="core/${folder.bin}"/>
<pathelement location="web/${folder.bin}"/>
- <fileset dir="web/lib" includes="**/*.jar"/>
</test>
</target>
- <!-- WTK -->
+ <!-- web-server -->
+ <target name="web-server" depends="core, web">
+ <compile project="web-server">
+ <pathelement location="core/${folder.bin}"/>
+ <pathelement location="web/${folder.bin}"/>
+ <fileset dir="web-server/lib" includes="**/*.jar"/>
+ </compile>
+ </target>
+
+ <target name="web-server-package" depends="web-server">
+ <package project="web-server" jarFile="${jar.web-server}" title="Web Queries Server"/>
+ </target>
+
+ <target name="web-server-clean">
+ <delete dir="web-server/${folder.bin}"/>
+ <delete file="${folder.lib}/${jar.web-server}"/>
+ </target>
+
+ <!-- wtk -->
<target name="wtk" depends="core">
<!-- Fail descriptively if the user's classpath is not set up correctly -->
<fail message="LiveConnect not found. Please see the BUILD file for more information.">
@@ -345,50 +396,16 @@
<compile project="wtk">
<pathelement location="core/${folder.bin}"/>
- <path refid="classpath.javalib"/>
</compile>
</target>
<target name="wtk-package" depends="wtk">
- <package jarFile="${jar.wtk}" title="WTK">
- <fileset dir="wtk/${folder.bin}">
- <exclude name="org/apache/pivot/wtk/skin/terra/**"/>
- <exclude name="org/apache/pivot/wtk/skin/obsidian/**"/>
- </fileset>
- <fileset dir="wtk/src">
- <exclude name="org/apache/pivot/wtk/skin/terra/**"/>
- <exclude name="org/apache/pivot/wtk/skin/obsidian/**"/>
- <exclude name="META-INF/**"/>
- <exclude name="**/*.java"/>
- <exclude name="**/package.html"/>
- </fileset>
- </package>
-
- <package jarFile="${jar.wtk.terra}" title="WTK Terra Theme">
- <fileset dir="wtk/${folder.bin}" includes="org/apache/pivot/wtk/skin/terra/**"/>
- <fileset dir="wtk/src">
- <include name="org/apache/pivot/wtk/skin/terra/**"/>
- <include name="META-INF/**"/>
- <exclude name="**/*.java"/>
- <exclude name="**/package.html"/>
- </fileset>
- </package>
-
- <package jarFile="${jar.wtk.obsidian}" title="WTK Obsidian Theme">
- <fileset dir="wtk/${folder.bin}" includes="org/apache/pivot/wtk/skin/obsidian/**"/>
- <fileset dir="wtk/src">
- <include name="org/apache/pivot/wtk/skin/obsidian/**"/>
- <exclude name="**/*.java"/>
- <exclude name="**/package.html"/>
- </fileset>
- </package>
+ <package project="wtk" jarFile="${jar.wtk}" title="WTK"/>
</target>
<target name="wtk-clean">
<delete dir="wtk/${folder.bin}"/>
<delete file="${folder.lib}/${jar.wtk}"/>
- <delete file="${folder.lib}/${jar.wtk.terra}"/>
- <delete file="${folder.lib}/${jar.wtk.obsidian}"/>
</target>
<target name="wtk-test" depends="core, wtk">
@@ -398,93 +415,31 @@
</compile>
</target>
- <!-- Tutorials -->
- <target name="tutorials" depends="core, wtk, web, tools">
- <compile project="tutorials">
+ <!-- wtk-terra -->
+ <target name="wtk-terra" depends="core, wtk">
+ <compile project="wtk-terra">
<pathelement location="core/${folder.bin}"/>
- <pathelement location="web/${folder.bin}"/>
<pathelement location="wtk/${folder.bin}"/>
- <pathelement location="tools/${folder.bin}"/>
</compile>
</target>
- <target name="tutorials-package" depends="tutorials">
- <package jarFile="${jar.tutorials}" title="Tutorials">
- <fileset dir="tutorials/${folder.bin}"/>
- <fileset dir="tutorials/src">
- <exclude name="**/*.java"/>
- </fileset>
- </package>
- </target>
-
- <target name="tutorials-clean">
- <delete dir="tutorials/${folder.bin}"/>
- <delete file="${folder.lib}/${jar.tutorials}"/>
- <clean-www project="tutorials"/>
+ <target name="wtk-terra-package" depends="wtk-terra">
+ <package project="wtk-terra" jarFile="${jar.wtk-terra}" title="WTK Terra Theme Provider"/>
</target>
- <!-- Demos -->
- <target name="demos" depends="core, wtk, web">
- <compile project="demos">
- <pathelement location="core/${folder.bin}"/>
- <pathelement location="web/${folder.bin}"/>
- <pathelement location="wtk/${folder.bin}"/>
- </compile>
- </target>
-
- <target name="demos-package" depends="demos">
- <package jarFile="${jar.demos}" title="Demos">
- <fileset dir="demos/${folder.bin}"/>
- <fileset dir="demos/src">
- <exclude name="**/*.java"/>
- <exclude name="**/package.html"/>
- </fileset>
- </package>
- </target>
-
- <target name="demos-clean">
- <delete dir="demos/${folder.bin}"/>
- <delete file="${folder.lib}/${jar.demos}"/>
- <clean-www project="demos"/>
- <delete>
- <fileset dir="demos/www">
- <include name="*.html"/>
- <include name="*.jnlp"/>
- </fileset>
- </delete>
- </target>
-
- <!-- Tools -->
- <target name="tools" depends="core, wtk, web">
- <compile project="tools">
- <pathelement location="core/${folder.bin}"/>
- <pathelement location="web/${folder.bin}"/>
- <pathelement location="wtk/${folder.bin}"/>
- </compile>
- </target>
-
- <target name="tools-package" depends="tools">
- <package jarFile="${jar.tools}" title="Tools">
- <fileset dir="tools/${folder.bin}"/>
- <fileset dir="tools/src">
- <exclude name="**/*.java"/>
- </fileset>
- </package>
- </target>
-
- <target name="tools-clean">
- <delete dir="tools/${folder.bin}"/>
- <delete file="${folder.lib}/${jar.tools}"/>
+ <target name="wtk-terra-clean">
+ <delete dir="wtk-terra/${folder.bin}"/>
+ <delete file="${folder.lib}/${jar.wtk-terra}"/>
</target>
<!-- Package source distribution -->
<target name="dist" description="Generates source release in ${folder.dist}"
depends="clean, trim-whitespace">
- <mkdir dir="${folder.dist}/${folder.release}-src"/>
+ <mkdir dir="${folder.dist}/${release}-src"/>
<!-- Copy the source files to the release folder -->
- <copy todir="${folder.dist}/${folder.release}-src">
- <fileset dir=".">
+ <copy todir="${folder.dist}/${release}-src">
+ <fileset dir="${basedir}">
<include name="**/*"/>
<!-- Exclude hidden files and folders -->
@@ -500,33 +455,33 @@
</copy>
<!-- Create .zip archive -->
- <zip destfile="${folder.dist}/${folder.release}-src.zip" level="9">
- <fileset dir="${folder.dist}" includes="${folder.release}-src/**"/>
+ <zip destfile="${folder.dist}/${release}-src.zip" level="9">
+ <fileset dir="${folder.dist}" includes="${release}-src/**"/>
</zip>
- <checksum file="${folder.dist}/${folder.release}-src.zip" algorithm="md5"/>
- <checksum file="${folder.dist}/${folder.release}-src.zip" algorithm="sha"/>
+ <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}/${folder.release}-src.tar" longfile="gnu">
- <fileset dir="${folder.dist}" includes="${folder.release}-src/**"/>
+ <tar destfile="${folder.dist}/${release}-src.tar" longfile="gnu">
+ <fileset dir="${folder.dist}" includes="${release}-src/**"/>
</tar>
- <gzip src="${folder.dist}/${folder.release}-src.tar"
- destfile="${folder.dist}/${folder.release}-src.tar.gz"/>
- <delete file="${folder.dist}/${folder.release}-src.tar"/>
- <checksum file="${folder.dist}/${folder.release}-src.tar.gz" algorithm="md5"/>
- <checksum file="${folder.dist}/${folder.release}-src.tar.gz" algorithm="sha"/>
+ <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}/${folder.release}/lib"/>
- <mkdir dir="${folder.install}/${folder.release}/doc"/>
- <mkdir dir="${folder.install}/${folder.release}/webapps"/>
+ <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}/${folder.release}">
- <fileset dir=".">
+ <copy todir="${folder.install}/${release}">
+ <fileset dir="${basedir}">
<include name="LICENSE"/>
<include name="NOTICE"/>
<include name="README"/>
@@ -535,25 +490,25 @@
</copy>
<!-- Copy release binaries -->
- <copy todir="${folder.install}/${folder.release}/lib">
+ <copy todir="${folder.install}/${release}/lib">
<fileset dir="${folder.lib}">
<include name="${jar.charts}"/>
<include name="${jar.core}"/>
+ <include name="${jar.tools}"/>
<include name="${jar.web}"/>
- <include name="${jar.web.server}"/>
+ <include name="${jar.web-server}"/>
<include name="${jar.wtk}"/>
- <include name="${jar.wtk.terra}"/>
- <include name="${jar.tools}"/>
+ <include name="${jar.wtk-terra}"/>
</fileset>
</copy>
<!-- Copy documentation -->
- <copy todir="${folder.install}/${folder.release}/doc">
+ <copy todir="${folder.install}/${release}/doc">
<fileset dir="${folder.doc}"/>
</copy>
<!-- Copy webapps -->
- <copy todir="${folder.install}/${folder.release}/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"/>
@@ -561,20 +516,20 @@
</copy>
<!-- Create .zip archive -->
- <zip destfile="${folder.install}/${folder.release}.zip" level="9">
- <fileset dir="${folder.install}" includes="${folder.release}/**"/>
+ <zip destfile="${folder.install}/${release}.zip" level="9">
+ <fileset dir="${folder.install}" includes="${release}/**"/>
</zip>
- <checksum file="${folder.install}/${folder.release}.zip" algorithm="md5"/>
- <checksum file="${folder.install}/${folder.release}.zip" algorithm="sha"/>
+ <checksum file="${folder.install}/${release}.zip" algorithm="md5"/>
+ <checksum file="${folder.install}/${release}.zip" algorithm="sha"/>
<!-- Create .tar.gz archive -->
- <tar destfile="${folder.install}/${folder.release}.tar" longfile="gnu">
- <fileset dir="${folder.install}" includes="${folder.release}/**"/>
+ <tar destfile="${folder.install}/${release}.tar" longfile="gnu">
+ <fileset dir="${folder.install}" includes="${release}/**"/>
</tar>
- <gzip src="${folder.install}/${folder.release}.tar" destfile="${folder.install}/${folder.release}.tar.gz"/>
- <delete file="${folder.install}/${folder.release}.tar"/>
- <checksum file="${folder.install}/${folder.release}.tar.gz" algorithm="md5"/>
- <checksum file="${folder.install}/${folder.release}.tar.gz" algorithm="sha"/>
+ <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 -->
@@ -584,12 +539,11 @@
<copy todir="${folder.lib}/signed">
<fileset dir="${folder.lib}">
<include name="*.jar"/>
- <exclude name="*.server.jar"/>
</fileset>
</copy>
- <signjar keystore="${keystore.location}" storepass="${keystore.passwd}" alias="${keystore.alias}"
- preservelastmodified="true" lazy="true">
+ <signjar keystore="${keystore.location}" storepass="${keystore.passwd}"
+ alias="${keystore.alias}" preservelastmodified="true" lazy="true">
<path>
<fileset dir="${folder.lib}/signed" includes="*.jar" />
</path>
@@ -607,24 +561,23 @@
<filter token="version" value="${version}"/>
<!-- Deploy demos -->
- <mkdir dir="demos/www/lib"/>
- <copy todir="demos/www/lib">
+ <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/www"
+ destdir="demos/${folder.deploy}"
extension=".html"
style="demos/xsl/index.xsl"
includes="index.xml"/>
<!-- Transform demos html -->
<xslt basedir="demos/www"
- destdir="demos/www"
+ destdir="demos/${folder.deploy}"
extension=".html"
style="demos/xsl/demo.html.xsl"
includes="*.xml"
@@ -635,7 +588,7 @@
<!-- Transform demos jnlp -->
<xslt basedir="demos/www"
- destdir="demos/www"
+ destdir="demos/${folder.deploy}"
extension=".jnlp"
style="demos/xsl/demo.jnlp.xsl"
includes="*.xml"
@@ -643,12 +596,14 @@
<param name="release" expression="${version}"/>
</xslt>
+ <!-- Copy static demo files to deploy folder -->
+ <copy todir="demos/${folder.deploy}">
+ <fileset dir="demos/www" excludes="**/*.xml"/>
+ </copy>
+
<!-- Generate demos WAR -->
<war destfile="${folder.lib}/${ant.project.name}-demos.war" webxml="demos/web.xml">
- <fileset dir="demos/www">
- <exclude name="*.xml"/>
- <exclude name="version.template.jsp"/>
- </fileset>
+ <fileset dir="demos/${folder.deploy}"/>
</war>
<!-- Deploy tutorials -->
Modified: incubator/pivot/trunk/demos/web.xml
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/demos/web.xml?rev=886171&r1=886170&r2=886171&view=diff
==============================================================================
--- incubator/pivot/trunk/demos/web.xml (original)
+++ incubator/pivot/trunk/demos/web.xml Wed Dec 2 15:13:42 2009
@@ -25,12 +25,10 @@
<welcome-file-list>
<welcome-file>index.html</welcome-file>
- <welcome-file>index.jsp</welcome-file>
</welcome-file-list>
<servlet-mapping>
<servlet-name>jsp</servlet-name>
<url-pattern>*.jnlp</url-pattern>
</servlet-mapping>
-
</web-app>