cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jo...@apache.org
Subject cvs commit: cocoon-2.0 build.xml changes.xml
Date Thu, 21 Aug 2003 01:14:17 GMT
joerg       2003/08/20 18:14:17

  Modified:    .        build.xml changes.xml
  Log:
  Changed the default build handling: "build webapp" builds a locally usable servlet context
and is now the default target. "build war" packages the webapp into the well-known cocoon.war.
"build all" is removed as it is the same as "build package".
  
  Revision  Changes    Path
  1.5       +148 -154  cocoon-2.0/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/build.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- build.xml	29 Jul 2003 18:49:28 -0000	1.4
  +++ build.xml	21 Aug 2003 01:14:16 -0000	1.5
  @@ -102,7 +102,7 @@
   
   ============================================================================ -->
   
  -<project default="all" basedir="." name="Apache Cocoon">
  +<project default="webapp" basedir="." name="Apache Cocoon">
   
     <!--
       Give user a chance to override without editing this file
  @@ -220,7 +220,7 @@
   
       <!-- compile the ant tasks -->
       <mkdir dir="${tools.dir}/anttasks"/>
  -    <javac srcdir="${tools.dir}/src" 
  +    <javac srcdir="${tools.dir}/src"
              destdir="${tools.dir}/anttasks"
              debug="off"
              optimize="on"
  @@ -261,22 +261,22 @@
             description="Installs the WAR package (with the scratchpad) in a specified directory">
       <echo message=" This contains SCRATCHPAD BUILDS. It is not guaranteed to work."/>
       <echo message=" You have been warned. "/>
  -  
  +
       <!-- Ask the user for the destination path for the war -->
       <taskdef name="user-input" classname="UserInputTask"
           classpath="./tools/anttasks"/>
  -        
  +
       <property name="install.war" value=""/>
       <user-input name="install.war">Please select an installation directory</user-input>
  -    
  +
       <!-- tell the install target to include all libs in dist -->
       <property name="include.webapp.libs" value="true"/>
  -    <property name="include.scratchpad.libs" value="true"/>    
  -        
  +    <property name="include.scratchpad.libs" value="true"/>
  +
       <!-- call install target -->
       <antcall target="install"/>
     </target>
  -  
  +
     <!-- =================================================================== -->
     <!-- Trial builds - end                                                  -->
     <!-- =================================================================== -->
  @@ -286,9 +286,9 @@
     <!-- Test for optional components                                        -->
     <!-- =================================================================== -->
     <target name="optional-tests" depends="init">
  -  
  +
       <!-- A simple task to test for a class -->
  -    <taskdef name="class-available" classname="ClassAvailableTask" 
  +    <taskdef name="class-available" classname="ClassAvailableTask"
           classpath="./tools/anttasks"/>
   
       <available property="jaxen.present" classname="org.jaxen.dom.XPath">
  @@ -300,13 +300,13 @@
   
   
       <class-available classpathref="classpath"
  -                     property="poi.proper.present" 
  +                     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"/>
-->
         <not>
  @@ -317,78 +317,78 @@
         </not>
        </and>
       </condition>
  -    
  +
       <class-available classpathref="classpath"
  -                     property="pizza.present" 
  +                     property="pizza.present"
                        classname="net.sf.pizzacompiler.compiler.Main"/>
   
       <class-available classpathref="classpath"
  -                     property="eclipse.present" 
  +                     property="eclipse.present"
                        classname="org.eclipse.jdt.internal.compiler.Compiler"/>
   
  -    <class-available classpathref="classpath" 
  -                     property="xmldb.present" 
  +    <class-available classpathref="classpath"
  +                     property="xmldb.present"
                        classname="org.xmldb.api.DatabaseManager"/>
   
  -    <class-available classpathref="classpath" 
  -                     property="xindice.present" 
  +    <class-available classpathref="classpath"
  +                     property="xindice.present"
                        classname="org.apache.xindice.client.xmldb.DatabaseImpl"/>
   
  -    <class-available classpathref="classpath" 
  -                     property="jfor.present" 
  +    <class-available classpathref="classpath"
  +                     property="jfor.present"
                        classname="org.jfor.jfor.converter.Converter"/>
   
  -    <class-available classpathref="classpath" 
  -                     property="servlet.present" 
  +    <class-available classpathref="classpath"
  +                     property="servlet.present"
                        classname="javax.servlet.http.HttpServlet"/>
   
       <class-available classpathref="classpath"
  -                     property="bsf.present" 
  +                     property="bsf.present"
                        classname="com.ibm.bsf.BSFException"/>
   
       <class-available classpathref="classpath"
  -                     property="rhino.compiler.present" 
  +                     property="rhino.compiler.present"
                        classname="org.mozilla.javascript.tools.jsc.Main"/>
   
       <class-available classpathref="classpath"
  -                     property="rhino.interpreter.present" 
  +                     property="rhino.interpreter.present"
                        classname="org.mozilla.javascript.Context"/>
   
       <class-available classpathref="classpath"
  -                     property="python.present" 
  +                     property="python.present"
                        classname="org.python.core.Py"/>
   
       <class-available classpathref="classpath"
  -                     property="jstyle.present" 
  +                     property="jstyle.present"
                        classname="jstyle.JSFormatter"/>
   
       <class-available classpathref="classpath"
  -                     property="xpath.present" 
  +                     property="xpath.present"
                        classname="org.apache.xpath.XPathAPI"/>
   
       <class-available classpathref="classpath"
  -                     property="deli.present" 
  +                     property="deli.present"
                        classname="com.hp.hpl.deli.Profile"/>
   
       <class-available classpathref="classpath"
  -                     property="velocity.present" 
  +                     property="velocity.present"
                        classname="org.apache.velocity.app.Velocity"/>
   
       <class-available classpathref="classpath"
  -                     property="resolver.present" 
  +                     property="resolver.present"
                        classname="org.apache.xml.resolver.Resolver"/>
   
  -    <available property="ora.driver.present" 
  +    <available property="ora.driver.present"
                  classname="oracle.jdbc.OracleResultSet">
         <classpath refid="classpath"/>
       </available>
   
  -    <available property="mail.present" 
  +    <available property="mail.present"
                  classname="javax.mail.Session">
         <classpath refid="classpath"/>
       </available>
   
  -    <available property="weblogic.present" 
  +    <available property="weblogic.present"
                  classname="weblogic.servlet.internal.ServletContextImpl">
         <classpath refid="classpath"/>
       </available>
  @@ -397,47 +397,47 @@
         <classpath refid="classpath"/>
       </available>
   
  -    <class-available classpathref="classpath" 
  -                     property="php.present" 
  +    <class-available classpathref="classpath"
  +                     property="php.present"
                        classname="net.php.servlet"/>
   
  -    <class-available classpathref="classpath" 
  -                     property="xt.present" 
  +    <class-available classpathref="classpath"
  +                     property="xt.present"
                        classname="com.jclark.xsl.sax.XMLProcessorImpl"/>
   
  -    <class-available classpathref="classpath" 
  -                     property="naming.present" 
  +    <class-available classpathref="classpath"
  +                     property="naming.present"
                        classname="javax.naming.Context"/>
   
  -    <class-available classpathref="classpath" 
  -                     property="svg.present" 
  +    <class-available classpathref="classpath"
  +                     property="svg.present"
                        classname="org.apache.batik.transcoder.Transcoder"/>
   
  -    <class-available classpathref="classpath" 
  -                     property="fop.present" 
  +    <class-available classpathref="classpath"
  +                     property="fop.present"
                        classname="org.apache.fop.apps.Driver"/>
   
  -    <class-available classpathref="classpath" 
  -                     property="tidy.present" 
  +    <class-available classpathref="classpath"
  +                     property="tidy.present"
                        classname="org.w3c.tidy.Tidy"/>
   
  -    <class-available classpathref="classpath" 
  -                     property="maybeupload.present" 
  +    <class-available classpathref="classpath"
  +                     property="maybeupload.present"
                        classname="uk.co.weft.maybeupload.MaybeUploadRequestWrapper"/>
   
  -    <class-available classpathref="classpath" 
  -                     property="lucene.present" 
  +    <class-available classpathref="classpath"
  +                     property="lucene.present"
                        classname="org.apache.lucene.search.Searcher"/>
   
  -    <class-available classpathref="classpath" 
  -                     property="hsqldb.present" 
  +    <class-available classpathref="classpath"
  +                     property="hsqldb.present"
                        classname="org.hsqldb.Server"/>
   
  -    <class-available classpathref="classpath" 
  -                     property="jisp.present" 
  +    <class-available classpathref="classpath"
  +                     property="jisp.present"
                        classname="com.coyotegulch.jisp.IndexedObjectDatabase"/>
     </target>
  -  
  +
     <target name="prepare-jdbc" depends="filter-jdbc,nofilter-jdbc"/>
   
     <target name="filter-jdbc" unless="jdbc3.present">
  @@ -463,184 +463,184 @@
       <echo>*</echo>
       <echo>*  Recovery:</echo>
       <echo>*  ${recovery}</echo>
  -    <echo>*</echo>    
  +    <echo>*</echo>
       <echo>***********************************************</echo>
     </target>
  -  
  +
     <!-- =================================================================== -->
     <!-- Warnings                                                            -->
     <!-- =================================================================== -->
  -  
  +
     <!-- Outputs a warning if com.ibm.bsf.* classes are missing during compilation -->
     <target name="bsf-warn" unless="bsf.present" depends="optional-tests">
       <antcall target="op-warning">
         <param name="thing" value="BSF"/>
  -      <param name="recovery" 
  +      <param name="recovery"
           value="Get the BSF package from http://oss.software.ibm.com/developerworks/projects/bsf/
and place the jar in the lib/optional dir"/>
  -      <param name="message" 
  +      <param name="message"
                value="BSF is required for the script action."/>
       </antcall>
  -  </target>  
  -  
  +  </target>
  +
     <!-- Outputs a warning if org.mozilla.javascript.* classes are missing during compilation
-->
     <target name="rhino-warn" unless="rhino.interpreter.present" depends="optional-tests">
       <antcall target="op-warning">
         <param name="thing" value="Rhino"/>
  -      <param name="recovery" 
  +      <param name="recovery"
           value="Get the Rhino package from http://www.mozilla.org/rhino/ and place the jar
in the lib/optional dir"/>
         <param name="message"
                value="Rhino is required for the scripts and XSP in Javascript."/>
       </antcall>
     </target>
  -  
  +
     <!-- Outputs a warning if org.python.* classes are missing during compilation -->
     <target name="python-warn" unless="python.present" depends="optional-tests">
       <antcall target="op-warning">
         <param name="thing" value="jython"/>
  -      <param name="recovery" 
  +      <param name="recovery"
           value="Get the jython package from http://www.jython.org/ and place the jar in
the lib/optional dir"/>
         <param name="message"
                value="Jython is required for the scripts in Python."/>
       </antcall>
     </target>
  -  
  +
     <!-- Outputs a warning if org.jfor.jfor.* classes are missing during compilation -->
     <target name="jfor-warn" unless="jfor.present" depends="optional-tests">
       <antcall target="op-warning">
         <param name="thing" value="JFOR"/>
  -      <param name="recovery" 
  +      <param name="recovery"
           value="Get the JFOR package from http://www.jfor.org/ and place the jar in the
lib/optional dir"/>
         <param name="message"
                value="JFOR is required for the fo2rtf serializer."/>
       </antcall>
     </target>
  -  
  +
     <!-- Outputs a warning if org.xmldb.api.* classes are missing during compilation -->
     <target name="xmldb-warn" unless="xmldb.present" depends="optional-tests">
       <antcall target="op-warning">
         <param name="thing" value="XMLDB"/>
  -      <param name="recovery" 
  +      <param name="recovery"
           value="Get the xmldb package from http://www.xmldb.org/xapi/ and place the xmldb-api
jar in the lib/optional dir"/>
         <param name="message"
                value="XMLDB is required for the xmldb and xmldbcollection generator."/>
       </antcall>
  -  </target>  
  +  </target>
   
     <!-- Outputs a warning if com.jclark.xsl.* classes are missing during compilation
-->
     <target name="xt-warn" unless="xt.present" depends="optional-tests">
       <antcall target="op-warning">
         <param name="thing" value="XT"/>
  -      <param name="recovery" 
  +      <param name="recovery"
           value="Get the xt package from http://www.jclark.com/xml/xt.html and place xt.jar
in the lib/optional dir"/>
         <param name="message"
                value="XT is required for the xt transformer."/>
       </antcall>
  -  </target>  
  +  </target>
   
     <!-- Outputs a warning if net.php.* classes are missing during compilation -->
     <target name="php-warn" unless="php.present" depends="optional-tests">
       <antcall target="op-warning">
         <param name="thing" value="PHP"/>
  -      <param name="recovery" 
  +      <param name="recovery"
           value="Get the PHP servlet (phpsrvlt.jar) from http://www.php.net/ and place the
jar in the lib/optional dir"/>
         <param name="message"
                value="PHP is required for the php generator."/>
       </antcall>
     </target>
  -  
  +
     <!-- Outputs a warning if javax.naming.* classes are missing during compilation -->
     <target name="naming-warn" unless="naming.present" depends="optional-tests">
       <antcall target="op-warning">
         <param name="thing" value="JNDI"/>
  -      <param name="recovery" 
  +      <param name="recovery"
           value="Get the jndi.jar from Sun and place the jar in the lib/optional dir"/>
         <param name="message"
                value="JNDI is required for the ldap generator and the parentcm generator."/>
       </antcall>
     </target>
  -  
  +
     <!-- Outputs a warning if org.apache.batik.* classes are missing during compilation
-->
  -  <target name="svg-warn" unless="svg.present" depends="optional-tests"> 
  +  <target name="svg-warn" unless="svg.present" depends="optional-tests">
       <antcall target="op-warning">
         <param name="thing" value="Batik"/>
  -      <param name="recovery" 
  +      <param name="recovery"
           value="Get Batik from http://xml.apache.org/batik/ and place the jar in the lib/optional
dir"/>
         <param name="message"
                value="Batik is required for the svg serializers."/>
       </antcall>
     </target>
  -  
  +
     <!-- Outputs a warning if org.apache.fop.* classes are missing during compilation
-->
     <target name="fop-warn" unless="fop.present" depends="optional-tests">
       <antcall target="op-warning">
         <param name="thing" value="FOP"/>
  -      <param name="recovery" 
  +      <param name="recovery"
           value="Get FOP from http://xml.apache.org/fop/ and place the jar in the lib/optional
dir"/>
         <param name="message"
                value="FOP is required for the fo2pdf, fo2ps and fo2pcl serializer."/>
       </antcall>
     </target>
  -  
  +
     <!-- Outputs a warning if org.w3c.tidy.* classes are missing during compilation -->
     <target name="tidy-warn" unless="tidy.present" depends="optional-tests">
       <antcall target="op-warning">
         <param name="thing" value="JTidy"/>
  -      <param name="recovery" 
  +      <param name="recovery"
           value="Get JTidy from http://sourceforge.net/projects/jtidy/ and place the jar
in the lib/optional dir"/>
         <param name="message"
                value="JTidy is required for the html generator."/>
       </antcall>
     </target>
  -  
  +
     <!-- Outputs a warning if uk.co.weft.maybeupload.* classes are missing during compilation
-->
     <target name="maybeupload-warn" unless="maybeupload.present" depends="optional-tests">
       <antcall target="op-warning">
         <param name="thing" value="MaybeUpload"/>
  -      <param name="recovery" 
  +      <param name="recovery"
           value="Get MaybeUpload from http://www.weft.co.uk/library/maybeupload/ and place
the jar in the lib/optional dir"/>
         <param name="message"
                value="MaybeUpload simplifies the handling of uploaded files."/>
       </antcall>
     </target>
  -  
  +
     <!-- Outputs a warning if org.apache.lucene.* classes are missing during compilation
-->
     <target name="lucene-warn" unless="lucene.present" depends="optional-tests">
       <antcall target="op-warning">
         <param name="thing" value="Lucene"/>
  -      <param name="recovery" 
  +      <param name="recovery"
           value="Get Lucene from http://jakarta.apache.org/lucene/ and place the jar in the
lib/optional dir"/>
         <param name="message"
                value="Lucene is required for the Cocoon searches."/>
       </antcall>
     </target>
  -  
  +
     <!-- Outputs a warning if com.hp.hpl.deli.* classes are missing during compilation
-->
     <target name="deli-warn" unless="deli.present" depends="optional-tests">
       <antcall target="op-warning">
         <param name="thing" value="Deli"/>
  -      <param name="recovery" 
  +      <param name="recovery"
           value="Get Deli and place the jar in the lib/optional dir"/>
         <param name="message"
                value="Deli is required for ..."/>
       </antcall>
     </target>
  -  
  +
     <!-- Outputs a warning if org.apache.velocity.* classes are missing during compilation
-->
     <target name="velocity-warn" unless="velocity.present" depends="optional-tests">
       <antcall target="op-warning">
         <param name="thing" value="Velocity"/>
  -      <param name="recovery" 
  +      <param name="recovery"
           value="Get Velocity from http://jakarta.apache.org/velocity/ and place the jar
in the lib/optional dir"/>
         <param name="message"
                value="Velocity is required for the velocity generator."/>
       </antcall>
     </target>
  -  
  +
     <!-- Outputs a warning if org.hsqldb.* classes are missing during compilation -->
     <target name="hsqldb-warn" unless="hsqldb.present" depends="optional-tests">
       <antcall target="op-warning">
         <param name="thing" value="hsqldb"/>
  -      <param name="recovery" 
  +      <param name="recovery"
           value="Get hsqldb from http://hsqldb.sourceforge.net/ and place the jar in the
lib/optional dir"/>
         <param name="message"
                value="hsqldb is required for the sql examples."/>
  @@ -651,7 +651,7 @@
     <target name="resolver-warn" unless="resolver.present" depends="optional-tests">
       <antcall target="op-warning">
         <param name="thing" value="Resolver"/>
  -      <param name="recovery" 
  +      <param name="recovery"
           value="Get the resolver package from xml-commons CVS and place the jar in the lib/optional
dir"/>
         <param name="message"
                value="The resolver allows entity resolving."/>
  @@ -695,29 +695,29 @@
     <target name="poi-warn" unless="poi.present" depends="optional-tests">
       <antcall target="op-warning">
         <param name="thing" value="POI"/>
  -      <param name="recovery" 
  +      <param name="recovery"
           value="Get the POI package from http://jakarta.apache.org/poi/ and place the jar
in the lib/optional dir"/>
         <param name="message"
                value="POI is required for the POI sitemap components."/>
       </antcall>
  -  </target>  
  +  </target>
   
     <!-- Outputs a warning if org.apache.commons.logging.* classes are missing during
compilation -->
     <target name="commons-logging-warn" unless="commons.logging.present" depends="optional-tests">
       <antcall target="op-warning">
         <param name="thing" value="Jakarta Commons Logging"/>
  -      <param name="recovery" 
  +      <param name="recovery"
           value="Get the Jakarta Commons Logging package from http://jakarta.apache.org/commons/logging/
and place the jar in the lib/optional dir"/>
         <param name="message"
                value="The Jakarta Commons Logging package is required for the POI sitemap
components."/>
       </antcall>
  -  </target>  
  -  
  -     
  +  </target>
  +
  +
     <!-- =================================================================== -->
     <!-- Print out warnings for optional components                          -->
     <!-- =================================================================== -->
  -  <target name="optional-warnings" 
  +  <target name="optional-warnings"
             depends="bsf-warn, rhino-warn, jfor-warn, xmldb-warn, xt-warn, php-warn, naming-warn,
svg-warn, fop-warn, tidy-warn, maybeupload-warn, lucene-warn, deli-warn, velocity-warn, hsqldb-warn,
resolver-warn, jisp-warn, pizza-warn, eclipse-warn, poi-warn, commons-logging-warn">
     </target>
   
  @@ -743,7 +743,7 @@
           <exclude name="**/HSSFSerializer.java"     unless="poi.present"/>
           <exclude name="**/poi.x*"                  unless="poi.present"/>
           <exclude name="**/POIFSSerializer.java"    unless="poi.present"/>
  -              
  +
           <exclude name="**/java/Pizza.java"         unless="pizza.present"/>
           <exclude name="**/java/pizza.x*"           unless="pizza.present"/>
           <exclude name="**/java/Eclipse*.java"      unless="eclipse.present"/>
  @@ -797,7 +797,7 @@
           <exclude name="**/resolver.x*"                           unless="resolver.present"/>
   
           <exclude name="**/Jstyle*"             unless="jstyle.present"/>
  -        
  +
           <exclude name="**/Php*"                unless="php.present"/>
           <exclude name="**/php.x*"              unless="php.present"/>
   
  @@ -842,7 +842,7 @@
       </copy>
   
       <!-- A task to change the roles file. It is used to add optional components -->
  -    <taskdef name="xroles" classname="XConfToolTask" 
  +    <taskdef name="xroles" classname="XConfToolTask"
                classpath="${tools.dir}/anttasks"/>
   
       <!-- Invoke the XConfTool to add optional roles for components -->
  @@ -965,7 +965,6 @@
     <!-- =================================================================== -->
     <!-- Creates the jar file                                                -->
     <!-- =================================================================== -->
  -  <target name="all" depends="package" description="Default target (calls the 'package'
target)"/>
   
     <target name="package" depends="compile" description="Generates the jar packages">
       <jar jarfile="${build.dir}/${name}.jar" manifest="${build.src}/Manifest.mf">
  @@ -987,7 +986,7 @@
     <!-- Target called by Gump                                                -->
     <!-- =================================================================== -->
     <target name="gump" depends="docs, javadocs, test, package" description="[admin] Target
called by Gump"/>
  -  
  +
     <!-- =================================================================== -->
     <!-- Prepares the docs                                                   -->
     <!-- =================================================================== -->
  @@ -1135,7 +1134,7 @@
     <!-- =================================================================== -->
     <target name="prepare-webapp" depends="copy-webapp">
         <!-- A task to change the xconf. It is used to add optional components -->
  -      <taskdef name="xconf" classname="XConfToolTask" 
  +      <taskdef name="xconf" classname="XConfToolTask"
                  classpath="${tools.dir}/anttasks"/>
   
         <!-- Invoke the XConfTool to add entries for optional components -->
  @@ -1268,17 +1267,23 @@
     </target>
   
     <!-- =================================================================== -->
  -  <!-- Prepare the war file                                                -->
  +  <!-- Creates a local webapp directly useable as a servlet context        -->
     <!-- =================================================================== -->
  -  <target name="prepare-war" depends="prepare-webapp, prepare-webapp-scratchpad, prepare-webapp-libs,
prepare-scratchpad-libs, prepare-xsp" description="* Prepares the war package">
  +
  +  <target name="webapp" depends="prepare-webapp, prepare-webapp-scratchpad, prepare-webapp-libs,
prepare-scratchpad-libs, prepare-xsp"
  +      description="Builds a local webapp directory usable as servlet context for quicker
turn around">
  +    <copy todir="${build.war}/WEB-INF/classes">
  +      <fileset dir="${build.dest}"/>
  +      <fileset dir="${build.scratchpad.dest}"/>
  +    </copy>
     </target>
   
     <!-- =================================================================== -->
     <!-- Creates the war file                                                -->
     <!-- =================================================================== -->
  -  <target name="webapp" depends="prepare-war" description="* Generates the war package">
  +  <target name="war" depends="webapp" description="* Generates the war package">
       <!-- A task to create manifest for webapp. -->
  -    <taskdef name="manifest" classname="ManifestToolTask" 
  +    <taskdef name="manifest" classname="ManifestToolTask"
                classpath="${tools.dir}/anttasks"/>
   
       <manifest directory="${build.war}/WEB-INF/lib"
  @@ -1291,17 +1296,6 @@
     </target>
   
     <!-- =================================================================== -->
  -  <!-- Creates a local webapp directly useable as a servlet context        -->
  -  <!-- =================================================================== -->
  -  <target name="webapp-local" depends="prepare-webapp, prepare-webapp-scratchpad, copy-webapp-libs,
copy-scratchpad-libs"
  -      description="Builds a local webapp directory usable as servlet context for quicker
turn around">
  -    <copy todir="${build.war}/WEB-INF/classes">
  -      <fileset dir="${build.dest}"/>
  -      <fileset dir="${build.scratchpad.dest}"/>
  -    </copy>
  -  </target>
  -
  -  <!-- =================================================================== -->
     <!-- Removes existing uncompressed webapp                                -->
     <!-- =================================================================== -->
     <target name="remove-webapp" if="remove.webapp" description="Removes existing uncompressed
webapp" depends="init">
  @@ -1311,7 +1305,7 @@
     <!-- =================================================================== -->
     <!-- Installs Cocoon file                                                -->
     <!-- =================================================================== -->
  -  <target name="install" depends="package, webapp, remove-webapp" if="install.war" 
  +  <target name="install" depends="war, remove-webapp" if="install.war"
             description="Installs the WAR package">
       <copy file="${build.dir}/${name}.war" tofile="${install.war}/${name}.war"/>
     </target>
  @@ -1340,16 +1334,16 @@
     <!-- =================================================================== -->
     <!-- Create the announcements                                            -->
     <!-- =================================================================== -->
  -  <target name="announcement" 
  -          depends="prepare-docs" 
  +  <target name="announcement"
  +          depends="prepare-docs"
             description="[admin] Creates the announcement for new releases">
   
       <copy file="announcement.xml" tofile="${build.context}\xdocs\announcement.xml" filtering="on"/>
   
  -    <style basedir="${build.context}\xdocs" 
  -           destdir="${build.dir}" 
  +    <style basedir="${build.context}\xdocs"
  +           destdir="${build.dir}"
              style="${build.context}\stylesheets\announcement2txt.xsl"
  -           includes="announcement.xml" 
  +           includes="announcement.xml"
              extension=".txt"
              force="true"/>
   
  @@ -1422,7 +1416,7 @@
     <!-- Set a variable if javadoc is already up-to-date.                    -->
     <!-- =================================================================== -->
     <target name="javadocs_check">
  -    <mkdir dir="${build.javadocs}"/> 
  +    <mkdir dir="${build.javadocs}"/>
       <uptodate property="javadocs.notrequired" targetfile="${build.javadocs}/packages.html"
>
         <srcfiles dir= "${build.src}" includes="**/*.java,**/package.html"/>
       </uptodate>
  @@ -1505,11 +1499,11 @@
         <classpath refid="classpath"/>
       </javadoc>
     </target>
  -  
  +
     <!-- =================================================================== -->
     <!-- Prepares the source distribution                                    -->
     <!-- =================================================================== -->
  -  <target name="dist-src" depends="docs, javadocs" 
  +  <target name="dist-src" depends="docs, javadocs"
             description="Prepares the source distribution">
       <!-- Simply copy all and add the html docs -->
       <mkdir dir="${dist.root}"/>
  @@ -1529,11 +1523,11 @@
   
       <copy todir="${dist.src.dir}/tools">
         <fileset dir="${tools.dir}">
  -        <exclude name="anttasks/**"/> 
  -        <exclude name="lib/xalan*"/> 
  -        <exclude name="lib/xerces*"/> 
  -        <exclude name="lib/jtidy*"/> 
  -        <exclude name="lib/xml-apis.jar"/> 
  +        <exclude name="anttasks/**"/>
  +        <exclude name="lib/xalan*"/>
  +        <exclude name="lib/xerces*"/>
  +        <exclude name="lib/jtidy*"/>
  +        <exclude name="lib/xml-apis.jar"/>
         </fileset>
       </copy>
   
  @@ -1572,7 +1566,7 @@
       <copy todir="${dist.src.dir}/src/scratchpad" filtering="off">
         <fileset dir="${scratchpad.dir}"/>
       </copy>
  -    
  +
       <copy todir="${dist.src.dir}/src/webapp" filtering="on">
         <fileset dir="${webapp.dir}">
           <exclude name="**/*.gif"/>
  @@ -1652,7 +1646,7 @@
     <!-- =================================================================== -->
     <!-- Prepares the binary distribution                                    -->
     <!-- =================================================================== -->
  -  <target name="dist-bin" depends="package, webapp, docs, javadocs">
  +  <target name="dist-bin" depends="package, war, docs, javadocs">
       <!-- Copy webapp and the html docs -->
       <mkdir dir="${dist.root}"/>
       <mkdir dir="${dist.bin.dir}"/>
  @@ -1755,12 +1749,12 @@
     <target name="dist-info" depends="init">
       <echo>**********************************************</echo>
       <echo>*</echo>
  -    <echo>*  Build all distributions:</echo> 
  +    <echo>*  Build all distributions:</echo>
       <echo>*  - source distribution for windows/unix.</echo>
       <echo>*  - binary distribution for windows/unix.</echo>
  -    <echo>*</echo>        
  -    <echo>*  This may take a while...</echo>        
  -    <echo>*</echo>        
  +    <echo>*</echo>
  +    <echo>*  This may take a while...</echo>
  +    <echo>*</echo>
       <echo>***********************************************</echo>
       <echo/>
     </target>
  @@ -1861,7 +1855,7 @@
           <filter token="JARS" value="${all.jars}"/>
         </filterset>
       </copy>
  -    
  +
       <!-- 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;"/>
  @@ -1934,7 +1928,7 @@
     <!-- Build the Eclipse projects files                                    -->
     <!--===================================================================  -->
     <target name="eclipse-project" depends="init">
  -  
  +
       <!-- prepare the various paths that will form the project -->
       <path id="src.dirs">
         <!-- main source dir -->
  @@ -1942,12 +1936,12 @@
         <!-- scratchpad source dir -->
         <pathelement path="${src.dir}/scratchpad/src"/>
       </path>
  -    
  +
       <path id="mocks.dirs">
         <!-- main mocks dir -->
         <pathelement path="${mocks.dir}"/>
       </path>
  -    
  +
       <path id="libs">
         <!-- main libs -->
         <fileset dir="${lib.dir}">
  @@ -1962,12 +1956,12 @@
           <include name="*.jar"/>
         </fileset>
       </path>
  -    
  +
       <!-- convert paths to properties -->
       <property name="src.dirs" refid="src.dirs"/>
       <property name="mocks.dirs" refid="mocks.dirs"/>
       <property name="libs" refid="libs"/>
  -    
  +
       <!-- expand properties in the template file -->
       <copy file="${src.dir}/resources/dev/eclipse/classpath-tmpl.xml"
             tofile="${build.work}/classpath-temp.xml"
  @@ -1979,7 +1973,7 @@
           <filter token="MOCKS_DIRS" value="${mocks.dirs}"/>
         </filterset>
       </copy>
  -    
  +
       <!-- split the path in 'item' XML elements -->
       <replace file="${build.work}/classpath-temp.xml"
                token="${path.separator}" value="&lt;/item&gt;&#xA; &lt;item&gt;"/>
  @@ -1998,7 +1992,7 @@
       <style in="${build.work}/classpath-temp.xml" out="${basedir}/.classpath"
              processor="trax"
              style="${src.dir}/resources/dev/eclipse/make-classpath.xsl"/>
  -    
  +
       <!-- copy the project file (expand version) -->
       <copy file="${src.dir}/resources/dev/eclipse/project"
             tofile="${basedir}/.project"
  
  
  
  1.35      +10 -3     cocoon-2.0/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/cocoon-2.0/changes.xml,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- changes.xml	18 Aug 2003 12:59:33 -0000	1.34
  +++ changes.xml	21 Aug 2003 01:14:16 -0000	1.35
  @@ -43,12 +43,19 @@
    </devs>
   
    <release version="@version@" date="@date@">
  +  <action dev="JH" type="update">
  +    Changed the default build handling: <code>build webapp</code> builds a
  +    locally usable servlet context in <code>./build/cocoon/webapp</code> and
is
  +    now the default target. <code>build war</code> packages the stuff from
  +    <code>./build/cocoon/webapp</code> into the well-known <code>cocoon.war</code>.
  +    <code>build all</code> is removed as it is the same as <code>build
package</code>.
  +  </action>
     <action dev="CZ" type="fix" fixes-bug="12173">
  -    Applying patch from Renaud Bruyeron (bruyeron@fullsix.com) that fixes 
  +    Applying patch from Renaud Bruyeron (bruyeron@fullsix.com) that fixes
       the prematurely closing of the connection causing in the SQL Transformer.
     </action>
     <action dev="CZ" type="fix" fixes-bug="14348">
  -    Applying patch from Marco Rolappe (m_rolappe@web.de) that fixes 
  +    Applying patch from Marco Rolappe (m_rolappe@web.de) that fixes
       the caching problem when
       using cocoon: pseudo protocol with ServerPagesGenerator.
     </action>
  
  
  

Mime
View raw message