ozeigermann 2004/01/15 05:21:29
Modified: . build.xml
Added: lib jdom-b9.jar
Removed: lib jdom.jar
Log:
Augmented Tomcat targets and moved jdom.jar to jdom-b9.jar to make it compliant to
naming schema of libs
Revision Changes Path
1.1 jakarta-slide/lib/jdom-b9.jar
<<Binary file>>
1.191 +18 -6 jakarta-slide/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/build.xml,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -r1.190 -r1.191
--- build.xml 14 Jan 2004 17:10:32 -0000 1.190
+++ build.xml 15 Jan 2004 13:21:29 -0000 1.191
@@ -1,4 +1,4 @@
-<project name="Slide" default="dist" basedir=".">
+<project name="Slide" default="full-dist" basedir=".">
<!-- =================================================================== -->
<!-- Load build.properties -->
<!-- =================================================================== -->
@@ -19,6 +19,7 @@
<property name="name" value="Jakarta-Slide"/>
<property name="year" value="2004"/>
<property name="version" value="2.0b1"/>
+ <property name="release-notes" value="RELEASE-NOTES-2.0-BETA1"/>
<property name="project" value="jakarta-slide"/>
<property name="final.name" value="${project}-${version}"/>
<property name="final-src.name" value="${project}-src-${version}"/>
@@ -28,7 +29,7 @@
<!-- =================================================================== -->
<property name="lib.dir" value="./lib"/>
<property name="servlet.jar" value="servlet-2.3.jar"/>
- <property name="jdom.jar" value="jdom.jar"/>
+ <property name="jdom.jar" value="jdom-b9.jar"/>
<property name="jta.jar" value="geronimo-jta.jar"/>
<property name="log4j.jar" value="log4j-1.2.8.jar"/>
<property name="commons-dbcp.jar" value="commons-dbcp-20031203.jar"/>
@@ -268,7 +269,7 @@
<!-- =================================================================== -->
<!-- Build documentation -->
<!-- =================================================================== -->
- <target name="doc" depends="prepare" if="xsl.present" description="Generate
documentation/website">
+ <target name="doc" depends="prepare" description="Generate
documentation/website">
<style basedir="src/doc" destdir="${slide.build}/doc" extension=".html"
style="src/doc/stylesheets/slide.xsl" includes="*.xml"/>
<copy todir="${slide.build}/doc">
<fileset dir="src/doc">
@@ -465,7 +466,7 @@
<!-- Installs Slide with Tomcat 5.x/4.xusing Tomcat authentication -->
<!-- This target requires Tomcat 5.x/4.x -->
<!-- =================================================================== -->
- <target name="tomcat-install" depends="catalina-wrapper" if="catalina.present">
+ <target name="tomcat-install" depends="catalina-wrapper, webapp-dist"
if="catalina.present">
<!-- create Slide dir and copy Domain.xml and web.xml to it -->
<mkdir dir="${slide.dist}/slide/catalina-conf"/>
<filter token="AUTH" value=""/>
@@ -497,6 +498,16 @@
<include name="web.xml"/>
</fileset>
</copy>
+
+ <!-- also copy general information into Slide directory -->
+ <copy todir="${catalina.dist}/slide" overwrite="yes">
+ <fileset dir=".">
+ <include name="README"/>
+ <include name="LICENSE"/>
+ <include name="${release-notes}"/>
+ </fileset>
+ </copy>
+
<!-- install jars in common lib and remove older Tomcat versions -->
<copy todir="${catalina.dist}/common/lib">
<fileset dir="${slide.dist}/slide/lib">
@@ -525,8 +536,9 @@
<!-- install wrapper in server lib -->
<copy todir="${catalina.dist}/server/lib">
<fileset dir="${slide.dist}/slide/wrappers"/>
- </copy>
- <copy file="${slide.dist}/slide/webapp/slide-doc.war"
tofile="${slide.dist}/server/webapps/slide-doc.war"/>
+ </copy>
+
+ <copy file="${slide.dist}/slide/webapp/slide-doc.war"
tofile="${catalina.dist}/webapps/slide-doc.war"/>
</target>
<!-- =================================================================== -->
<!-- Testsuite build, distribution & package -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
