cocoon-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stef...@locus.apache.org
Subject cvs commit: xml-cocoon build.xml changes.xml
Date Mon, 24 Jan 2000 21:35:29 GMT
stefano     00/01/24 13:35:28

  Modified:    .        build.xml changes.xml
  Log:
  updated to 1.6.1-dev and uses the new skin for doc/site generation
  
  Revision  Changes    Path
  1.23      +16 -24    xml-cocoon/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/build.xml,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- build.xml	2000/01/20 00:17:41	1.22
  +++ build.xml	2000/01/24 21:35:28	1.23
  @@ -11,7 +11,7 @@
    - write the target rule that reacts on class presence.
    
   Legal: 
  -  Copyright (c) 1999 The Apache Software Foundation. All Rights Reserved.
  +  Copyright (c) 1999-2000 The Apache Software Foundation. All Rights Reserved.
   
   ================================================================================
   
  @@ -41,15 +41,15 @@
   First thing you should do to be able to compile Cocoon or generate its 
   documentation, is to install Ant on your system. Unfortunately, there is no
   Ant distribution (but we're planning to create one soon), so you have to 
  -use CVS to checkout the "jakarta-tools" module under the jakarta.apache.org
  +use CVS to checkout the "jakarta-ant" module under the jakarta.apache.org
   CVS repository.
   
  -Once, you've done the checkout, check into the "/ant" directory where you'll 
  -find
  +Once, you've done the checkout, generate ant.jar by running the bootstrap script
  +(.bat for win32, .sh for unix). Then, look into the /lib directory where you 
  +should find
   
     - ant.jar
     - projectx-tr2.jar
  -  - servlet-2.2.0.jar
     
   that you should place into your classpath.
   
  @@ -69,8 +69,8 @@
    Apache Xalan 0.19.1+   - http://xml.apache.org/dist/
    Apache FOP 0.12.0+     - http://xml.apache.org/dist/
    
  - Sun ProjectX (TR2)     - jakarta-tools CVS at jakarta.apache.org
  - Sun Servlet API (2.2+) - jakarta-tools CVS at jakarta.apache.org
  + Sun ProjectX (TR2)     - http://java.sun.com/xml/index.html
  + Sun Servlet API (2.2+) - http://java.sun.com/products/servlet/index.html
    Sun JNDI API (1.2.1+)  - http://java.sun.com/products/jndi/index.html
   
    James Clark XT         - ftp://ftp.jclark.com/pub/xml/xt.zip
  @@ -78,10 +78,8 @@
    GNU RegExp (1.0.8+)    - http://www.cacas.org/java/gnu/regexp/
   
    StyleBook (1.0b1+)     - xml-stylebook CVS at xml.apache.org
  - Site Style             - xml-site CVS at xml.apache.org
   
  - [xml-stylebook and xml-site are required only for documentation generation,
  -  not for compilation]
  +[xml-stylebook are required only for documentation generation, not for compilation]
    
   once you have placed all the ".jar" files in your classpath, you're ready to
   build the whole thing.
  @@ -119,16 +117,8 @@
   unsupported classes out of the compilation. For now, it's easier to download
   all the required packages or to remove/rename the Cocoon modules you don't use.
   
  -2) why is the "javadoc2" task not working?
  +2) why not using make or more standard stuff?
   
  -There are problems with javadoc in the java 1.2 platform and Ant due to some
  -security manager problems. While the Ant team works a solution around it,
  -you should go into the "AntSecurityManager.java" class, remove the commented 
  -out methods, recompile ant under java 1.2 and it works. Or, wait for a new
  -version of ant that is already scheduled to fix that problem.
  -
  -3) why not using make or more standard stuff?
  -
    - performance: Ant is faster because it allows a single JVM to be reused
    - portability: Ant is pure java, very small, works every java platform and can
      be easily tuned for special needs.
  @@ -140,7 +130,7 @@
      to allow newbies, expecially from the non-Unix world to be up to speed
      sooner, without requiring to learn other languages and paradigms.
      
  -4) can I use Ant for my stuff?
  +3) can I use Ant for my stuff?
   
   Sure. We highly welcome you to do so, but please, if you clone or copy parts
   of build files, give credits to the original authors. Thank you.
  @@ -150,7 +140,7 @@
   <project default="package" basedir=".">
   
     <property name="name" value="Cocoon"/>
  -  <property name="version" value="1.6"/>
  +  <property name="version" value="1.6.1-dev"/>
     <property name="year" value="1999-2000"/>
   
     <property name="build.compiler" value="classic"/>
  @@ -169,7 +159,8 @@
     <property name="packages" value="org.apache.cocoon.*"/>
   
     <property name="sbk.docs" value="./build/sbkdocs"/>
  -  <property name="style" value="../xml-site/style/"/>
  +<!--  <property name="skin" value="../xml-site/style/"/> old skin -->
  +  <property name="skin" value="./skins/xml.apache.org/"/>
     <property name="xslt" value="org.apache.xalan.xslt.Process"/>
     <property name="xslt.params" value="-xml -validate -indent 1"/>
     <property name="doc.generator" value="org.apache.stylebook.StyleBook"/>
  @@ -277,7 +268,7 @@
     <target name="docs" depends="docs-convert">
       <mkdir dir="${build.docs}"/>
       <copyfile src="${docs.dir}/docs-book.xml" dest="${sbk.docs}/book.xml"/>
  -    <java class="${doc.generator}" args="targetDirectory=${build.docs} ${sbk.docs}/book.xml
${style}"/>
  +    <java class="${doc.generator}" args="targetDirectory=${build.docs} ${sbk.docs}/book.xml
${skin}"/>
     </target>
     
     <!-- =================================================================== -->
  @@ -285,6 +276,7 @@
     <!-- =================================================================== -->
     <target name="javadocs" depends="prepare-src">
       <mkdir dir="${build.javadocs}"/>
  +    <!-- NOTE: we need to change this to "javadoc" as soon as there is a new Ant distribution
-->
       <javadoc2 packagenames="${packages}"
                 sourcepath="${build.src}"
                 destdir="${build.javadocs}"
  @@ -363,7 +355,7 @@
       <java class="${xslt}" args="${xslt.params} -in todo.xml -out ${site.dir}/todo-sbk.xml
-xsl ${sheets.dir}/todo-stylebook.xsl"/>  
       <copydir src="${images.dir}" dest="${site.dir}/images"/>
       <copyfile src="${docs.dir}/site-book.xml" dest="${site.dir}/../cocoon.xml"/>
  -    <java class="${doc.generator}" args="targetDirectory=${site.docs} ${site.dir}/../cocoon.xml
${style}"/>
  +    <java class="${doc.generator}" args="targetDirectory=${site.docs} ${site.dir}/../cocoon.xml
${skin}"/>
     </target>
   
   </project>
  
  
  
  1.23      +7 -1      xml-cocoon/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/changes.xml,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- changes.xml	2000/01/23 23:09:52	1.22
  +++ changes.xml	2000/01/24 21:35:28	1.23
  @@ -4,7 +4,7 @@
   
   <!--
     History of Cocoon changes
  -  $Id: changes.xml,v 1.22 2000/01/23 23:09:52 stefano Exp $
  +  $Id: changes.xml,v 1.23 2000/01/24 21:35:28 stefano Exp $
   -->
   
   <changes title="Cocoon History of Changes">
  @@ -15,6 +15,12 @@
     </devs>
   
    <release version="1.6.1-dev" date="Not yet released">
  +  <action dev="SM" type="fix" due-to="Timm, Sean" due-to-email="STimm@mailgo.com">
  +    Fixed a nullpointerexception when removing the very last PI.
  +  </action>
  +  <action dev="SM" type="update">
  +    Patched xml.apache.org skin for better source code and figures handling.
  +  </action>
     <action dev="SM" type="fix" due-to="Manuel Schulte" due-to-email="manuel@alpha.sea-to-sky.netv">
       Fixed XML name which X stands for "eXtensible" not "eXtended".
     </action>
  
  
  

Mime
View raw message