From: Per O. <per...@us...> - 2004-03-17 22:40:19
|
perolesen 04/03/17 14:30:50 Modified: sdocbook/xdocs changes.xml Log: Added description of changes in 1.4 so far Revision Changes Path 1.3 +19 -0 maven-plugins/sdocbook/xdocs/changes.xml Index: changes.xml =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/xdocs/changes.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- changes.xml 17 Oct 2003 18:53:25 -0000 1.2 +++ changes.xml 17 Mar 2004 22:30:50 -0000 1.3 @@ -7,6 +7,25 @@ <body> + <release version="1.4" date=""> + <action dev="polesen" type="add"> + 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. + </action> + <action dev="polesen" type="add"> + Added the xalan25 extensions jar from stylesheet distribution to be able + to use the stylesheet extensions. + </action> + <action dev="polesen" type="add"> + Added possibility to set the stylesheet params. + </action> + <action dev="polesen" type="add"> + Added copying of external resources like images, which the target output + references externally (e.g. a HTML output which includes a IMG tag). + </action> + </release> + <release version="1.3" date="2003-10-17"> <action dev="wdsgoe" type="add"> Added on more example files |
From: Per O. <per...@us...> - 2004-04-12 11:11:37
|
perolesen 04/04/12 03:57:51 Modified: sdocbook/xdocs changes.xml Log: added change on docs Revision Changes Path 1.4 +7 -1 maven-plugins/sdocbook/xdocs/changes.xml Index: changes.xml =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/xdocs/changes.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- changes.xml 17 Mar 2004 22:30:50 -0000 1.3 +++ changes.xml 12 Apr 2004 10:57:51 -0000 1.4 @@ -3,11 +3,17 @@ <properties> <title>Changes</title> <author email="sie...@it...">Siegfried Goeschl</author> + <author email="po...@no...">Per Olesen</author> </properties> <body> - <release version="1.4" date=""> + <!-- @todo update release date of 1.4 when actually releasing --> + <release version="1.4" date="not-released"> + <action dev="polesen" type="update"> + Update of documentation to include description of the new properties, + how to set stylesheet parameters, how to update to use newer stylesheets etc. + </action> <action dev="polesen" type="add"> The docbook DTDs are huge and take time to resolve externally. Added the EntityResolver from xml-commons and added properties to be |
From: Carlos S. <car...@us...> - 2004-12-19 13:33:44
|
carlossg 04/12/19 05:33:37 Modified: sdocbook/xdocs changes.xml Log: Allow using new stylesheet versions as dependencies in POM Revision Changes Path 1.7 +3 -0 maven-plugins/sdocbook/xdocs/changes.xml Index: changes.xml =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/xdocs/changes.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- changes.xml 11 Dec 2004 23:03:37 -0000 1.6 +++ changes.xml 19 Dec 2004 13:33:37 -0000 1.7 @@ -10,6 +10,9 @@ <release version="1.4-SNAPSHOT" date="in CVS"> <action dev="carlossg" type="add"> + Allow using new stylesheet versions as dependencies in POM. + </action> + <action dev="carlossg" type="add"> Added documentation to use custom stylesheets. </action> <action dev="carlossg" type="fix"> |
From: Carlos S. <car...@us...> - 2005-01-01 20:54:45
|
carlossg 05/01/01 12:54:38 Modified: sdocbook plugin.jelly sdocbook/xdocs changes.xml Log: Don't flatten resources when copying Revision Changes Path 1.10 +2 -2 maven-plugins/sdocbook/plugin.jelly Index: plugin.jelly =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/plugin.jelly,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- plugin.jelly 1 Jan 2005 20:39:20 -0000 1.9 +++ plugin.jelly 1 Jan 2005 20:54:37 -0000 1.10 @@ -171,7 +171,7 @@ <!-- 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"> + <copy todir="${maven.sdocbook.target.dir}" filtering="no" flatten="false"> <fileset dir="${maven.sdocbook.src.dir}" includes="${resources}"/> </copy> </j:if> @@ -260,7 +260,7 @@ <!-- 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"> + <copy todir="${maven.sdocbook.generated.fo}" filtering="no" flatten="false"> <fileset dir="${maven.sdocbook.src.dir}" includes="${resources}"/> </copy> </j:if> 1.11 +3 -0 maven-plugins/sdocbook/xdocs/changes.xml Index: changes.xml =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/xdocs/changes.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- changes.xml 1 Jan 2005 20:39:13 -0000 1.10 +++ changes.xml 1 Jan 2005 20:54:37 -0000 1.11 @@ -9,6 +9,9 @@ <body> <release version="1.4.1-SNAPSHOT" date="in CVS"> + <action dev="carlossg" type="fix"> + Don't flatten resources when copying. + </action> <action dev="carlossg" type="add"> Added maven.sdocbook.files property. </action> |
From: Carlos S. <car...@us...> - 2005-01-08 22:41:10
|
carlossg 05/01/08 14:41:02 Modified: sdocbook project.xml sdocbook/xdocs changes.xml Log: [maven-scm-plugin] prepare release 1.4.1 Revision Changes Path 1.28 +34 -33 maven-plugins/sdocbook/project.xml Index: project.xml =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/project.xml,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- project.xml 1 Jan 2005 20:39:20 -0000 1.27 +++ project.xml 8 Jan 2005 22:41:01 -0000 1.28 @@ -1,18 +1,20 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> +<?xml version="1.0" encoding="UTF-8"?> + <project> <extend>../plugin-project.xml</extend> <!--pomVersion is in parent --> + <artifactId>maven-sdocbook-plugin</artifactId> <name>SDocBook Plug-in</name> <!-- groupId is in parent --> - <currentVersion>1.4.1-SNAPSHOT</currentVersion> + + <currentVersion>1.4.1</currentVersion> <!-- organization is in parent --> + <inceptionYear>2002</inceptionYear> <!-- package, logo are in parent. no gumpRepositoryId --> - <description> - A plugin for DOCBOOK processing. Uses the DocBook Open Repository project XSL stylesheets to - process DocBook XML sources into different output formats. - </description> + + <description>A plugin for DOCBOOK processing. Uses the DocBook Open Repository project XSL stylesheets to process DocBook XML sources into different output formats.</description> <shortDescription>MAVEN Plug-in for DOCBOOK</shortDescription> <!-- issueTrackingUrl, siteAddress are in parent --> @@ -21,7 +23,6 @@ <developerConnection>scm:cvs:ext:${maven.username}@cvs.sourceforge.net:/cvsroot/maven-plugins:maven-plugins/sdocbook</developerConnection> <url>http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/maven-plugins/maven-plugins/sdocbook/</url> </repository> - <versions> <version> <id>1.4</id> @@ -33,11 +34,13 @@ <name>1.3</name> <tag>maven-sdocbook-plugin-1-3-0</tag> </version> + <version> + <id>1.4.1</id> + <name>1.4.1</name> + <tag>maven-sdocbook-plugin-1-4-1</tag> + </version> </versions> - - <branches> - </branches> - + <branches></branches> <!-- mailingLists are in parent --> <developers> @@ -49,7 +52,7 @@ <roles> <role>SQA Consultant</role> </roles> - </developer> + </developer> <developer> <name>Per Olesen</name> <id>perolesen</id> @@ -60,7 +63,7 @@ </roles> <url>https://sourceforge.net/users/perolesen/</url> <timezone>+1</timezone> - </developer> + </developer> <developer> <name>Carlos Sanchez</name> <id>carlossg</id> @@ -69,12 +72,11 @@ <role>Developer</role> </roles> <timezone>+1</timezone> - </developer> + </developer> </developers> - <dependencies> - <!-- default docbook stylesheets --> + <dependency> <groupId>docbook</groupId> <artifactId>docbook-xsl</artifactId> @@ -82,38 +84,38 @@ <url>http://docbook.sourceforge.net</url> <type>zip</type> </dependency> - <dependency> <id>avalon-framework</id> <version>4.0</version> <url>http://avalon.apache.org/index.html</url> - </dependency> + </dependency> <dependency> <id>batik</id> <version>1.1.1</version> - <url>http://xml.apache.org/batik/index.html</url> - </dependency> - <dependency> + <url>http://xml.apache.org/batik/index.html</url> + </dependency> + <dependency> <id>fop</id> <version>0.20.5</version> - <url>http://xml.apache.org/fop/index.html</url> - </dependency> + <url>http://xml.apache.org/fop/index.html</url> + </dependency> <!-- if any of the jimi dependencies are updated remember to update ../maven-xml --> - <dependency> + + <dependency> <id>jimi</id> <version>1.0</version> - <url>http://java.sun.com/products/jimi/</url> - </dependency> - <dependency> + <url>http://java.sun.com/products/jimi/</url> + </dependency> + <dependency> <id>logkit</id> <version>1.0.1</version> <url>http://avalon.apache.org/logkit/index.html</url> - </dependency> + </dependency> <dependency> <id>xalan</id> <version>2.5.1</version> - <url>http://xml.apache.org/xalan-j/</url> - </dependency> + <url>http://xml.apache.org/xalan-j/</url> + </dependency> <dependency> <id>xerces</id> <version>2.3.0</version> @@ -123,12 +125,11 @@ <id>xml-apis</id> <version>1.0.b2</version> <url>http://xml.apache.org/xerces2-j/index.html</url> - </dependency> + </dependency> <dependency> <id>xml-resolver</id> <version>1.1</version> <url>http://xml.apache.org/dist/commons/</url> - </dependency> + </dependency> </dependencies> </project> - 1.13 +24 -78 maven-plugins/sdocbook/xdocs/changes.xml Index: changes.xml =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/xdocs/changes.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- changes.xml 1 Jan 2005 23:30:09 -0000 1.12 +++ changes.xml 8 Jan 2005 22:41:02 -0000 1.13 @@ -1,96 +1,42 @@ -<document> +<?xml version="1.0" encoding="UTF-8"?> +<document> <properties> <title>Changes</title> <author email="sie...@it...">Siegfried Goeschl</author> <author email="per...@us...">Per Olesen</author> </properties> - <body> - - <release version="1.4.1-SNAPSHOT" date="in CVS"> - <action dev="carlossg" type="add"> - Added **/*.jpg, **/*.css to maven.sdocbook.resources.include - </action> - <action dev="carlossg" type="fix"> - Don't flatten resources when copying. - </action> - <action dev="carlossg" type="add"> - Added maven.sdocbook.files property. - </action> - <action dev="carlossg" type="fix"> - Stylesheet version used may have not been already downloaded. - </action> + <release version="1.4.1" date="2005-01-08"> + <action dev="carlossg" type="add">Added **/*.jpg, **/*.css to maven.sdocbook.resources.include</action> + <action dev="carlossg" type="fix">Don't flatten resources when copying.</action> + <action dev="carlossg" type="add">Added maven.sdocbook.files property.</action> + <action dev="carlossg" type="fix">Stylesheet version used may have not been already downloaded.</action> </release> <release version="1.4" date="2004-12-31"> - <action dev="carlossg" type="add"> - Added properties maven.sdocbook.html.xsl and maven.sdocbook.fo.xsl. - </action> - <action dev="carlossg" type="add"> - Allow using new stylesheet versions as dependencies in POM. - </action> - <action dev="carlossg" type="add"> - Added documentation to use custom stylesheets. - </action> - <action dev="carlossg" type="fix"> - Fail on transformation errors. - </action> - <action dev="perolesen" type="update"> - Update of documentation to include description of the new properties, - how to set stylesheet parameters, how to update to use newer stylesheets etc. - </action> - <action dev="perolesen" type="add"> - 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. - </action> - <action dev="perolesen" type="add"> - Added the xalan25 extensions jar from stylesheet distribution to be able - to use the stylesheet extensions. - </action> - <action dev="perolesen" type="add"> - Added possibility to set the stylesheet params. - </action> - <action dev="perolesen" type="add"> - Added copying of external resources like images, which the target output - references externally (e.g. a HTML output which includes a IMG tag). - </action> + <action dev="carlossg" type="add">Added properties maven.sdocbook.html.xsl and maven.sdocbook.fo.xsl.</action> + <action dev="carlossg" type="add">Allow using new stylesheet versions as dependencies in POM.</action> + <action dev="carlossg" type="add">Added documentation to use custom stylesheets.</action> + <action dev="carlossg" type="fix">Fail on transformation errors.</action> + <action dev="perolesen" type="update">Update of documentation to include description of the new properties, how to set stylesheet parameters, how to update to use newer stylesheets etc.</action> + <action dev="perolesen" type="add">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.</action> + <action dev="perolesen" type="add">Added the xalan25 extensions jar from stylesheet distribution to be able to use the stylesheet extensions.</action> + <action dev="perolesen" type="add">Added possibility to set the stylesheet params.</action> + <action dev="perolesen" type="add">Added copying of external resources like images, which the target output references externally (e.g. a HTML output which includes a IMG tag).</action> </release> - <release version="1.3" date="2003-10-17"> - <action dev="wdsgoe" type="add"> - Added on more example files - </action> - <action dev="wdsgoe" type="add"> - Check if the source directory exists and quit if not - </action> - <action dev="wdsgoe" type="fix"> - Andy Jefferson fixed a few flaws in the project.xml - </action> + <action dev="wdsgoe" type="add">Added on more example files</action> + <action dev="wdsgoe" type="add">Check if the source directory exists and quit if not</action> + <action dev="wdsgoe" type="fix">Andy Jefferson fixed a few flaws in the project.xml</action> </release> - <release version="1.2" date="2003-08-26"> - <action dev="wdsgoe" type="update"> - Updated to newer JARs - </action> - <action dev="wdsgoe" type="update"> - Update to use version 1.61.3 of Open DocBook - </action> - <action dev="wdsgoe" type="fix"> - Pulling in all the XML related stuff in the Java boot classpath - to get it working with JDK 1,4 - </action> - <action dev="wdsgoe" type="update"> - Updated documentation - </action> + <action dev="wdsgoe" type="update">Updated to newer JARs</action> + <action dev="wdsgoe" type="update">Update to use version 1.61.3 of Open DocBook</action> + <action dev="wdsgoe" type="fix">Pulling in all the XML related stuff in the Java boot classpath to get it working with JDK 1,4</action> + <action dev="wdsgoe" type="update">Updated documentation</action> </release> - <release version="1.1" date="2003-08-19"> - <action dev="wdsgoe" type="update"> - Migrate from Maven B7 to Maven B10 - </action> + <action dev="wdsgoe" type="update">Migrate from Maven B7 to Maven B10</action> </release> - </body> - </document> |
From: Carlos S. <car...@us...> - 2005-01-08 22:42:36
|
carlossg 05/01/08 14:42:27 Modified: sdocbook/xdocs changes.xml Log: Added sdocbook:generate-htmlchunk goal Revision Changes Path 1.14 +1 -0 maven-plugins/sdocbook/xdocs/changes.xml Index: changes.xml =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/xdocs/changes.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- changes.xml 8 Jan 2005 22:41:02 -0000 1.13 +++ changes.xml 8 Jan 2005 22:42:27 -0000 1.14 @@ -8,6 +8,7 @@ </properties> <body> <release version="1.4.1" date="2005-01-08"> + <action dev="carlossg" type="add">Added sdocbook:generate-htmlchunk goal</action> <action dev="carlossg" type="add">Added **/*.jpg, **/*.css to maven.sdocbook.resources.include</action> <action dev="carlossg" type="fix">Don't flatten resources when copying.</action> <action dev="carlossg" type="add">Added maven.sdocbook.files property.</action> |
From: Carlos S. <car...@us...> - 2005-01-10 21:58:48
|
carlossg 05/01/10 13:58:42 Modified: sdocbook plugin.properties project.xml sdocbook/xdocs changes.xml Log: Generate xhtml instead of html Revision Changes Path 1.11 +2 -2 maven-plugins/sdocbook/plugin.properties Index: plugin.properties =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/plugin.properties,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- plugin.properties 8 Jan 2005 19:24:05 -0000 1.10 +++ plugin.properties 10 Jan 2005 21:58:41 -0000 1.11 @@ -22,13 +22,13 @@ maven.sdocbook.resources.include = **/*.png, **/*.gif, **/*.jpg, **/*.css # stylesheet to use for html transformation -maven.sdocbook.html.xsl = ${maven.sdocbook.stylesheets.dir}/html/docbook.xsl +maven.sdocbook.html.xsl = ${maven.sdocbook.stylesheets.dir}/xhtml/docbook.xsl # can be set to the "-param ..." which user can use to parameterize the html stylesheets maven.sdocbook.html.params = # stylesheet to use for html chunk transformation -maven.sdocbook.htmlchunk.xsl = ${maven.sdocbook.stylesheets.dir}/html/chunk.xsl +maven.sdocbook.htmlchunk.xsl = ${maven.sdocbook.stylesheets.dir}/xhtml/chunk.xsl # stylesheet to use for fo transformation maven.sdocbook.fo.xsl = ${maven.sdocbook.stylesheets.dir}/fo/docbook.xsl 1.29 +1 -1 maven-plugins/sdocbook/project.xml Index: project.xml =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/project.xml,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- project.xml 8 Jan 2005 22:41:01 -0000 1.28 +++ project.xml 10 Jan 2005 21:58:41 -0000 1.29 @@ -8,7 +8,7 @@ <name>SDocBook Plug-in</name> <!-- groupId is in parent --> - <currentVersion>1.4.1</currentVersion> + <currentVersion>1.4.2-SNAPSHOT</currentVersion> <!-- organization is in parent --> <inceptionYear>2002</inceptionYear> 1.15 +3 -0 maven-plugins/sdocbook/xdocs/changes.xml Index: changes.xml =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/xdocs/changes.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- changes.xml 8 Jan 2005 22:42:27 -0000 1.14 +++ changes.xml 10 Jan 2005 21:58:42 -0000 1.15 @@ -7,6 +7,9 @@ <author email="per...@us...">Per Olesen</author> </properties> <body> + <release version="1.4.2-SNAPSHOT" date="in CVS"> + <action dev="carlossg" type="update">Generate xhtml instead of html</action> + </release> <release version="1.4.1" date="2005-01-08"> <action dev="carlossg" type="add">Added sdocbook:generate-htmlchunk goal</action> <action dev="carlossg" type="add">Added **/*.jpg, **/*.css to maven.sdocbook.resources.include</action> |
From: Carlos S. <car...@us...> - 2005-08-01 18:21:38
|
carlossg 05/08/01 11:21:32 Modified: sdocbook plugin.jelly sdocbook/xdocs changes.xml Log: maven.sdocbook.files property was not properly used Revision Changes Path 1.18 +2 -12 maven-plugins/sdocbook/plugin.jelly Index: plugin.jelly =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/plugin.jelly,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- plugin.jelly 13 Feb 2005 15:33:13 -0000 1.17 +++ plugin.jelly 1 Aug 2005 18:21:32 -0000 1.18 @@ -103,12 +103,7 @@ <!-- 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> + <fileset dir="${maven.sdocbook.src.dir}" includes="${maven.sdocbook.files}"/> </fileScanner> <j:set var="unzipped" value="false" /> @@ -243,12 +238,7 @@ </fileset> </copy> <fileScanner var="generatedScanner"> - <fileset dir="${maven.sdocbook.generated}"> - <util:tokenize var="files" delim=",">${maven.sdocbook.files}</util:tokenize> - <j:forEach var="file" items="${files}"> - <include name="${file}"/> - </j:forEach> - </fileset> + <fileset dir="${maven.sdocbook.generated}" includes="${maven.sdocbook.files}"/> </fileScanner> <j:forEach var="file" items="${generatedScanner.iterator()}"> 1.16 +1 -0 maven-plugins/sdocbook/xdocs/changes.xml Index: changes.xml =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/xdocs/changes.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- changes.xml 10 Jan 2005 21:58:42 -0000 1.15 +++ changes.xml 1 Aug 2005 18:21:32 -0000 1.16 @@ -8,6 +8,7 @@ </properties> <body> <release version="1.4.2-SNAPSHOT" date="in CVS"> + <action dev="carlossg" type="fix">maven.sdocbook.files property was not properly used</action> <action dev="carlossg" type="update">Generate xhtml instead of html</action> </release> <release version="1.4.1" date="2005-01-08"> |
From: Carlos S. <car...@us...> - 2005-08-30 16:23:15
|
carlossg 05/08/30 09:23:04 Modified: sdocbook plugin.jelly sdocbook/xdocs changes.xml Log: Source structure was not respected Revision Changes Path 1.20 +25 -5 maven-plugins/sdocbook/plugin.jelly Index: plugin.jelly =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/plugin.jelly,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- plugin.jelly 1 Aug 2005 21:52:14 -0000 1.19 +++ plugin.jelly 30 Aug 2005 16:23:04 -0000 1.20 @@ -189,10 +189,16 @@ <j:forEach var="file" items="${scanner.iterator()}"> - <!-- strip the extension from the file name --> - <j:set var="index" value="${file.name.lastIndexOf('.')}"/> - <j:set var="maven.sdocbook.out" value="${maven.sdocbook.generated}/${file.name.substring(0,index)}.html"/> + <!-- Extract the path component of the original file, relative to + maven.sdocbook.src.dir. --> + <j:set var="rfpath" value="${file.absolutePath.replaceFirst(context.getVariable('maven.sdocbook.src.dir'),'')}" /> + <j:set var="rdir" value="${rfpath.substring(0,rfpath.lastIndexOf('/'))}" /> + + <!-- create target hierarchy --> + <mkdir dir="${maven.sdocbook.generated}/${rdir}"/> + <j:set var="index" value="${file.name.lastIndexOf('.')}"/> + <j:set var="maven.sdocbook.out" value="${maven.sdocbook.generated}/${rdir}/${file.name.substring(0,index)}.html"/> <attainGoal name="sdocbook:transform"/> </j:forEach> @@ -279,9 +285,16 @@ <j:forEach var="file" items="${scanner.iterator()}"> + <!-- Extract the path component of the original file, relative to + maven.sdocbook.src.dir. --> + <j:set var="rfpath" value="${file.absolutePath.replaceFirst(context.getVariable('maven.sdocbook.src.dir'),'')}" /> + <j:set var="rdir" value="${rfpath.substring(0,rfpath.lastIndexOf('/'))}" /> + <!-- create target hierarchy --> + <mkdir dir="${maven.sdocbook.generated}/${rdir}"/> + <!-- strip the extension from the file name --> <j:set var="index" value="${file.name.lastIndexOf('.')}"/> - <j:set var="maven.sdocbook.out" value="${maven.sdocbook.generated}/${file.name.substring(0,index)}.fo"/> + <j:set var="maven.sdocbook.out" value="${maven.sdocbook.generated}/${rdir}/${file.name.substring(0,index)}.fo"/> <attainGoal name="sdocbook:transform"/> @@ -323,6 +336,13 @@ <j:set var="index" value="${file.name.lastIndexOf('.')}"/> <j:set var="basename" value="${file.name.substring(0,index)}"/> + <!-- Extract the path component of the original file, relative to + maven.sdocbook.generated.fo. --> + <j:set var="rfpath" value="${file.absolutePath.replaceFirst(context.getVariable('maven.sdocbook.generated.fo'),'')}" /> + <j:set var="rdir" value="${rfpath.substring(0,rfpath.lastIndexOf('/'))}" /> + <!-- create target hierarchy --> + <mkdir dir="${maven.sdocbook.generated.pdf}/${rdir}"/> + <!-- Run FOP to transform FO into PDF --> <java classname="org.apache.fop.apps.Fop" fork="yes" failonerror="true"> <jvmarg value="-Xbootclasspath/p:${_bootclasspath}"/> @@ -340,7 +360,7 @@ <arg value="-fo"/> <arg value="${file.absolutePath}"/> <arg value="-pdf"/> - <arg value="${maven.sdocbook.generated.pdf}/${basename}.pdf"/> + <arg value="${maven.sdocbook.generated.pdf}/${rdir}/${basename}.pdf"/> </java> </j:forEach> 1.17 +1 -0 maven-plugins/sdocbook/xdocs/changes.xml Index: changes.xml =================================================================== RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/xdocs/changes.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- changes.xml 1 Aug 2005 18:21:32 -0000 1.16 +++ changes.xml 30 Aug 2005 16:23:04 -0000 1.17 @@ -8,6 +8,7 @@ </properties> <body> <release version="1.4.2-SNAPSHOT" date="in CVS"> + <action dev="carlossg" type="fix" due-to="Julian C. Dunn" issue="1182778">Source structure was not respected</action> <action dev="carlossg" type="fix">maven.sdocbook.files property was not properly used</action> <action dev="carlossg" type="update">Generate xhtml instead of html</action> </release> |