[hornetq-commits] JBoss hornetq SVN: r9261 - in branches/HnetQ_323_cn: docs/user-manual/zh and 5 other directories.

Author: gaohoward Date: 2010-05-25 10:33:34 -0400 (Tue, 25 May 2010) New Revision: 9261 Added: branches/HnetQ_323_cn/lib/docbook-support/support/fop-conf/ branches/HnetQ_323_cn/lib/docbook-support/support/fop-conf/fop.xconf branches/HnetQ_323_cn/lib/docbook-support/support/lib/avalon-framework-4.2.0.jar branches/HnetQ_323_cn/lib/docbook-support/support/lib/batik-all-1.7.jar branches/HnetQ_323_cn/lib/docbook-support/support/lib/commons-io-1.3.1.jar branches/HnetQ_323_cn/lib/docbook-support/support/lib/commons-logging-1.0.4.jar branches/HnetQ_323_cn/lib/docbook-support/support/lib/serializer-2.7.0.jar branches/HnetQ_323_cn/lib/docbook-support/support/lib/xalan-2.7.0.jar branches/HnetQ_323_cn/lib/docbook-support/support/lib/xercesImpl-2.7.1.jar branches/HnetQ_323_cn/lib/docbook-support/support/lib/xml-apis-1.3.04.jar branches/HnetQ_323_cn/lib/docbook-support/support/lib/xml-apis-ext-1.3.04.jar branches/HnetQ_323_cn/lib/docbook-support/support/lib/xmlgraphics-commons-1.3.1.jar Modified: branches/HnetQ_323_cn/docs/quickstart-guide/zh/examples.xml branches/HnetQ_323_cn/docs/quickstart-guide/zh/master.xml branches/HnetQ_323_cn/docs/user-manual/zh/appserver-integration.xml branches/HnetQ_323_cn/docs/user-manual/zh/master.xml branches/HnetQ_323_cn/lib/docbook-support/styles/zh/fopdf.xsl branches/HnetQ_323_cn/lib/docbook-support/support.xml branches/HnetQ_323_cn/lib/docbook-support/support/lib/fop.jar Log: update fop Modified: branches/HnetQ_323_cn/docs/quickstart-guide/zh/examples.xml =================================================================== --- branches/HnetQ_323_cn/docs/quickstart-guide/zh/examples.xml 2010-05-25 12:18:22 UTC (rev 9260) +++ branches/HnetQ_323_cn/docs/quickstart-guide/zh/examples.xml 2010-05-25 14:33:34 UTC (rev 9261) @@ -185,13 +185,11 @@ BUILD SUCCESSFUL Total time: 7 seconds</programlisting> - <para>You may also see some output from the JBoss Application Server, in this instance it - is:</para> + <para>在JBoss应用服务器端你还会看到如下的输出：</para> <programlisting>16:27:54,703 INFO [STDOUT] message This is a text message received</programlisting> - <para>The application can then be undeployed by running the following command from within the - <literal>mdb</literal> directory.</para> + <para>然后在<literal>mdb</literal>目录下运行下面的命令可以将这个例子卸载。</para> <programlisting>./build.sh undeploy</programlisting> - <para>This should so some output similar to the following:</para> + <para>你将会看到如下的输出：</para> <programlisting>Buildfile: build.xml validate-jboss: Modified: branches/HnetQ_323_cn/docs/quickstart-guide/zh/master.xml =================================================================== --- branches/HnetQ_323_cn/docs/quickstart-guide/zh/master.xml 2010-05-25 12:18:22 UTC (rev 9260) +++ branches/HnetQ_323_cn/docs/quickstart-guide/zh/master.xml 2010-05-25 14:33:34 UTC (rev 9261) @@ -30,7 +30,7 @@ ]> <book lang="en"> <bookinfo> - <title>HornetQ Quickstart Guide</title> + <title>HornetQ快速指南</title> <subtitle>Putting the buzz in messaging</subtitle> </bookinfo> Modified: branches/HnetQ_323_cn/docs/user-manual/zh/appserver-integration.xml =================================================================== --- branches/HnetQ_323_cn/docs/user-manual/zh/appserver-integration.xml 2010-05-25 12:18:22 UTC (rev 9260) +++ branches/HnetQ_323_cn/docs/user-manual/zh/appserver-integration.xml 2010-05-25 14:33:34 UTC (rev 9261) @@ -395,7 +395,7 @@ <entry>String</entry> <entry>备份传输的配置参数</entry> </row> - <row>399 + <row> <entry><link linkend="configuration.discovery-group.group-address">DiscoveryAddress</link></entry> <entry>String</entry> <entry>服务器自动检测所使用的发现组（discovery group）地址</entry> @@ -471,6 +471,16 @@ <entry>Integer</entry> <entry>接收者内部缓存的窗口大小</entry> </row> + </tbody> + </tgroup> + </table> + <para>接上页..</para> + <informaltable frame="topbot"> + <tgroup cols="3"> + <colspec colname="c1" colnum="1"/> + <colspec colname="c2" colnum="2"/> + <colspec colname="c3" colnum="3"/> + <tbody> <row> <entry> <link linkend="configuration.connection-factory.consumer-max-rate">ConsumerMaxRate</link> @@ -599,7 +609,7 @@ </row> </tbody> </tgroup> - </table> + </informaltable> </section> <section> <title>适配器外部（outbound）配置</title> Modified: branches/HnetQ_323_cn/docs/user-manual/zh/master.xml =================================================================== --- branches/HnetQ_323_cn/docs/user-manual/zh/master.xml 2010-05-25 12:18:22 UTC (rev 9260) +++ branches/HnetQ_323_cn/docs/user-manual/zh/master.xml 2010-05-25 14:33:34 UTC (rev 9261) @@ -70,7 +70,7 @@ ]> <book lang="en"> <bookinfo> - <title>HornetQ 2.0 User Manual</title> + <title>HornetQ 2.0用户手册</title> <subtitle>Putting the buzz in messaging</subtitle> </bookinfo> Modified: branches/HnetQ_323_cn/lib/docbook-support/styles/zh/fopdf.xsl =================================================================== --- branches/HnetQ_323_cn/lib/docbook-support/styles/zh/fopdf.xsl 2010-05-25 12:18:22 UTC (rev 9260) +++ branches/HnetQ_323_cn/lib/docbook-support/styles/zh/fopdf.xsl 2010-05-25 14:33:34 UTC (rev 9261) @@ -26,6 +26,10 @@ <!-- this controls whether xrefs have the title in it. We don't want that --> <xsl:param name="xref.with.number.and.title" select="0"/> + + <xsl:param name="body.font.family">FangSong</xsl:param> + <xsl:param name="title.font.family">FangSong</xsl:param> + <xsl:param name="monospace.font.family">FangSong</xsl:param> <xsl:template match="processing-instruction('lb')"> <fo:block> @@ -52,22 +56,22 @@ </fo:block> </xsl:if> <xsl:if test="bookinfo/title"> - <fo:block font-family="Helvetica" font-size="22pt" padding-before="10mm"> + <fo:block font-family="FangSong" font-size="22pt" padding-before="10mm"> <xsl:value-of select="bookinfo/title"/> </fo:block> </xsl:if> <xsl:if test="bookinfo/subtitle"> - <fo:block font-family="Helvetica" font-size="18pt" padding-before="10mm"> + <fo:block font-family="FangSong" font-size="18pt" padding-before="10mm"> <xsl:value-of select="bookinfo/subtitle"/> </fo:block> </xsl:if> <xsl:if test="bookinfo/releaseinfo"> - <fo:block font-family="Helvetica" font-size="12pt" + <fo:block font-family="FangSong" font-size="12pt" padding="10mm"><xsl:value-of select="bookinfo/releaseinfo"/> </fo:block> </xsl:if> <xsl:if test="bookinfo/copyright"> - <fo:block font-family="Helvetica" font-size="12pt" + <fo:block font-family="FangSong" font-size="12pt" padding="10mm"> <xsl:apply-templates select="bookinfo/copyright" @@ -256,7 +260,7 @@ Fonts & Styles ################################################### --> <!-- Default Font size --> - <xsl:param name="body.font.master">11</xsl:param> + <xsl:param name="body.font.master">9</xsl:param> <!-- Line height in body text --> <xsl:param name="line-height">1.4</xsl:param> <!-- Monospaced fonts are smaller than regular text --> Added: branches/HnetQ_323_cn/lib/docbook-support/support/fop-conf/fop.xconf =================================================================== --- branches/HnetQ_323_cn/lib/docbook-support/support/fop-conf/fop.xconf (rev 0) +++ branches/HnetQ_323_cn/lib/docbook-support/support/fop-conf/fop.xconf 2010-05-25 14:33:34 UTC (rev 9261) @@ -0,0 +1,172 @@ +<?xml version="1.0"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<!-- $Id: fop.xconf 447325 2006-09-18 08:55:33Z jeremias $ --> + +<!-- + +This is an example configuration file for FOP. +This file contains the same settings as the default values +and will have no effect if used unchanged. + +Relative config url's will be resolved relative to +the location of this file. + +--> + +<!-- NOTE: This is the version of the configuration --> +<fop version="1.0"> + + <!-- Base URL for resolving relative URLs --> + <!-- <base>.</base> --> + + <!-- Source resolution in dpi (dots/pixels per inch) for determining the size of pixels in SVG and bitmap images, default: 72dpi --> + <source-resolution>72</source-resolution> + <!-- Target resolution in dpi (dots/pixels per inch) for specifying the target resolution for generated bitmaps, default: 72dpi --> + <target-resolution>72</target-resolution> + + <!-- Default page-height and page-width, in case + value is specified as auto --> + <default-page-settings height="11in" width="8.26in"/> + + <!-- Information for specific renderers --> + <!-- Uses renderer mime type for renderers --> + <renderers> + <renderer mime="application/pdf"> + <filterList> + <!-- provides compression using zlib flate (default is on) --> + <value>flate</value> + + <!-- encodes binary data into printable ascii characters (default off) + This provides about a 4:5 expansion of data size --> + <!-- <value>ascii-85</value> --> + + <!-- encodes binary data with hex representation (default off) + This filter is not recommended as it doubles the data size --> + <!-- <value>ascii-hex</value> --> + </filterList> + + <fonts> + <!-- embedded fonts --> + <!-- + This information must exactly match the font specified + in the fo file. Otherwise it will use a default font. + + For example, + <fo:inline font-family="Arial" font-weight="bold" font-style="normal"> + Arial-normal-normal font + </fo:inline> + for the font triplet specified by: + <font-triplet name="Arial" style="normal" weight="bold"/> + + If you do not want to embed the font in the pdf document + then do not include the "embed-url" attribute. + The font will be needed where the document is viewed + for it to be displayed properly. + + possible styles: normal | italic | oblique | backslant + possible weights: normal | bold | 100 | 200 | 300 | 400 + | 500 | 600 | 700 | 800 | 900 + (normal = 400, bold = 700) + --> + + <!-- + <font metrics-url="arial.xml" kerning="yes" embed-url="arial.ttf"> + <font-triplet name="Arial" style="normal" weight="normal"/> + <font-triplet name="ArialMT" style="normal" weight="normal"/> + </font> + <font metrics-url="arialb.xml" kerning="yes" embed-url="arialb.ttf"> + <font-triplet name="Arial" style="normal" weight="bold"/> + <font-triplet name="ArialMT" style="normal" weight="bold"/> + </font> + --> + <font metrics-url="file:///home/howard/tmp/fop/fop-0.95/ttchdzb96.xml" kerning="yes" + embed-url="file:///usr/share/fonts/truetype/wqy/wqy-zenhei.ttc"> + <font-triplet name="WenQuanYi Zen Hei" style="normal" weight="normal"/> + </font> + + <font metrics-url="file:///home/howard/tmp/fop/fop-0.95/simfangfm.xml" kerning="yes" + embed-url="file:///home/howard/tmp/fonts/simfang.ttf"> + <font-triplet name="FangSong" style="normal" weight="normal"/> + <font-triplet name="FangSong" style="italic" weight="normal"/> + <font-triplet name="FangSong" style="oblique" weight="bold"/> + </font> + + <!-- automatically detect operating system installed fonts --> + <!-- <auto-detect/> --> + + </fonts> + + <!-- This option lets you specify additional options on an XML handler --> + <!--xml-handler namespace="http://www.w3.org/2000/svg"> + <stroke-text>false</stroke-text> + </xml-handler--> + + </renderer> + + <renderer mime="application/postscript"> + <!-- This option forces the PS renderer to rotate landscape pages --> + <!--auto-rotate-landscape>true</auto-rotate-landscape--> + + <!-- This option lets you specify additional options on an XML handler --> + <!--xml-handler namespace="http://www.w3.org/2000/svg"> + <stroke-text>false</stroke-text> + </xml-handler--> + </renderer> + + <renderer mime="application/vnd.hp-PCL"> + </renderer> + + <!-- MIF does not have a renderer + <renderer mime="application/vnd.mif"> + </renderer> + --> + + <renderer mime="image/svg+xml"> + <format type="paginated"/> + <link value="true"/> + <strokeText value="false"/> + </renderer> + + <renderer mime="application/awt"> + </renderer> + + <renderer mime="image/png"> + <!--transparent-page-background>true</transparent-page-background--> + </renderer> + + <renderer mime="image/tiff"> + <!--transparent-page-background>true</transparent-page-background--> + <!--compression>CCITT T.6</compression--> + </renderer> + + <renderer mime="text/xml"> + </renderer> + + <!-- RTF does not have a renderer + <renderer mime="text/rtf"> + </renderer> + --> + + <renderer mime="text/plain"> + <pageSize columns="80"/> + </renderer> + + </renderers> + +</fop> + Added: branches/HnetQ_323_cn/lib/docbook-support/support/lib/avalon-framework-4.2.0.jar =================================================================== (Binary files differ) Property changes on: branches/HnetQ_323_cn/lib/docbook-support/support/lib/avalon-framework-4.2.0.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/HnetQ_323_cn/lib/docbook-support/support/lib/batik-all-1.7.jar =================================================================== (Binary files differ) Property changes on: branches/HnetQ_323_cn/lib/docbook-support/support/lib/batik-all-1.7.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/HnetQ_323_cn/lib/docbook-support/support/lib/commons-io-1.3.1.jar =================================================================== (Binary files differ) Property changes on: branches/HnetQ_323_cn/lib/docbook-support/support/lib/commons-io-1.3.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/HnetQ_323_cn/lib/docbook-support/support/lib/commons-logging-1.0.4.jar =================================================================== (Binary files differ) Property changes on: branches/HnetQ_323_cn/lib/docbook-support/support/lib/commons-logging-1.0.4.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: branches/HnetQ_323_cn/lib/docbook-support/support/lib/fop.jar =================================================================== (Binary files differ) Added: branches/HnetQ_323_cn/lib/docbook-support/support/lib/serializer-2.7.0.jar =================================================================== (Binary files differ) Property changes on: branches/HnetQ_323_cn/lib/docbook-support/support/lib/serializer-2.7.0.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/HnetQ_323_cn/lib/docbook-support/support/lib/xalan-2.7.0.jar =================================================================== (Binary files differ) Property changes on: branches/HnetQ_323_cn/lib/docbook-support/support/lib/xalan-2.7.0.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/HnetQ_323_cn/lib/docbook-support/support/lib/xercesImpl-2.7.1.jar =================================================================== (Binary files differ) Property changes on: branches/HnetQ_323_cn/lib/docbook-support/support/lib/xercesImpl-2.7.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/HnetQ_323_cn/lib/docbook-support/support/lib/xml-apis-1.3.04.jar =================================================================== (Binary files differ) Property changes on: branches/HnetQ_323_cn/lib/docbook-support/support/lib/xml-apis-1.3.04.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/HnetQ_323_cn/lib/docbook-support/support/lib/xml-apis-ext-1.3.04.jar =================================================================== (Binary files differ) Property changes on: branches/HnetQ_323_cn/lib/docbook-support/support/lib/xml-apis-ext-1.3.04.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: branches/HnetQ_323_cn/lib/docbook-support/support/lib/xmlgraphics-commons-1.3.1.jar =================================================================== (Binary files differ) Property changes on: branches/HnetQ_323_cn/lib/docbook-support/support/lib/xmlgraphics-commons-1.3.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: branches/HnetQ_323_cn/lib/docbook-support/support.xml =================================================================== --- branches/HnetQ_323_cn/lib/docbook-support/support.xml 2010-05-25 12:18:22 UTC (rev 9260) +++ branches/HnetQ_323_cn/lib/docbook-support/support.xml 2010-05-25 14:33:34 UTC (rev 9261) @@ -8,6 +8,7 @@ <!-- Support files for build process. --> <property name="support.dir" value="${support.basedir}/support"/> <property name="styles.dir" value="${support.basedir}/styles"/> + <property name="config.dir" value="${support.dir}/fop-conf"/> <!-- Set DocBook stylesheets. --> <property name="db.style.fopdf" value="fopdf.xsl"/> @@ -28,6 +29,10 @@ </fileset> </path> + <taskdef name="fop" classname="org.apache.fop.tools.anttasks.Fop"> + <classpath refid="lib.classpath"/> + </taskdef> + <!-- ################################################################## --> <target name="all.doc" depends="clean"> @@ -132,17 +137,13 @@ </xslt> --> <!-- Create a PDF from the XSL/FO. --> - <java classname="org.apache.fop.apps.Fop" - maxmemory="${maxmem}" - fork="true" dir="${basedir}"> - <classpath refid="lib.classpath"/> - <arg value="${build.dir}/${lang}/pdf/docbook_fop.tmp"/> - <arg value="${build.dir}/${lang}/pdf/${pdf.name}"/> - </java> + <fop format="application/pdf" + userconfig="${config.dir}/fop.xconf" + fofile="${build.dir}/${lang}/pdf/docbook_fop.tmp" + basedir="${build.dir}/${lang}/pdf" + outfile="${build.dir}/${lang}/pdf/${pdf.name}" /> <!-- Delete temporary files. --> - <delete file="${build.dir}/${lang}/pdf/docbook_fop.tmp"/> - <delete dir="${build.dir}/${lang}/pdf/images"/> </target> <target name="lang.dochtml">