ozeigermann    2005/01/19 00:52:46

  Modified:    wck      build.properties.sample build.xml
  Log:
  Added property to allow for inclusion of configuration files available in the 
war classpath
  
  Revision  Changes    Path
  1.6       +4 -0      jakarta-slide/wck/build.properties.sample
  
  Index: build.properties.sample
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/wck/build.properties.sample,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build.properties.sample   13 Jan 2005 17:05:30 -0000      1.5
  +++ build.properties.sample   19 Jan 2005 08:52:45 -0000      1.6
  @@ -33,6 +33,10 @@
   #additional.src.dir=

   #additional.lib.dir=

   

  +# also add a directory additional configuration files that shall go into the 
classpath

  +

  +#additional.conf.dir=

  +

   # ----- Slide -----

   # these properties by default point to the Slide

   # version checked out along with WCK

  
  
  
  1.8       +14 -1     jakarta-slide/wck/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-slide/wck/build.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- build.xml 18 Jan 2005 17:38:17 -0000      1.7
  +++ build.xml 19 Jan 2005 08:52:45 -0000      1.8
  @@ -65,6 +65,7 @@
       <!-- =================================================================== 
-->
       <target name="prepare">
           <mkdir dir="build/classes"/>
  +        <mkdir dir="build/conf"/>
           <mkdir dir="build/doc/javadoc"/>
           <mkdir dir="dist"/>
       </target>
  @@ -127,7 +128,7 @@
       <!-- =================================================================== 
-->
       <!-- Build a WCK distribution packaged as a JAAS web application       
-->
       <!-- =================================================================== 
-->
  -    <target name="dist" depends="clean,build,javadoc,copy-additional-libs" 
description="Creates a web archive (war) with JAAS authentication">
  +    <target name="dist" 
depends="clean,build,javadoc,copy-additional-libs,copy-additional-config" 
description="Creates a web archive (war) with JAAS authentication">
           <copy file="${slide.properties}" 
todir="build/classes/org/apache/slide" filtering="true" overwrite="yes" />
           <jar jarfile="dist/${final.name}.jar" basedir="build/classes"/>
           <!-- rebuild kernel with slide.properties, because we want ours to 
be used -->
  @@ -151,6 +152,9 @@
               <classes dir="${slide.base.dir}/src/conf/webapp">
                   <include name="*.properties"/>
               </classes>
  +            <classes dir="${basedir}/build/conf">
  +                <include name="**.**"/>
  +            </classes>
           </war>
       </target>
       <target name="copy-additional-libs" if="additional.lib.dir">
  @@ -161,6 +165,15 @@
               </fileset>
            </copy>
       </target>
  +    <target name="copy-additional-config" if="additional.conf.dir">
  +        <echo message="Copying additional configuration from 
${additional.conf.dir} to classpath"/>
  +         <copy todir="${basedir}/build/conf" overwrite="yes">
  +            <fileset dir="${additional.conf.dir}">
  +                <include name="**.**"/>
  +            </fileset>
  +         </copy>
  +    </target>
  +
       <!-- =================================================================== 
-->
       <!-- Deploy WCK as a web application with JAAS authentication to       
-->
       <!-- Tomcat 5.0.28 and later                                             
-->
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to