From e66dc526955342b511417a3fb1a86670f15e0485 Mon Sep 17 00:00:00 2001
From: michal <michal@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 15 May 2003 12:56:27 +0000
Subject: [PATCH] Fix for Maven-383

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113421 13f79535-47bb-0310-9956-ffa450edef68
---
 xdoc/plugin.jelly                                      | 8 ++++++++
 xdoc/src/plugin-resources/templates/cvs-usage.xml      | 2 +-
 xdoc/src/plugin-resources/templates/dependencies.xml   | 2 +-
 xdoc/src/plugin-resources/templates/index.xml          | 2 +-
 xdoc/src/plugin-resources/templates/issue-tracking.xml | 2 +-
 xdoc/src/plugin-resources/templates/mail-lists.xml     | 2 +-
 xdoc/src/plugin-resources/templates/maven-reports.xml  | 2 +-
 xdoc/src/plugin-resources/templates/project-info.xml   | 2 +-
 xdoc/src/plugin-resources/templates/team-list.xml      | 2 +-
 xdoc/xdocs/changes.xml                                 | 5 +++++
 10 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/xdoc/plugin.jelly b/xdoc/plugin.jelly
index e307c6cf..1064de8c 100644
--- a/xdoc/plugin.jelly
+++ b/xdoc/plugin.jelly
@@ -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}"
diff --git a/xdoc/src/plugin-resources/templates/cvs-usage.xml b/xdoc/src/plugin-resources/templates/cvs-usage.xml
index c4fbe1a8..5de2d9b6 100644
--- a/xdoc/src/plugin-resources/templates/cvs-usage.xml
+++ b/xdoc/src/plugin-resources/templates/cvs-usage.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="$encoding" ?>
 <document>
   
   
diff --git a/xdoc/src/plugin-resources/templates/dependencies.xml b/xdoc/src/plugin-resources/templates/dependencies.xml
index ee27c792..5cd72ec2 100644
--- a/xdoc/src/plugin-resources/templates/dependencies.xml
+++ b/xdoc/src/plugin-resources/templates/dependencies.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="$encoding" ?>
 <document>
 
   <properties>
diff --git a/xdoc/src/plugin-resources/templates/index.xml b/xdoc/src/plugin-resources/templates/index.xml
index 44cbe2b0..dc969ad0 100644
--- a/xdoc/src/plugin-resources/templates/index.xml
+++ b/xdoc/src/plugin-resources/templates/index.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="$encoding" ?>
 <document>
 
   <properties>
diff --git a/xdoc/src/plugin-resources/templates/issue-tracking.xml b/xdoc/src/plugin-resources/templates/issue-tracking.xml
index aae6ba7c..eb3ee955 100644
--- a/xdoc/src/plugin-resources/templates/issue-tracking.xml
+++ b/xdoc/src/plugin-resources/templates/issue-tracking.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="$encoding" ?>
 <document>
   
   <properties>
diff --git a/xdoc/src/plugin-resources/templates/mail-lists.xml b/xdoc/src/plugin-resources/templates/mail-lists.xml
index 82772850..df129b05 100644
--- a/xdoc/src/plugin-resources/templates/mail-lists.xml
+++ b/xdoc/src/plugin-resources/templates/mail-lists.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="$encoding" ?>
 
 #macro (displayLink $label $link)
 <td>
diff --git a/xdoc/src/plugin-resources/templates/maven-reports.xml b/xdoc/src/plugin-resources/templates/maven-reports.xml
index 43e75e0b..f773c5cd 100644
--- a/xdoc/src/plugin-resources/templates/maven-reports.xml
+++ b/xdoc/src/plugin-resources/templates/maven-reports.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="$encoding" ?>
 <document>
 
   <properties>
diff --git a/xdoc/src/plugin-resources/templates/project-info.xml b/xdoc/src/plugin-resources/templates/project-info.xml
index fc0e84da..9f667239 100644
--- a/xdoc/src/plugin-resources/templates/project-info.xml
+++ b/xdoc/src/plugin-resources/templates/project-info.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="$encoding" ?>
 <document>
 
   <properties>
diff --git a/xdoc/src/plugin-resources/templates/team-list.xml b/xdoc/src/plugin-resources/templates/team-list.xml
index 4d6cfbfc..66bca94e 100644
--- a/xdoc/src/plugin-resources/templates/team-list.xml
+++ b/xdoc/src/plugin-resources/templates/team-list.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
+<?xml version="1.0" encoding="$encoding" ?>
 <document>
 
   <properties>
diff --git a/xdoc/xdocs/changes.xml b/xdoc/xdocs/changes.xml
index d19e64db..e721ae50 100644
--- a/xdoc/xdocs/changes.xml
+++ b/xdoc/xdocs/changes.xml
@@ -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>