qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From oru...@apache.org
Subject svn commit: r1718815 - in /qpid/java/branches/6.0.x: ./ doc/book/src/Makefile.inc doc/book/src/java-broker/ doc/book/src/java-broker/security/Java-Broker-Security-ACLs.xml
Date Wed, 09 Dec 2015 11:03:09 GMT
Author: orudyy
Date: Wed Dec  9 11:03:09 2015
New Revision: 1718815

URL: http://svn.apache.org/viewvc?rev=1718815&view=rev
Log:
QPID-6936: Fix exceptions thrown on java-broker doc book generation in pdf format
------------------------------------------------------------------------
Merged from trunk with command:
svn merge -c r1718744 https://svn.apache.org/repos/asf/qpid/java/trunk

Modified:
    qpid/java/branches/6.0.x/   (props changed)
    qpid/java/branches/6.0.x/doc/book/src/Makefile.inc   (contents, props changed)
    qpid/java/branches/6.0.x/doc/book/src/java-broker/   (props changed)
    qpid/java/branches/6.0.x/doc/book/src/java-broker/security/Java-Broker-Security-ACLs.xml

Propchange: qpid/java/branches/6.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec  9 11:03:09 2015
@@ -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
+/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
 /qpid/trunk/qpid:796646-796653

Modified: qpid/java/branches/6.0.x/doc/book/src/Makefile.inc
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/book/src/Makefile.inc?rev=1718815&r1=1718814&r2=1718815&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/doc/book/src/Makefile.inc (original)
+++ qpid/java/branches/6.0.x/doc/book/src/Makefile.inc Wed Dec  9 11:03:09 2015
@@ -49,7 +49,7 @@ $(OUTPUT)/html/index.html: $(BOOK) $(OUT
 	xsltproc -o $(OUTPUT)/html/ --xinclude --stringparam  chunk.section.depth 1  --stringparam
 section.autolabel 1  --stringparam  callout.graphics 0  --stringparam  callout.unicode 0
--stringparam section.label.includes.component.label 1 --stringparam use.id.as.filename 1
--stringparam html.stylesheet css/style.css --stringparam section.autolabel.max.depth 3 --stringparam
toc.section.depth 2 --stringparam chunker.output.encoding UTF-8 --stringparam css.decoration
0 ../../xsl/html-custom.xsl $<
 
 %.fo: %.xml
-	xsltproc --xinclude --stringparam  section.autolabel 1  --stringparam  callout.graphics
0  --stringparam  callout.unicode 0 --stringparam section.label.includes.component.label 1
http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl $< > $@
+	xsltproc --xinclude --stringparam fop1.extensions 1 --stringparam  section.autolabel 1 
--stringparam  callout.graphics 0  --stringparam  callout.unicode 0 --stringparam section.label.includes.component.label
1 http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl $< > $@
  
 
 %.pdf: %.fo

Propchange: qpid/java/branches/6.0.x/doc/book/src/Makefile.inc
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec  9 11:03:09 2015
@@ -7,3 +7,4 @@
 /qpid/branches/mcpierce-QPID-4719/qpid/doc/book/src/Makefile.inc:1477004-1477093
 /qpid/branches/qpid-2935/qpid/doc/book/src/Makefile.inc:1061302-1072333
 /qpid/branches/qpid-3346/qpid/doc/book/src/Makefile.inc:1144319-1179855
+/qpid/java/trunk/doc/book/src/Makefile.inc:1718744

Propchange: qpid/java/branches/6.0.x/doc/book/src/java-broker/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec  9 11:03:09 2015
@@ -7,4 +7,4 @@
 /qpid/branches/mcpierce-QPID-4719/qpid/doc/book/src/java-broker:1477004-1477093
 /qpid/branches/qpid-2935/qpid/doc/book/src/java-broker:1061302-1072333
 /qpid/branches/qpid-3346/qpid/doc/book/src/java-broker:1144319-1179855
-/qpid/java/trunk/doc/book/src/java-broker:1716086-1716087,1716455,1716489,1716497,1716610,1717626,1717780
+/qpid/java/trunk/doc/book/src/java-broker:1716086-1716087,1716455,1716489,1716497,1716610,1717626,1717780,1718744

Modified: qpid/java/branches/6.0.x/doc/book/src/java-broker/security/Java-Broker-Security-ACLs.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.0.x/doc/book/src/java-broker/security/Java-Broker-Security-ACLs.xml?rev=1718815&r1=1718814&r2=1718815&view=diff
==============================================================================
--- qpid/java/branches/6.0.x/doc/book/src/java-broker/security/Java-Broker-Security-ACLs.xml
(original)
+++ qpid/java/branches/6.0.x/doc/book/src/java-broker/security/Java-Broker-Security-ACLs.xml
Wed Dec  9 11:03:09 2015
@@ -470,7 +470,7 @@
   </table>
   <table id="table-Java-Broker-Security-ACLs-Queue-Exchnage-Operations">
     <title>ACL for Queue management operations invoked via REST interfaces</title>
-    <tgroup cols="2">
+    <tgroup cols="4">
       <tbody>
         <row>
           <entry> <command>Operation</command> </entry>



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


Mime
View raw message