You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by mi...@apache.org on 2003/05/15 14:56:27 UTC
cvs commit: maven/src/plugins-build/xdoc plugin.jelly
michal 2003/05/15 05:56:27
Modified: src/plugins-build/xdoc/src/plugin-resources/templates
project-info.xml cvs-usage.xml team-list.xml
index.xml dependencies.xml mail-lists.xml
maven-reports.xml issue-tracking.xml
src/plugins-build/xdoc/xdocs changes.xml
src/plugins-build/xdoc plugin.jelly
Log:
Fix for Maven-383
Revision Changes Path
1.3 +1 -1 maven/src/plugins-build/xdoc/src/plugin-resources/templates/project-info.xml
Index: project-info.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/xdoc/src/plugin-resources/templates/project-info.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project-info.xml 19 Mar 2003 06:01:19 -0000 1.2
+++ project-info.xml 15 May 2003 12:56:25 -0000 1.3
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="$encoding" ?>
<document>
<properties>
1.5 +1 -1 maven/src/plugins-build/xdoc/src/plugin-resources/templates/cvs-usage.xml
Index: cvs-usage.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/xdoc/src/plugin-resources/templates/cvs-usage.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cvs-usage.xml 30 Mar 2003 22:59:57 -0000 1.4
+++ cvs-usage.xml 15 May 2003 12:56:25 -0000 1.5
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="$encoding" ?>
<document>
1.5 +1 -1 maven/src/plugins-build/xdoc/src/plugin-resources/templates/team-list.xml
Index: team-list.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/xdoc/src/plugin-resources/templates/team-list.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- team-list.xml 18 Apr 2003 15:00:55 -0000 1.4
+++ team-list.xml 15 May 2003 12:56:25 -0000 1.5
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
+<?xml version="1.0" encoding="$encoding" ?>
<document>
<properties>
1.2 +1 -1 maven/src/plugins-build/xdoc/src/plugin-resources/templates/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/xdoc/src/plugin-resources/templates/index.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.xml 24 Jan 2003 03:45:03 -0000 1.1
+++ index.xml 15 May 2003 12:56:25 -0000 1.2
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="$encoding" ?>
<document>
<properties>
1.2 +1 -1 maven/src/plugins-build/xdoc/src/plugin-resources/templates/dependencies.xml
Index: dependencies.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/xdoc/src/plugin-resources/templates/dependencies.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dependencies.xml 24 Jan 2003 03:45:03 -0000 1.1
+++ dependencies.xml 15 May 2003 12:56:25 -0000 1.2
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="$encoding" ?>
<document>
<properties>
1.2 +1 -1 maven/src/plugins-build/xdoc/src/plugin-resources/templates/mail-lists.xml
Index: mail-lists.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/xdoc/src/plugin-resources/templates/mail-lists.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mail-lists.xml 24 Jan 2003 03:45:03 -0000 1.1
+++ mail-lists.xml 15 May 2003 12:56:25 -0000 1.2
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="$encoding" ?>
#macro (displayLink $label $link)
<td>
1.7 +1 -1 maven/src/plugins-build/xdoc/src/plugin-resources/templates/maven-reports.xml
Index: maven-reports.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/xdoc/src/plugin-resources/templates/maven-reports.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- maven-reports.xml 19 Mar 2003 05:54:18 -0000 1.6
+++ maven-reports.xml 15 May 2003 12:56:25 -0000 1.7
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="$encoding" ?>
<document>
<properties>
1.2 +1 -1 maven/src/plugins-build/xdoc/src/plugin-resources/templates/issue-tracking.xml
Index: issue-tracking.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/xdoc/src/plugin-resources/templates/issue-tracking.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- issue-tracking.xml 24 Jan 2003 03:45:03 -0000 1.1
+++ issue-tracking.xml 15 May 2003 12:56:25 -0000 1.2
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="$encoding" ?>
<document>
<properties>
1.3 +5 -0 maven/src/plugins-build/xdoc/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/xdoc/xdocs/changes.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- changes.xml 18 Feb 2003 13:12:32 -0000 1.2
+++ changes.xml 15 May 2003 12:56:26 -0000 1.3
@@ -7,6 +7,11 @@
<body>
<release version="1.3" date="in CVS">
+ <action dev="michal" type="add" due-to="Kuisong Tong">
+ Fix for Maven-383, target encoding can be set for files
+ generated from POM.
+ </action>
+
<action dev="dion" type="add">
Added a target to validate the navigation.xml files from the schema
</action>
1.28 +8 -0 maven/src/plugins-build/xdoc/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/xdoc/plugin.jelly,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- plugin.jelly 13 Apr 2003 15:08:12 -0000 1.27
+++ plugin.jelly 15 May 2003 12:56:27 -0000 1.28
@@ -353,6 +353,14 @@
<j:useBean var="escape" class="org.apache.velocity.anakia.Escape"/>
<j:useBean var="files" class="org.apache.velocity.texen.util.FileUtil"/>
+
+ <j:if test="${encoding == null}">
+ <j:set
+ var="encoding"
+ value="${maven.docs.outputencoding}"
+ />
+ </j:if>
+
<j:forEach var="pomDocument" items="${pomDocuments}">
<velocity:merge
name="${maven.gen.docs}/${pomDocument}"
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org