Author: mprudhom
Date: Tue Jan 30 19:08:42 2007
New Revision: 501704

URL: http://svn.apache.org/viewvc?view=rev&rev=501704
Log:
Changed docbook build mechanism to no longer manually download the docbook 
files from sourgeforge.net, and instead have the docbook files be a maven 
dependency, and access the dependency directly. This is mainly because they 
removed the old file from http://docbook.sourceforge.net/release/xsl that we 
were relying on, but has the side-benefit of removing one network-sensitive 
component from the release build probless. Unfortunately, this also means that 
we need to downgrade from version 1.69.1 to 1.67.2 of the docbook stylesheets 
(since the Maven repository doesn't yet have the newer versions), but that 
doesn't appear to have any visible effects.

Modified:
    incubator/openjpa/trunk/openjpa-project/pom.xml
    
incubator/openjpa/trunk/openjpa-project/src/doc/manual/manual-xhtml-chunk.xsl
    incubator/openjpa/trunk/openjpa-project/src/doc/manual/manual-xhtml.xsl

Modified: incubator/openjpa/trunk/openjpa-project/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-project/pom.xml?view=diff&rev=501704&r1=501703&r2=501704
==============================================================================
--- incubator/openjpa/trunk/openjpa-project/pom.xml (original)
+++ incubator/openjpa/trunk/openjpa-project/pom.xml Tue Jan 30 19:08:42 2007
@@ -52,6 +52,9 @@
         <openjpa.assembly.sourceSuffix>source</openjpa.assembly.sourceSuffix>
         
<openjpa.assembly.sourceBase>${openjpa.assembly.outputDirectory}/${openjpa.assembly.finalName}-${openjpa.assembly.sourceSuffix}</openjpa.assembly.sourceBase>
         
<openjpa.assembly.sourceFile>${openjpa.assembly.sourceBase}.zip</openjpa.assembly.sourceFile>
+
+        <docbook.version>1.67.2</docbook.version>
+        <local.repository>${settings.localRepository}</local.repository>
     </properties>
 
     <build>
@@ -150,20 +153,11 @@
                                     <tasks>
                                     <echo>Building docbook manual</echo>
 
-                                    <!-- download stylesheets -->
-                                    <property name="stylesheet" 
value="1.69.1.tar.bz2"/>
-                                    <!--
-                                    For some reason, this variable will not
-                                    currectly evaluated at runtime: it 
-                                    creates a directory called
-                                    '${stylesheet-dir}', rather than
-                                    resolving the property
-                                    <property name="stylesheet-dir" 
value="${project.basedir}/target/stylesheets"/>
-                                    -->
-
                                     <mkdir 
dir="${project.basedir}/target/stylesheets"/>
-                                    <get 
src="http://docbook.sourceforge.net/release/xsl/${stylesheet}"; 
usetimestamp="true" dest="${project.basedir}/target/stylesheets/${stylesheet}"/>
-                                    <untar 
src="${project.basedir}/target/stylesheets/${stylesheet}" 
dest="${project.basedir}/target/stylesheets/" compression="bzip2" 
overwrite="false"/>
+                                    <available 
file="${local.repository}/docbook/docbook-xsl/${docbook.version}/docbook-xsl-${docbook.version}.zip"
 property="docbook.available"/>
+                                    <fail unless="docbook.available">Could not 
find docbook file: 
${local.repository}/docbook/docbook-xsl/${docbook.version}/docbook-xsl-${docbook.version}.zip</fail>
+
+                                    <unzip 
src="${local.repository}/docbook/docbook-xsl/${docbook.version}/docbook-xsl-${docbook.version}.zip"
 dest="${project.basedir}/target/stylesheets/" overwrite="false"/>
 
 
                                     <style includes="**/manual.xml"
@@ -370,6 +364,13 @@
             <artifactId>bcel</artifactId>
             <version>5.1</version>
             <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>docbook</groupId>
+            <artifactId>docbook-xsl</artifactId>
+            <version>${docbook.version}</version>
+            <scope>runtime</scope>
+            <type>zip</type>
         </dependency>
     </dependencies>
 </project>

Modified: 
incubator/openjpa/trunk/openjpa-project/src/doc/manual/manual-xhtml-chunk.xsl
URL: 
http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-project/src/doc/manual/manual-xhtml-chunk.xsl?view=diff&rev=501704&r1=501703&r2=501704
==============================================================================
--- 
incubator/openjpa/trunk/openjpa-project/src/doc/manual/manual-xhtml-chunk.xsl 
(original)
+++ 
incubator/openjpa/trunk/openjpa-project/src/doc/manual/manual-xhtml-chunk.xsl 
Tue Jan 30 19:08:42 2007
@@ -17,9 +17,9 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version='1.0'>
 
     <!-- docbook stylesheet customizations for openjpa manual -->
-       <!-- <xsl:import 
href="http://docbook.sourceforge.net/release/xsl/1.69.1/html/chunk.xsl"/> -->
+       <!-- <xsl:import 
href="http://docbook.sourceforge.net/release/xsl/docbook-xsl-1.67.2/html/chunk.xsl"/>
 -->
     <!-- locally downloaded cache of stylesheets -->
-       <xsl:import href="../../../target/stylesheets/1.69.1/html/chunk.xsl"/>
+       <xsl:import 
href="../../../target/stylesheets/docbook-xsl-1.67.2/html/chunk.xsl"/>
 
 
        <xsl:param name="html.stylesheet">css/docbook.css</xsl:param>

Modified: 
incubator/openjpa/trunk/openjpa-project/src/doc/manual/manual-xhtml.xsl
URL: 
http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-project/src/doc/manual/manual-xhtml.xsl?view=diff&rev=501704&r1=501703&r2=501704
==============================================================================
--- incubator/openjpa/trunk/openjpa-project/src/doc/manual/manual-xhtml.xsl 
(original)
+++ incubator/openjpa/trunk/openjpa-project/src/doc/manual/manual-xhtml.xsl Tue 
Jan 30 19:08:42 2007
@@ -17,9 +17,9 @@
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version='1.0'>
 
     <!-- docbook stylesheet customizations for openjpa manual -->
-       <!-- <xsl:import 
href="http://docbook.sourceforge.net/release/xsl/1.69.1/html/docbook.xsl"/> -->
+       <!-- <xsl:import 
href="http://docbook.sourceforge.net/release/xsl/docbook-xsl-1.67.2/html/docbook.xsl"/>
 -->
     <!-- locally downloaded cache of stylesheets -->
-       <xsl:import href="../../../target/stylesheets/1.69.1/html/docbook.xsl"/>
+       <xsl:import 
href="../../../target/stylesheets/docbook-xsl-1.67.2/html/docbook.xsl"/>
 
        <xsl:param name="html.stylesheet">css/docbook.css</xsl:param>
 


Reply via email to