You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by re...@locus.apache.org on 2000/12/04 19:25:30 UTC
cvs commit: jakarta-slide build.xml
remm 00/12/04 10:25:29
Modified: . build.xml
Log:
- Remove the out of date code from the buildfile.
Thanks to Fredrik Hultkrantz <fj...@blink.se> for the report.
Revision Changes Path
1.58 +16 -130 jakarta-slide/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/build.xml,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- build.xml 2000/12/01 06:33:12 1.57
+++ build.xml 2000/12/04 18:25:26 1.58
@@ -89,6 +89,8 @@
<available property="jmx.present"
classname="javax.management.MBeanServer" />
+ <available property="avalon.present"
+ classname="org.apache.avalon.blocks.Block" />
<available property="junit.present"
classname="junit.framework.TestCase" />
<available property="catalina.present"
@@ -483,10 +485,18 @@
<!-- =================================================================== -->
+ <!-- Build an Avalon wrapper -->
+ <!-- =================================================================== -->
+ <target name="wrappers" depends="no-debug">
+
+ </target>
+
+
+ <!-- =================================================================== -->
<!-- Build Catalina related components -->
<!-- This target requires Tomcat 4.0 -->
<!-- =================================================================== -->
- <target name="catalina-wrapper" depends="no-debug" if="catalina.present">
+ <target name="catalina-wrapper" depends="wrappers" if="catalina.present">
<javac srcdir="src/wrappers/catalina"
destdir="${slide.build}/classes"
@@ -508,143 +518,19 @@
</target>
- <!-- =================================================================== -->
- <!-- Build a standalone Slide server -->
- <!-- This target requires Tomcat 4.0 -->
- <!-- =================================================================== -->
- <target name="standalone-dist" depends="no-debug, doc, javadoc,
- prepare-dav-dist">
-
- <!-- Building the Catalina-based server -->
-
- <echo message="Building Catalina JARs" />
- <jar jarfile="${dav.dist}/lib/webserver.jar"
- basedir="${catalina.build}/classes"
- includes="org/apache/catalina/**,**/*.properties" />
- <javac srcdir="src/clients/tomcat"
- destdir="${slide.build}/classes"
- debug="off" deprecation="off"
- includes="**/org/apache/catalina/**"
- excludes="**/CVS/**"
- classpath="${slide.build}/classes:${catalina.build}/classes" />
- <copy file="src/etc/MANIFEST.MF"
- tofile="${slide.build}/classes/MANIFEST.MF" />
- <replace file="${slide.build}/classes/MANIFEST.MF"
- token="$$VERSION$$" value="${version}" />
- <copy todir="${slide.build}/classes">
- <fileset dir="src/etc">
- <include name="LICENSE" />
- <include name="README" />
- <include name="CHANGELOG" />
- </fileset>
- </copy>
- <jar jarfile="${dav.dist}/lib/slide.jar"
- basedir="${slide.build}/classes"
- manifest="${slide.build}/classes/MANIFEST.MF"
- includes="LICENSE,README,CHANGELOG,org/apache/slide/**"
- excludes="org/apache/slide/webdav/**" />
- <jar jarfile="${dav.dist}/lib/catalinautil.jar"
- basedir="${slide.build}/classes"
- manifest="${slide.build}/classes/MANIFEST.MF"
- includes="LICENSE,README,CHANGELOG,org/apache/catalina/**" />
-
- <echo message="Building WebDAV Servlet JAR" />
- <jar jarfile="${dav.dist}/lib/webdav.jar"
- basedir="${slide.build}/classes"
- manifest="${slide.build}/classes/MANIFEST.MF"
- includes="LICENSE,README,CHANGELOG,org/apache/slide/webdav/**" />
-
- <echo message="Update distribution configuration" />
- <copy todir="${dav.dist}">
- <fileset dir="src/conf/catalina/standalone">
- <exclude name="**/bin/**" />
- <exclude name="**/CVS/**" />
- </fileset>
- </copy>
- <copy todir="${dav.dist}/bin">
- <fileset dir="src/conf/dist">
- <include name="*.bat" />
- <exclude name="*.sh" />
- </fileset>
- </copy>
-
- <echo message="Copying libraries" />
- <copy dir="${slide.build}/lib"
- todir="${dav.dist}/lib" />
- <copy file="${servlet.jar}"
- tofile="${dav.dist}/lib/servlet.jar" />
- <copy file="${jaxp.home}/jaxp.jar"
- tofile="${dav.dist}/lib/jaxp.jar"/>
- <copy file="${jaxp.home}/parser.jar"
- tofile="${dav.dist}/lib/parser.jar"/>
- <copy file="${regexp.jar}"
- tofile="${dav.dist}/lib/regexp.jar"/>
-
- <echo message="Copying documentation" />
- <copy dir="${slide.build}/doc"
- todir="${dav.dist}/doc" />
-
- </target>
-
<!-- =================================================================== -->
- <!-- Build an Avalon-enabled Catalina - Slide server -->
+ <!-- Build an Avalon wrapper -->
<!-- =================================================================== -->
- <target name="avalon-dist" depends="standalone-dist">
-
- <!-- Building Avalon blocks -->
-
- <echo message="Build Avalon blocks" />
- <mkdir dir="${slide.build}/classes/temp" />
- <javac srcdir="src/clients/avalon/src"
- destdir="${slide.build}/classes/temp"
- debug="off"
- deprecation="off"
- excludes="**/CVS/**,**/package.html"
- includes="**/slide/**"
- classpath="${slide.build}/classes:${catalina.build}/classes:${avalon.dist}/lib/AvalonAware.jar" />
- <javac srcdir="src/clients/avalon/src"
- destdir="${slide.build}/classes/temp"
- debug="off"
- deprecation="off"
- excludes="**/CVS/**,**/package.html"
- includes="**/catalina/**"
- classpath="${slide.build}/classes:${catalina.build}/classes:${avalon.dist}/lib/AvalonAware.jar" />
- <mkdir dir="${slide.build}/classes/conf" />
- <copyfile src="src/clients/avalon/conf/Slide.conf.xml"
- dest="${slide.build}/classes/temp/conf/Slide.conf.xml" />
- <mkdir dir="${catalina.build}/classes/conf" />
- <copyfile src="src/clients/avalon/conf/Catalina.conf.xml"
- dest="${slide.build}/classes/temp/conf/Catalina.conf.xml" />
-
- <echo message="Adding Slide Avalon block" />
- <jar jarfile="${avalon.dist}/bin/blocks/Slide.jar"
- basedir="${slide.build}/classes/temp"
- manifest="${slide.build}/classes/MANIFEST.MF"
- includes="LICENSE,README,CHANGELOG,conf/Slide.conf.xml,org/apache/slide/**" />
-
- <echo message="Adding Catalina Avalon block" />
- <jar jarfile="${avalon.dist}/bin/blocks/Catalina.jar"
- basedir="${slide.build}/classes/temp"
- manifest="${slide.build}/classes/MANIFEST.MF"
- includes="LICENSE,README,CHANGELOG,conf/Catalina.conf.xml,org/apache/catalina/**" />
- <copydir src="src/conf/catalina/standalone"
- dest="${avalon.dist}/bin"
- excludes="**/bin/**,**/CVS/**" />
-
- <echo message="Removing temporary files" />
- <deltree dir="${slide.build}/classes/temp" />
-
- <echo message="Copying libraries" />
- <copydir src="${dav.dist}/lib" dest="${avalon.dist}/lib" />
+ <target name="avalon-wrapper" depends="wrappers" if="avalon.present">
</target>
<!-- =================================================================== -->
- <!-- Build a JMX-enabled Catalina - Slide server -->
+ <!-- Build a JMX wrapper -->
<!-- =================================================================== -->
- <target name="jmx-dist" depends="dist">
+ <target name="jmx-wrapper" depends="wrappers" if="jmx.present">
</target>
@@ -653,7 +539,7 @@
<!-- Full distribution -->
<!-- =================================================================== -->
<target name="full-dist" depends="dist, webdav-client-dist, webapp-dist,
- catalina-wrapper, jmx-dist">
+ catalina-wrapper, avalon-wrapper, jmx-wrapper">
</target>