You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by ev...@apache.org on 2003/02/25 12:50:55 UTC
cvs commit: jakarta-turbine-maven/src/plugins-build/vdoclet/src/main/org/apache/maven/vdoclet VDocletBean.java
evenisse 2003/02/25 03:50:54
Modified: src/plugins-build/tasklist plugin.jelly
src/plugins-build/tasklist/src/plugin-resources/templates
tasklist.vm
src/plugins-build/vdoclet plugin.jelly
src/plugins-build/vdoclet/src/main/org/apache/maven/vdoclet
VDocletBean.java
Log:
Add encoding support for tasklist
Revision Changes Path
1.5 +3 -0 jakarta-turbine-maven/src/plugins-build/tasklist/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/tasklist/plugin.jelly,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin.jelly 23 Feb 2003 15:57:06 -0000 1.4
+++ plugin.jelly 25 Feb 2003 11:50:54 -0000 1.5
@@ -30,6 +30,8 @@
<j:set var="genDocs"
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.gen.docs')}"/>
+ <j:set var="encoding"
+ value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.docs.outputencoding')}"/>
<j:if test="${sourcesPresent == 'true'}">
@@ -40,6 +42,7 @@
destDir="${genDocs}"
template="plugin-resources/templates/tasklist.vm"
outputFile="task-list.xml"
+ encoding="${encoding}"
/>
</j:if>
1.3 +1 -1 jakarta-turbine-maven/src/plugins-build/tasklist/src/plugin-resources/templates/tasklist.vm
Index: tasklist.vm
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/tasklist/src/plugin-resources/templates/tasklist.vm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tasklist.vm 18 Feb 2003 09:58:15 -0000 1.2
+++ tasklist.vm 25 Feb 2003 11:50:54 -0000 1.3
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="$encoding"?>
<document>
<properties>
1.2 +1 -0 jakarta-turbine-maven/src/plugins-build/vdoclet/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/vdoclet/plugin.jelly,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- plugin.jelly 24 Jan 2003 03:46:23 -0000 1.1
+++ plugin.jelly 25 Feb 2003 11:50:54 -0000 1.2
@@ -16,6 +16,7 @@
destDir="${destDir}"
template="${template}"
outputFile="${outputFile}"
+ encoding="${encoding}"
/>
</define:tag>
</define:taglib>
1.2 +16 -1 jakarta-turbine-maven/src/plugins-build/vdoclet/src/main/org/apache/maven/vdoclet/VDocletBean.java
Index: VDocletBean.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/vdoclet/src/main/org/apache/maven/vdoclet/VDocletBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VDocletBean.java 24 Jan 2003 03:46:23 -0000 1.1
+++ VDocletBean.java 25 Feb 2003 11:50:54 -0000 1.2
@@ -25,9 +25,12 @@
/** control template */
String template;
+ /** encoding */
+ String encoding;
+
/** verbose flag */
boolean verbose = false;
-
+
/** docinfo */
DocInfo docInfo;
@@ -62,6 +65,14 @@
{
this.template = template;
}
+
+ /**
+ * encoding attribute
+ */
+ public void setEncoding(String encoding)
+ {
+ this.encoding = encoding;
+ }
/**
* Description of the Method
@@ -114,6 +125,10 @@
Generator generator = new Generator(destDir);
generator.setAttribute("docInfo", docInfo);
+ if (encoding != null)
+ {
+ generator.setAttribute("encoding", encoding);
+ }
generator.eval(template, new FileWriter(new File(destDir, outputFile)));
}
}