giacomo 01/03/04 23:28:08
Modified: . Tag: xml-cocoon2 build.xml
webapp/stylesheets Tag: xml-cocoon2 simple-samples2html.xsl
svg-samples2html.xsl
xdocs Tag: xml-cocoon2 httprequest.xml
Log:
Added version pattern to make use of Ants replacement capabilities. Patch
submitted by Hand Ulrich Niederman
Revision Changes Path
No revision
No revision
1.6.2.61 +35 -14 xml-cocoon/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-cocoon/build.xml,v
retrieving revision 1.6.2.60
retrieving revision 1.6.2.61
diff -u -r1.6.2.60 -r1.6.2.61
--- build.xml 2001/02/27 20:08:55 1.6.2.60
+++ build.xml 2001/03/05 07:28:07 1.6.2.61
@@ -113,8 +113,8 @@
<echo message="------------------- ${fullname} ${version} [${year}]
----------------"/>
- <property name="debug" value="on"/>
- <property name="optimize" value="off"/>
+ <property name="debug" value="off"/>
+ <property name="optimize" value="on"/>
<property name="deprecation" value="off"/>
<property name="build.compiler" value="classic"/>
<property name="target.vm" value="1.2"/>
@@ -138,6 +138,7 @@
<property name="build.src" value="${build.dir}/src"/>
<property name="build.dest" value="${build.dir}/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.war" value="${build.dir}/webapp"/>
<property name="build.javadocs" value="${build.dir}/javadocs"/>
@@ -375,14 +376,34 @@
<!-- Prepares the docs
-->
<!-- ===================================================================
-->
<target name="prepare-docs" depends="init">
- <copy todir="${build.docs}/images">
- <fileset dir="${docs.dir}/images"/>
+ <mkdir dir="${build.xdocs}"/>
+
+ <!-- make filtered copy of XML docs -->
+ <copy todir="${build.xdocs}" filtering="on">
+ <fileset dir="${docs.dir}">
+ <exclude name="*.gif"/>
+ <exclude name="*.png"/>
+ <exclude name="*.jpg"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${build.xdocs}" filtering="off">
+ <fileset dir="${docs.dir}/images">
+ <include name="*.gif"/>
+ <include name="*.png"/>
+ <include name="*.jpg"/>
+ </fileset>
+ </copy>
+
+ <copy todir="${build.docs}/images" filtering="off">
+ <fileset dir="${build.xdocs}/images"/>
</copy>
- <copy file="changes.xml" tofile="${docs.dir}/changes.xml"
filtering="on"/>
- <copy file="todo.xml" tofile="${docs.dir}/todo.xml"/>
+
+ <copy file="changes.xml" tofile="${build.xdocs}/changes.xml"
filtering="on"/>
+ <copy file="todo.xml" tofile="${build.xdocs}/todo.xml"/>
- <replace file="${docs.dir}/changes.xml" token="./xdocs/dtd/"
value="dtd/"/>
- <replace file="${docs.dir}/todo.xml" token="./xdocs/dtd/"
value="dtd/"/>
+ <replace file="${build.xdocs}/changes.xml" token="./xdocs/dtd/"
value="dtd/"/>
+ <replace file="${build.xdocs}/todo.xml" token="./xdocs/dtd/"
value="dtd/"/>
</target>
<!-- ===================================================================
-->
@@ -390,10 +411,10 @@
<!-- ===================================================================
-->
<target name="docs" depends="prepare-docs" description="Generates the
documentation">
<mkdir dir="${build.docs}"/>
- <copy file="${docs.dir}/docs-book.xml" tofile="${docs.dir}/book.xml"
filtering="on"/>
+ <copy file="${build.xdocs}/docs-book.xml"
tofile="${build.xdocs}/book.xml"/>
<java classname="${doc.generator}" fork="yes">
<classpath refid="classpath"/>
- <arg line="targetDirectory=${build.docs} ${docs.dir}/book.xml
${browser.skin}"/>
+ <arg line="targetDirectory=${build.docs} ${build.xdocs}/book.xml
${browser.skin}"/>
</java>
</target>
@@ -402,10 +423,10 @@
<!-- ===================================================================
-->
<target name="printer-docs" depends="prepare-docs" description="Generates
printer-friendly documentation">
<mkdir dir="${build.docs.printer}"/>
- <copy file="${docs.dir}/docs-book.xml" tofile="${docs.dir}/book.xml"
filtering="on"/>
+ <copy file="${build.xdocs}/docs-book.xml"
tofile="${build.xdocs}/book.xml"/>
<java classname="${doc.generator}" fork="yes">
<classpath refid="classpath"/>
- <arg line="targetDirectory=${build.docs.printer} ${docs.dir}/book.xml
${printer.skin}"/>
+ <arg line="targetDirectory=${build.docs.printer}
${build.xdocs}/book.xml ${printer.skin}"/>
</java>
</target>
@@ -414,10 +435,10 @@
<!-- ===================================================================
-->
<target name="site" depends="prepare-docs" description="Generates the web
site (for site maintainers only)">
<mkdir dir="${site}"/>
- <copy file="${docs.dir}/site-book.xml" tofile="${docs.dir}/book.xml"
filtering="on"/>
+ <copy file="${build.xdocs}/site-book.xml"
tofile="${build.xdocs}/book.xml"/>
<java classname="${doc.generator}" fork="yes">
<classpath refid="classpath"/>
- <arg line="targetDirectory=${site} ${docs.dir}/book.xml
${browser.skin}"/>
+ <arg line="targetDirectory=${site} ${build.xdocs}/book.xml
${browser.skin}"/>
</java>
</target>
No revision
No revision
1.1.2.9 +3 -3
xml-cocoon/webapp/stylesheets/Attic/simple-samples2html.xsl
Index: simple-samples2html.xsl
===================================================================
RCS file:
/home/cvs/xml-cocoon/webapp/stylesheets/Attic/simple-samples2html.xsl,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- simple-samples2html.xsl 2001/02/28 13:37:35 1.1.2.8
+++ simple-samples2html.xsl 2001/03/05 07:28:07 1.1.2.9
@@ -5,20 +5,20 @@
<xsl:template match="/">
<html>
<head>
- <title>Apache Cocoon 2.0a4</title>
+ <title>Apache Cocoon @version@</title>
</head>
<body bgcolor="#ffffff" link="#0086b2" vlink="#00698c" alink="#743e75">
<p align="center"><font size="+0" face="arial,helvetica,sanserif"
color="#000000">The Apache Software Foundation is proud to present...</font></p>
<p align="center"><img border="0" src="images/cocoon.gif"/></p>
- <p align="center"><font size="+0" face="arial,helvetica,sanserif"
color="#000000"><b>version 2.0a4</b></font></p>
+ <p align="center"><font size="+0" face="arial,helvetica,sanserif"
color="#000000"><b>version @version@</b></font></p>
<xsl:apply-templates/>
<p align="center">
<font size="-1">
- Copyright © 1999-2000 <a href="http://www.apache.org";>The Apache
Software Foundation</a>.<br/>
+ Copyright © @year@ <a href="http://www.apache.org";>The Apache
Software Foundation</a>.<br/>
All rights reserved.
</font>
</p>
1.1.2.4 +3 -3 xml-cocoon/webapp/stylesheets/Attic/svg-samples2html.xsl
Index: svg-samples2html.xsl
===================================================================
RCS file: /home/cvs/xml-cocoon/webapp/stylesheets/Attic/svg-samples2html.xsl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- svg-samples2html.xsl 2001/02/28 13:37:35 1.1.2.3
+++ svg-samples2html.xsl 2001/03/05 07:28:07 1.1.2.4
@@ -6,20 +6,20 @@
<xsl:template match="/">
<html>
<head>
- <title>Apache Cocoon 2.0a4</title>
+ <title>Apache Cocoon @version@</title>
</head>
<body bgcolor="#ffffff" link="#0086b2" vlink="#00698c" alink="#743e75">
<p align="center"><font size="+0" face="arial,helvetica,sanserif"
color="#000000">The Apache Software Foundation is proud to present...</font></p>
<p align="center"><img border="0" src="images/cocoon.gif"/></p>
- <p align="center"><font size="+0" face="arial,helvetica,sanserif"
color="#000000"><b>version 2.0a4</b></font></p>
+ <p align="center"><font size="+0" face="arial,helvetica,sanserif"
color="#000000"><b>version @version@</b></font></p>
<xsl:apply-templates/>
<p align="center">
<font size="-1">
- Copyright © 1999-2000 <a href="http://www.apache.org";>The Apache
Software Foundation</a>.<br/>
+ Copyright © @year@ <a href="http://www.apache.org";>The Apache
Software Foundation</a>.<br/>
All rights reserved.
</font>
</p>
No revision
No revision
1.1.2.5 +15 -15 xml-cocoon/xdocs/Attic/httprequest.xml
Index: httprequest.xml
===================================================================
RCS file: /home/cvs/xml-cocoon/xdocs/Attic/httprequest.xml,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- httprequest.xml 2001/02/28 13:37:36 1.1.2.4
+++ httprequest.xml 2001/03/05 07:28:08 1.1.2.5
@@ -2,27 +2,27 @@
<!DOCTYPE document SYSTEM "dtd/document-v10.dtd">
<document>
<header>
- <title>Cocoon 2a4</title>
+ <title>Cocoon @version@</title>
<subtitle>What happens if a http request arrives</subtitle>
<version>0.1</version>
<type>Technical Document</type>
<authors><person name="Tom Klaasen" email="[EMAIL PROTECTED]"/>
</authors>
<abstract>This document tries to explain Cocoon 2 (based on the version
- 2a4) technically. We do this by describing what happens if
somebody types in
- the URL of a simple Cocoon page.</abstract>
- </header>
- <body>
- <s1 title="Introduction">
- <s2 title="Goal">
- <p>This document tries to explain Cocoon 2 (based on the
version 2a4)
+ @version@) technically. We do this by describing what happens
if somebody types in
+ the URL of a simple Cocoon page.</abstract>
+ </header>
+ <body>
+ <s1 title="Introduction">
+ <s2 title="Goal">
+ <p>This document tries to explain Cocoon 2 (based on the
version @version@)
technically. We do this by describing what happens if
somebody types in the URL
of a simple Cocoon page.</p>
</s2>
<s2 title="Intended public">
<p>The reader should have a knowledge of:</p>
<ul>
- <li>the Java 2 platform</li>
+ <li>the Java 2 platform</li>
<li>the javax.servlet extensions</li>
<li>XML</li>
<li>HTTP</li>
@@ -32,13 +32,13 @@
<s1 title="The configuration assumptions">
<p>The sequence of events described in this document, depends
on some
assumptions with regard to the configuration of Cocoon.
That's what's described
- here.</p>
- <s2 title="sitemap.xmap">
+ here.</p>
+ <s2 title="sitemap.xmap">
<p>The task of the sitemap is to define the pipelines that
Cocoon will
- apply to URI's called in one's browser.</p>
+ apply to URI's called in one's browser.</p>
<p>This is the minimal sitemap that is necessary. The lines
here are
included in the standard sitemap.xmap that comes with
the distribution of
- Cocoon 2a4.</p>
+ Cocoon @[EMAIL PROTECTED]</p>
<p>The sitemap is defined in
<code>${cocoon}/sitemap.xmap</code>.</p>
<source><![CDATA[
<?xml version="1.0"?>
@@ -91,9 +91,9 @@
</s2>
<s2 title="cocoon.xconf">
<p><code>cocoon.xconf</code> is the file that defines the
- <link href="avalon.html">Avalon</link> Components.</p>
+ <link href="avalon.html">Avalon</link> Components.</p>
<p>For our study, we need the standard
<code>cocoon.xconf</code> file
- of Cocoon 2a4.</p>
+ of Cocoon @[EMAIL PROTECTED]</p>
<p>It can be found in
<code>${cocoon}/cocoon.xconf</code>.</p>
<source><