Author: afedosik
Date: 2007-12-13 10:44:58 -0500 (Thu, 13 Dec 2007)
New Revision: 5283
Added:
trunk/jsf/docs/resources/support/lib/avalon-framework-4.2.0.jar
trunk/jsf/docs/resources/support/lib/batik-all-1.6.jar
trunk/jsf/docs/resources/support/lib/commons-io-1.3.1.jar
trunk/jsf/docs/resources/support/lib/commons-logging-1.0.4.jar
trunk/jsf/docs/resources/support/lib/fop-hyph.jar
trunk/jsf/docs/resources/support/lib/fop-sandbox.jar
trunk/jsf/docs/resources/support/lib/fop-transcoder-allinone.jar
trunk/jsf/docs/resources/support/lib/fop-transcoder.jar
trunk/jsf/docs/resources/support/lib/serializer-2.7.0.jar
trunk/jsf/docs/resources/support/lib/servlet-2.2.jar
trunk/jsf/docs/resources/support/lib/xalan-2.7.0.jar
trunk/jsf/docs/resources/support/lib/xercesImpl-2.7.1.jar
trunk/jsf/docs/resources/support/lib/xml-apis-1.3.02.jar
trunk/jsf/docs/resources/support/lib/xmlgraphics-commons-1.2.jar
Removed:
trunk/jsf/docs/resources/support/lib/avalon-framework-cvs-20020806.jar
trunk/jsf/docs/resources/support/lib/batik.jar
Modified:
trunk/jsf/docs/resources/styles/en/fopdf.xsl
trunk/jsf/docs/resources/support.xml
trunk/jsf/docs/resources/support/docbook-xsl/html/param.xsl
trunk/jsf/docs/resources/support/lib/fop.jar
Log:
http://jira.jboss.com/jira/browse/JBDS-5 FOP updated to fop-0.94 version, problem with
"out of memory" is fixed.
Modified: trunk/jsf/docs/resources/styles/en/fopdf.xsl
===================================================================
--- trunk/jsf/docs/resources/styles/en/fopdf.xsl 2007-12-13 14:17:55 UTC (rev 5282)
+++ trunk/jsf/docs/resources/styles/en/fopdf.xsl 2007-12-13 15:44:58 UTC (rev 5283)
@@ -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>
Modified: trunk/jsf/docs/resources/support/docbook-xsl/html/param.xsl
===================================================================
--- trunk/jsf/docs/resources/support/docbook-xsl/html/param.xsl 2007-12-13 14:17:55 UTC
(rev 5282)
+++ trunk/jsf/docs/resources/support/docbook-xsl/html/param.xsl 2007-12-13 15:44:58 UTC
(rev 5283)
@@ -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/jsf/docs/resources/support/lib/avalon-framework-4.2.0.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/resources/support/lib/avalon-framework-4.2.0.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/jsf/docs/resources/support/lib/avalon-framework-cvs-20020806.jar
===================================================================
(Binary files differ)
Added: trunk/jsf/docs/resources/support/lib/batik-all-1.6.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/resources/support/lib/batik-all-1.6.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/jsf/docs/resources/support/lib/batik.jar
===================================================================
(Binary files differ)
Added: trunk/jsf/docs/resources/support/lib/commons-io-1.3.1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/resources/support/lib/commons-io-1.3.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/docs/resources/support/lib/commons-logging-1.0.4.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/resources/support/lib/commons-logging-1.0.4.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/docs/resources/support/lib/fop-hyph.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/resources/support/lib/fop-hyph.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/docs/resources/support/lib/fop-sandbox.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/resources/support/lib/fop-sandbox.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/docs/resources/support/lib/fop-transcoder-allinone.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/resources/support/lib/fop-transcoder-allinone.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/docs/resources/support/lib/fop-transcoder.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/resources/support/lib/fop-transcoder.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/jsf/docs/resources/support/lib/fop.jar
===================================================================
(Binary files differ)
Added: trunk/jsf/docs/resources/support/lib/serializer-2.7.0.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/resources/support/lib/serializer-2.7.0.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/docs/resources/support/lib/servlet-2.2.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/resources/support/lib/servlet-2.2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/docs/resources/support/lib/xalan-2.7.0.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/resources/support/lib/xalan-2.7.0.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/docs/resources/support/lib/xercesImpl-2.7.1.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/resources/support/lib/xercesImpl-2.7.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/docs/resources/support/lib/xml-apis-1.3.02.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/resources/support/lib/xml-apis-1.3.02.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsf/docs/resources/support/lib/xmlgraphics-commons-1.2.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsf/docs/resources/support/lib/xmlgraphics-commons-1.2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/jsf/docs/resources/support.xml
===================================================================
--- trunk/jsf/docs/resources/support.xml 2007-12-13 14:17:55 UTC (rev 5282)
+++ trunk/jsf/docs/resources/support.xml 2007-12-13 15:44:58 UTC (rev 5283)
@@ -1,7 +1,7 @@
<project name="DocSupport" default="all.doc"
basedir=".">
<dirname property="support.startdir"
file="${ant.file.DocSupport}"/>
-
+ <property environment="env"></property>
<property name="support.basedir"
value="${support.startdir}"/>
<property file="${support.basedir}/support.properties" />
@@ -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">
@@ -140,20 +149,50 @@
<xmlcatalog refid="docbook.catalog"/>
</xslt>
-->
+ <!--echo>${basedir}</echo-->
<!-- Create a PDF from the XSL/FO. -->
- <java classname="org.apache.fop.apps.Fop"
+ <java classname="org.apache.tools.ant.Main"
+ maxmemory="${maxmem}"
+ fork="true" dir="${basedir}"
failonerror="true">
+ <classpath>
+ <pathelement location="${ant.core.lib}"/>
+ <fileset dir="${ant.home}/lib">
+ <include name="*.jar"/>
+ </fileset>
+ </classpath>
+ <arg value="fork-fop-instance"/>
+ <sysproperty key="lang" value="${lang}"/>
+ </java>
+
+<!-- <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"/>
</target>
+ <target name="fork-fop-instance">
+
+ <echo>${build.dir}/${lang}/pdf</echo>
+ <echo>${build.dir}/${lang}/pdf/${pdf.name}</echo>
+ <echo>${build.dir}/${lang}/pdf/docbook_fop.tmp</echo>
+
+ <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>
+ </target>
+
<target name="lang.dochtml">
<mkdir dir="${build.dir}/${lang}/html/"/>