You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@click.apache.org by sa...@apache.org on 2009/03/01 23:02:41 UTC
svn commit: r749126 - in /incubator/click/trunk/tools/docbook: README.txt
build.xml project.properties src/docbook/click/chapter-introduction.xml
src/docbook/click/chapter-pages.xml src/resources/
Author: sabob
Date: Sun Mar 1 22:02:40 2009
New Revision: 749126
URL: http://svn.apache.org/viewvc?rev=749126&view=rev
Log:
added click.basedir for copying artifacts to click distribution
Removed:
incubator/click/trunk/tools/docbook/src/resources/
Modified:
incubator/click/trunk/tools/docbook/README.txt
incubator/click/trunk/tools/docbook/build.xml
incubator/click/trunk/tools/docbook/project.properties
incubator/click/trunk/tools/docbook/src/docbook/click/chapter-introduction.xml
incubator/click/trunk/tools/docbook/src/docbook/click/chapter-pages.xml
Modified: incubator/click/trunk/tools/docbook/README.txt
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/docbook/README.txt?rev=749126&r1=749125&r2=749126&view=diff
==============================================================================
--- incubator/click/trunk/tools/docbook/README.txt (original)
+++ incubator/click/trunk/tools/docbook/README.txt Sun Mar 1 22:02:40 2009
@@ -43,10 +43,11 @@
Docbook XLS 1.75 (or latest snapshot) somewhere on your computer. Once done set
the following properties in the file project.properties:
- dbf.basedir = directory-where-DBF-is-installed
- fop.basedir = directory-where-FOP-is-installed
+ dbf.basedir = directory-where-DBF-is-installed
+ fop.basedir = directory-where-FOP-is-installed
+ click.basedir = directory-where-Click-is-located
-The following changes must also be made to DBF:
+The following changes must be made to DBF:
# Replace the existing docbook-xsl version of DBF with 1.75.0. You can do that
by copying docbook-xsl-1.75.0.zip to the DBF folder '<dbf-install>/src/zip/'.
@@ -75,6 +76,9 @@
target/click/html
target/click/htmlsingle
+NOTE: All documentation artifacts will also be copied to the Click folder specified
+by the property 'click.basedir'. The artifacts will be copied to the folder:
+'<click-distribution>/documentation/docs/user-guide/'
Linking to resources
====================
Modified: incubator/click/trunk/tools/docbook/build.xml
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/docbook/build.xml?rev=749126&r1=749125&r2=749126&view=diff
==============================================================================
--- incubator/click/trunk/tools/docbook/build.xml (original)
+++ incubator/click/trunk/tools/docbook/build.xml Sun Mar 1 22:02:40 2009
@@ -95,6 +95,7 @@
<target name="all" description="--> Build all documentation" depends="init">
<!-- Build the Users Guide -->
+ <!--
<ant antfile="${dbf.basedir}/build-docbook.xml" target="html">
<property name="docbook.dir" value="${docbook.dir}"/>
<property name="docbook.file" value="${docbook.file}"/>
@@ -103,8 +104,10 @@
<ant antfile="${dbf.basedir}/build-docbook.xml" target="htmlsingle">
<property name="docbook.dir" value="${docbook.dir}"/>
<property name="docbook.file" value="${docbook.file}"/>
- </ant>
+ </ant>-->
+ <antcall target="html"/>
+ <antcall target="htmlsingle"/>
<antcall target="pdf"/>
<delete quiet="true" dir="${target.dir}/${docbook.dir}/tmp"/>
@@ -143,6 +146,13 @@
outfile="target/${docbook.dir}/pdf/${docbook.file}.pdf" />
<antcall target="postprocess"/>
+
+ <!-- Copy artifacts to Click user-guide folder -->
+ <delete dir="${click.basedir}/documentation/docs/user-guide/pdf/"/>
+ <copy todir="${click.basedir}/documentation/docs/user-guide/pdf/">
+ <fileset dir="target/${docbook.dir}/pdf/"/>
+ </copy>
+
</target>
<target name="html"
@@ -153,19 +163,16 @@
<property name="docbook.file" value="${docbook.file}"/>
</ant>
- <!--
- Add IE Mark of the Web to each html page.
- NB: The MARK_OF_THE_WEB comment must end with a newline!
- -->
- <replace dir="${target.dir}/${docbook.dir}">
- <include name="**/html/*.html"/>
- <replacetoken><!-- MARK_OF_THE_WEB --></replacetoken>
- <replacevalue><!-- saved from url=(0014)about:internet -->
- </replacevalue>
- </replace>
-
<antcall target="postprocess"/>
+ <!-- Copy artifacts to Click user-guide folder -->
+ <delete dir="${click.basedir}/documentation/docs/user-guide/html/"/>
+ <copy todir="${click.basedir}/documentation/docs/user-guide/html/">
+ <fileset dir="target/${docbook.dir}/html/">
+ <exclude name="**/*.zip"/>
+ </fileset>
+ </copy>
+
</target>
<target name="htmlsingle"
@@ -176,18 +183,15 @@
<property name="docbook.file" value="${docbook.file}"/>
</ant>
- <!--
- Add IE Mark of the Web to each html page.
- NB: The MARK_OF_THE_WEB comment must end with a newline!
- -->
- <replace dir="${target.dir}/${docbook.dir}">
- <include name="**/htmlsingle/*.html"/>
- <replacetoken><!-- MARK_OF_THE_WEB --></replacetoken>
- <replacevalue><!-- saved from url=(0014)about:internet -->
- </replacevalue>
- </replace>
-
<antcall target="postprocess"/>
+
+ <!-- Copy artifacts to Click user-guide folder -->
+ <delete dir="${click.basedir}/documentation/docs/user-guide/htmlsingle/"/>
+ <copy todir="${click.basedir}/documentation/docs/user-guide/htmlsingle/">
+ <fileset dir="target/${docbook.dir}/htmlsingle/">
+ <exclude name="**/*.zip"/>
+ </fileset>
+ </copy>
</target>
<target name="postprocess">
Modified: incubator/click/trunk/tools/docbook/project.properties
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/docbook/project.properties?rev=749126&r1=749125&r2=749126&view=diff
==============================================================================
--- incubator/click/trunk/tools/docbook/project.properties (original)
+++ incubator/click/trunk/tools/docbook/project.properties Sun Mar 1 22:02:40 2009
@@ -21,5 +21,8 @@
# Basedir for the FOP framework
fop.basedir = ../fop-0.95
+# Basedir for Click
+click.basedir = ../../click-svn
+
# The size of the PDF pages.
paper.type= Letter
Modified: incubator/click/trunk/tools/docbook/src/docbook/click/chapter-introduction.xml
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/docbook/src/docbook/click/chapter-introduction.xml?rev=749126&r1=749125&r2=749126&view=diff
==============================================================================
--- incubator/click/trunk/tools/docbook/src/docbook/click/chapter-introduction.xml (original)
+++ incubator/click/trunk/tools/docbook/src/docbook/click/chapter-introduction.xml Sun Mar 1 22:02:40 2009
@@ -28,12 +28,12 @@
</para>
<para>Click is an open source project, licensed under the
- <ulink url="../../resources/LICENSE.txt"><citetitle>Apache license</citetitle>
+ <ulink url="../../LICENSE.txt"><citetitle>Apache license</citetitle>
</ulink>.
</para>
<para>Click uses an event based programming model for processing Servlet
- requests and <ulink url="velocity/velocity.html">Velocity</ulink> for
+ requests and <ulink url="../../velocity/velocity.html">Velocity</ulink> for
rendering the response. (Note other template engines such as
<ulink url="http://java.sun.com/products/jsp/">JSP</ulink> and
<ulink url="http://freemarker.sourceforge.net/">Freemarker</ulink> are also
Modified: incubator/click/trunk/tools/docbook/src/docbook/click/chapter-pages.xml
URL: http://svn.apache.org/viewvc/incubator/click/trunk/tools/docbook/src/docbook/click/chapter-pages.xml?rev=749126&r1=749125&r2=749126&view=diff
==============================================================================
--- incubator/click/trunk/tools/docbook/src/docbook/click/chapter-pages.xml (original)
+++ incubator/click/trunk/tools/docbook/src/docbook/click/chapter-pages.xml Sun Mar 1 22:02:40 2009
@@ -337,7 +337,7 @@
<para>The execution sequence for POST requests is almost identical, except
the <methodname>onPost()</methodname> method is invoked instead on
<methodname>onGet()</methodname>. See the
- <ulink url="../../resources/post-sequence-diagram.png">POST Request Sequence Diagram</ulink>.
+ <ulink url="../../../images/post-sequence-diagram.png">POST Request Sequence Diagram</ulink>.
</para>
<para>Another view on the execution flow of Pages is illustrated in the