Menu
▾
▴
[Maven-plugins-cvs] cvs commit: maven-plugins/sdocbook plugin.jelly plugin.properties project.xml
|
From: Carlos S. <car...@us...> - 2005-01-01 20:39:28
|
carlossg 05/01/01 12:39:21
Modified: sdocbook/xdocs properties.xml changes.xml
sdocbook plugin.jelly plugin.properties project.xml
Log:
Added maven.sdocbook.files property
Fixed stylesheet version
Revision Changes Path
1.6 +10 -0 maven-plugins/sdocbook/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/xdocs/properties.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- properties.xml 21 Dec 2004 22:58:41 -0000 1.5
+++ properties.xml 1 Jan 2005 20:39:13 -0000 1.6
@@ -21,6 +21,16 @@
</tr>
<tr>
+ <td>maven.sdocbook.files</td>
+ <td>No</td>
+ <td>
+ The docbook sources that will be transformed. Set this if you use entities to avoid transformation
+ of every of them.
+ It defaults to **/*.xml, **/*.sgml
+ </td>
+ </tr>
+
+ <tr>
<td>maven.sdocbook.resources.include</td>
<td>No</td>
<td>
1.10 +9 -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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- changes.xml 30 Dec 2004 23:53:49 -0000 1.9
+++ changes.xml 1 Jan 2005 20:39:13 -0000 1.10
@@ -8,7 +8,15 @@
<body>
- <release version="1.4" date="in CVS">
+ <release version="1.4.1-SNAPSHOT" date="in CVS">
+ <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>
1.9 +13 -11 maven-plugins/sdocbook/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/plugin.jelly,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- plugin.jelly 21 Dec 2004 22:58:41 -0000 1.8
+++ plugin.jelly 1 Jan 2005 20:39:20 -0000 1.9
@@ -31,6 +31,17 @@
<!-- 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>
+
+ <!-- get docbook stylesheets and unzip them if needed -->
<j:set var="docbookZipPath" value="${pom.getDependencyPath('docbook:docbook-xsl')}"/>
<j:if test="${docbookZipPath == null}">
<echo>Using default stylesheets</echo>
@@ -65,6 +76,7 @@
<echo>PathSeperator = ${_sep}</echo>
<echo>bootclasspath = ${_bootclasspath}</echo>
<echo>maven.sdocbook.src.dir = ${maven.sdocbook.src.dir}</echo>
+ <echo>maven.sdocbook.files = ${maven.sdocbook.files}</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>
@@ -92,11 +104,6 @@
<!-- create target directory for generated HTML -->
<mkdir dir="${maven.sdocbook.generated.html}"/>
- <!-- get all *.xml and *.sgml -->
- <fileScanner var="scanner">
- <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'}">
@@ -182,11 +189,6 @@
<!-- create target directory for generated HTML -->
<mkdir dir="${maven.sdocbook.generated.fo}"/>
- <!-- get all *.xml and *.sgml -->
- <fileScanner var="scanner">
- <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'}">
@@ -263,7 +265,7 @@
</copy>
</j:if>
- <!-- get all *.xml and *.sgml -->
+ <!-- get generated fo files -->
<fileScanner var="scanner">
<fileset dir="${maven.sdocbook.generated.fo}" includes="**/*.fo"/>
</fileScanner>
1.7 +3 -1 maven-plugins/sdocbook/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/plugin.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- plugin.properties 21 Dec 2004 22:58:42 -0000 1.6
+++ plugin.properties 1 Jan 2005 20:39:20 -0000 1.7
@@ -11,7 +11,7 @@
maven.sdocbook.target.dir = ${maven.build.dir}/docs/docbook
# version should be the same as in the plugin POM
-maven.sdocbook.stylesheets.version = 1.66.1
+maven.sdocbook.stylesheets.version = 1.67.2
# the root dir of the stylesheet to use (defaults to version in plugin POM)
#maven.sdocbook.stylesheets.dir = ${plugin.dir}/plugin-resources/docbook-xsl-${maven.sdocbook.stylesheets.version}
# default stylesheets zip path
@@ -32,6 +32,8 @@
# can be set to the "-param ..." which user can use to parameterize the fo stylesheets
maven.sdocbook.fo.params =
+# files to transform
+maven.sdocbook.files = **/*.xml, **/*.sgml
# set this to true if you want to use xml-commons-resolver for resolving the dtd elements
maven.sdocbook.use.entityresolver=false
1.27 +1 -1 maven-plugins/sdocbook/project.xml
Index: project.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/sdocbook/project.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- project.xml 30 Dec 2004 23:53:49 -0000 1.26
+++ project.xml 1 Jan 2005 20:39:20 -0000 1.27
@@ -5,7 +5,7 @@
<artifactId>maven-sdocbook-plugin</artifactId>
<name>SDocBook Plug-in</name>
<!-- groupId is in parent -->
- <currentVersion>1.4</currentVersion>
+ <currentVersion>1.4.1-SNAPSHOT</currentVersion>
<!-- organization is in parent -->
<inceptionYear>2002</inceptionYear>
<!-- package, logo are in parent. no gumpRepositoryId -->
|
