Author: kwall
Date: Sat Jan  2 22:07:54 2016
New Revision: 1722674

URL: http://svn.apache.org/viewvc?rev=1722674&view=rev
Log:
QPID-6961: [Java Docbook] Flip output format to xhtml (to match that that used 
by the generated by Make; reinstate section numbering and other xsl formatting 
options

Modified:
    qpid/java/trunk/doc/java-broker/pom.xml
    
qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Queues.xml
    qpid/java/trunk/doc/java-perftests/pom.xml
    qpid/java/trunk/doc/jms-client-0-8/pom.xml
    qpid/java/trunk/doc/pom.xml

Modified: qpid/java/trunk/doc/java-broker/pom.xml
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/pom.xml?rev=1722674&r1=1722673&r2=1722674&view=diff
==============================================================================
--- qpid/java/trunk/doc/java-broker/pom.xml (original)
+++ qpid/java/trunk/doc/java-broker/pom.xml Sat Jan  2 22:07:54 2016
@@ -52,6 +52,9 @@
                         <artifactId>docbkx-maven-plugin</artifactId>
                         <configuration>
                             
<includes>AMQP-Messaging-Broker-Java-Book.xml</includes>
+                            <postProcess>
+                                <move 
file="${docbook.target}/AMQP-Messaging-Broker-Java-Book.html" 
tofile="${docbook.target}/index.html"/>
+                            </postProcess>
                         </configuration>
                     </plugin>
                 </plugins>

Modified: 
qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Queues.xml
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Queues.xml?rev=1722674&r1=1722673&r2=1722674&view=diff
==============================================================================
--- 
qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Queues.xml
 (original)
+++ 
qpid/java/trunk/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Queues.xml
 Sat Jan  2 22:07:54 2016
@@ -74,7 +74,7 @@
       <title>Last Value Queues (LVQ)</title>
       <para>LVQs (or conflation queues) are special queues that automatically 
discard any message
         when a newer message arrives with the same key value. The key is 
specified by arbitrary
-          <link xmlns:xlink="http://www.w3.org/1999/xlink"; 
xlink:href="${oracleJeeDocUrl;javax}/jms/Message.html#getPropertyNames()">JMS 
message
+          <link xmlns:xlink="http://www.w3.org/1999/xlink"; 
xlink:href="${oracleJeeDocUrl}javax/jms/Message.html#getPropertyNames()">JMS 
message
           property</link>.</para>
       <para>An example of an LVQ might be where a queue represents prices on a 
stock exchange: when
         you first consume from the queue you get the latest quote for each 
stock, and then as new

Modified: qpid/java/trunk/doc/java-perftests/pom.xml
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/doc/java-perftests/pom.xml?rev=1722674&r1=1722673&r2=1722674&view=diff
==============================================================================
--- qpid/java/trunk/doc/java-perftests/pom.xml (original)
+++ qpid/java/trunk/doc/java-perftests/pom.xml Sat Jan  2 22:07:54 2016
@@ -54,6 +54,9 @@
                         <artifactId>docbkx-maven-plugin</artifactId>
                         <configuration>
                             
<includes>JMS-Performance-Test-Framework.xml</includes>
+                            <postProcess>
+                                <move 
file="${docbook.target}/JMS-Performance-Test-Framework.html" 
tofile="${docbook.target}/index.html"/>
+                            </postProcess>
                         </configuration>
                     </plugin>
                 </plugins>

Modified: qpid/java/trunk/doc/jms-client-0-8/pom.xml
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/doc/jms-client-0-8/pom.xml?rev=1722674&r1=1722673&r2=1722674&view=diff
==============================================================================
--- qpid/java/trunk/doc/jms-client-0-8/pom.xml (original)
+++ qpid/java/trunk/doc/jms-client-0-8/pom.xml Sat Jan  2 22:07:54 2016
@@ -53,6 +53,9 @@
                         <artifactId>docbkx-maven-plugin</artifactId>
                         <configuration>
                             <includes>JMS-Client-Book.xml</includes>
+                            <postProcess>
+                                <move 
file="${docbook.target}/JMS-Client-Book.html" 
tofile="${docbook.target}/index.html"/>
+                            </postProcess>
                         </configuration>
                     </plugin>
                 </plugins>

Modified: qpid/java/trunk/doc/pom.xml
URL: 
http://svn.apache.org/viewvc/qpid/java/trunk/doc/pom.xml?rev=1722674&r1=1722673&r2=1722674&view=diff
==============================================================================
--- qpid/java/trunk/doc/pom.xml (original)
+++ qpid/java/trunk/doc/pom.xml Sat Jan  2 22:07:54 2016
@@ -48,7 +48,7 @@
         <qpidCppBook>../../AMQP-Messaging-Broker-CPP-Book/html/</qpidCppBook>
         
<qpidJavaBrokerBook>../../AMQP-Messaging-Broker-Java-Book/html/</qpidJavaBrokerBook>
         <qpidJmsBook>../../Programming-In-Apache-Qpid/html/</qpidJmsBook>
-        
<qpidJmsBookClientConectionUrl>../../Programming-In-Apache-Qpid/html/QpidJNDI.html#section-jms-connection-url</qpidJmsBookClientConectionUrl>
+        
<qpidJmsBookClientConectionUrl>${qpidJmsBook}QpidJNDI.html#section-jms-connection-url</qpidJmsBookClientConectionUrl>
 
         
<oracleJdkDocUrl>http://docs.oracle.com/javase/7/docs/api/</oracleJdkDocUrl>
         <oracleJeeDocUrl>http://docs.oracle.com/javaee/6/api/</oracleJeeDocUrl>
@@ -113,7 +113,7 @@
                             <id>docbook-html</id>
                             <phase>compile</phase>
                             <goals>
-                                <goal>generate-html</goal>
+                                <goal>generate-xhtml</goal>
                             </goals>
                         </execution>
                     </executions>
@@ -137,6 +137,22 @@
                                 <name>use.id.as.filename</name>
                                 <value>1</value>
                             </parameter>
+                            <parameter>
+                                <name>section.autolabel</name>
+                                <value>1</value>
+                            </parameter>
+                            <parameter>
+                                <name>section.autolabel.max.depth</name>
+                                <value>3</value>
+                            </parameter>
+                            <parameter>
+                                
<name>section.label.includes.component.label</name>
+                                <value>1</value>
+                            </parameter>
+                            <parameter>
+                                <name>callout.unicode</name>
+                                <value>0</value>
+                            </parameter>
                         </customizationParameters>
                         <preProcess>
                             <copy todir="${docbook.target}/images" 
failOnError="false">



---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to