dflorey 2004/07/22 06:16:26
Modified: projector build.xml
Removed: projector/dist/webapp projector.war
projector/dist/conf web.xml
Log:
Removed dist dirs
Revision Changes Path
1.2 +134 -124 jakarta-slide/projector/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-slide/projector/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- build.xml 19 Jul 2004 12:09:25 -0000 1.1
+++ build.xml 22 Jul 2004 13:16:25 -0000 1.2
@@ -1,149 +1,159 @@
-<?xml version="1.0"?>
-
-<!-- <!DOCTYPE project SYSTEM "project.dtd"> -->
-
+<?xml version="1.0"?>
+
+<!-- <!DOCTYPE project SYSTEM "project.dtd"> -->
+
<!--
=======================================================================
WebDAV projector build file
=======================================================================
--->
-<project name="projector" default="jar" basedir=".">
-
- <!-- Give user a chance to override without editing this file
- (and without typing -D each time it compiles it) -->
- <property file=".ant.properties" />
-
- <property name="debug" value="true" />
- <property name="deprecation" value="true" />
- <property name="optimize" value="true" />
-
- <property name="version" value="0.1"/>
- <property name="name" value="projector" />
-
-
- <!--
+-->
+<project name="projector" default="jar" basedir=".">
+
+ <!-- Give user a chance to override without editing this file
+ (and without typing -D each time it compiles it) -->
+ <property file="../build.properties"/>
+
+ <property file=".ant.properties" />
+
+ <property name="debug" value="true" />
+ <property name="deprecation" value="true" />
+ <property name="optimize" value="true" />
+
+ <property name="version" value="0.1" />
+ <property name="name" value="projector" />
+
+
+ <!--
===================================================================
Set the properties related to the source tree
===================================================================
- -->
- <property name="src.dir" value="src"/>
- <property name="java.dir" value="${src.dir}/java"/>
- <property name="lib.dir" value="lib"/>
- <property name="docs.dir" value="doc"/>
- <property name="conf.dir" value="${src.dir}/conf"/>
- <property name="dist.dir" value="dist"/>
- <property name="webapp.dist" value="${dist.dir}/webapp"/>
-
- <!--
+ -->
+ <property name="src.dir" value="src" />
+ <property name="java.dir" value="${src.dir}/java" />
+ <property name="content.dir" value="${src.dir}/content" />
+ <property name="lib.dir" value="lib" />
+ <property name="docs.dir" value="doc" />
+ <property name="conf.dir" value="${src.dir}/conf" />
+ <property name="dist.dir" value="dist" />
+ <property name="webapp.dist" value="${dist.dir}/webapp" />
+
+ <!--
===================================================================
Set the properties for the build area
===================================================================
- -->
- <property name="build.dir" value="build"/>
- <property name="build.classes" value="${build.dir}/classes"/>
- <property name="build.lib" value="${build.dir}/lib"/>
- <property name="build.javadocs" value="${docs.dir}/javadoc"/>
-
-
- <path id="classpath">
- <pathelement location="${build.classes}" />
- <fileset dir="${lib.dir}" includes="*.jar" />
- </path>
-
-
- <!--
+ -->
+ <property name="build.dir" value="build" />
+ <property name="build.classes" value="${build.dir}/classes" />
+ <property name="build.lib" value="${build.dir}/lib" />
+ <property name="build.javadocs" value="${docs.dir}/javadoc" />
+
+
+ <path id="classpath">
+ <pathelement location="${build.classes}" />
+ <fileset dir="${lib.dir}" includes="*.jar" />
+ </path>
+
+
+ <!--
===================================================================
Prepare the build
===================================================================
- -->
- <target name="prepare">
- <tstamp />
- <mkdir dir="${build.dir}"/>
- <mkdir dir="${build.classes}"/>
- <mkdir dir="${build.lib}"/>
- </target>
-
- <!--
+ -->
+ <target name="prepare">
+ <tstamp />
+ <mkdir dir="${build.dir}" />
+ <mkdir dir="${build.classes}" />
+ <mkdir dir="${build.lib}" />
+ </target>
+
+ <!--
===================================================================
Build the code
===================================================================
- -->
-
- <target name="build" depends="prepare">
- <javac destdir="${build.classes}"
- debug="${debug}"
- deprecation="${deprecation}"
- optimize="${optimize}" >
- <src path="${java.dir}"/>
- <classpath refid="classpath" />
- </javac>
-
- </target>
-
- <!--
+ -->
+
+ <target name="build" depends="prepare">
+ <javac destdir="${build.classes}" debug="${debug}"
deprecation="${deprecation}" optimize="${optimize}">
+ <src path="${java.dir}" />
+ <classpath refid="classpath" />
+ </javac>
+
+ </target>
+
+ <!--
===================================================================
Create the jar
===================================================================
- -->
- <target name="jar" depends="build">
-
- <jar jarfile="${build.lib}/${name}-${version}.jar" basedir="${build.classes}" >
- <include name="org/apache/slide/projector/**" />
- </jar>
-
- </target>
-
- <!-- =================================================================== -->
- <!-- Create the webapp
-->
- <!-- =================================================================== -->
- <target name="webapp" depends="jar" description="Creates a web archive (war)">
- <copy todir="${dist.dir}/conf" overwrite="yes">
- <fileset dir="${conf.dir}">
- <include name="web.xml"/>
- </fileset>
- </copy>
- <mkdir dir="${webapp.dist}"/>
- <war destfile="${webapp.dist}/projector.war"
webxml="${dist.dir}/conf/web.xml">
- <lib dir="${lib.dir}" />
- <lib dir="${build.lib}" />
- </war>
- </target>
-
- <!--
+ -->
+ <target name="jar" depends="build">
+
+ <jar jarfile="${build.lib}/${name}-${version}.jar"
basedir="${build.classes}">
+ <include name="org/apache/slide/projector/**" />
+ </jar>
+
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- Create the webapp
-->
+ <!-- =================================================================== -->
+ <target name="webapp" depends="jar" description="Creates a web archive (war)">
+ <copy todir="${dist.dir}/conf" overwrite="yes">
+ <fileset dir="${conf.dir}">
+ <include name="web.xml" />
+ </fileset>
+ </copy>
+ <mkdir dir="${webapp.dist}" />
+ <war destfile="${webapp.dist}/projector.war"
webxml="${dist.dir}/conf/web.xml">
+ <lib dir="${lib.dir}" />
+ <lib dir="${build.lib}" />
+ </war>
+ </target>
+
+ <!--
===================================================================
Cleans up build directories
===================================================================
- -->
- <target name="clean">
- <delete dir="${build.dir}" />
- </target>
-
- <target name="clean-javadocs">
- <delete dir="${build.javadocs}"/>
- </target>
-
- <target name="scrub" depends="clean, clean-javadocs">
- </target>
-
- <!--
+ -->
+ <target name="clean">
+ <delete dir="${build.dir}" />
+ </target>
+
+ <target name="clean-javadocs">
+ <delete dir="${build.javadocs}" />
+ </target>
+
+ <target name="scrub" depends="clean, clean-javadocs">
+ </target>
+
+ <!--
===================================================================
Creates the API documentation
===================================================================
- -->
-
- <target name="javadocs" depends="build, clean-javadocs" description="Creates the
API documentation">
- <mkdir dir="${build.javadocs}"/>
- <mkdir dir="${build.javadocs}"/>
- <javadoc sourcepath="${java.dir}"
- packagenames="org.apache.slide.projector.*"
- destdir="${build.javadocs}"
- author="true"
- windowtitle="WebDAV Projector"
- doctitle="WebDAV Projector"
- link="http://java.sun.com/j2se/1.4/docs/api/";
- bottom="Copyright © 2002-2004 Apache Software Foundation. All Rights
Reserved."
- classpathref="classpath"/>
- </target>
-
- <target name="all" depends="jar, javadocs"/>
-</project>
+ -->
+
+ <target name="javadocs" depends="build, clean-javadocs" description="Creates
the API documentation">
+ <mkdir dir="${build.javadocs}" />
+ <mkdir dir="${build.javadocs}" />
+ <javadoc sourcepath="${java.dir}"
packagenames="org.apache.slide.projector.*" destdir="${build.javadocs}" author="true"
windowtitle="WebDAV Projector" doctitle="WebDAV Projector"
link="http://java.sun.com/j2se/1.4/docs/api/"; bottom="Copyright © 2002-2004
Apache Software Foundation. All Rights Reserved." classpathref="classpath" />
+ </target>
+
+ <!-- =================================================================== -->
+ <!-- Installs Slide with Tomcat 5.x/4.xusing Tomcat authentication -->
+ <!-- This target requires Tomcat 5.x/4.x -->
+ <!-- =================================================================== -->
+ <target name="tomcat-install" depends="webapp" description="Modify tomcat 5
installation to run projector">
+ <copy todir="${catalina.dist}/webapps" overwrite="yes">
+ <fileset dir="${webapp.dist}">
+ <include name="projector.war" />
+ </fileset>
+ </copy>
+ <copy todir="${catalina.dist}/slide/" overwrite="yes">
+ <fileset dir="${conf.dir}">
+ <include name="projector.xml" />
+ </fileset>
+ </copy>
+ <unzip src="${content.dir}/store.zip" dest="${catalina.dist}/bin/"/>
+ </target>
+
+ <target name="all" depends="jar, javadocs" />
+</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
