You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@etch.apache.org by fi...@apache.org on 2011/07/29 17:52:16 UTC
svn commit: r1152285 - in /incubator/etch/trunk/doc: ./ docs/C/
Author: fitzner
Date: Fri Jul 29 15:52:14 2011
New Revision: 1152285
URL: http://svn.apache.org/viewvc?rev=1152285&view=rev
Log:
ETCH-115 Upgraded docbook xml-files from docbook 4.3 to docbook 5
Modified:
incubator/etch/trunk/doc/README.txt
incubator/etch/trunk/doc/docs/C/bibliography.xml
incubator/etch/trunk/doc/docs/C/binding-c.xml
incubator/etch/trunk/doc/docs/C/binding-csharp.xml
incubator/etch/trunk/doc/docs/C/binding-java.xml
incubator/etch/trunk/doc/docs/C/docbook-intro.xml
incubator/etch/trunk/doc/docs/C/hello-world-example.xml
incubator/etch/trunk/doc/docs/C/introduction.xml
incubator/etch/trunk/doc/docs/C/main.xml
incubator/etch/trunk/doc/docs/C/nsdl.xml
incubator/etch/trunk/doc/docs/C/overview.xml
Modified: incubator/etch/trunk/doc/README.txt
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/doc/README.txt?rev=1152285&r1=1152284&r2=1152285&view=diff
==============================================================================
--- incubator/etch/trunk/doc/README.txt (original)
+++ incubator/etch/trunk/doc/README.txt Fri Jul 29 15:52:14 2011
@@ -30,7 +30,7 @@ in the near future.
If you would like to generate the documentation, you need the
following components.
-- sudo apt-get install docbook
+- sudo apt-get install docbook5-xml
- sudo apt-get install docbook-xsl
- sudo apt-get install docbook-xsl-doc-pdf
- sudo apt-get install xsltproc
@@ -58,7 +58,7 @@ following components.
- Change still the following files:
-- Makefile; set the FOP variable to the fop binary etc. FOP=C:/etch/external/fop/1.0/fop.bat
--- Set the correct docbook import file etc
+-- Set the correct docbook import file in every xsl file (e.g. libs/etch-pdf.xsl):
<xsl:import href="/usr/share/sgml/docbook/xsl-ns-stylesheets/fo/docbook.xsl"/>
# Links
Modified: incubator/etch/trunk/doc/docs/C/bibliography.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/doc/docs/C/bibliography.xml?rev=1152285&r1=1152284&r2=1152285&view=diff
==============================================================================
--- incubator/etch/trunk/doc/docs/C/bibliography.xml (original)
+++ incubator/etch/trunk/doc/docs/C/bibliography.xml Fri Jul 29 15:52:14 2011
@@ -1,14 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
- "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter [
<!ENTITY % globalent SYSTEM "../../libs/global.ent">
%globalent;
-<!ENTITY % xinclude SYSTEM "../../libs/xinclude.mod">
-%xinclude;
-<!ENTITY language "en">
]>
-<chapter id="bibliography-chap" status="review">
- <title id="bibliography">Bibliography</title>
-
+<chapter xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="bibliography-chap" status="review">
+ <info>
+ <title xml:id="bibliography">Bibliography</title>
+ </info>
</chapter>
-
Modified: incubator/etch/trunk/doc/docs/C/binding-c.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/doc/docs/C/binding-c.xml?rev=1152285&r1=1152284&r2=1152285&view=diff
==============================================================================
--- incubator/etch/trunk/doc/docs/C/binding-c.xml (original)
+++ incubator/etch/trunk/doc/docs/C/binding-c.xml Fri Jul 29 15:52:14 2011
@@ -1,14 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
- "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter [
<!ENTITY % globalent SYSTEM "../../libs/global.ent">
%globalent;
-<!ENTITY % xinclude SYSTEM "../../libs/xinclude.mod">
-%xinclude;
-<!ENTITY language "en">
]>
-<chapter id="binding-c-chap" status="review">
- <title id="binding-c">Binding C</title>
-
+<chapter xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="binding-c-chap" status="review">
+ <info>
+ <title xml:id="binding-c">Binding C</title>
+ </info>
</chapter>
-
Modified: incubator/etch/trunk/doc/docs/C/binding-csharp.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/doc/docs/C/binding-csharp.xml?rev=1152285&r1=1152284&r2=1152285&view=diff
==============================================================================
--- incubator/etch/trunk/doc/docs/C/binding-csharp.xml (original)
+++ incubator/etch/trunk/doc/docs/C/binding-csharp.xml Fri Jul 29 15:52:14 2011
@@ -1,14 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
- "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter [
<!ENTITY % globalent SYSTEM "../../libs/global.ent">
%globalent;
-<!ENTITY % xinclude SYSTEM "../../libs/xinclude.mod">
-%xinclude;
-<!ENTITY language "en">
]>
-<chapter id="binding-csharp-chap" status="review">
- <title id="binding-csharp">Binding C#</title>
-
+<chapter xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="binding-csharp-chap" status="review">
+ <info>
+ <title xml:id="binding-csharp">Binding C#</title>
+ </info>
</chapter>
-
Modified: incubator/etch/trunk/doc/docs/C/binding-java.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/doc/docs/C/binding-java.xml?rev=1152285&r1=1152284&r2=1152285&view=diff
==============================================================================
--- incubator/etch/trunk/doc/docs/C/binding-java.xml (original)
+++ incubator/etch/trunk/doc/docs/C/binding-java.xml Fri Jul 29 15:52:14 2011
@@ -1,14 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
- "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter [
<!ENTITY % globalent SYSTEM "../../libs/global.ent">
%globalent;
-<!ENTITY % xinclude SYSTEM "../../libs/xinclude.mod">
-%xinclude;
-<!ENTITY language "en">
]>
-<chapter id="binding-java-chap" status="review">
- <title id="binding-java">Binding Java</title>
-
+<chapter xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="binding-java-chap" status="review">
+ <info>
+ <title xml:id="binding-java">Binding Java</title>
+ </info>
</chapter>
-
Modified: incubator/etch/trunk/doc/docs/C/docbook-intro.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/doc/docs/C/docbook-intro.xml?rev=1152285&r1=1152284&r2=1152285&view=diff
==============================================================================
--- incubator/etch/trunk/doc/docs/C/docbook-intro.xml (original)
+++ incubator/etch/trunk/doc/docs/C/docbook-intro.xml Fri Jul 29 15:52:14 2011
@@ -1,23 +1,18 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
- "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter [
<!ENTITY % globalent SYSTEM "../../libs/global.ent">
%globalent;
-<!ENTITY % xinclude SYSTEM "../../libs/xinclude.mod">
-%xinclude;
-<!ENTITY language "en">
]>
-<chapter id="docbook-introduction-chap" status="review">
- <title id="docbook-introduction">Docbook Introduction</title>
+<chapter xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="docbook-introduction-chap" status="review"><info><title xml:id="docbook-introduction">Docbook Introduction</title></info>
- <sect1 id="docbook-general" status="review">
- <title>Docbook general</title>
+
+ <section xml:id="docbook-general" status="review"><info><title>Docbook general</title></info>
+
<!--
<para>
There are example para. For more information see the
<ulink url="http://www.link">Further information</ulink> page.
</para>
-->
- </sect1>
+ </section>
</chapter>
-
Modified: incubator/etch/trunk/doc/docs/C/hello-world-example.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/doc/docs/C/hello-world-example.xml?rev=1152285&r1=1152284&r2=1152285&view=diff
==============================================================================
--- incubator/etch/trunk/doc/docs/C/hello-world-example.xml (original)
+++ incubator/etch/trunk/doc/docs/C/hello-world-example.xml Fri Jul 29 15:52:14 2011
@@ -1,34 +1,31 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
- "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter [
<!ENTITY % globalent SYSTEM "../../libs/global.ent">
%globalent;
-<!ENTITY % xinclude SYSTEM "../../libs/xinclude.mod">
-%xinclude;
-<!ENTITY language "en">
]>
-<chapter id="hellp-world-example-chap" status="review">
- <title id="hellp-world-example">Hello World Example</title>
-
- <sect1 id="hellp-world-nsdl" status="review">
- <title>Network Service Definition Language</title>
+<chapter xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="hellp-world-example-chap" status="review">
+ <info>
+ <title xml:id="hellp-world-example">Hello World Example</title>
+ </info>
+
+ <section xml:id="hellp-world-nsdl" status="review"><info><title>Network Service Definition Language</title></info>
+
<para>Write Network Service Definition Language for Hello World example.</para>
- </sect1>
+ </section>
- <sect1 id="hellp-world-java" status="review">
- <title>Binding Java</title>
+ <section xml:id="hellp-world-java" status="review"><info><title>Binding Java</title></info>
+
<para>Write example with java.</para>
- </sect1>
+ </section>
- <sect1 id="hellp-world-csharp" status="review">
- <title>Binding C#</title>
+ <section xml:id="hellp-world-csharp" status="review"><info><title>Binding C#</title></info>
+
<para>Write example with java.</para>
- </sect1>
+ </section>
- <sect1 id="hellp-world-c" status="review">
- <title>Binding C</title>
+ <section xml:id="hellp-world-c" status="review"><info><title>Binding C</title></info>
+
<para>Write example with java.</para>
- </sect1>
+ </section>
</chapter>
-
Modified: incubator/etch/trunk/doc/docs/C/introduction.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/doc/docs/C/introduction.xml?rev=1152285&r1=1152284&r2=1152285&view=diff
==============================================================================
--- incubator/etch/trunk/doc/docs/C/introduction.xml (original)
+++ incubator/etch/trunk/doc/docs/C/introduction.xml Fri Jul 29 15:52:14 2011
@@ -1,17 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
- "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter [
<!ENTITY % globalent SYSTEM "../../libs/global.ent">
%globalent;
-<!ENTITY % xinclude SYSTEM "../../libs/xinclude.mod">
-%xinclude;
-<!ENTITY language "en">
]>
-<chapter id="introduction-chap" status="review">
- <title id="introduction">Introduction</title>
-
- <sect1 id="about" status="review">
- <title>About Etch</title>
+<chapter xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="introduction-chap" status="review">
+ <info><title xml:id="introduction">Introduction</title></info>
+
+ <section xml:id="about" status="review"><info><title>About Etch</title></info>
+
<para>
Etch is a cross-platform, language- and transport-independent
framework for building and consuming network services. The Etch
@@ -42,7 +38,7 @@
<listitem>finally, it must be easy to use for developers both implementing and/or consuming the service.</listitem>
</itemizedlist>
</para>
- </sect1>
+ </section>
<!--
<sect1 id="typo-conventions" status="review">
@@ -55,8 +51,8 @@
<para>Section about Code Examples.</para>
</sect1>
-->
- <sect1 id="contact" status="review">
- <title>Who we are</title>
+ <section xml:id="contact" status="review"><info><title>Who we are</title></info>
+
<para>
Past and present Etch contributors include (in alphabetical order)
@@ -81,13 +77,13 @@
<listitem> Etch Development List: etch-dev@incubator.apache.org</listitem>
</itemizedlist>
</para>
- </sect1>
+ </section>
- <sect1 id="support" status="review">
- <title>Etch Support</title>
+ <section xml:id="support" status="review"><info><title>Etch Support</title></info>
+
<para>
The main source of static information about Etch (aside of this manual) is the project
- website at <ulink url="http://incubator.apache.org/etch"> http://incubator.apache.org/etch</ulink>.
+ website at <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://incubator.apache.org/etch"> http://incubator.apache.org/etch</link>.
</para>
<para>
@@ -101,11 +97,10 @@
<para>
Archives are available at
<itemizedlist>
- <listitem> <ulink url="http://mail-archives.apache.org/mod_mbox/incubator-etch-user/"> Etch-User List Archive </ulink> </listitem>
- <listitem> <ulink url="http://mail-archives.apache.org/mod_mbox/incubator-etch-dev/"> Etch-User List Archive </ulink> </listitem>
+ <listitem> <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://mail-archives.apache.org/mod_mbox/incubator-etch-user/"> Etch-User List Archive </link> </listitem>
+ <listitem> <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://mail-archives.apache.org/mod_mbox/incubator-etch-dev/"> Etch-User List Archive </link> </listitem>
</itemizedlist>
</para>
- </sect1>
+ </section>
</chapter>
-
Modified: incubator/etch/trunk/doc/docs/C/main.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/doc/docs/C/main.xml?rev=1152285&r1=1152284&r2=1152285&view=diff
==============================================================================
--- incubator/etch/trunk/doc/docs/C/main.xml (original)
+++ incubator/etch/trunk/doc/docs/C/main.xml Fri Jul 29 15:52:14 2011
@@ -1,29 +1,24 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
- "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE book [
<!ENTITY % globalent SYSTEM "../../libs/global.ent">
%globalent;
-<!ENTITY % xinclude SYSTEM "../../libs/xinclude.mod">
-%xinclude;
-<!ENTITY language "en">
]>
-<book lang="&language;">
-<bookinfo>
- <title>Etch Documentation</title>
+<book xmlns="http://docbook.org/ns/docbook" version="5.0" xml:lang="en">
+<info><title>Etch Documentation</title>
+
<abstract>
<para>
This is the reference documentation for Apache Etch.
</para>
</abstract>
-</bookinfo>
-<xi:include href="introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-<xi:include href="overview.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-<xi:include href="hello-world-example.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-<xi:include href="nsdl.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-<xi:include href="binding-java.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-<xi:include href="binding-csharp.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-<xi:include href="binding-c.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-<xi:include href="bibliography.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-<xi:include href="docbook-intro.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+</info>
+<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="introduction.xml" parse="xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="overview.xml" parse="xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="hello-world-example.xml" parse="xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="nsdl.xml" parse="xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="binding-java.xml" parse="xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="binding-csharp.xml" parse="xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="binding-c.xml" parse="xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bibliography.xml" parse="xml"/>
+<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="docbook-intro.xml" parse="xml"/>
</book>
-
Modified: incubator/etch/trunk/doc/docs/C/nsdl.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/doc/docs/C/nsdl.xml?rev=1152285&r1=1152284&r2=1152285&view=diff
==============================================================================
--- incubator/etch/trunk/doc/docs/C/nsdl.xml (original)
+++ incubator/etch/trunk/doc/docs/C/nsdl.xml Fri Jul 29 15:52:14 2011
@@ -1,15 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
- "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter [
<!ENTITY % globalent SYSTEM "../../libs/global.ent">
%globalent;
-<!ENTITY % xinclude SYSTEM "../../libs/xinclude.mod">
-%xinclude;
-<!ENTITY language "en">
]>
-<chapter id="nsdl-chap" status="review">
- <title id="nsdl">Network Service Definition Language</title>
-
+<chapter xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="nsdl-chap" status="review">
+ <info>
+ <title xml:id="nsdl">Network Service Definition Language</title>
+ </info>
+
<para>
The Network Service Definition Language is used to specify the message exchange between client / server applications.
The language specifies the messages, their parameters, message direction, timeout, authorization, delivery style, custom
@@ -18,8 +16,8 @@
programming languages and environments with the help of a small runtime library.
</para>
- <sect1 id="nsdl-syntax" status="review">
- <title>Syntax Elements</title>
+ <section xml:id="nsdl-syntax" status="review"><info><title>Syntax Elements</title></info>
+
<para>
The NSDL uses syntax elements common to other programming languages:
</para>
@@ -28,7 +26,6 @@
This is a note!
</note>
- </sect1>
+ </section>
</chapter>
-
Modified: incubator/etch/trunk/doc/docs/C/overview.xml
URL: http://svn.apache.org/viewvc/incubator/etch/trunk/doc/docs/C/overview.xml?rev=1152285&r1=1152284&r2=1152285&view=diff
==============================================================================
--- incubator/etch/trunk/doc/docs/C/overview.xml (original)
+++ incubator/etch/trunk/doc/docs/C/overview.xml Fri Jul 29 15:52:14 2011
@@ -1,19 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
- "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE chapter [
<!ENTITY % globalent SYSTEM "../../libs/global.ent">
%globalent;
-<!ENTITY % xinclude SYSTEM "../../libs/xinclude.mod">
-%xinclude;
-<!ENTITY language "en">
]>
-<chapter id="overview-chap" status="review">
- <title id="overview">Overview</title>
-
- <sect1 id="architecture" status="review">
- <title>Architecture</title>
+<chapter xmlns="http://docbook.org/ns/docbook" version="5.0" xml:id="overview-chap" status="review">
+ <info>
+ <title xml:id="overview">Overview</title>
+ </info>
+
+ <section xml:id="architecture" status="review"><info><title>Architecture</title></info>
+
<para>Section about Etch Architecture.</para>
- </sect1>
+ </section>
</chapter>
-