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 changes.xml build.xml README todo.xml
Date Fri, 10 Dec 1999 22:34:50 GMT
stefano     99/12/10 14:34:49

  Modified:    .        changes.xml build.xml README todo.xml
  Log:
  updated info files
  
  Revision  Changes    Path
  1.9       +7 -7      xml-cocoon/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/changes.xml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- changes.xml	1999/12/09 07:51:54	1.8
  +++ changes.xml	1999/12/10 22:34:49	1.9
  @@ -4,7 +4,7 @@
   
   <!-- 
     History of Cocoon changes
  -  $Id: changes.xml,v 1.8 1999/12/09 07:51:54 balld Exp $
  +  $Id: changes.xml,v 1.9 1999/12/10 22:34:49 stefano Exp $
   -->
   
   <changes title="Cocoon History of Changes">
  @@ -19,6 +19,12 @@
     	Added dummy methods to EngineWrapper for JSDK 2.2 compatibility
     </action>
     <action dev="DB" type="add">
  +  	Added ProducerFromMap as a sitemap primer.
  +  </action>
  +  <action dev="SM" type="add" due-to="Brett McLaughlin" due-to-email="bmclaugh@algx.net">
  +  	Added Tomcat installation instructions.
  +  </action>
  +  <action dev="DB" type="update">
     	Moved a few things around in ColumnFormatter so that it's possible for columns to be
formatted as more than simply a text node (e.g. embedded HTML). Also added a little formatter
that can transform \n into <![CDATA[<br>]]> for text and varchar columns.
     </action>
     <action dev="DB" type="add" due-to="Ed Ward" due-to-email="ed@waterfall.freeserve.co.uk">
  @@ -36,12 +42,6 @@
     </action>
     <action dev="SM" type="add">
       Added Documentation DTD.
  -  </action>
  -  <action dev="SM" type="add">
  -    Added Documentation DTD.
  -  </action>
  -  <action dev="SM" type="update">
  -    Moved "examples/" under "samples/" for global xml.apache.org pattern.
     </action>
     <action dev="SM" type="update">
       Moved "examples/" under "samples/" for global xml.apache.org pattern.
  
  
  
  1.6       +53 -48    xml-cocoon/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/build.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build.xml	1999/12/08 12:29:05	1.5
  +++ build.xml	1999/12/10 22:34:49	1.6
  @@ -32,7 +32,7 @@
   Copyright:
     Copyright (c) 1999 The Apache Software Foundation.
   
  -   $Id: build.xml,v 1.5 1999/12/08 12:29:05 stefano Exp $
  +   $Id: build.xml,v 1.6 1999/12/10 22:34:49 stefano Exp $
   
   ==================================================================== -->
   
  @@ -52,8 +52,13 @@
     <property name="images.dir" value="./resources"/>
     <property name="samples.dir" value="./samples"/>
     <property name="version.file" value="org/apache/cocoon/Defaults.java"/>
  +  <property name="packages" value="org.apache.cocoon.*"/>
   
  -  <property name="packages" value="org.apache.cocoon"/>
  +  <property name="sbk.docs" value="./build/sbkdocs"/>
  +  <property name="style" value="../xml-site/style/"/>
  +  <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"/>
   
     <property name="build.dir" value="./build"/>
     <property name="build.src" value="./build/src"/>
  @@ -61,15 +66,11 @@
     <property name="build.docs" value="./build/docs"/>
     <property name="build.javadocs" value="./build/javadocs"/>
   
  -  <property name="sbk.docs" value="./build/sbkdocs"/>
  -
     <property name="dist.dir" value="./dist"/>
   
     <property name="site.dir" value="../xml-site/sources/cocoon"/>
     <property name="site.docs" value="../xml-site/targets/cocoon"/>
   
  -  <property name="style" value="../xml-site/style"/>
  -
     <!-- =================================================================== -->
     <!-- Prepares the build directory                                        -->
     <!-- =================================================================== -->
  @@ -80,7 +81,7 @@
     <!-- =================================================================== -->
     <!-- Compiles the source code                                            -->
     <!-- =================================================================== -->
  -  <target name="compile" depends="prepare">
  +  <target name="prepare-src" depends="prepare">
       <!-- create directories -->
       <mkdir dir="${build.src}"/>
       <mkdir dir="${build.dest}"/>
  @@ -91,8 +92,12 @@
       <!-- substitute tokens as needed -->
       <replace file="${build.src}/${version.file}" token="@@version@@" value="${version}"/>
       <replace file="${build.src}/${version.file}" token="@@year@@" value="${year}"/>
  +  </target>
   
  -    <!-- do the compilation -->
  +  <!-- =================================================================== -->
  +  <!-- Compiles the source directory                                       -->
  +  <!-- =================================================================== -->
  +  <target name="compile" depends="prepare-src">
       <javac srcdir="${build.src}" destdir="${build.dest}" debug="${debug}"/>
     </target>
   
  @@ -100,7 +105,6 @@
     <!-- Creates the class package                                           -->
     <!-- =================================================================== -->
     <target name="package" depends="compile">
  -    <!-- create the package -->
       <jar jarfile="${build.dir}/${name}.jar" basedir="${build.dest}" manifest="${build.src}/MANIFEST.mf"
items="org"/>
     </target>
   
  @@ -109,38 +113,38 @@
     <!-- =================================================================== -->
     <target name="docs-convert" depends="prepare">
       <mkdir dir="${sbk.docs}"/>
  -    <xslt src="${docs.dir}/index.xml" dest="${sbk.docs}/index-sbk.xml" sheet="${sheets.dir}/document-stylebook.xsl"/>
  -    <xslt src="${docs.dir}/installing.xml" dest="${sbk.docs}/installing-sbk.xml" sheet="${sheets.dir}/document-stylebook.xsl"/>
  -    <xslt src="${docs.dir}/cocoon2.xml" dest="${sbk.docs}/cocoon2-sbk.xml" sheet="${sheets.dir}/document-stylebook.xsl"/>
  -    <xslt src="${docs.dir}/dcpprocessor.xml" dest="${sbk.docs}/dcpprocessor-sbk.xml"
sheet="${sheets.dir}/document-stylebook.xsl"/>
  -    <xslt src="${docs.dir}/sqlprocessor.xml" dest="${sbk.docs}/sqlprocessor-sbk.xml"
sheet="${sheets.dir}/document-stylebook.xsl"/>
  -    <xslt src="${docs.dir}/license.xml" dest="${sbk.docs}/license-sbk.xml" sheet="${sheets.dir}/document-stylebook.xsl"/>
  -    <xslt src="${docs.dir}/javadoc.xml" dest="${sbk.docs}/javadoc-sbk.xml" sheet="${sheets.dir}/document-stylebook.xsl"/>
  -    <xslt src="${docs.dir}/guide.xml" dest="${sbk.docs}/guide-sbk.xml" sheet="${sheets.dir}/document-stylebook.xsl"/>
  -    <xslt src="${docs.dir}/technologies.xml" dest="${sbk.docs}/technologies-sbk.xml"
sheet="${sheets.dir}/document-stylebook.xsl"/>
  -    <xslt src="${docs.dir}/dynamic.xml" dest="${sbk.docs}/dynamic-sbk.xml" sheet="${sheets.dir}/document-stylebook.xsl"/>
  -    <xslt src="${docs.dir}/faq.xml" dest="${sbk.docs}/faq-sbk.xml" sheet="${sheets.dir}/faq-stylebook.xsl"/>
  -    <xslt src="${docs.dir}/WD-xsp.xml" dest="${sbk.docs}/WD-xsp-sbk.xml" sheet="${sheets.dir}/spec-stylebook.xsl"/>
  -    <xslt src="changes.xml" dest="${sbk.docs}/changes-sbk.xml" sheet="${sheets.dir}/changes-stylebook.xsl"/>
  -    <xslt src="todo.xml" dest="${sbk.docs}/todo-sbk.xml" sheet="${sheets.dir}/todo-stylebook.xsl"/>
  +    <java class="${xslt}" args="${xslt.params} -in ${docs.dir}/index.xml -out ${sbk.docs}/index-sbk.xml
-xsl ${sheets.dir}/document-stylebook.xsl"/>
  +    <java class="${xslt}" args="${xslt.params} -in ${docs.dir}/installing.xml -out ${sbk.docs}/installing-sbk.xml
-xsl ${sheets.dir}/document-stylebook.xsl"/>
  +    <java class="${xslt}" args="${xslt.params} -in ${docs.dir}/cocoon2.xml -out ${sbk.docs}/cocoon2-sbk.xml
-xsl ${sheets.dir}/document-stylebook.xsl"/>
  +    <java class="${xslt}" args="${xslt.params} -in ${docs.dir}/dcpprocessor.xml -out
${sbk.docs}/dcpprocessor-sbk.xml -xsl ${sheets.dir}/document-stylebook.xsl"/>
  +    <java class="${xslt}" args="${xslt.params} -in ${docs.dir}/sqlprocessor.xml -out
${sbk.docs}/sqlprocessor-sbk.xml -xsl ${sheets.dir}/document-stylebook.xsl"/>
  +    <java class="${xslt}" args="${xslt.params} -in ${docs.dir}/license.xml -out ${sbk.docs}/license-sbk.xml
-xsl ${sheets.dir}/document-stylebook.xsl"/>
  +    <java class="${xslt}" args="${xslt.params} -in ${docs.dir}/javadoc.xml -out ${sbk.docs}/javadoc-sbk.xml
-xsl ${sheets.dir}/document-stylebook.xsl"/>
  +    <java class="${xslt}" args="${xslt.params} -in ${docs.dir}/guide.xml -out ${sbk.docs}/guide-sbk.xml
-xsl ${sheets.dir}/document-stylebook.xsl"/>
  +    <java class="${xslt}" args="${xslt.params} -in ${docs.dir}/technologies.xml -out
${sbk.docs}/technologies-sbk.xml -xsl ${sheets.dir}/document-stylebook.xsl"/>
  +    <java class="${xslt}" args="${xslt.params} -in ${docs.dir}/dynamic.xml -out ${sbk.docs}/dynamic-sbk.xml
-xsl ${sheets.dir}/document-stylebook.xsl"/>
  +    <java class="${xslt}" args="${xslt.params} -in ${docs.dir}/faq.xml -out ${sbk.docs}/faq-sbk.xml
-xsl ${sheets.dir}/faq-stylebook.xsl"/>
  +    <java class="${xslt}" args="${xslt.params} -in ${docs.dir}/WD-xsp.xml -out ${sbk.docs}/WD-xsp-sbk.xml
-xsl ${sheets.dir}/spec-stylebook.xsl"/>
  +    <java class="${xslt}" args="${xslt.params} -in changes.xml -out ${sbk.docs}/changes-sbk.xml
-xsl ${sheets.dir}/changes-stylebook.xsl"/>
  +    <java class="${xslt}" args="${xslt.params} -in todo.xml -out ${sbk.docs}/todo-sbk.xml
-xsl ${sheets.dir}/todo-stylebook.xsl"/>
       <copydir src="${images.dir}" dest="${sbk.docs}/images"/>
     </target>
   
     <!-- =================================================================== -->
     <!-- Generate HTML docs                                                  -->
     <!-- =================================================================== -->
  +<!--  <target name="docs" depends="docs-convert"> -->
     <target name="docs">
       <mkdir dir="${build.docs}"/>
       <copyfile src="${docs.dir}/docs-book.xml" dest="${sbk.docs}/book.xml"/>
  -    <stylebook book="${sbk.docs}/book.xml" dest="${build.docs}" style="${style}"/>
  +    <java class="${doc.generator}" args="targetDirectory=${build.docs} ${sbk.docs}/book.xml
${style}"/>
     </target>
  -
  +  
     <!-- =================================================================== -->
     <!-- Creates the API documentation                                       -->
     <!-- =================================================================== -->
  -  <target name="javadocs" depends="prepare">
  +  <target name="javadocs" depends="prepare-src">
       <mkdir dir="${build.javadocs}"/>
  -    <copyfile src="${stylesheets}/javadoc.css" dest="{$build.javadocs}/stylesheet.css"/>
       <javadoc2 packagenames="${packages}"
                 sourcepath="${build.src}"
                 destdir="${build.javadocs}"
  @@ -149,8 +153,9 @@
                 use="true"
                 windowtitle="${name} API"
                 doctitle="${name}"
  -              bottom="Copyright &#169; ${YEAR} Apache XML Project. All Rights Reserved."
  +              bottom="Copyright &#169; ${year} Apache XML Project. All Rights Reserved."
       />
  +    <copyfile src="${stylesheets}/javadoc.css" dest="{$build.javadocs}/stylesheet.css"/>
     </target>
   
     <!-- =================================================================== -->
  @@ -169,11 +174,11 @@
       <mkdir dir="${dist.dir}/xdocs/stylesheets"/>
   
       <copydir src="${build.src}" dest="${dist.dir}/src" ignore="cocoon.properties"/>
  -    <copyfile src="${dist.dir}/src/org/apache/cocoon/cocoon.properties" dest="${dist.dir}/conf/cocoon.properties"/>
  -    <copyfile src="${build.dir}/${name}-${version}.jar" dest="${dist.dir}/bin/${name}-${version}.jar"/>
  +    <copyfile src="${src.dir}/org/apache/cocoon/cocoon.properties" dest="${dist.dir}/conf/cocoon.properties"/>
  +    <copyfile src="${build.dir}/${name}.jar" dest="${dist.dir}/bin/${name}.jar"/>
       <copydir src="${build.docs}" dest="${dist.dir}/docs"/>
       <copydir src="${build.javadocs}" dest="${dist.dir}/docs/api"/>
  -    <copydir src="${samples.src}" dest="${dist.dir}/samples"/>
  +    <copydir src="${samples.dir}" dest="${dist.dir}/samples"/>
       <copydir src="${docs.dir}" dest="${dist.dir}/xdocs" ignore="docs-book.xml, site-book.xml"/>
       <copydir src="${dtd.dir}" dest="${dist.dir}/xdocs/DTD"/>
       <copydir src="${sheets.dir}" dest="${dist.dir}/xdocs/stylesheets" ignore="javadoc.css"/>
  @@ -183,7 +188,7 @@
       <copyfile src="LICENSE" dest="${dist.dir}/LICENSE"/>
       <copyfile src="build.xml" dest="${dist.dir}/build.xml"/>
   
  -    <jar jarfile="${name}-${version}.jar" basedir="${dist.dir}" items="bin, src, conf,
docs, samples, xdocs"/>
  +    <jar jarfile="${name}-${version}.jar" basedir="${dist.dir}" items="."/>
     </target>
   
     <!-- =================================================================== -->
  @@ -198,23 +203,23 @@
     <!-- Creates the web site                                                -->
     <!-- =================================================================== -->
     <target name="site">
  -    <copyfile src="${docs.dir}/site-book.xml" dest="${site.dir}/../cocoon.xml"/>
  -    <xslt src="${docs.dir}/index.xml" dest="${site.dir}/index-sbk.xml" sheet="${sheets.dir}/document-stylebook.xsl"/>
  -    <xslt src="${docs.dir}/installing.xml" dest="${site.dir}/installing-sbk.xml" sheet="${sheets.dir}/document-stylebook.xsl"/>
  -    <xslt src="${docs.dir}/cocoon2.xml" dest="${site.dir}/cocoon2-sbk.xml" sheet="${sheets.dir}/document-stylebook.xsl"/>
  -    <xslt src="${docs.dir}/dcpprocessor.xml" dest="${site.dir}/dcpprocessor-sbk.xml"
sheet="${sheets.dir}/document-stylebook.xsl"/>
  -    <xslt src="${docs.dir}/sqlprocessor.xml" dest="${site.dir}/sqlprocessor-sbk.xml"
sheet="${sheets.dir}/document-stylebook.xsl"/>
  -    <xslt src="${docs.dir}/license.xml" dest="${site.dir}/license-sbk.xml" sheet="${sheets.dir}/document-stylebook.xsl"/>
  -    <xslt src="${docs.dir}/javadoc.xml" dest="${site.dir}/javadoc-sbk.xml" sheet="${sheets.dir}/document-stylebook.xsl"/>
  -    <xslt src="${docs.dir}/guide.xml" dest="${site.dir}/guide-sbk.xml" sheet="${sheets.dir}/document-stylebook.xsl"/>
  -    <xslt src="${docs.dir}/technologies.xml" dest="${site.dir}/technologies-sbk.xml"
sheet="${sheets.dir}/document-stylebook.xsl"/>
  -    <xslt src="${docs.dir}/dynamic.xml" dest="${site.dir}/dynamic-sbk.xml" sheet="${sheets.dir}/document-stylebook.xsl"/>
  -    <xslt src="${docs.dir}/faq.xml" dest="${site.dir}/faq-sbk.xml" sheet="${sheets.dir}/faq-stylebook.xsl"/>
  -    <xslt src="${docs.dir}/WD-xsp.xml" dest="${site.dir}/WD-xsp-sbk.xml" sheet="${sheets.dir}/spec-stylebook.xsl"/>
  -    <xslt src="changes.xml" dest="${site.dir}/changes-sbk.xml" sheet="${sheets.dir}/changes-stylebook.xsl"/>
  -    <xslt src="todo.xml" dest="${site.dir}/todo-sbk.xml" sheet="${sheets.dir}/todo-stylebook.xsl"/>
  +    <java class="${xslt}" args="${xslt.params} -in ${docs.dir}/index.xml -out ${site.dir}/index-sbk.xml
-xsl ${sheets.dir}/document-stylebook.xsl"/>
  +    <java class="${xslt}" args="${xslt.params} -in ${docs.dir}/installing.xml -out ${site.dir}/installing-sbk.xml
-xsl ${sheets.dir}/document-stylebook.xsl"/>
  +    <java class="${xslt}" args="${xslt.params} -in ${docs.dir}/cocoon2.xml -out ${site.dir}/cocoon2-sbk.xml
-xsl ${sheets.dir}/document-stylebook.xsl"/>
  +    <java class="${xslt}" args="${xslt.params} -in ${docs.dir}/dcpprocessor.xml -out
${site.dir}/dcpprocessor-sbk.xml -xsl ${sheets.dir}/document-stylebook.xsl"/>
  +    <java class="${xslt}" args="${xslt.params} -in ${docs.dir}/sqlprocessor.xml -out
${site.dir}/sqlprocessor-sbk.xml -xsl ${sheets.dir}/document-stylebook.xsl"/>
  +    <java class="${xslt}" args="${xslt.params} -in ${docs.dir}/license.xml -out ${site.dir}/license-sbk.xml
-xsl ${sheets.dir}/document-stylebook.xsl"/>
  +    <java class="${xslt}" args="${xslt.params} -in ${docs.dir}/javadoc.xml -out ${site.dir}/javadoc-sbk.xml
-xsl ${sheets.dir}/document-stylebook.xsl"/>
  +    <java class="${xslt}" args="${xslt.params} -in ${docs.dir}/guide.xml -out ${site.dir}/guide-sbk.xml
-xsl ${sheets.dir}/document-stylebook.xsl"/>
  +    <java class="${xslt}" args="${xslt.params} -in ${docs.dir}/technologies.xml -out
${site.dir}/technologies-sbk.xml -xsl ${sheets.dir}/document-stylebook.xsl"/>
  +    <java class="${xslt}" args="${xslt.params} -in ${docs.dir}/dynamic.xml -out ${site.dir}/dynamic-sbk.xml
-xsl ${sheets.dir}/document-stylebook.xsl"/>
  +    <java class="${xslt}" args="${xslt.params} -in ${docs.dir}/faq.xml -out ${site.dir}/faq-sbk.xml
-xsl ${sheets.dir}/faq-stylebook.xsl"/>
  +    <java class="${xslt}" args="${xslt.params} -in ${docs.dir}/WD-xsp.xml -out ${site.dir}/WD-xsp-sbk.xml
-xsl ${sheets.dir}/spec-stylebook.xsl"/>
  +    <java class="${xslt}" args="${xslt.params} -in changes.xml -out ${site.dir}/changes-sbk.xml
-xsl ${sheets.dir}/changes-stylebook.xsl"/>
  +    <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"/>
  -    <stylebook book="${site.dir}/../cocoon.xml" dest="${site.docs}" style="${style}"/>
  +    <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}"/>
     </target>
   
   </project>
  
  
  
  1.4       +3 -1      xml-cocoon/README
  
  Index: README
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/README,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- README	1999/12/08 12:29:05	1.3
  +++ README	1999/12/10 22:34:49	1.4
  @@ -1,5 +1,7 @@
   
  -                        C   O   C   O   O   N   @@version@@
  +                        C   O   C   O   O   N 
  +                        
  +                              @@version@@
                                   
                         
     What is it?
  
  
  
  1.6       +2 -6      xml-cocoon/todo.xml
  
  Index: todo.xml
  ===================================================================
  RCS file: /home/cvs/xml-cocoon/todo.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- todo.xml	1999/12/08 12:29:05	1.5
  +++ todo.xml	1999/12/10 22:34:49	1.6
  @@ -4,7 +4,7 @@
   
   <!-- 
     History of Cocoon changes
  -  $Id: todo.xml,v 1.5 1999/12/08 12:29:05 stefano Exp $
  +  $Id: todo.xml,v 1.6 1999/12/10 22:34:49 stefano Exp $
   -->
   
   <todo title="Cocoon Things To Do">
  @@ -16,15 +16,11 @@
    </devs>
    
    <action priority="showstopper" assigned-to="SM" context="docs">
  -  Finish XML-ize the docs (install, DCP, SQL).
  +  Finish XML-ize the docs (DCP, SQL).
    </action>
   
    <action priority="showstopper" assigned-to="SM" context="admin">
     Write the user selectable error page.
  - </action>
  -
  - <action priority="showstopper" assigned-to="SM" context="build">
  -  Finish Ant build file and clean it up.
    </action>
   
    <action priority="showstopper" assigned-to="SM" context="admin">
  
  
  

Mime
View raw message