Return-Path: 
 <cvs-return-12894-apmail-cocoon-cvs-archive=cocoon.apache.org@cocoon.apache.org>
Delivered-To: apmail-cocoon-cvs-archive@cocoon.apache.org
Received: (qmail 64176 invoked by uid 500); 3 Jul 2003 00:54:44 -0000
Mailing-List: contact cvs-help@cocoon.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cocoon.apache.org
list-help: <mailto:cvs-help@cocoon.apache.org>
list-unsubscribe: <mailto:cvs-unsubscribe@cocoon.apache.org>
list-post: <mailto:cvs@cocoon.apache.org>
Delivered-To: mailing list cvs@cocoon.apache.org
Received: (qmail 64151 invoked by uid 500); 3 Jul 2003 00:54:44 -0000
Delivered-To: apmail-cocoon-2.0-cvs@apache.org
Received: (qmail 64148 invoked from network); 3 Jul 2003 00:54:44 -0000
Received: from icarus.apache.org (208.185.179.13)
  by daedalus.apache.org with SMTP; 3 Jul 2003 00:54:44 -0000
Received: (qmail 82194 invoked by uid 1342); 3 Jul 2003 00:54:43 -0000
Date: 3 Jul 2003 00:54:43 -0000
Message-ID: <20030703005443.82193.qmail@icarus.apache.org>
From: vgritsenko@apache.org
To: cocoon-2.0-cvs@apache.org
Subject: cvs commit: cocoon-2.0 build.properties build.xml database.properties
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

vgritsenko    2003/07/02 17:54:43

  Modified:    .        build.xml
  Added:       .        build.properties
  Removed:     .        database.properties
  Log:
  update build script: move properties out into the build.properties file
  
  Revision  Changes    Path
  1.3       +153 -233  cocoon-2.0/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/build.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- build.xml	15 May 2003 14:24:19 -0000	1.2
  +++ build.xml	3 Jul 2003 00:54:43 -0000	1.3
  @@ -98,7 +98,7 @@
   
                                 Happy hacking from the Apache Cocoon Dev Team :)
   
  -CVS: $Id:
  +CVS: $Id$
   
   ============================================================================ -->
   
  @@ -108,24 +108,14 @@
       Give user a chance to override without editing this file
       (and without typing -D each time he compiles it)
     -->
  -  <property file=".ant.properties"/>
  -  <property file="${user.home}/.ant.properties"/>
  -
  -  <!--
  -    these are here only for those who use jikes compiler. For other
  -    developers this part makes no difference.
  -  -->
  -  <property name="build.compiler.emacs" value="on"/>
  -  <!-- property name="build.compiler.warnings" value="true"/ -->
  -  <property name="build.compiler.pedantic" value="false"/>
  -  <property name="build.compiler.depend" value="true"/>
  -  <property name="build.compiler.fulldepend" value="true"/>
  +  <property file="local.build.properties"/>
  +  <property file="${user.home}/cocoon.build.properties"/>
  +  <property file="build.properties"/>
   
     <!-- =================================================================== -->
     <!-- Initialization target                                               -->
     <!-- =================================================================== -->
     <target name="init">
  -
       <tstamp/>
   
       <!-- Detecting the current jvm -->
  @@ -194,17 +184,6 @@
         <pathelement path="./build/cocoon/classes"/>
       </path>
   
  -    <!-- =================================================================== -->
  -    <!-- Properties                                                          -->
  -    <!-- =================================================================== -->
  -
  -    <property name="fullname" value="Apache Cocoon"/>
  -    <property name="Name"     value="Cocoon"/>
  -    <property name="name"     value="cocoon"/>
  -    <property name="version"  value="2.0.5-dev"/>         <!-- This is the current CVS version -->
  -    <property name="released.version" value="2.0.4"/>     <!-- This is the latest official release -->
  -    <property name="year"     value="1999-2003"/>
  -
       <echo message="--------------------------------------------------------------"/>
       <echo message="            ${fullname} ${version} [${year}]                  "/>
       <echo message="--------------------------------------------------------------"/>
  @@ -219,61 +198,7 @@
       <echo message="                                                              "/>
       <echo message="--------------------------------------------------------------"/>
   
  -    <property name="debug"          value="on"/>
  -    <property name="optimize"       value="off"/>
  -    <property name="deprecation"    value="off"/>
  -    <property name="nowarn"         value="on"/>
  -    <!-- <property name="build.compiler" value="classic"/> -->
  -
  -    <property name="src.dir"      value="./src"/>
  -    <property name="java.dir"     value="${src.dir}/java"/>
  -    <property name="mocks.dir"     value="${src.dir}/mocks"/>
  -    <property name="test.dir"     value="${src.dir}/test"/>
  -    <property name="lib.dir"      value="./lib"/>
  -    <property name="tools.dir"    value="./tools"/>
  -    <property name="docs.dir"     value="${src.dir}/documentation/xdocs"/>
  -    <property name="images.dir"   value="${src.dir}/documentation/images"/>
  -    <property name="webapp.dir"   value="${src.dir}/webapp"/>
  -    <property name="resource.dir" value="${src.dir}/resources"/>
  -    <property name="packages"     value="org.apache"/>
  -    <property name="context.dir"  value="${src.dir}/documentation"/>
  -
  -    <property name="scratchpad.dir"     value="${src.dir}/scratchpad"/>
  -    <property name="scratchpad.src"     value="${scratchpad.dir}/src"/>
  -    <property name="scratchpad.lib"     value="${scratchpad.dir}/lib"/>
  -    <property name="scratchpad.webapp"  value="${scratchpad.dir}/webapp"/>
  -    <property name="scratchpad.name"    value="cocoon-scratchpad"/>
  -
  -    <property name="build.root"     value="./build"/>
  -    <property name="build.dir"      value="${build.root}/${name}"/>
  -    <property name="build.src"      value="${build.dir}/src"/>
  -    <property name="build.test"      value="${build.dir}/test"/>
  -    <property name="build.dest"     value="${build.dir}/classes"/>
  -    <property name="build.mocks"    value="${build.dir}/mock-classes"/>
  -    <property name="build.docs"     value="${build.dir}/docs"/>
  -    <property name="build.xdocs"    value="${build.dir}/xdocs"/>
  -    <property name="build.docs.printer" value="${build.dir}/printer-docs"/>
  -    <property name="build.docs.loglevel" value="INFO"/>
  -    <property name="build.war"      value="${build.dir}/webapp"/>
  -    <property name="build.javadocs" value="${build.dir}/javadocs"/>
  -    <property name="build.xjavadocs" value="${build.dir}/xjavadocs"/>
  -    <property name="build.context" value="${build.dir}/documentation"/>
  -    <property name="build.scratchpad" value="${build.dir}/scratchpad"/>
  -    <property name="build.scratchpad.src" value="${build.scratchpad}/src"/>
  -    <property name="build.scratchpad.dest" value="${build.scratchpad}/classes"/>
  -    <property name="build.work"    value="${build.dir}/work"/>
  -    <property name="dist.root"   value="./dist"/>
  -    <property name="dist.name" value="${name}-${version}"/>
  -    <property name="dist.dir"    value="${dist.root}/${dist.name}"/>
  -    <property name="dist.src.dir"    value="${dist.root}/source/${dist.name}"/>
  -    <property name="dist.bin.dir"    value="${dist.root}/bin/${dist.name}"/>
  -    <property name="dist.target" value="${dist.root}"/>
  -
  -    <property name="site" value="../cocoon-site/site/2.0"/>
  -
  -    <!--
  -    The location of tools.jar, relative to the JAVA_HOME home.
  -    -->
  +    <!-- The location of tools.jar, relative to the JAVA_HOME home. -->
       <property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
       <available file="${tools.jar}" property="tools.jar.present"/>
   
  @@ -287,8 +212,7 @@
       <filter token="released.version" value="${released.version}"/>
       <filter token="install.war" value="${install.war}"/>
   
  -    <!-- Add filters for loading database information from database.properties file -->
  -    <property file="database.properties"/>
  +    <!-- Add filters for loading database information from build.properties file -->
       <filter token="database-driver" value="${database-driver}"/>
       <filter token="database-url" value="${database-url}"/>
       <filter token="database-user" value="${database-user}"/>
  @@ -304,7 +228,6 @@
              target="1.2"
              nowarn="on"
              classpathref="anttasks.classpath"/>
  -
     </target>
   
     <!-- =================================================================== -->
  @@ -331,7 +254,6 @@
       <antcall target="install"/>
     </target>
   
  -
     <!-- =================================================================== -->
     <!-- Installs Cocoon war with scratchpad stuff in a specified directory  -->
     <!-- =================================================================== -->
  @@ -359,6 +281,7 @@
     <!-- Trial builds - end                                                  -->
     <!-- =================================================================== -->
   
  +
     <!-- =================================================================== -->
     <!-- Test for optional components                                        -->
     <!-- =================================================================== -->
  @@ -377,12 +300,12 @@
   
   
       <class-available classpathref="classpath"
  -                    property="poi.proper.present" 
  -                    classname="org.apache.poi.poifs.common.POIFSConstants"/>
  +                     property="poi.proper.present" 
  +                     classname="org.apache.poi.poifs.common.POIFSConstants"/>
                       
       <class-available classpathref="classpath"
  -                    property="commons.logging.present" 
  -                    classname="org.apache.commons.logging.LogFactory"/>     
  +                     property="commons.logging.present" 
  +                     classname="org.apache.commons.logging.LogFactory"/>     
                       
       <condition property="poi.present">
        <and> <!-- with post 1.4.1 Ant use <isset property="poi.proper.present"/> -->
  @@ -396,74 +319,74 @@
       </condition>
       
       <class-available classpathref="classpath"
  -                    property="pizza.present" 
  -                    classname="net.sf.pizzacompiler.compiler.Main"/>
  +                     property="pizza.present" 
  +                     classname="net.sf.pizzacompiler.compiler.Main"/>
   
       <class-available classpathref="classpath" 
  -                    property="xmldb.present" 
  -                    classname="org.xmldb.api.DatabaseManager"/>
  +                     property="xmldb.present" 
  +                     classname="org.xmldb.api.DatabaseManager"/>
   
       <class-available classpathref="classpath" 
  -                    property="xindice.present" 
  -                    classname="org.apache.xindice.client.xmldb.DatabaseImpl"/>
  +                     property="xindice.present" 
  +                     classname="org.apache.xindice.client.xmldb.DatabaseImpl"/>
   
       <class-available classpathref="classpath" 
  -                    property="jfor.present" 
  -                    classname="org.jfor.jfor.converter.Converter"/>
  +                     property="jfor.present" 
  +                     classname="org.jfor.jfor.converter.Converter"/>
   
       <class-available classpathref="classpath" 
  -                    property="servlet.present" 
  -                    classname="javax.servlet.http.HttpServlet"/>
  +                     property="servlet.present" 
  +                     classname="javax.servlet.http.HttpServlet"/>
   
       <class-available classpathref="classpath"
  -                    property="bsf.present" 
  -                    classname="com.ibm.bsf.BSFException"/>
  +                     property="bsf.present" 
  +                     classname="com.ibm.bsf.BSFException"/>
   
       <class-available classpathref="classpath"
  -                    property="rhino.compiler.present" 
  -                    classname="org.mozilla.javascript.tools.jsc.Main"/>
  +                     property="rhino.compiler.present" 
  +                     classname="org.mozilla.javascript.tools.jsc.Main"/>
   
       <class-available classpathref="classpath"
  -                    property="rhino.interpreter.present" 
  -                    classname="org.mozilla.javascript.Context"/>
  +                     property="rhino.interpreter.present" 
  +                     classname="org.mozilla.javascript.Context"/>
   
       <class-available classpathref="classpath"
  -                    property="python.present" 
  -                    classname="org.python.core.Py"/>
  +                     property="python.present" 
  +                     classname="org.python.core.Py"/>
   
       <class-available classpathref="classpath"
  -                    property="jstyle.present" 
  -                    classname="jstyle.JSFormatter"/>
  +                     property="jstyle.present" 
  +                     classname="jstyle.JSFormatter"/>
   
       <class-available classpathref="classpath"
  -                    property="xpath.present" 
  -                    classname="org.apache.xpath.XPathAPI"/>
  +                     property="xpath.present" 
  +                     classname="org.apache.xpath.XPathAPI"/>
   
       <class-available classpathref="classpath"
  -                    property="deli.present" 
  -                    classname="com.hp.hpl.deli.Profile"/>
  +                     property="deli.present" 
  +                     classname="com.hp.hpl.deli.Profile"/>
   
       <class-available classpathref="classpath"
  -                    property="velocity.present" 
  -                    classname="org.apache.velocity.app.Velocity"/>
  +                     property="velocity.present" 
  +                     classname="org.apache.velocity.app.Velocity"/>
   
       <class-available classpathref="classpath"
  -                    property="resolver.present" 
  -                    classname="org.apache.xml.resolver.Resolver"/>
  +                     property="resolver.present" 
  +                     classname="org.apache.xml.resolver.Resolver"/>
   
       <available property="ora.driver.present" 
                  classname="oracle.jdbc.OracleResultSet">
  -          <classpath refid="classpath"/>
  +      <classpath refid="classpath"/>
       </available>
   
       <available property="mail.present" 
                  classname="javax.mail.Session">
  -          <classpath refid="classpath"/>
  +      <classpath refid="classpath"/>
       </available>
   
       <available property="weblogic.present" 
                  classname="weblogic.servlet.internal.ServletContextImpl">
  -          <classpath refid="classpath"/>
  +      <classpath refid="classpath"/>
       </available>
   
       <available property="jdbc3.present" classname="java.sql.Savepoint">
  @@ -471,44 +394,44 @@
       </available>
   
       <class-available classpathref="classpath" 
  -                    property="php.present" 
  -                    classname="net.php.servlet"/>
  +                     property="php.present" 
  +                     classname="net.php.servlet"/>
   
       <class-available classpathref="classpath" 
  -                    property="xt.present" 
  -                    classname="com.jclark.xsl.sax.XMLProcessorImpl"/>
  +                     property="xt.present" 
  +                     classname="com.jclark.xsl.sax.XMLProcessorImpl"/>
   
       <class-available classpathref="classpath" 
  -                    property="naming.present" 
  -                    classname="javax.naming.Context"/>
  +                     property="naming.present" 
  +                     classname="javax.naming.Context"/>
   
       <class-available classpathref="classpath" 
  -                    property="svg.present" 
  -                    classname="org.apache.batik.transcoder.Transcoder"/>
  +                     property="svg.present" 
  +                     classname="org.apache.batik.transcoder.Transcoder"/>
   
       <class-available classpathref="classpath" 
  -                    property="fop.present" 
  -                    classname="org.apache.fop.apps.Driver"/>
  +                     property="fop.present" 
  +                     classname="org.apache.fop.apps.Driver"/>
   
       <class-available classpathref="classpath" 
  -                    property="tidy.present" 
  -                    classname="org.w3c.tidy.Tidy"/>
  +                     property="tidy.present" 
  +                     classname="org.w3c.tidy.Tidy"/>
   
       <class-available classpathref="classpath" 
  -                    property="maybeupload.present" 
  -                    classname="uk.co.weft.maybeupload.MaybeUploadRequestWrapper"/>
  +                     property="maybeupload.present" 
  +                     classname="uk.co.weft.maybeupload.MaybeUploadRequestWrapper"/>
   
       <class-available classpathref="classpath" 
  -                    property="lucene.present" 
  -                    classname="org.apache.lucene.search.Searcher"/>
  +                     property="lucene.present" 
  +                     classname="org.apache.lucene.search.Searcher"/>
   
       <class-available classpathref="classpath" 
  -                    property="hsqldb.present" 
  -                    classname="org.hsqldb.Server"/>
  +                     property="hsqldb.present" 
  +                     classname="org.hsqldb.Server"/>
   
       <class-available classpathref="classpath" 
  -                    property="jisp.present" 
  -                    classname="com.coyotegulch.jisp.IndexedObjectDatabase"/>
  +                     property="jisp.present" 
  +                     classname="com.coyotegulch.jisp.IndexedObjectDatabase"/>
     </target>
     
     <target name="prepare-jdbc" depends="filter-jdbc,nofilter-jdbc"/>
  @@ -894,19 +817,19 @@
           <exclude name="**/MaybeUpload*.java"           unless="maybeupload.present"/>
           <exclude name="**/http/RequestWrapper*.java"/>
   -->
  -<!-- FIXME (SW) : why is this excluded ? -->
  +        <!-- These are used to generate java source; excluded from build -->
           <exclude name="**/browser/*.x*"/>
         </fileset>
       </copy>
   
       <!-- A task to change the roles file. It is used to add optional components -->
  -    <taskdef name="roles-tool" classname="XConfToolTask" 
  +    <taskdef name="xroles" classname="XConfToolTask" 
                classpath="${tools.dir}/anttasks"/>
   
       <!-- Invoke the XConfTool to add optional roles for components -->
  -    <roles-tool directory="${build.src}"
  -                extension="xroles"
  -                configuration="${build.src}/org/apache/cocoon/cocoon.roles"/>
  +    <xroles directory="${build.src}"
  +            extension="xroles"
  +            configuration="${build.src}/org/apache/cocoon/cocoon.roles"/>
   
       <mkdir dir="${build.scratchpad.src}"/>
       <mkdir dir="${build.scratchpad.dest}"/>
  @@ -953,14 +876,13 @@
     <!-- =================================================================== -->
     <target name="compile-mocks">
       <mkdir dir="${build.mocks}"/>
  -
       <javac srcdir="${mocks.dir}"
              destdir="${build.mocks}"
  -           debug="${debug}"
  -           optimize="${optimize}"
  -           deprecation="${deprecation}"
  +           debug="${compiler.debug}"
  +           optimize="${compiler.optimize}"
  +           deprecation="${compiler.deprecation}"
              target="${target.vm}"
  -           nowarn="${nowarn}">
  +           nowarn="${compiler.nowarn}">
         <classpath refid="classpath"/>
       </javac>
     </target>
  @@ -982,15 +904,15 @@
         </fileset>
       </copy>
   
  -    <echo message="Compiling with Java ${ant.java.version}, debug ${debug}, optimize ${optimize}, deprecation ${deprecation}"/>
  +    <echo message="Compiling with Java ${ant.java.version}, debug ${compiler.debug}, optimize ${compiler.optimize}, deprecation ${compiler.deprecation}"/>
   
       <javac srcdir="${build.src}"
              destdir="${build.dest}"
  -           debug="${debug}"
  -           optimize="${optimize}"
  -           deprecation="${deprecation}"
  +           debug="${compiler.debug}"
  +           optimize="${compiler.optimize}"
  +           deprecation="${compiler.deprecation}"
              target="${target.vm}"
  -           nowarn="${nowarn}">
  +           nowarn="${compiler.nowarn}">
         <!--classpath refid="classpath"/-->
         <classpath>
           <path refid="classpath"/>
  @@ -1009,9 +931,9 @@
   
       <javac srcdir="${build.scratchpad.src}"
              destdir="${build.scratchpad.dest}"
  -           debug="${debug}"
  -           optimize="${optimize}"
  -           deprecation="${deprecation}"
  +           debug="${compiler.debug}"
  +           optimize="${compiler.optimize}"
  +           deprecation="${compiler.deprecation}"
              target="${target.vm}">
         <!--classpath refid="scratchpad.classpath"/-->
         <classpath>
  @@ -1069,7 +991,7 @@
       <replace file="${build.context}/xdocs/changes.xml" token="src/documentation/xdocs/dtd/" value="dtd/"/>
       <replace file="${build.context}/xdocs/todo.xml"    token="src/documentation/xdocs/dtd/" value="dtd/"/>
   
  -	<copy file="${build.dir}/jars.xml" tofile="${build.context}/xdocs/installing/jars.xml" filtering="off" overwrite="yes"/>
  +    <copy file="${build.dir}/jars.xml" tofile="${build.context}/xdocs/installing/jars.xml" filtering="off" overwrite="yes"/>
   
       <!-- Copy images -->
       <copy todir="${build.context}/images" filtering="off">
  @@ -1194,21 +1116,21 @@
     <!-- =================================================================== -->
     <target name="prepare-webapp" depends="copy-webapp">
         <!-- A task to change the xconf. It is used to add optional components -->
  -      <taskdef name="xconf-tool" classname="XConfToolTask" 
  -          classpath="${tools.dir}/anttasks"/>
  +      <taskdef name="xconf" classname="XConfToolTask" 
  +               classpath="${tools.dir}/anttasks"/>
   
         <!-- Invoke the XConfTool to add entries for optional components -->
  -      <xconf-tool directory="${build.src}"
  -                  extension="xmap"
  -                  configuration="${build.war}/sitemap.xmap"/>
  -
  -      <xconf-tool directory="${build.src}"
  -                  extension="xpipe"
  -                  configuration="${build.war}/sitemap.xmap"/>
  -
  -      <xconf-tool directory="${build.src}"
  -                  extension="xconf"
  -                  configuration="${build.war}/WEB-INF/cocoon.xconf"/>
  +      <xconf directory="${build.src}"
  +             extension="xmap"
  +             configuration="${build.war}/sitemap.xmap"/>
  +
  +      <xconf directory="${build.src}"
  +             extension="xpipe"
  +             configuration="${build.war}/sitemap.xmap"/>
  +
  +      <xconf directory="${build.src}"
  +             extension="xconf"
  +             configuration="${build.war}/WEB-INF/cocoon.xconf"/>
     </target>
   
     <!-- =================================================================== -->
  @@ -1216,17 +1138,17 @@
     <!-- =================================================================== -->
     <target name="prepare-webapp-scratchpad" depends="copy-webapp" if="include.scratchpad.libs">
         <!-- Invoke the XConfTool to add optional entries -->
  -      <xconf-tool directory="${build.scratchpad.src}"
  -                  extension="xmap"
  -                  configuration="${build.war}/sitemap.xmap"/>
  -
  -      <xconf-tool directory="${build.scratchpad.src}"
  -                  extension="xpipe"
  -                  configuration="${build.war}/sitemap.xmap"/>
  -
  -      <xconf-tool directory="${build.scratchpad.src}"
  -                  extension="xconf"
  -                  configuration="${build.war}/WEB-INF/cocoon.xconf"/>
  +      <xconf directory="${build.scratchpad.src}"
  +             extension="xmap"
  +             configuration="${build.war}/sitemap.xmap"/>
  +
  +      <xconf directory="${build.scratchpad.src}"
  +             extension="xpipe"
  +             configuration="${build.war}/sitemap.xmap"/>
  +
  +      <xconf directory="${build.scratchpad.src}"
  +             extension="xconf"
  +             configuration="${build.war}/WEB-INF/cocoon.xconf"/>
   
       <!-- copy scratchpad webapp samples -->
       <copy todir="${build.war}" filtering="on">
  @@ -1855,7 +1777,7 @@
     </target>
   
     <!-- =================================================================== -->
  -  <!-- Test targets                                                       -->
  +  <!-- Test targets                                                        -->
     <!-- =================================================================== -->
     <target name="test" depends="compile" description="Perform jUnit tests">
       <mkdir dir="${build.test}"/>
  @@ -1866,9 +1788,9 @@
       <!-- Compile tests -->
       <javac srcdir="${build.test}"
               destdir="${build.test}"
  -            debug="${debug}"
  -            optimize="${optimize}"
  -            deprecation="${deprecation}"
  +            debug="${compiler.debug}"
  +            optimize="${compiler.optimize}"
  +            deprecation="${compiler.deprecation}"
               target="${target.vm}">
         <classpath refid="classpath"/>
         <classpath>
  @@ -1913,9 +1835,9 @@
   
       <property name="all.jars" refid="all.jars"/>
       <copy file="${lib.dir}/jars.xml.tmpl"
  -	  tofile="${build.dir}/current-jars.xml"
  -	  filtering="yes"
  -	  overwrite="yes">
  +          tofile="${build.dir}/current-jars.xml"
  +          filtering="yes"
  +          overwrite="yes">
         <filterset>
           <filter token="JARS" value="${all.jars}"/>
         </filterset>
  @@ -1923,23 +1845,23 @@
       
       <!-- split the path in 'jar' XML elements -->
       <replace file="${build.dir}/current-jars.xml"
  -	     token="${path.separator}" value="&lt;/jar&gt;&#xA; &lt;jar&gt;"/>
  +             token="${path.separator}" value="&lt;/jar&gt;&#xA; &lt;jar&gt;"/>
       <!-- relativize file names by removing the current directory -->
       <replace file="${build.dir}/current-jars.xml"
  -	     token="${user.dir}${file.separator}lib${file.separator}" value=""/>
  +             token="${user.dir}${file.separator}lib${file.separator}" value=""/>
       <!-- and incase that fails, remove the base directory -->
       <replace file="${build.dir}/current-jars.xml"
  -	     token="${basedir}${file.separator}lib${file.separator}" value=""/>
  +             token="${basedir}${file.separator}lib${file.separator}" value=""/>
   
       <!-- replace platform-dependent path separator by '/' -->
       <replace file="${build.dir}/current-jars.xml"
  -	     token="${file.separator}" value="/"/>
  +             token="${file.separator}" value="/"/>
   
       <style in="${lib.dir}/jars.xml" out="${build.dir}/jars.xml"
  -	   processor="trax"
  -	   style="${tools.dir}/src/check-jars.xsl">
  +           processor="trax"
  +           style="${tools.dir}/src/check-jars.xsl">
         <param name="current-files"
  -	     expression="../../${build.dir}/current-jars.xml"/>
  +             expression="../../${build.dir}/current-jars.xml"/>
       </style>
     </target>
   
  @@ -1952,41 +1874,41 @@
     <target name="validate-config"
             description="Validation of core configuration files using RELAX NG"
             depends="prepare-docs, prepare-webapp, prepare-webapp-scratchpad">
  -   <taskdef name="jing" classname="com.thaiopensource.relaxng.util.JingTask">
  -    <classpath refid="anttasks.classpath"/>
  -   </taskdef>
  -   <echo message="Conducting validation of core configuration files."/>
  -   <echo message="Note: This stand-alone build target is experimental."/>
  -
  -   <!-- book.xml -->
  -   <echo message="Validating all book.xml instances ..."/>
  -   <jing rngfile="${webapp.dir}/resources/entities/book-v01.rng">
  -    <fileset dir="${build.context}" includes="**/book.xml"/>
  -   </jing>
  -
  -   <!-- cocoon.roles -->
  -   <echo message="Validating all cocoon.roles instances ..."/>
  -   <jing rngfile="${webapp.dir}/resources/entities/roles-v01.rng">
  -    <fileset dir="${build.dir}" includes="**/cocoon.roles"/>
  -   </jing>
  -
  -   <!-- All stylesheets **/*.xsl -->
  -   <echo message="Validating all stylesheets ..."/>
  -   <jing rngfile="${webapp.dir}/resources/entities/xslt-20020523.rng">
  -<!-- FIXME: Need catalog entity resolver, so excluding catalog tester xsl -->
  -<!-- FIXME: Excluding the "hello world" SWF sitemap (minor issue) -->
  -    <fileset dir="./src" includes="**/*.xsl"
  -      excludes="**/catalog/style.xsl, **/simple-page2swf.xsl"/>
  -    <fileset dir="./tools" includes="**/*.xsl"/>
  -   </jing>
  -
  -   <!-- sitemap.xmap -->
  -   <!-- leaving this until last because it is the one most likely to break -->
  -   <echo message="Validating all sitemap.xmap instances ..."/>
  -<!-- FIXME: The sitemaps and their RNG grammar still need tweaking -->
  -   <jing rngfile="${webapp.dir}/resources/entities/sitemap-v06.rng">
  -    <fileset dir="${build.dir}" includes="**/sitemap.xmap"/>
  -   </jing>
  +    <taskdef name="jing" classname="com.thaiopensource.relaxng.util.JingTask">
  +      <classpath refid="anttasks.classpath"/>
  +    </taskdef>
  +    <echo message="Conducting validation of core configuration files."/>
  +    <echo message="Note: This stand-alone build target is experimental."/>
  +
  +    <!-- book.xml -->
  +    <echo message="Validating all book.xml instances ..."/>
  +    <jing rngfile="${webapp.dir}/resources/entities/book-v01.rng">
  +      <fileset dir="${build.context}" includes="**/book.xml"/>
  +    </jing>
  +
  +    <!-- cocoon.roles -->
  +    <echo message="Validating all cocoon.roles instances ..."/>
  +    <jing rngfile="${webapp.dir}/resources/entities/roles-v01.rng">
  +      <fileset dir="${build.dir}" includes="**/cocoon.roles"/>
  +    </jing>
  +
  +    <!-- All stylesheets **/*.xsl -->
  +    <echo message="Validating all stylesheets ..."/>
  +    <jing rngfile="${webapp.dir}/resources/entities/xslt-20020523.rng">
  +      <!-- FIXME: Need catalog entity resolver, so excluding catalog tester xsl -->
  +      <!-- FIXME: Excluding the "hello world" SWF sitemap (minor issue) -->
  +      <fileset dir="./src" includes="**/*.xsl"
  +               excludes="**/catalog/style.xsl, **/simple-page2swf.xsl"/>
  +      <fileset dir="./tools" includes="**/*.xsl"/>
  +    </jing>
  +
  +    <!-- sitemap.xmap -->
  +    <!-- leaving this until last because it is the one most likely to break -->
  +    <echo message="Validating all sitemap.xmap instances ..."/>
  +    <!-- FIXME: The sitemaps and their RNG grammar still need tweaking -->
  +    <jing rngfile="${webapp.dir}/resources/entities/sitemap-v06.rng">
  +      <fileset dir="${build.dir}" includes="**/sitemap.xmap"/>
  +    </jing>
     </target>
   
     <!-- =================================================================== -->
  @@ -2066,9 +1988,7 @@
           <filter token="VERSION" value="${version}"/>
         </filterset>
       </copy>
  -
     </target>
  -    
   </project>
   
   <!-- End of file -->
  
  
  
  1.1                  cocoon-2.0/build.properties
  
  Index: build.properties
  ===================================================================
  #----------------------------------------------
  #  Cocoon Build Properties
  #----------------------------------------------
  # CVS: $Id: build.properties,v 1.1 2003/07/03 00:54:43 vgritsenko Exp $
  #
  # NOTE: don't modify this file directly but copy the properties you need
  # to modify over to a file named 'local.build.properties' and modify that. 
  # The build system will override these properties with the ones in the 
  # 'local.build.properties' file.
  
  
  # ---- Includes ----------------------------------------------------------------
  include.webapp.libs=yes
  include.scratchpad.libs=yes
  
  
  # ---- Database ----------------------------------------------------------------
  # Specify the Driver Class.
  database-driver=org.hsqldb.jdbcDriver
  # Specify the URL for the Database
  database-url=jdbc:hsqldb:hsql://localhost:9002
  # Specify the user id
  database-user=sa
  # Specify the password
  database-password=
  
  
  # ---- Compilation -------------------------------------------------------------
  compiler=classic
  compiler.debug=on
  compiler.optimize=on
  compiler.deprecation=off
  compiler.nowarn=on
  
  
  # ------ System Properties -----------------------------------------------------
  # WARNING: you shouldn't need to modify anything below here since there is a
  # very high change of breaking the build system. Do it only if you know what
  # you're doing.
  
  # Cocoon Constants
  name=cocoon
  fullname=Apache Cocoon
  Name=Cocoon
  # This is the current CVS version
  version=2.0.5-dev
  # This is the latest official release
  released.version=2.0.4
  year=1999-2003
  
  # Build Directories Layout
  build.root=./build
  build.dir=${build.root}/${name}
  build.src=${build.dir}/src
  build.test=${build.dir}/test
  build.dest=${build.dir}/classes
  build.mocks=${build.dir}/mock-classes
  build.docs=${build.dir}/docs
  build.xdocs=${build.dir}/xdocs
  build.docs.printer=${build.dir}/printer-docs
  build.docs.loglevel=INFO
  build.war=${build.dir}/webapp
  build.javadocs=${build.dir}/javadocs
  build.xjavadocs=${build.dir}/xjavadocs
  build.context=${build.dir}/documentation
  build.scratchpad=${build.dir}/scratchpad
  build.scratchpad.src=${build.scratchpad}/src
  build.scratchpad.dest=${build.scratchpad}/classes
  build.work=${build.dir}/work
  dist.root=./dist
  dist.name=${name}-${version}
  dist.dir=${dist.root}/${dist.name}
  dist.src.dir=${dist.root}/source/${dist.name}
  dist.bin.dir=${dist.root}/bin/${dist.name}
  dist.target=${dist.root}
  
  # Directories Layout
  src.dir=./src
  java.dir=${src.dir}/java
  mocks.dir=${src.dir}/mocks
  test.dir=${src.dir}/test
  lib.dir=./lib
  tools.dir=./tools
  docs.dir=${src.dir}/documentation/xdocs
  images.dir=${src.dir}/documentation/images
  webapp.dir=${src.dir}/webapp
  resource.dir=${src.dir}/resources
  packages=org.apache
  context.dir=${src.dir}/documentation
  
  scratchpad.dir=${src.dir}/scratchpad
  scratchpad.src=${scratchpad.dir}/src
  scratchpad.lib=${scratchpad.dir}/lib
  scratchpad.webapp=${scratchpad.dir}/webapp
  scratchpad.name=cocoon-scratchpad
  
  site=../cocoon-site/site/2.0