Fix for Maven-383

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113421 13f79535-47bb-0310-9956-ffa450edef68
2003-05-15 12:56:27 +00:00
1 parent 72471b9fc3
commit e66dc52695
@@ -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}"
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="$encoding" ?>
 <document>
  
  
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="$encoding" ?>
 <document>

  <properties>
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="$encoding" ?>
 <document>

  <properties>
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="$encoding" ?>
 <document>
  
  <properties>
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="$encoding" ?>

 #macro (displayLink $label $link)
 <td>
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="$encoding" ?>
 <document>

  <properties>
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="$encoding" ?>
 <document>

  <properties>
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
+<?xml version="1.0" encoding="$encoding" ?>
 <document>

  <properties>
@@ -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>