Author: afedosik Date: 2007-12-12 08:03:43 -0500 (Wed, 12 Dec 2007) New Revision: 5255 Added: trunk/as/docs/resources/support/lib/avalon-framework-4.2.0.jar trunk/as/docs/resources/support/lib/batik-all-1.6.jar trunk/as/docs/resources/support/lib/commons-io-1.3.1.jar trunk/as/docs/resources/support/lib/commons-logging-1.0.4.jar trunk/as/docs/resources/support/lib/fop-hyph.jar trunk/as/docs/resources/support/lib/fop-sandbox.jar trunk/as/docs/resources/support/lib/fop-transcoder-allinone.jar trunk/as/docs/resources/support/lib/fop-transcoder.jar trunk/as/docs/resources/support/lib/serializer-2.7.0.jar trunk/as/docs/resources/support/lib/servlet-2.2.jar trunk/as/docs/resources/support/lib/xalan-2.7.0.jar trunk/as/docs/resources/support/lib/xercesImpl-2.7.1.jar trunk/as/docs/resources/support/lib/xml-apis-1.3.02.jar trunk/as/docs/resources/support/lib/xmlgraphics-commons-1.2.jar Removed: trunk/as/docs/resources/support/lib/avalon-framework-cvs-20020806.jar trunk/as/docs/resources/support/lib/batik.jar Modified: trunk/as/docs/reference/en/images/modules/modules_1.png trunk/as/docs/reference/en/images/modules/modules_2.png trunk/as/docs/reference/en/images/perspective/perspective_10.png trunk/as/docs/reference/en/images/perspective/perspective_11.png trunk/as/docs/reference/en/images/perspective/perspective_13.png trunk/as/docs/reference/en/images/perspective/perspective_15.png trunk/as/docs/reference/en/images/perspective/perspective_2.png trunk/as/docs/reference/en/images/runtimes_servers/runtimes_servers_1.png trunk/as/docs/reference/en/images/runtimes_servers/runtimes_servers_2.png trunk/as/docs/reference/en/images/runtimes_servers/runtimes_servers_3.png trunk/as/docs/reference/en/images/runtimes_servers/runtimes_servers_4.png trunk/as/docs/reference/en/images/runtimes_servers/runtimes_servers_5.png trunk/as/docs/reference/en/images/webtools/webtools_1.png trunk/as/docs/reference/en/images/webtools/webtools_2.png trunk/as/docs/reference/en/images/webtools/webtools_3.png trunk/as/docs/reference/en/modules/perspective.xml trunk/as/docs/resources/styles/en/fopdf.xsl trunk/as/docs/resources/support.xml trunk/as/docs/resources/support/docbook-xsl/html/param.xsl trunk/as/docs/resources/support/lib/fop.jar Log: http://jira.jboss.com/jira/browse/JBDS-5 FOP updated to fop-0.94 version, screenshots for pdf version are fixed. "scale" attribute added for wide images. Modified: trunk/as/docs/reference/en/images/modules/modules_1.png =================================================================== (Binary files differ) Modified: trunk/as/docs/reference/en/images/modules/modules_2.png =================================================================== (Binary files differ) Modified: trunk/as/docs/reference/en/images/perspective/perspective_10.png =================================================================== (Binary files differ) Modified: trunk/as/docs/reference/en/images/perspective/perspective_11.png =================================================================== (Binary files differ) Modified: trunk/as/docs/reference/en/images/perspective/perspective_13.png =================================================================== (Binary files differ) Modified: trunk/as/docs/reference/en/images/perspective/perspective_15.png =================================================================== (Binary files differ) Modified: trunk/as/docs/reference/en/images/perspective/perspective_2.png =================================================================== (Binary files differ) Modified: trunk/as/docs/reference/en/images/runtimes_servers/runtimes_servers_1.png =================================================================== (Binary files differ) Modified: trunk/as/docs/reference/en/images/runtimes_servers/runtimes_servers_2.png =================================================================== (Binary files differ) Modified: trunk/as/docs/reference/en/images/runtimes_servers/runtimes_servers_3.png =================================================================== (Binary files differ) Modified: trunk/as/docs/reference/en/images/runtimes_servers/runtimes_servers_4.png =================================================================== (Binary files differ) Modified: trunk/as/docs/reference/en/images/runtimes_servers/runtimes_servers_5.png =================================================================== (Binary files differ) Modified: trunk/as/docs/reference/en/images/webtools/webtools_1.png =================================================================== (Binary files differ) Modified: trunk/as/docs/reference/en/images/webtools/webtools_2.png =================================================================== (Binary files differ) Modified: trunk/as/docs/reference/en/images/webtools/webtools_3.png =================================================================== (Binary files differ) Modified: trunk/as/docs/reference/en/modules/perspective.xml =================================================================== --- trunk/as/docs/reference/en/modules/perspective.xml 2007-12-12 12:03:36 UTC (rev 5254) +++ trunk/as/docs/reference/en/modules/perspective.xml 2007-12-12 13:03:43 UTC (rev 5255) @@ -40,7 +40,7 @@ <title>View Preferences</title> <mediaobject> <imageobject> - <imagedata fileref="images/perspective/perspective_2.png"/> + <imagedata fileref="images/perspective/perspective_2.png" scale="75"/> </imageobject> </mediaobject> </figure> @@ -147,7 +147,7 @@ <title>JMX Console</title> <mediaobject> <imageobject> - <imagedata fileref="images/perspective/perspective_17.png"/> + <imagedata fileref="images/perspective/perspective_17.png" scale="75"/> </imageobject> </mediaobject> </figure> Modified: trunk/as/docs/resources/styles/en/fopdf.xsl =================================================================== --- trunk/as/docs/resources/styles/en/fopdf.xsl 2007-12-12 12:03:36 UTC (rev 5254) +++ trunk/as/docs/resources/styles/en/fopdf.xsl 2007-12-12 13:03:43 UTC (rev 5255) @@ -112,7 +112,7 @@ <xsl:variable name="Version"> <xsl:choose> <xsl:when test="//releaseinfo"> - <xsl:text>JBoss </xsl:text> + <xsl:text></xsl:text> <xsl:value-of select="//releaseinfo"/> </xsl:when> <xsl:otherwise> @@ -215,7 +215,7 @@ <xsl:param name="tablecolumns.extension">0</xsl:param> <!-- FOP provide only PDF Bookmarks at the moment --> - <xsl:param name="fop.extensions">1</xsl:param> + <xsl:param name="fop1.extensions">1</xsl:param> @@ -225,8 +225,8 @@ <!-- Generate the TOCs for named components only --> <xsl:param name="generate.toc"> book toc,title</xsl:param> <!-- ,figure,table,equation --> - <!-- Show only Sections up to level 3 in the TOCs --> - <xsl:param name="toc.section.depth">3</xsl:param> + <!-- Show only Sections up to level 5 in the TOCs --> + <xsl:param name="toc.section.depth">5</xsl:param> <!-- Dot and Whitespace as separator in TOC between Label and Title--> <xsl:param name="autotoc.label.separator" select="'. '"/> Modified: trunk/as/docs/resources/support/docbook-xsl/html/param.xsl =================================================================== --- trunk/as/docs/resources/support/docbook-xsl/html/param.xsl 2007-12-12 12:03:36 UTC (rev 5254) +++ trunk/as/docs/resources/support/docbook-xsl/html/param.xsl 2007-12-12 13:03:43 UTC (rev 5255) @@ -262,7 +262,7 @@ <xsl:param name="index.term.separator"/> <xsl:param name="index.range.separator"/> <xsl:param name="index.prefer.titleabbrev" select="0"/> -<xsl:param name="ignore.image.scaling" select="0"/> +<xsl:param name="ignore.image.scaling" select="1"/> <xsl:param name="inherit.keywords" select="1"/> <xsl:param name="insert.xref.page.number">no</xsl:param> <xsl:param name="javahelp.encoding">iso-8859-1</xsl:param> Added: trunk/as/docs/resources/support/lib/avalon-framework-4.2.0.jar =================================================================== (Binary files differ) Property changes on: trunk/as/docs/resources/support/lib/avalon-framework-4.2.0.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/as/docs/resources/support/lib/avalon-framework-cvs-20020806.jar =================================================================== (Binary files differ) Added: trunk/as/docs/resources/support/lib/batik-all-1.6.jar =================================================================== (Binary files differ) Property changes on: trunk/as/docs/resources/support/lib/batik-all-1.6.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: trunk/as/docs/resources/support/lib/batik.jar =================================================================== (Binary files differ) Added: trunk/as/docs/resources/support/lib/commons-io-1.3.1.jar =================================================================== (Binary files differ) Property changes on: trunk/as/docs/resources/support/lib/commons-io-1.3.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/as/docs/resources/support/lib/commons-logging-1.0.4.jar =================================================================== (Binary files differ) Property changes on: trunk/as/docs/resources/support/lib/commons-logging-1.0.4.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/as/docs/resources/support/lib/fop-hyph.jar =================================================================== (Binary files differ) Property changes on: trunk/as/docs/resources/support/lib/fop-hyph.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/as/docs/resources/support/lib/fop-sandbox.jar =================================================================== (Binary files differ) Property changes on: trunk/as/docs/resources/support/lib/fop-sandbox.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/as/docs/resources/support/lib/fop-transcoder-allinone.jar =================================================================== (Binary files differ) Property changes on: trunk/as/docs/resources/support/lib/fop-transcoder-allinone.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/as/docs/resources/support/lib/fop-transcoder.jar =================================================================== (Binary files differ) Property changes on: trunk/as/docs/resources/support/lib/fop-transcoder.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/as/docs/resources/support/lib/fop.jar =================================================================== (Binary files differ) Added: trunk/as/docs/resources/support/lib/serializer-2.7.0.jar =================================================================== (Binary files differ) Property changes on: trunk/as/docs/resources/support/lib/serializer-2.7.0.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/as/docs/resources/support/lib/servlet-2.2.jar =================================================================== (Binary files differ) Property changes on: trunk/as/docs/resources/support/lib/servlet-2.2.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/as/docs/resources/support/lib/xalan-2.7.0.jar =================================================================== (Binary files differ) Property changes on: trunk/as/docs/resources/support/lib/xalan-2.7.0.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/as/docs/resources/support/lib/xercesImpl-2.7.1.jar =================================================================== (Binary files differ) Property changes on: trunk/as/docs/resources/support/lib/xercesImpl-2.7.1.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/as/docs/resources/support/lib/xml-apis-1.3.02.jar =================================================================== (Binary files differ) Property changes on: trunk/as/docs/resources/support/lib/xml-apis-1.3.02.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/as/docs/resources/support/lib/xmlgraphics-commons-1.2.jar =================================================================== (Binary files differ) Property changes on: trunk/as/docs/resources/support/lib/xmlgraphics-commons-1.2.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/as/docs/resources/support.xml =================================================================== --- trunk/as/docs/resources/support.xml 2007-12-12 12:03:36 UTC (rev 5254) +++ trunk/as/docs/resources/support.xml 2007-12-12 13:03:43 UTC (rev 5255) @@ -37,6 +37,15 @@ </fileset> </path> + <property name="fop.home" value="${support.dir}/lib"/> + + <taskdef name="fop" + classname="org.apache.fop.tools.anttasks.Fop"> + <classpath refid="lib.classpath"> + + </classpath> + </taskdef> + <!-- ################################################################## --> <target name="all.doc" depends="clean"> @@ -141,14 +150,24 @@ </xslt> --> <!-- Create a PDF from the XSL/FO. --> - <java classname="org.apache.fop.apps.Fop" + + <fop format="application/pdf" + basedir="${build.dir}/${lang}/pdf" + outfile="${build.dir}/${lang}/pdf/${pdf.name}" + fofile="${build.dir}/${lang}/pdf/docbook_fop.tmp" + messagelevel="debug"> + + </fop> + +<!-- <java classname="org.apache.fop.cli.Main" maxmemory="${maxmem}" fork="true" dir="${basedir}" failonerror="true"> <classpath refid="lib.classpath"/> + <sysproperty key="fop.home" path="${support.dir}/lib"/> <arg value="${build.dir}/${lang}/pdf/docbook_fop.tmp"/> <arg value="${build.dir}/${lang}/pdf/${pdf.name}"/> </java> - +--> <!-- Delete temporary files. --> <delete file="${build.dir}/${lang}/pdf/docbook_fop.tmp"/> <delete dir="${build.dir}/${lang}/pdf/images"/>