Return-Path: <remm@locus.apache.org>
Mailing-List: contact slide-dev-help@jakarta.apache.org; run by ezmlm
Delivered-To: mailing list slide-dev@jakarta.apache.org
Received: (qmail 13905 invoked by uid 500); 5 Jun 2000 05:55:28 -0000
Delivered-To: apmail-jakarta-slide-cvs@apache.org
Received: (qmail 13896 invoked by uid 1135); 5 Jun 2000 05:55:26 -0000
Date: 5 Jun 2000 05:55:26 -0000
Message-ID: <20000605055526.13893.qmail@locus.apache.org>
From: remm@locus.apache.org
To: jakarta-slide-cvs@apache.org
Subject: cvs commit: jakarta-slide/docs index.htsrc

remm        00/06/04 22:55:25

  Modified:    .        build.xml
               docs     index.htsrc
  Log:
  Updated some build targets (especially dist)
  
  Revision  Changes    Path
  1.10      +75 -60    jakarta-slide/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/build.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- build.xml	2000/06/01 23:47:33	1.9
  +++ build.xml	2000/06/05 05:55:21	1.10
  @@ -1,6 +1,8 @@
   <project name="Slide" default="main" basedir=".">
   
  -  <!-- Initialize property values -->
  +  <!-- =================================================================== -->
  +  <!-- Prepare                                                             -->
  +  <!-- =================================================================== -->
     <property name="name"            value="Jakarta-Slide" />
     <property name="year"            value="2000" />
     <property name="version"         value="0.9dev" />
  @@ -10,13 +12,15 @@
     <property name="build.compiler"  value="classic" />
     <property name="catalina.build"  value="../build/catalina" />
     <property name="catalina.dist"   value="../dist/catalina" />
  -  <property name="servlet.jar"     value="../jakarta-servletapi/lib/servlet.jar" />
  +  <property name="servlet.jar"     
  +   value="../jakarta-servletapi/lib/servlet.jar" />
     <property name="tomcat.build"    value="../build/tomcat" />
     <property name="slide.build"     value="../build/slide" />
     <property name="slide.dist"      value="../dist/slide" />
  -  <property name="dav.build"       value="../build/dav" />
     
  -  <!-- Create directories -->
  +  <!-- =================================================================== -->
  +  <!-- Prepare                                                             -->
  +  <!-- =================================================================== -->
     <target name="prepare">
       <mkdir dir="${slide.build}"/>
       <mkdir dir="${slide.build}/classes"/>
  @@ -28,108 +32,119 @@
       <mkdir dir="${slide.build}/logs"/>
       <mkdir dir="${slide.build}/doc"/>
       <mkdir dir="${slide.build}/doc/javadoc"/>
  -  </target>
  -  
  -  <!-- Copy static files -->
  -  <target name="static" depends="prepare">
       <copyfile src="${ant.home}/lib/ant.jar" dest="${slide.build}/lib/ant.jar"/>
       <copydir src="src/conf" dest="${slide.build}/conf"/>
     </target>
     
  -  <!-- Same as core, but also cleans -->
  +  <!-- =================================================================== -->
  +  <!-- Build All : Main and JavaDoc                                        -->
  +  <!-- =================================================================== -->
     <target name="all" depends="clean,main,javadoc"/>
     
  -  <!-- Build all the sources with debug and deprecation -->
  -  <target name="main" depends="prepare,static">
  +  <!-- =================================================================== -->
  +  <!-- Build Slide                                                         -->
  +  <!-- =================================================================== -->
  +  <target name="main" depends="prepare">
       <javac srcdir="src/share" destdir="${slide.build}/classes"
        debug="on" deprecation="on" 
        excludes="**/CVS/**,**/package.html,**/apache/tomcat/**" />
     </target>
     
  -  <!-- Same as main, but no debug and no deprecation -->
  +  <!-- =================================================================== -->
  +  <!-- Build Slide, without debug                                          -->
  +  <!-- =================================================================== -->
     <target name="no-debug" depends="prepare">
       <javac srcdir="src/share" destdir="${slide.build}/classes"
        debug="off" deprecation="off" 
  -     excludes="**/CVS/**,**/package.html,**/slide/webdav/**" />
  -    <javac srcdir="src/share" destdir="${catalina.build}/classes"
  -     debug="off" deprecation="off" excludes="**/CVS/**,**/package.html"
  -     includes="**/slide/webdav/**" />
  +     excludes="**/CVS/**,**/package.html,**/apache/tomcat/**" />
     </target>
     
  -  <!-- Build some samples -->
  +  <!-- =================================================================== -->
  +  <!-- Build some examples                                                 -->
  +  <!-- =================================================================== -->
     <target name="examples" depends="main">
       <javac srcdir="src/examples" destdir="${slide.build}/examples"
        debug="on" deprecation="on" excludes="**/CVS/**"/>
     </target>
     
  -  <!-- Build a standalone DAV server, based on Catalina -->
  -  <target name="catalinadav" depends="main">
  -    <mkdir dir="${dav.build}" />
  -    <mkdir dir="${dav.build}/conf" />
  -    <mkdir dir="${dav.build}/classes" />
  -    <copydir src="lib" dest="${dav.build}/lib" />
  -    <copydir src="${catalina.build}" dest="${dav.build}" 
  -     excludes="**/conf/**" />
  -    <javac srcdir="src/clients/tomcat" destdir="${dav.build}/classes"
  -     debug="off" deprecation="off" excludes="**/CVS/**,**/package.html" />
  -    <!--copydir src="${tomcat.build}/classes" dest="${dav.build}/classes" /-->
  -    <copydir src="src/conf/catalina/standalone" dest="${dav.build}" />
  -    <mkdir dir="${dav.build}/files" />
  -  </target>
  -  
  -  <!-- Kill all the directories created in prepare -->
  +  <!-- =================================================================== -->
  +  <!-- Clean build and distribution directories                            -->
  +  <!-- =================================================================== -->
     <target name="clean">
       <deltree dir="${slide.build}"/>
  -    <deltree dir="${dav.build}"/>
  -  </target>
  -  
  -  <target name="dist-clean">
       <deltree dir="${slide.dist}"/>
     </target>
     
  -  <!-- Build the API and full JavaDocs -->
  +  <!-- =================================================================== -->
  +  <!-- Build a standalone Slide server                                     -->
  +  <!-- =================================================================== -->
     <target name="javadoc" depends="prepare">
       <property name="copyright" value="" />
  -    <javadoc sourcepath="src/share" destdir="${slide.build}/doc/javadoc" dir="."
  -     doctitle="Slide JavaDoc" public="true" noindex="true" author="true"
  -     packagenames="org.*" />
  +    <javadoc sourcepath="src/share" destdir="${slide.build}/doc/javadoc" 
  +     dir="." doctitle="Slide JavaDoc" public="true" noindex="true" 
  +     author="true" packagenames="org.*" />
     </target>
     
  -  <!-- Build the JAR file -->
  -  <target name="dist" depends="main, catalinadav">
  +  <!-- =================================================================== -->
  +  <!-- Build a standalone Slide server                                     -->
  +  <!-- This target requires Catalina and Avalon                            -->
  +  <!-- =================================================================== -->
  +  <target name="dist" depends="no-debug">
       <mkdir    dir="${slide.dist}" />
       <mkdir    dir="${slide.dist}/lib" />
  -    <delete   file="${slide.dist}/lib/slide.jar" />
  -    <copyfile src="src/etc/MANIFEST.MF" dest="${slide.build}/classes/MANIFEST.MF" />
  -    <replace  file="${slide.build}/classes/MANIFEST.MF" token="$$VERSION$$" value="${slide.version}" />
  -    <copydir  src="src/etc" dest="${slide.build}/classes" includes="LICENSE,README,CHANGELOG" />
  -    <jar      jarfile="${slide.dist}/lib/slide.jar" basedir="${slide.build}/classes"
  -              manifest="${slide.build}/classes/MANIFEST.MF" includes="LICENSE,README,CHANGELOG,org/**" />
  -    <!-- Build a JAR packaged DAV server -->
  -    <jar      jarfile="${slide.dist}/lib/tomcat.jar" basedir="${dav.build}/classes" />
  -    <mkdir    dir="${slide.dist}/files" />
  -    <mkdir    dir="${slide.dist}/bin" />
       <mkdir    dir="${slide.dist}/conf" />
  -    <copydir  src="${dav.build}" dest="${slide.dist}" includes="Domain.xml,Base.xml,Webdav.xml" />
  -    <copydir  src="${dav.build}/conf" dest="${slide.dist}/conf" />
  -    <copydir  src="${dav.build}/lib" dest="${slide.dist}/lib" />
  +    <mkdir    dir="${slide.dist}/bin" />
  +    <mkdir    dir="${slide.dist}/files" />
  +    <delete   file="${slide.dist}/lib/slide.jar" />
  +    <jar jarfile="${slide.dist}/lib/webserver.jar"
  +     basedir="${catalina.build}/classes"
  +     includes="org/apache/tomcat/**" /> 
  +    <javac srcdir="src/clients/tomcat" destdir="${slide.build}/classes"
  +     debug="off" deprecation="off" excludes="**/CVS/**,**/package.html"
  +     classpath="${slide.build}/classes" />
  +    <copyfile src="src/etc/MANIFEST.MF" 
  +     dest="${slide.build}/classes/MANIFEST.MF" />
  +    <replace  file="${slide.build}/classes/MANIFEST.MF" 
  +     token="$$VERSION$$" value="${slide.version}" />
  +    <copydir  src="src/etc" dest="${slide.build}/classes" 
  +     includes="LICENSE,README,CHANGELOG" />
  +    <jar jarfile="${slide.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="${slide.dist}/lib/catalinautil.jar" 
  +     basedir="${slide.build}/classes"
  +     manifest="${slide.build}/classes/MANIFEST.MF" 
  +     includes="LICENSE,README,CHANGELOG,org/apache/tomcat/**" />
  +    <jar jarfile="${slide.dist}/lib/webdav.jar" 
  +     basedir="${slide.build}/classes"
  +     manifest="${slide.build}/classes/MANIFEST.MF" 
  +     includes="LICENSE,README,CHANGELOG,org/apache/slide/webdav/**"  />
  +    <copydir  src="src/conf/catalina/standalone" dest="${slide.dist}" 
  +     excludes="**/bin/**" />
  +    <copydir  src="${slide.build}/lib" dest="${slide.dist}/lib" />
       <copyfile src="${servlet.jar}" dest="${slide.dist}/lib/servlet.jar" />
  -    <copydir  src="src/conf/dist" dest="${slide.dist}/bin" includes="*.bat,*.sh" />
  +    <copydir  src="src/conf/dist" dest="${slide.dist}/bin" 
  +     includes="*.bat,*.sh" />
     </target>
     
     <!-- =================================================================== -->
     <!-- Packages the distribution with ZIP                                  -->
     <!-- =================================================================== -->
     <target name="package-zip" depends="dist">
  -    <zip zipfile="../dist/${name}-${version}.zip" basedir="${slide.dist}" includes="**"/>
  +    <zip zipfile="../dist/${name}-${version}.zip" basedir="${slide.dist}" 
  +     includes="**"/>
     </target>
       
     <!-- =================================================================== -->
     <!-- Packages the distribution with TAR-GZIP                             -->
     <!-- =================================================================== -->
     <target name="package-tgz" depends="dist">
  -    <tar tarfile="../dist/${name}-${version}.tar" basedir="${slide.dist}" includes="**"/>
  -    <gzip zipfile="../dist/${name}-${version}.tar.gz" src="../${name}-${version}.tar"/>
  +    <tar tarfile="../dist/${name}-${version}.tar" basedir="${slide.dist}" 
  +     includes="**"/>
  +    <gzip zipfile="../dist/${name}-${version}.tar.gz" 
  +     src="../${name}-${version}.tar"/>
     </target>
       
     <!-- =================================================================== -->
  
  
  
  1.2       +4 -0      jakarta-slide/docs/index.htsrc
  
  Index: index.htsrc
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/docs/index.htsrc,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- index.htsrc	2000/05/17 18:35:44	1.1
  +++ index.htsrc	2000/06/05 05:55:24	1.2
  @@ -29,6 +29,10 @@
   </p>
   
   <p>
  +You can also <a href="http://jakarta.apache.org/slide/doc/">read some online documentation</a> (included in the CVS tree).
  +</p>
  +
  +<p>
   If you would like to get involved with this project in one way or another 
   (Mailing lists, CVS, Contributions), please see the <a 
   href="http://jakarta.apache.org/getinvolved/getinvolvedindex.html">Getting