openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r1213170 - in /openjpa/trunk: openjpa-project/pom.xml openjpa-project/src/doc/manual/manual-pdf.xsl pom.xml
Date Mon, 12 Dec 2011 08:58:46 GMT
Author: struberg
Date: Mon Dec 12 08:58:46 2011
New Revision: 1213170

URL: http://svn.apache.org/viewvc?rev=1213170&view=rev
Log:
OPENJPA-2091 upgrade docbkx plugin to 2.0.13 and FOP-1.0

fop now creates the chunked document in an own directory 
(directory name == book name), and there is a new template 
parameter fop1.extensions. This is needed because some extension
URI got moved from xml.apache.org to xmlgraphics.apache.org.

I compared all outputs and they look the same. I only
saw that the size of the PDF increased a few kB. This might be 
caused by embedding some fonts, etc which previously haven't
been shipped. Could need some investigation.

Modified:
    openjpa/trunk/openjpa-project/pom.xml
    openjpa/trunk/openjpa-project/src/doc/manual/manual-pdf.xsl
    openjpa/trunk/pom.xml

Modified: openjpa/trunk/openjpa-project/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/pom.xml?rev=1213170&r1=1213169&r2=1213170&view=diff
==============================================================================
--- openjpa/trunk/openjpa-project/pom.xml (original)
+++ openjpa/trunk/openjpa-project/pom.xml Mon Dec 12 08:58:46 2011
@@ -80,7 +80,7 @@
         </parent.site.docs>
 
         <docbook.source>${project.basedir}/src/doc/manual</docbook.source>
-        <docbook.target>${project.basedir}/target/manual</docbook.target>
+        <docbook.target>${project.basedir}/target/docbook</docbook.target>
         <docbook.version>1.67.2</docbook.version>
         <local.repository>${settings.localRepository}</local.repository>
 
@@ -243,7 +243,7 @@
                                         ${docbook.source}/
                                     </imgSrcPath>
                                     <postProcess>
-                                        <!-- copy to parent module for 
+                                        <!-- copy to parent module for
                                              expanded access in upload -->
                                         <mkdir dir="${parent.site.docs}" />
                                         <delete file="${docbook.target}/manual.fo" />
@@ -274,32 +274,32 @@
                                     </htmlCustomization>
                                     <postProcess>
                                         <!-- rename manual to index -->
-                                        <move file="${docbook.target}/manual.html" tofile="${docbook.target}/index.html"
/>
+                                        <move file="${docbook.target}/manual/manual.html"
tofile="${docbook.target}/manual/index.html" />
                                         <!-- Replace a 'base href' token to 'base target'
in the index.html -->
                                         <!-- This base href was inserted by manual-xhtml-chunk.xsl
parameter 'html.base' -->
-                                        <replace file="${docbook.target}/index.html" token="base
href" value="base target" />
+                                        <replace file="${docbook.target}/manual/index.html"
token="base href" value="base target" />
                                         <!-- Copy main.html from original location to
docbook target  -->
-                                        <copy file="${docbook.source}/main.html" tofile="${docbook.target}/main.html"
/>
+                                        <copy file="${docbook.source}/main.html" tofile="${docbook.target}/manual/main.html"
/>
                                         <!-- copy over images and styles -->
-                                        <mkdir dir="${docbook.target}/img" />
-                                        <copy todir="${docbook.target}/img">
+                                        <mkdir dir="${docbook.target}/manual/img" />
+                                        <copy todir="${docbook.target}/manual/img">
                                             <fileset dir="${docbook.source}/img">
                                                 <include name="*.*" />
                                             </fileset>
                                         </copy>
 
-                                        <mkdir dir="${docbook.target}/css" />
-                                        <copy todir="${docbook.target}/css">
+                                        <mkdir dir="${docbook.target}/manual/css" />
+                                        <copy todir="${docbook.target}/manual/css">
                                             <fileset dir="${docbook.source}/css">
                                                 <include name="*.*" />
                                             </fileset>
                                         </copy>
 
-                                        <!-- copy to parent module for 
+                                        <!-- copy to parent module for
                                              expanded access in upload -->
                                         <mkdir dir="${parent.site.docs}" />
                                         <copy todir="${parent.site.docs}">
-                                            <fileset dir="${docbook.target}">
+                                            <fileset dir="${docbook.target}/manual">
                                                 <include name="*.*" />
                                             </fileset>
                                         </copy>
@@ -323,7 +323,7 @@
                                         ${docbook.source}/manual-xhtml.xsl
                                     </htmlCustomization>
                                     <postProcess>
-                                        <!-- copy to parent module for 
+                                        <!-- copy to parent module for
                                              expanded access in upload -->
                                         <mkdir dir="${parent.site.docs}" />
                                         <copy todir="${parent.site.docs}">

Modified: openjpa/trunk/openjpa-project/src/doc/manual/manual-pdf.xsl
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/src/doc/manual/manual-pdf.xsl?rev=1213170&r1=1213169&r2=1213170&view=diff
==============================================================================
--- openjpa/trunk/openjpa-project/src/doc/manual/manual-pdf.xsl (original)
+++ openjpa/trunk/openjpa-project/src/doc/manual/manual-pdf.xsl Mon Dec 12 08:58:46 2011
@@ -29,7 +29,8 @@
 	<xsl:param name="toc.indent.width" select="24"/>
 
 	<!-- required for PDF bookmarks and some other stuff -->
-	<xsl:param name="fop.extensions" select="1"/>
+    <xsl:param name="fop.extensions" select="0"/>
+    <xsl:param name="fop1.extensions" select="1"/>
 	<!-- <xsl:param name="use.extensions" select="1"/> -->
 
 	<xsl:param name="ulink.hyphenate" select="''"/>

Modified: openjpa/trunk/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/trunk/pom.xml?rev=1213170&r1=1213169&r2=1213170&view=diff
==============================================================================
--- openjpa/trunk/pom.xml (original)
+++ openjpa/trunk/pom.xml Mon Dec 12 08:58:46 2011
@@ -27,7 +27,6 @@
       <groupId>org.apache</groupId>
       <artifactId>apache</artifactId>
       <version>7</version>
-      <relativePath />
     </parent>
 
     <groupId>org.apache.openjpa</groupId>
@@ -890,7 +889,7 @@
                 <plugin>
                     <groupId>com.agilejava.docbkx</groupId>
                     <artifactId>docbkx-maven-plugin</artifactId>
-                    <version>2.0.7</version>
+                    <version>2.0.13</version>
                 </plugin>
                 
                 <!-- Ignore/Execute plugin execution -->



Mime
View raw message