From: Siegfried G. <wd...@us...> - 2002-12-12 11:52:28
|
wdsgoe 02/12/12 03:52:27 Modified: sdocbook plugin.jelly Log: Deleted unwanted "maven -g" in the script Revision Changes Path 1.2 +1 -1 maven-plugins/sdocbook/plugin.jelly Index: plugin.jelly =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/plugin.jelly,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- plugin.jelly 11 Dec 2002 16:06:14 -0000 1.1 +++ plugin.jelly 12 Dec 2002 11:52:27 -0000 1.2 @@ -4,7 +4,7 @@ xmlns:j="jelly:core" xmlns:define="jelly:define" xmlns:maven="jelly:maven" - xmlns:dep="depTagLib">maven -g + xmlns:dep="depTagLib"> <goal name="sdocbook" |
From: Per O. <per...@us...> - 2004-03-17 22:05:02
|
perolesen 04/03/17 13:55:34 Modified: sdocbook plugin.jelly Log: Made some extension to the plugin to make it possible to do more with the used stylesheets. I've tried to keep it backward compatible (aka: if users does not actively use the new features, it should do what it did before, ... hopefully :-) Features: - The docbook DTDs are huge and take time to resolve externally. Added the EntityResolver from xml-commons and added properties to be able to use it. - Added the xalan25 extensions jar to be able to use the stylesheet extensions. - Added possibility to set the stylesheet params. - Added copying of external resources like images, which the target output references externally (e.g. a HTML output which includes a IMG tag) Revision Changes Path 1.4 +83 -10 maven-plugins/sdocbook/plugin.jelly Index: plugin.jelly =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/plugin.jelly,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- plugin.jelly 17 Oct 2003 17:33:46 -0000 1.3 +++ plugin.jelly 17 Mar 2004 21:55:34 -0000 1.4 @@ -39,14 +39,20 @@ <goal name="sdocbook:info"> - <echo>PathSeperator = ${_sep}</echo> - <echo>bootclasspath = ${_bootclasspath}</echo> - <echo>maven.sdocbook.src.dir = ${maven.sdocbook.src.dir}</echo> - <echo>maven.sdocbook.generated.html = ${maven.sdocbook.generated.html}</echo> - <echo>maven.sdocbook.generated.fo = ${maven.sdocbook.generated.fo}</echo> - <echo>maven.sdocbook.generated.pdf = ${maven.sdocbook.generated.pdf}</echo> - <echo>maven.sdocbook.target.dir = ${maven.sdocbook.target.dir}</echo> - + <echo>PathSeperator = ${_sep}</echo> + <echo>bootclasspath = ${_bootclasspath}</echo> + <echo>maven.sdocbook.src.dir = ${maven.sdocbook.src.dir}</echo> + <echo>maven.sdocbook.generated.html = ${maven.sdocbook.generated.html}</echo> + <echo>maven.sdocbook.generated.fo = ${maven.sdocbook.generated.fo}</echo> + <echo>maven.sdocbook.generated.pdf = ${maven.sdocbook.generated.pdf}</echo> + <echo>maven.sdocbook.target.dir = ${maven.sdocbook.target.dir}</echo> + <echo>maven.sdocbook.stylesheets.dir = ${maven.sdocbook.stylesheets.dir}</echo> + <echo>maven.sdocbook.resources.include = ${maven.sdocbook.resources.include}</echo> + <echo>maven.sdocbook.html.params = ${maven.sdocbook.html.params}</echo> + <echo>maven.sdocbook.fo.params = ${maven.sdocbook.fo.params}</echo> + <echo>maven.sdocbook.use.entityresolver = ${maven.sdocbook.use.entityresolver}</echo> + <echo>maven.sdocbook.catalogmanager.properties = ${maven.sdocbook.catalogmanager.properties}</echo> + </goal> <!-- ================================================================== --> @@ -66,6 +72,17 @@ <fileset dir="${maven.sdocbook.src.dir}" includes="**/*.xml, **/*.sgml"/> </fileScanner> + <!-- determine if entity-resolver is requested --> + <j:set var="useEntityResolver" value="${maven.sdocbook.use.entityresolver}" /> + <j:if test="${useEntityResolver == 'true'}"> + <j:set var="catalogManagerPropertiesFile" value="${maven.sdocbook.catalogmanager.properties}" /> + <j:if test="${empty(catalogManagerPropertiesFile)}"> + <fail message="property 'maven.sdocbook.catalogmanager.properties' required when using 'maven.sdocbook.use.entityresolver==true'" /> + </j:if> + <dirname property="catalogManagerPropertiesDir" file="${maven.sdocbook.catalogmanager.properties}" /> + <j:set var="catalogManagerPropertiesDir" value="${catalogManagerPropertiesDir}" /> + </j:if> + <j:forEach var="file" items="${scanner.iterator()}"> <echo>Processing ${file.absolutePath}</echo> @@ -83,16 +100,31 @@ <pathelement location="${plugin.getDependencyPath('fop')}"/> <pathelement location="${plugin.getDependencyPath('jimi')}"/> <pathelement location="${plugin.getDependencyPath('logkit')}"/> + + <!-- this is required for extensions to work with xalan --> + <pathelement location="${maven.sdocbook.stylesheets.dir}/extensions/xalan25.jar"/> + + <j:if test="${useEntityResolver == 'true'}"> + <pathelement location="${plugin.getDependencyPath('xml-resolver')}"/> + <pathelement location="${catalogManagerPropertiesDir}"/> <!-- includes the users CatalogManager.properties in classpath --> + </j:if> </classpath> <sysproperty key="user.language" value="en"/> <sysproperty key="javax.xml.parsers.DocumentBuilderFactory" value="org.apache.xerces.jaxp.DocumentBuilderFactoryImpl"/> <sysproperty key="javax.xml.parsers.SAXParserFactory" value="org.apache.xerces.jaxp.SAXParserFactoryImpl"/> + <j:if test="${useEntityResolver == 'true'}"> + <arg value="-ENTITYRESOLVER"/> + <arg value="org.apache.xml.resolver.tools.CatalogResolver"/> + <arg value="-URIRESOLVER"/> + <arg value="org.apache.xml.resolver.tools.CatalogResolver"/> + </j:if> <arg value="-in"/> <arg value="${file.absolutePath}"/> <arg value="-out"/> <arg value="${maven.sdocbook.generated.html}/${basename}.html"/> <arg value="-xsl"/> - <arg value="${plugin.dir}/plugin-resources/html/docbook.xsl"/> + <arg value="${maven.sdocbook.stylesheets.dir}/html/docbook.xsl"/> + <arg line="${maven.sdocbook.html.params}"/> </java> </j:forEach> @@ -104,6 +136,13 @@ </fileset> </copy> + <!-- copy resources which html might reference too --> + <j:set var="resources" value="${maven.sdocbook.resources.include}" /> + <j:if test="${!empty(resources)}"> + <copy todir="${maven.sdocbook.target.dir}" filtering="no" flatten="true"> + <fileset dir="${maven.sdocbook.src.dir}" includes="${resources}"/> + </copy> + </j:if> </goal> <!-- ================================================================== --> @@ -123,6 +162,17 @@ <fileset dir="${maven.sdocbook.src.dir}" includes="**/*.xml, **/*.sgml"/> </fileScanner> + <!-- determine if entity-resolver is requested --> + <j:set var="useEntityResolver" value="${maven.sdocbook.use.entityresolver}" /> + <j:if test="${useEntityResolver == 'true'}"> + <j:set var="catalogManagerPropertiesFile" value="${maven.sdocbook.catalogmanager.properties}" /> + <j:if test="${empty(catalogManagerPropertiesFile)}"> + <fail message="property 'maven.sdocbook.catalogmanager.properties' required when using 'maven.sdocbook.use.entityresolver==true'" /> + </j:if> + <dirname property="catalogManagerPropertiesDir" file="${maven.sdocbook.catalogmanager.properties}" /> + <j:set var="catalogManagerPropertiesDir" value="${catalogManagerPropertiesDir}" /> + </j:if> + <j:forEach var="file" items="${scanner.iterator()}"> <echo>Processing ${file.absolutePath}</echo> @@ -133,15 +183,30 @@ <java classname="org.apache.xalan.xslt.Process" fork="yes"> <jvmarg value="-Xbootclasspath/p:${_bootclasspath}"/> + <classpath> + <pathelement location="${maven.sdocbook.stylesheets.dir}/extensions/xalan25.jar"/> + + <j:if test="${useEntityResolver == 'true'}"> + <pathelement location="${plugin.getDependencyPath('xml-resolver')}"/> + <pathelement location="${catalogManagerPropertiesDir}"/> <!-- includes the users CatalogManager.properties in classpath --> + </j:if> + </classpath> <sysproperty key="user.language" value="en"/> <sysproperty key="javax.xml.parsers.DocumentBuilderFactory" value="org.apache.xerces.jaxp.DocumentBuilderFactoryImpl"/> <sysproperty key="javax.xml.parsers.SAXParserFactory" value="org.apache.xerces.jaxp.SAXParserFactoryImpl"/> + <j:if test="${useEntityResolver == 'true'}"> + <arg value="-ENTITYRESOLVER"/> + <arg value="org.apache.xml.resolver.tools.CatalogResolver"/> + <arg value="-URIRESOLVER"/> + <arg value="org.apache.xml.resolver.tools.CatalogResolver"/> + </j:if> <arg value="-in"/> <arg value="${file.absolutePath}"/> <arg value="-out"/> <arg value="${maven.sdocbook.generated.fo}/${basename}.fo"/> <arg value="-xsl"/> - <arg value="${plugin.dir}/plugin-resources/fo/docbook.xsl"/> + <arg value="${maven.sdocbook.stylesheets.dir}/fo/docbook.xsl"/> + <arg line="${maven.sdocbook.fo.params}"/> </java> @@ -162,6 +227,14 @@ <!-- create target directory for generated PDF --> <mkdir dir="${maven.sdocbook.generated.pdf}"/> + <!-- before doing fo2pdf translation, we need to copy any possible resources referenced from the original docbooks --> + <j:set var="resources" value="${maven.sdocbook.resources.include}" /> + <j:if test="${!empty(resources)}"> + <copy todir="${maven.sdocbook.generated.fo}" filtering="no" flatten="true"> + <fileset dir="${maven.sdocbook.src.dir}" includes="${resources}"/> + </copy> + </j:if> + <!-- get all *.xml and *.sgml --> <fileScanner var="scanner"> <fileset dir="${maven.sdocbook.generated.fo}" includes="**/*.fo"/> |
From: Carlos S. <car...@us...> - 2004-12-11 20:11:09
|
carlossg 04/12/11 12:11:01 Modified: sdocbook plugin.jelly Log: Added failonerror="true" to transformations Revision Changes Path 1.6 +7 -3 maven-plugins/sdocbook/plugin.jelly Index: plugin.jelly =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/plugin.jelly,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- plugin.jelly 12 Apr 2004 09:42:05 -0000 1.5 +++ plugin.jelly 11 Dec 2004 20:11:01 -0000 1.6 @@ -92,7 +92,7 @@ <j:set var="basename" value="${file.name.substring(0,index)}"/> <!-- Use XSLT processor to transform DOCBOOK into HTML --> - <java classname="org.apache.xalan.xslt.Process" fork="yes"> + <java classname="org.apache.xalan.xslt.Process" fork="yes" failonerror="true"> <jvmarg value="-Xbootclasspath/p:${_bootclasspath}"/> <classpath> <pathelement location="${plugin.getDependencyPath('avalon-framework')}"/> @@ -181,7 +181,7 @@ <j:set var="index" value="${file.name.lastIndexOf('.')}"/> <j:set var="basename" value="${file.name.substring(0,index)}"/> - <java classname="org.apache.xalan.xslt.Process" fork="yes"> + <java classname="org.apache.xalan.xslt.Process" fork="yes" failonerror="true"> <jvmarg value="-Xbootclasspath/p:${_bootclasspath}"/> <classpath> <pathelement location="${maven.sdocbook.stylesheets.dir}/extensions/xalan25.jar"/> @@ -191,9 +191,11 @@ <pathelement location="${catalogManagerPropertiesDir}"/> <!-- includes the users CatalogManager.properties in classpath --> </j:if> </classpath> + <sysproperty key="user.language" value="en"/> <sysproperty key="javax.xml.parsers.DocumentBuilderFactory" value="org.apache.xerces.jaxp.DocumentBuilderFactoryImpl"/> <sysproperty key="javax.xml.parsers.SAXParserFactory" value="org.apache.xerces.jaxp.SAXParserFactoryImpl"/> + <j:if test="${useEntityResolver == 'true'}"> <arg value="-ENTITYRESOLVER"/> <arg value="org.apache.xml.resolver.tools.CatalogResolver"/> @@ -206,6 +208,7 @@ <arg value="${maven.sdocbook.generated.fo}/${basename}.fo"/> <arg value="-xsl"/> <arg value="${maven.sdocbook.stylesheets.dir}/fo/docbook.xsl"/> + <arg line="${maven.sdocbook.fo.params}"/> </java> @@ -249,7 +252,7 @@ <j:set var="basename" value="${file.name.substring(0,index)}"/> <!-- Run FOP to transform FO into PDF --> - <java classname="org.apache.fop.apps.Fop" fork="yes"> + <java classname="org.apache.fop.apps.Fop" fork="yes" failonerror="true"> <jvmarg value="-Xbootclasspath/p:${_bootclasspath}"/> <classpath> <pathelement location="${plugin.getDependencyPath('avalon-framework')}"/> @@ -261,6 +264,7 @@ <sysproperty key="user.language" value="en"/> <sysproperty key="javax.xml.parsers.DocumentBuilderFactory" value="org.apache.xerces.jaxp.DocumentBuilderFactoryImpl"/> <sysproperty key="javax.xml.parsers.SAXParserFactory" value="org.apache.xerces.jaxp.SAXParserFactoryImpl"/> + <arg value="-fo"/> <arg value="${file.absolutePath}"/> <arg value="-pdf"/> |
From: Carlos S. <car...@us...> - 2005-01-01 23:59:29
|
carlossg 05/01/01 15:59:22 Modified: sdocbook plugin.jelly Log: Fixed typo Revision Changes Path 1.11 +1 -1 maven-plugins/sdocbook/plugin.jelly Index: plugin.jelly =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/plugin.jelly,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- plugin.jelly 1 Jan 2005 20:54:37 -0000 1.10 +++ plugin.jelly 1 Jan 2005 23:59:21 -0000 1.11 @@ -186,7 +186,7 @@ prereqs="sdocbook:prepare-filesystem" description="Generate FO for all docbooks in ${maven.sdocbook.src.dir}"> - <!-- create target directory for generated HTML --> + <!-- create target directory for generated FO --> <mkdir dir="${maven.sdocbook.generated.fo}"/> <!-- determine if entity-resolver is requested --> |
From: Carlos S. <car...@us...> - 2005-01-05 21:51:34
|
carlossg 05/01/05 13:51:28 Modified: sdocbook plugin.jelly Log: Reordered goals Revision Changes Path 1.13 +34 -34 maven-plugins/sdocbook/plugin.jelly Index: plugin.jelly =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/plugin.jelly,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- plugin.jelly 5 Jan 2005 21:47:43 -0000 1.12 +++ plugin.jelly 5 Jan 2005 21:51:27 -0000 1.13 @@ -22,40 +22,6 @@ </goal> <!-- ================================================================== --> - <!-- P R E P A R E F I L E S Y S T E M --> - <!-- ================================================================== --> - - <goal name="sdocbook:prepare-filesystem"> - - <attainGoal name="xdoc:init"/> - - <!-- create target directory for generated documentation --> - <mkdir dir="${maven.sdocbook.target.dir}"/> - - <!-- get source docbook files --> - <fileScanner var="scanner"> - <fileset dir="${maven.sdocbook.src.dir}"> - <util:tokenize var="files" delim=",">${maven.sdocbook.files}</util:tokenize> - <j:forEach var="file" items="${files}"> - <include name="${file}"/> - </j:forEach> - </fileset> - </fileScanner> - - <j:set var="unzipped" value="false" /> - <util:available file="${maven.sdocbook.stylesheets.dir}"> - <j:set var="unzipped" value="true" /> - <echo>Using previusly unzipped docbook stylesheets in ${maven.sdocbook.stylesheets.dir}</echo> - </util:available> - <j:if test="${!unzipped}"> - <!-- unzip docbook files --> - <ant:unzip dest="${maven.sdocbook.stylesheets.dir}/.." - src="${docbookZipPath}"/> - </j:if> - - </goal> - - <!-- ================================================================== --> <!-- I N I T --> <!-- ================================================================== --> @@ -113,6 +79,40 @@ </goal> <!-- ================================================================== --> + <!-- P R E P A R E F I L E S Y S T E M --> + <!-- ================================================================== --> + + <goal name="sdocbook:prepare-filesystem"> + + <attainGoal name="xdoc:init"/> + + <!-- create target directory for generated documentation --> + <mkdir dir="${maven.sdocbook.target.dir}"/> + + <!-- get source docbook files --> + <fileScanner var="scanner"> + <fileset dir="${maven.sdocbook.src.dir}"> + <util:tokenize var="files" delim=",">${maven.sdocbook.files}</util:tokenize> + <j:forEach var="file" items="${files}"> + <include name="${file}"/> + </j:forEach> + </fileset> + </fileScanner> + + <j:set var="unzipped" value="false" /> + <util:available file="${maven.sdocbook.stylesheets.dir}"> + <j:set var="unzipped" value="true" /> + <echo>Using previusly unzipped docbook stylesheets in ${maven.sdocbook.stylesheets.dir}</echo> + </util:available> + <j:if test="${!unzipped}"> + <!-- unzip docbook files --> + <ant:unzip dest="${maven.sdocbook.stylesheets.dir}/.." + src="${docbookZipPath}"/> + </j:if> + + </goal> + + <!-- ================================================================== --> <!-- G E N E R A T E H T M L --> <!-- ================================================================== --> |
From: Carlos S. <car...@us...> - 2005-01-05 22:08:20
|
carlossg 05/01/05 14:08:13 Modified: sdocbook plugin.jelly Log: Fixed maven.sdocbook.stylesheets.version Revision Changes Path 1.14 +1 -1 maven-plugins/sdocbook/plugin.jelly Index: plugin.jelly =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/plugin.jelly,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- plugin.jelly 5 Jan 2005 21:51:27 -0000 1.13 +++ plugin.jelly 5 Jan 2005 22:08:13 -0000 1.14 @@ -29,7 +29,7 @@ <maven:get plugin="maven-sdocbook-plugin" property="plugin" var="sdocbookPlugin" /> <j:set var="maven.sdocbook.stylesheets.version" - value="${sdocbookPlugin.pom.getDependency('docbook:docbook-xsl').version}"/> + value="${sdocbookPlugin.getDependency('docbook:docbook-xsl').version}"/> <!-- get docbook stylesheets and unzip them if needed --> <j:set var="docbookZipPath" value="${pom.getDependencyPath('docbook:docbook-xsl')}"/> |
From: Carlos S. <car...@us...> - 2005-01-08 22:07:53
|
carlossg 05/01/08 14:07:47 Modified: sdocbook plugin.jelly Log: Fixed scanner Revision Changes Path 1.16 +2 -2 maven-plugins/sdocbook/plugin.jelly Index: plugin.jelly =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/plugin.jelly,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- plugin.jelly 8 Jan 2005 19:24:05 -0000 1.15 +++ plugin.jelly 8 Jan 2005 22:07:46 -0000 1.16 @@ -241,7 +241,7 @@ <include name="**/*.xml, **/*.sgml"/> </fileset> </copy> - <fileScanner var="scanner"> + <fileScanner var="generatedScanner"> <fileset dir="${maven.sdocbook.generated}"> <util:tokenize var="files" delim=",">${maven.sdocbook.files}</util:tokenize> <j:forEach var="file" items="${files}"> @@ -250,7 +250,7 @@ </fileset> </fileScanner> - <j:forEach var="file" items="${scanner.iterator()}"> + <j:forEach var="file" items="${generatedScanner.iterator()}"> <attainGoal name="sdocbook:transform"/> |
From: Carlos S. <car...@us...> - 2005-02-13 15:33:20
|
carlossg 05/02/13 07:33:13 Modified: sdocbook plugin.jelly Log: Revision Changes Path 1.17 +2 -1 maven-plugins/sdocbook/plugin.jelly Index: plugin.jelly =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/plugin.jelly,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- plugin.jelly 8 Jan 2005 22:07:46 -0000 1.16 +++ plugin.jelly 13 Feb 2005 15:33:13 -0000 1.17 @@ -238,7 +238,8 @@ <!-- copy source docbook files to dest --> <copy todir="${maven.sdocbook.generated}" filtering="no"> <fileset dir="${maven.sdocbook.src.dir}"> - <include name="**/*.xml, **/*.sgml"/> + <include name="**/*.xml"/> + <include name="**/*.sgml"/> </fileset> </copy> <fileScanner var="generatedScanner"> |
From: Carlos S. <car...@us...> - 2005-08-01 21:52:21
|
carlossg 05/08/01 14:52:14 Modified: sdocbook plugin.jelly Log: Use maven.sdocbook.files instead of hardcoded patterns Revision Changes Path 1.19 +1 -4 maven-plugins/sdocbook/plugin.jelly Index: plugin.jelly =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/plugin.jelly,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- plugin.jelly 1 Aug 2005 18:21:32 -0000 1.18 +++ plugin.jelly 1 Aug 2005 21:52:14 -0000 1.19 @@ -232,10 +232,7 @@ <!-- copy source docbook files to dest --> <copy todir="${maven.sdocbook.generated}" filtering="no"> - <fileset dir="${maven.sdocbook.src.dir}"> - <include name="**/*.xml"/> - <include name="**/*.sgml"/> - </fileset> + <fileset dir="${maven.sdocbook.src.dir}" includes="${maven.sdocbook.files}"/> </copy> <fileScanner var="generatedScanner"> <fileset dir="${maven.sdocbook.generated}" includes="${maven.sdocbook.files}"/> |