qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kw...@apache.org
Subject svn commit: r1727619 - in /qpid/java/branches/6.0.x: ./ doc/ doc/book/ doc/java-broker/ doc/java-broker/src/docbkx/ doc/java-broker/src/docbkx/concepts/ doc/java-perftests/ doc/jms-client-0-8/ doc/jms-client-0-8/src/docbkx/ doc/src/ doc/src/main/docbkx/
Date Fri, 29 Jan 2016 17:25:29 GMT
Author: kwall
Date: Fri Jan 29 17:25:29 2016
New Revision: 1727619

URL: http://svn.apache.org/viewvc?rev=1727619&view=rev
Log:
QPID-6961: Use maven to generate Java Broker and (legacy) Java Client docbook

Merged from trunk with command:


svn merge -c 1722020,1722674,1722678,1722683,1722711,1725760 ^/qpid/java/trunk



Added:
    qpid/java/branches/6.0.x/doc/docbook4to5.sh
      - copied unchanged from r1722020, qpid/java/trunk/doc/docbook4to5.sh
    qpid/java/branches/6.0.x/doc/java-broker/
      - copied from r1722020, qpid/java/trunk/doc/java-broker/
    qpid/java/branches/6.0.x/doc/java-perftests/
      - copied from r1722020, qpid/java/trunk/doc/java-perftests/
    qpid/java/branches/6.0.x/doc/jms-client-0-8/
      - copied from r1722020, qpid/java/trunk/doc/jms-client-0-8/
    qpid/java/branches/6.0.x/doc/pom.xml
      - copied, changed from r1722020, qpid/java/trunk/doc/pom.xml
    qpid/java/branches/6.0.x/doc/src/
      - copied from r1722711, qpid/java/trunk/doc/src/
    qpid/java/branches/6.0.x/doc/src/main/docbkx/
      - copied from r1725760, qpid/java/trunk/doc/src/main/docbkx/
Removed:
    qpid/java/branches/6.0.x/doc/book/
Modified:
    qpid/java/branches/6.0.x/   (props changed)
    qpid/java/branches/6.0.x/.gitignore
    qpid/java/branches/6.0.x/doc/java-broker/pom.xml
    qpid/java/branches/6.0.x/doc/java-broker/src/docbkx/Java-Broker-High-Availability.xml
    qpid/java/branches/6.0.x/doc/java-broker/src/docbkx/Java-Broker-Introduction.xml
    qpid/java/branches/6.0.x/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Queues.xml
    qpid/java/branches/6.0.x/doc/java-perftests/pom.xml
    qpid/java/branches/6.0.x/doc/jms-client-0-8/pom.xml
    qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Appendix-Tomcat-JNDI-Integration.xml
    qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Binding-URL.xml
    qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Introduction.xml
    qpid/java/branches/6.0.x/pom.xml

Propchange: qpid/java/branches/6.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 29 17:25:29 2016
@@ -9,5 +9,5 @@
 /qpid/branches/java-broker-vhost-refactor/java:1493674-1494547
 /qpid/branches/java-network-refactor/qpid/java:805429-821809
 /qpid/branches/qpid-2935/qpid/java:1061302-1072333
-/qpid/java/trunk:1715445-1715447,1715586,1715940,1716086-1716087,1716127-1716128,1716141,1716153,1716155,1716194,1716204,1716209,1716227,1716277,1716357,1716368,1716370,1716374,1716432,1716444-1716445,1716455,1716461,1716474,1716489,1716497,1716515,1716555,1716602,1716606-1716610,1716619,1716636,1717269,1717299,1717401,1717446,1717449,1717626,1717691,1717735,1717780,1718744,1718889,1718893,1718918,1718922,1719026,1719028,1719033,1719037,1719047,1719051,1720340,1720664,1721151,1721198,1722019,1722246,1722339,1723064,1723194,1723563,1724216,1724251,1724257,1724292,1724375,1724397,1724432,1724582,1724603,1724780,1724843-1724844,1725295,1725569,1726176,1726244-1726246,1726249,1726358,1726436,1726449,1726456,1726646,1726653,1726755,1726778,1727608
+/qpid/java/trunk:1715445-1715447,1715586,1715940,1716086-1716087,1716127-1716128,1716141,1716153,1716155,1716194,1716204,1716209,1716227,1716277,1716357,1716368,1716370,1716374,1716432,1716444-1716445,1716455,1716461,1716474,1716489,1716497,1716515,1716555,1716602,1716606-1716610,1716619,1716636,1717269,1717299,1717401,1717446,1717449,1717626,1717691,1717735,1717780,1718744,1718889,1718893,1718918,1718922,1719026,1719028,1719033,1719037,1719047,1719051,1720340,1720664,1721151,1721198,1722019-1722020,1722246,1722339,1722674,1722678,1722683,1722711,1723064,1723194,1723563,1724216,1724251,1724257,1724292,1724375,1724397,1724432,1724582,1724603,1724780,1724843-1724844,1725295,1725569,1725760,1726176,1726244-1726246,1726249,1726358,1726436,1726449,1726456,1726646,1726653,1726755,1726778,1727608
 /qpid/trunk/qpid:796646-796653

Modified: qpid/java/branches/6.0.x/.gitignore
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/.gitignore?rev=1727619&r1=1727618&r2=1727619&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/.gitignore (original)
+++ qpid/java/branches/6.0.x/.gitignore Fri Jan 29 17:25:29 2016
@@ -34,6 +34,3 @@ derby.log
 *.iml
 *.ipr
 *.iws
-
-# docbook
-doc/book/build/

Modified: qpid/java/branches/6.0.x/doc/java-broker/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/java-broker/pom.xml?rev=1727619&r1=1722020&r2=1727619&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/doc/java-broker/pom.xml (original)
+++ qpid/java/branches/6.0.x/doc/java-broker/pom.xml Fri Jan 29 17:25:29 2016
@@ -52,8 +52,15 @@
                         <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>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                    </plugin>
                 </plugins>
             </build>
         </profile>

Modified: qpid/java/branches/6.0.x/doc/java-broker/src/docbkx/Java-Broker-High-Availability.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/java-broker/src/docbkx/Java-Broker-High-Availability.xml?rev=1727619&r1=1722020&r2=1727619&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/doc/java-broker/src/docbkx/Java-Broker-High-Availability.xml
(original)
+++ qpid/java/branches/6.0.x/doc/java-broker/src/docbkx/Java-Broker-High-Availability.xml
Fri Jan 29 17:25:29 2016
@@ -463,7 +463,7 @@
     <title>Client failover</title>
     <para>As mentioned above, the clients need to be able to find the location of the
active
       virtualhost within the group.</para>
-    <para>Clients can do this using a static technique, for example , utilising the
<link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${qpidJmsBookClientConectionUrl}">failover
feature of the Qpid connection url</link>
+    <para>Clients can do this using a static technique, for example , utilising the
<link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${qpidJmsClient08Book}JMS-Client-0-8-Connection-URL.html">failover
feature of the Qpid connection url</link>
       where the client has a list of all the nodes, and tries each node in sequence until
it
       discovers the node with the active virtualhost.</para>
     <para>Another possibility is a dynamic technique utilising a proxy or Virtual IP
(VIP). These

Modified: qpid/java/branches/6.0.x/doc/java-broker/src/docbkx/Java-Broker-Introduction.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/java-broker/src/docbkx/Java-Broker-Introduction.xml?rev=1727619&r1=1722020&r2=1727619&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/doc/java-broker/src/docbkx/Java-Broker-Introduction.xml (original)
+++ qpid/java/branches/6.0.x/doc/java-broker/src/docbkx/Java-Broker-Introduction.xml Fri Jan
29 17:25:29 2016
@@ -26,7 +26,7 @@
       <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="http://www.amqp.org">
Advanced Message Queuing Protocol (AMQP)</link>. The Java
     Broker is actually one of two message brokers provided by the <link xmlns:xlink="http://www.w3.org/1999/xlink"
xlink:href="http://qpid.apache.org">Apache Qpid project</link>: the Java Broker and
the C++
     Broker.</para>
-  <para>This document relates to the Java Broker. The <link xmlns:xlink="http://www.w3.org/1999/xlink"
xlink:href="http://x.y.x">C++ Broker is
+  <para>This document relates to the Java Broker. The <link xmlns:xlink="http://www.w3.org/1999/xlink"
xlink:href="${qpidCppBook}">C++ Broker is
     described separately</link>.</para>
   <para><emphasis>Headline features</emphasis></para>
   <itemizedlist mark="circle">

Modified: qpid/java/branches/6.0.x/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Queues.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Queues.xml?rev=1727619&r1=1722020&r2=1727619&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Queues.xml
(original)
+++ qpid/java/branches/6.0.x/doc/java-broker/src/docbkx/concepts/Java-Broker-Concepts-Queues.xml
Fri Jan 29 17:25:29 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
@@ -237,7 +237,7 @@
 -Dmax_prefetch=1
 </programlisting>
     <para> The prefetch can be also be adjusted on a per connection basis by adding
a
-        <varname>maxprefetch</varname> value to the <link xmlns:xlink="http://www.w3.org/1999/xlink"
xlink:href="${qpidJmsBookClientConectionUrl}">Connection URLs</link>
+        <varname>maxprefetch</varname> value to the <link xmlns:xlink="http://www.w3.org/1999/xlink"
xlink:href="${qpidJmsClient08Book}JMS-Client-0-8-Connection-URL.html">Connection URLs</link>
     </para>
     <programlisting>
 amqp://guest:guest@client1/development?maxprefetch='1'&amp;brokerlist='tcp://localhost:5672'

Modified: qpid/java/branches/6.0.x/doc/java-perftests/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/java-perftests/pom.xml?rev=1727619&r1=1722020&r2=1727619&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/doc/java-perftests/pom.xml (original)
+++ qpid/java/branches/6.0.x/doc/java-perftests/pom.xml Fri Jan 29 17:25:29 2016
@@ -54,8 +54,15 @@
                         <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>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                    </plugin>
                 </plugins>
             </build>
         </profile>

Modified: qpid/java/branches/6.0.x/doc/jms-client-0-8/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/jms-client-0-8/pom.xml?rev=1727619&r1=1722020&r2=1727619&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/doc/jms-client-0-8/pom.xml (original)
+++ qpid/java/branches/6.0.x/doc/jms-client-0-8/pom.xml Fri Jan 29 17:25:29 2016
@@ -53,8 +53,15 @@
                         <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>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                    </plugin>
                 </plugins>
             </build>
         </profile>

Modified: qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Appendix-Tomcat-JNDI-Integration.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Appendix-Tomcat-JNDI-Integration.xml?rev=1727619&r1=1722020&r2=1727619&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Appendix-Tomcat-JNDI-Integration.xml
(original)
+++ qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Appendix-Tomcat-JNDI-Integration.xml
Fri Jan 29 17:25:29 2016
@@ -70,7 +70,7 @@
         <para>
           an instance of <literal>AMQQueue</literal> from a <literal>Reference</literal>
containing reference
           address (<link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${oracleJdkDocUrl}javax/naming/RefAddr.html">javax.naming.RefAddr</link>)
-          <literal>address</literal> with content set to either <link xmlns:xlink="http://www.w3.org/1999/xlink"
xlink:href="${qpidJmsBook}">Address</link> or
+          <literal>address</literal> with content set to either <link xmlns:xlink="http://www.w3.org/1999/xlink"
xlink:href="${qpidProgrammingBook}">Address</link> or
           <link linkend="JMS-Client-0-8-Binding-URL">Binding URL</link>.
         </para>
       </listitem>
@@ -78,7 +78,7 @@
         <para>
           an instance of <literal>AMQTopic</literal> from a <literal>Reference</literal>
containing reference
           address (<link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${oracleJdkDocUrl}javax/naming/RefAddr.html">javax.naming.RefAddr</link>)
-          <literal>address</literal> with content set to either <link xmlns:xlink="http://www.w3.org/1999/xlink"
xlink:href="${qpidJmsBook}">Address</link> or
+          <literal>address</literal> with content set to either <link xmlns:xlink="http://www.w3.org/1999/xlink"
xlink:href="${qpidProgrammingBook}">Address</link> or
           <link linkend="JMS-Client-0-8-Binding-URL">Binding URL</link>.
         </para>
       </listitem>
@@ -87,7 +87,7 @@
       <para>
         For  <literal>AMQQueue</literal> and <literal>AMQTopic</literal>
prefix <literal>BURL:</literal> need
         to be specified for <link linkend="JMS-Client-0-8-Binding-URL">Binding URL</link>.
Otherwise, client will try
-        to parse content using <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${qpidJmsBook}">Address</link>
format.
+        to parse content using <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${qpidProgrammingBook}">Address</link>
format.
       </para>
     </note>
   </para>

Modified: qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Binding-URL.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Binding-URL.xml?rev=1727619&r1=1722020&r2=1727619&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Binding-URL.xml (original)
+++ qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Binding-URL.xml Fri
Jan 29 17:25:29 2016
@@ -24,7 +24,7 @@
   <title>Binding URL</title>
 
   <para> The <emphasis>Binding URL</emphasis> syntax for addressing<footnote>
-      <para>The client also supports the ADDR format. This is documented in <link
xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${qpidJmsBook}">Programming in Apache
Qpid</link>.</para>
+      <para>The client also supports the ADDR format. This is documented in <link
xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${qpidProgrammingBook}">Programming
in Apache Qpid</link>.</para>
     </footnote>. It allows the specification of the bindings between a queue and an
exchange, queue
     and exchange creation arguments and some ancillary options.</para>
 

Modified: qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Introduction.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Introduction.xml?rev=1727619&r1=1722020&r2=1727619&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Introduction.xml (original)
+++ qpid/java/branches/6.0.x/doc/jms-client-0-8/src/docbkx/JMS-Client-Introduction.xml Fri
Jan 29 17:25:29 2016
@@ -35,7 +35,7 @@
     <title>Using the Qpid JMS client with 0-10</title>
     <para>This book documents the behaviour of the Qpid JMS client when used with the
AMQP
       protocols <emphasis>0-8, 0-9, and 0-9-1</emphasis> only. For behaviour
when using the client
-      with AMQP 0-10 protocol, please refer to <link xmlns:xlink="http://www.w3.org/1999/xlink"
xlink:href="${qpidJmsBook}">Programming in Apache Qpid</link>.</para>
+      with AMQP 0-10 protocol, please refer to <link xmlns:xlink="http://www.w3.org/1999/xlink"
xlink:href="${qpidProgrammingBook}">Programming in Apache Qpid</link>.</para>
   </important>
 
 </chapter>

Copied: qpid/java/branches/6.0.x/doc/pom.xml (from r1722020, qpid/java/trunk/doc/pom.xml)
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/pom.xml?p2=qpid/java/branches/6.0.x/doc/pom.xml&p1=qpid/java/trunk/doc/pom.xml&r1=1722020&r2=1727619&rev=1727619&view=diff
==============================================================================
--- qpid/java/trunk/doc/pom.xml (original)
+++ qpid/java/branches/6.0.x/doc/pom.xml Fri Jan 29 17:25:29 2016
@@ -45,10 +45,11 @@
         <qpidDownloadUrlDesc>the Apache Qpid project web site</qpidDownloadUrlDesc>
         <qpidDownloadUrl>http://qpid.apache.org/download.html</qpidDownloadUrl>
 
-        <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>
+        <qpidJavaBrokerBook>../../java-broker/book/</qpidJavaBrokerBook>
+        <qpidJmsClient08Book>../../jms-client-0-8/book/</qpidJmsClient08Book>
+
+        <qpidCppBook>../../cpp-broker/book/</qpidCppBook>
+        <qpidProgrammingBook>../../programming/book/</qpidProgrammingBook>
 
         <oracleJdkDocUrl>http://docs.oracle.com/javase/7/docs/api/</oracleJdkDocUrl>
         <oracleJeeDocUrl>http://docs.oracle.com/javaee/6/api/</oracleJeeDocUrl>
@@ -113,7 +114,7 @@
                             <id>docbook-html</id>
                             <phase>compile</phase>
                             <goals>
-                                <goal>generate-html</goal>
+                                <goal>generate-xhtml</goal>
                             </goals>
                         </execution>
                     </executions>
@@ -132,20 +133,61 @@
                         <targetDirectory>${docbook.target}</targetDirectory>
                         <xincludeSupported>true</xincludeSupported>
                         <chunkedOutput>true</chunkedOutput>
+                        <showXslMessages>true</showXslMessages>
+                        <xhtmlCustomization>../src/main/docbkx/docbook-xhtml.xsl</xhtmlCustomization>
+                        <htmlStylesheet>./css/style.css</htmlStylesheet>
                         <customizationParameters>
                             <parameter>
                                 <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">
                                 <fileset dir="${docbook.src}/images" />
                             </copy>
+                            <copy todir="${docbook.target}/css" failOnError="false">
+                                <fileset dir="${project.basedir}/../src/main/docbkx/css"
/>
+                            </copy>
                         </preProcess>
                     </configuration>
                 </plugin>
                 <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <configuration>
+                        <descriptors>
+                            <descriptor>${project.basedir}/../src/main/assembly/html.xml</descriptor>
+                        </descriptors>
+                        <tarLongFileMode>gnu</tarLongFileMode>
+                        <appendAssemblyId>false</appendAssemblyId>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <phase>package</phase>
+                            <goals>
+                                <goal>single</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
                     <artifactId>maven-deploy-plugin</artifactId>
                     <configuration>
                         <skip>true</skip>

Modified: qpid/java/branches/6.0.x/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/pom.xml?rev=1727619&r1=1727618&r2=1727619&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/pom.xml (original)
+++ qpid/java/branches/6.0.x/pom.xml Fri Jan 29 17:25:29 2016
@@ -153,6 +153,8 @@
     <findbugs-maven-plugin-version>2.5.2</findbugs-maven-plugin-version>
     <jacoco-plugin-version>0.7.5.201505241946</jacoco-plugin-version>
     <apache-rat-plugin-version>0.11</apache-rat-plugin-version>
+    <maven-docbx-plugin-version>2.0.15</maven-docbx-plugin-version>
+    <maven-docbook-xml-plugin-version>5.0-all</maven-docbook-xml-plugin-version>
 
     <!-- These versions needs to be kept in sync with versions in parent pom-->
     <maven-project-info-reports-plugin-version>2.8</maven-project-info-reports-plugin-version>
@@ -200,6 +202,8 @@
     <module>bdbstore/systests</module>
 
     <module>joramtests</module>
+
+    <module>doc</module>
   </modules>
 
   <dependencies>
@@ -274,7 +278,11 @@
           <artifactId>findbugs-maven-plugin</artifactId>
           <version>${findbugs-maven-plugin-version}</version>
         </plugin>
-
+        <plugin>
+          <groupId>com.agilejava.docbkx</groupId>
+          <artifactId>docbkx-maven-plugin</artifactId>
+          <version>${maven-docbx-plugin-version}</version>
+        </plugin>
         <!-- REMOVE 2 PLUGINS BELOW AFTER CHANGING APACHE PARENT TO V 17 -->
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message