cmlenz 02/01/28 05:03:43
Modified: . build.xml
Log:
- Add target for packaging the taglib examples webapp
- Change build target directory of slide-admin to build/webapps
- Change target name of slidedoc.war to slide-doc.war
- Exclude taglib and antlr jars from slide.war
Revision Changes Path
1.149 +86 -19 jakarta-slide/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/build.xml,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -r1.148 -r1.149
--- build.xml 27 Jan 2002 15:46:37 -0000 1.148
+++ build.xml 28 Jan 2002 13:03:42 -0000 1.149
@@ -936,7 +936,7 @@
manifest="${slide.build}/classes/MANIFEST.MF"
includes="LICENSE,README,CHANGELOG,org/apache/slide/**,org/apache/util/**"
excludes="org/apache/slide/webdav/**,org/apache/slide/manager/**,
- org/apache/slide/taglib/**" />
+ org/apache/slide/taglib/**,org/apache/slide/admin/**" />
<echo message="Building Slide Standard Stores JAR file" />
<jar jarfile="${slide.dist}/slide/lib/slide-stores.jar"
@@ -1010,13 +1010,16 @@
<fileset dir="src/conf/webapp">
<include name="**/Domain.xml" />
</fileset>
- <lib dir="${slide.dist}/slide/lib" />
+ <lib dir="${slide.dist}/slide/lib">
+ <exclude name="antlr*.jar"/>
+ <exclude name="slide-taglib*.jar"/>
+ </lib>
<classes dir="${slide.dist}/slide/conf">
<include name="log4j.properties"/>
</classes>
</war>
- <war warfile="${webapp.dist}/slidedoc.war"
+ <war warfile="${webapp.dist}/slide-doc.war"
webxml="src/conf/webapp/webdoc.xml">
<fileset dir="${slide.dist}/doc">
</fileset>
@@ -1161,6 +1164,71 @@
<!-- =================================================================== -->
+ <!-- Tag Libraries Examples Web Application -->
+ <!-- =================================================================== -->
+
+ <!-- Prepare taglib examples web-app -->
+ <target name="taglib-examples-dist-prepare"
+ depends="taglib-common-jar">
+ <mkdir dir="${slide.build}/webapps/slide-taglib-examples"/>
+ <copy todir="${slide.build}/webapps/slide-taglib-examples">
+ <fileset dir="web/taglib-examples"/>
+ </copy>
+ <copy todir="${slide.build}/webapps/slide-taglib-examples">
+ <fileset dir="web/taglib-examples">
+ <include name="*.jsp"/>
+ </fileset>
+ <mapper type="glob" from="*.jsp" to="*.txt" />
+ </copy>
+ <mkdir dir="${slide.build}/webapps/slide-taglib-examples/WEB-INF/lib"/>
+ <copy file="${slide.dist}/slide/lib/slide-taglib-common.jar"
+ todir="${slide.build}/webapps/slide-taglib-examples/WEB-INF/lib"/>
+ </target>
+
+ <!-- Prepare JSTL portion of the taglib examples web-app -->
+ <target name="taglib-examples-dist-jstl-prepare"
+ depends="taglib-examples-dist-prepare,taglib-jstl-jar"
+ if="jstl.present">
+ <copy file="${slide.dist}/slide/lib/slide-taglib-jstl.jar"
+ todir="${slide.build}/webapps/slide-taglib-examples/WEB-INF/lib"/>
+ <copy file="${taglibs-standard.jar}"
+ todir="${slide.build}/webapps/slide-taglib-examples/WEB-INF/lib"/>
+ <copy file="src/taglib/slide-jstl.tld"
+ todir="${slide.build}/webapps/slide-taglib-examples/WEB-INF"/>
+ </target>
+
+ <!-- Prepare Struts portion of the taglib examples web-app -->
+ <target name="taglib-examples-dist-struts-prepare"
+ depends="taglib-examples-dist-prepare,taglib-struts-jar"
+ if="struts.present">
+ <copy file="${slide.dist}/slide/lib/slide-taglib-struts.jar"
+ todir="${slide.build}/webapps/slide-taglib-examples/WEB-INF/lib"/>
+ <copy file="${struts.jar}"
+ todir="${slide.build}/webapps/slide-taglib-examples/WEB-INF/lib"/>
+ <copy file="src/taglib/slide-struts.tld"
+ todir="${slide.build}/webapps/slide-taglib-examples/WEB-INF"/>
+ <copy todir="${slide.build}/webapps/slide-taglib-examples/WEB-INF">
+ <fileset dir="${struts.home}/lib">
+ <include name="struts-bean.tld"/>
+ <include name="struts-html.tld"/>
+ <include name="struts-logic.tld"/>
+ <include name="struts-template.tld"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <!-- Make taglib examples webapp distribution -->
+ <target name="taglib-examples-dist"
+ depends="taglib-examples-dist-jstl-prepare,taglib-examples-dist-struts-prepare"
+ description="Build the Tag Libraries Examples Webapp">
+ <echo message="Building Tag Libraries Examples Webapp..." />
+ <jar jarfile="${webapp.dist}/slide-taglib-examples.war"
+ basedir="${slide.build}/webapps/slide-taglib-examples">
+ </jar>
+ </target>
+
+
+ <!-- =================================================================== -->
<!-- Administration Web Application -->
<!-- =================================================================== -->
@@ -1168,10 +1236,9 @@
<target name="admin-compile-prepare"
depends="prepare"
if="struts.present">
- <mkdir dir="${slide.build}/admin" />
- <mkdir dir="${slide.build}/admin/classes" />
- <mkdir dir="${slide.build}/admin/slide-admin" />
- <mkdir dir="${slide.build}/admin/slide-admin/WEB-INF/lib" />
+ <mkdir dir="${slide.build}/webapps/slide-admin" />
+ <mkdir dir="${slide.build}/webapps/slide-admin" />
+ <mkdir dir="${slide.build}/webapps/slide-admin/WEB-INF/lib" />
<mkdir dir="${slide.build}/doc/admin-javadoc" />
</target>
@@ -1181,7 +1248,7 @@
if="struts.present">
<echo message="Compiling admin web-app classes..." />
<javac srcdir="src/admin"
- destdir="${slide.build}/admin/classes"
+ destdir="${slide.build}/classes"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
optimize="${compile.optimize}"
@@ -1194,23 +1261,23 @@
<target name="admin-dist-prepare"
depends="taglib-common-jar,taglib-struts-jar,admin-compile,dist"
if="struts.present">
- <copy todir="${slide.build}/admin/slide-admin">
+ <copy todir="${slide.build}/webapps/slide-admin">
<fileset dir="web/admin"/>
</copy>
- <jar jarfile="${slide.build}/admin/slide-admin/WEB-INF/lib/slide-admin.jar"
- basedir="${slide.build}/admin/classes"
+ <jar jarfile="${slide.build}/webapps/slide-admin/WEB-INF/lib/slide-admin.jar"
+ basedir="${slide.build}/classes"
includes="org/apache/slide/admin/**"/>
<copy file="${slide.dist}/slide/lib/slide-roles.jar"
- todir="${slide.build}/admin/slide-admin/WEB-INF/lib"/>
+ todir="${slide.build}/webapps/slide-admin/WEB-INF/lib"/>
<copy file="${slide.dist}/slide/lib/slide-taglib-common.jar"
- todir="${slide.build}/admin/slide-admin/WEB-INF/lib"/>
+ todir="${slide.build}/webapps/slide-admin/WEB-INF/lib"/>
<copy file="${slide.dist}/slide/lib/slide-taglib-struts.jar"
- todir="${slide.build}/admin/slide-admin/WEB-INF/lib"/>
+ todir="${slide.build}/webapps/slide-admin/WEB-INF/lib"/>
<copy file="${struts.jar}"
- todir="${slide.build}/admin/slide-admin/WEB-INF/lib"/>
+ todir="${slide.build}/webapps/slide-admin/WEB-INF/lib"/>
<copy file="src/taglib/slide-struts.tld"
- todir="${slide.build}/admin/slide-admin/WEB-INF"/>
- <copy todir="${slide.build}/admin/slide-admin/WEB-INF">
+ todir="${slide.build}/webapps/slide-admin/WEB-INF"/>
+ <copy todir="${slide.build}/webapps/slide-admin/WEB-INF">
<fileset dir="${struts.home}/lib">
<include name="struts-bean.tld"/>
<include name="struts-html.tld"/>
@@ -1244,7 +1311,7 @@
description="Build the Adminstration Webapp (Struts required)">
<echo message="Building Admin Webapp Archive..." />
<jar jarfile="${webapp.dist}/slide-admin.war"
- basedir="${slide.build}/admin/slide-admin">
+ basedir="${slide.build}/webapps/slide-admin">
</jar>
</target>
@@ -1440,7 +1507,7 @@
</war>
<!-- Slide documentation -->
- <copy file="${slide.dist}/slide/webapp/slidedoc.war"
+ <copy file="${slide.dist}/slide/webapp/slide-doc.war"
tofile="${slide.dist}/server/webapps/slide-doc.war" />
<!-- WebDAV view of the server -->
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
