From 57f391b91bda1db44cd9d1ac8f4f47cd3f5f5cda Mon Sep 17 00:00:00 2001
From: evenisse <evenisse@13f79535-47bb-0310-9956-ffa450edef68>
Date: Mon, 29 Sep 2003 19:22:56 +0000
Subject: [PATCH] Fix MAVEN-866. Fix encoding.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@114123 13f79535-47bb-0310-9956-ffa450edef68
---
 multiproject/plugin.jelly                     | 25 +++++++++++++++----
 multiproject/project.xml                      | 12 ++++++++-
 .../dependency-convergence-report.xml         |  2 +-
 .../templates/navigation-aggregate.xml        |  2 +-
 .../templates/navigation-independent.xml      |  2 +-
 .../templates/projects-overview.xml           |  2 +-
 multiproject/xdocs/changes.xml                |  7 +++++-
 7 files changed, 41 insertions(+), 11 deletions(-)

diff --git a/multiproject/plugin.jelly b/multiproject/plugin.jelly
index ec04ce48..3a617fd5 100644
--- a/multiproject/plugin.jelly
+++ b/multiproject/plugin.jelly
@@ -107,12 +107,16 @@
     </j:forEach>
     
     <!-- generate navbar for project based on aggregate or independent -->    
+    <j:set var="encoding" value="${maven.docs.outputencoding}"/>
     <j:if test="${navType != ''}">
       <echo>Producing ${navType} navigation...</echo> 
       <velocity:merge 
         name="${maven.gen.docs}/navigation.xml"
         basedir="${maven.multiproject.templates}"
-        template="navigation-${navType}.xml"/>
+        template="navigation-${navType}.xml"
+        inputEncoding="${encoding}"
+        outputEncoding="${encoding}" 
+        />
     </j:if>
 
     <j:set var="userNav" value="${maven.docs.src}/navigation.xml" />
@@ -125,7 +129,10 @@
       <velocity:merge 
         name="${maven.gen.docs}/navigation.xml"
         basedir="${maven.docs.src}"
-        template="navigation.xml"/>
+        template="navigation.xml"
+        inputEncoding="${encoding}"
+        outputEncoding="${encoding}" 
+        />
     </j:if>
 
   </goal>
@@ -145,11 +152,15 @@
     <ant:echo>${file.parent} ${file.parent}</ant:echo>
     <ant:echo>create ${overviewPageCreate}</ant:echo>
     <j:if test="${overviewPageCreate=='true'}">      
+      <j:set var="encoding" value="${maven.docs.outputencoding}"/>
       <velocity:merge 
         name="${maven.gen.docs}/${overviewPageLink}.xml"
         basedir="${maven.multiproject.templates}"
-        template="projects-overview.xml"/>
-    </j:if>      
+        template="projects-overview.xml"
+        inputEncoding="${encoding}"
+        outputEncoding="${encoding}" 
+        />
+    </j:if>
  
   </goal>
 
@@ -318,10 +329,14 @@ maven -Dgoal=clean multiproject:goal</maven:param-check>
       <j:useBean var="harmonizer" class="org.apache.maven.multiproject.harmonizer.DependencyHarmonizer"/>
       ${harmonizer.build(reactorProjects)}
       
+      <j:set var="encoding" value="${maven.docs.outputencoding}"/>
       <velocity:merge 
         name="${maven.gen.docs}/dependency-convergence-report.xml"
         basedir="${plugin.resources}/templates"
-        template="dependency-convergence-report.xml"/>
+        template="dependency-convergence-report.xml"
+        inputEncoding="${encoding}"
+        outputEncoding="${encoding}" 
+        />
   </goal>
   
   
diff --git a/multiproject/project.xml b/multiproject/project.xml
index 9138a888..eaa7f841 100644
--- a/multiproject/project.xml
+++ b/multiproject/project.xml
@@ -4,7 +4,7 @@
   <extend>../project.xml</extend>
   <id>maven-multiproject-plugin</id>
   <name>Maven Multi-Project Plug-in</name>
-  <currentVersion>1.1</currentVersion>
+  <currentVersion>1.2-SNAPSHOT</currentVersion>
   <description>A plugin to handle the building of multiple projects within maven</description>
   <shortDescription>Multi-Project Plugin for Maven</shortDescription>
   <url>http://maven.apache.org/reference/plugins/multiproject/</url>
@@ -44,6 +44,16 @@
         <role>Java Developer</role>
       </roles>
     </developer>
+    <developer>
+      <name>Emmanuel Venisse</name>
+      <id>evenisse</id>
+      <email>emmanuel@venisse.net</email>
+      <organization/>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+      <timezone>+18</timezone>
+    </developer>
   </developers>
   <dependencies>
     <dependency>
diff --git a/multiproject/src/plugin-resources/templates/dependency-convergence-report.xml b/multiproject/src/plugin-resources/templates/dependency-convergence-report.xml
index c9839b12..0495e74c 100644
--- a/multiproject/src/plugin-resources/templates/dependency-convergence-report.xml
+++ b/multiproject/src/plugin-resources/templates/dependency-convergence-report.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="$encoding"?>
 <document>
   <properties>
     <title>Multiproject Dependency Convergence Report</title>
diff --git a/multiproject/src/plugin-resources/templates/navigation-aggregate.xml b/multiproject/src/plugin-resources/templates/navigation-aggregate.xml
index 5458f6b6..b0d79335 100644
--- a/multiproject/src/plugin-resources/templates/navigation-aggregate.xml
+++ b/multiproject/src/plugin-resources/templates/navigation-aggregate.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="$encoding"?>
 
 <project name="$pom.name">
 
diff --git a/multiproject/src/plugin-resources/templates/navigation-independent.xml b/multiproject/src/plugin-resources/templates/navigation-independent.xml
index 4d687d9a..e23140f6 100644
--- a/multiproject/src/plugin-resources/templates/navigation-independent.xml
+++ b/multiproject/src/plugin-resources/templates/navigation-independent.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="$encoding"?>
 
 <project name="$pom.name">
 
diff --git a/multiproject/src/plugin-resources/templates/projects-overview.xml b/multiproject/src/plugin-resources/templates/projects-overview.xml
index a1de71e7..47a20e4a 100644
--- a/multiproject/src/plugin-resources/templates/projects-overview.xml
+++ b/multiproject/src/plugin-resources/templates/projects-overview.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="$encoding"?>
 <document>
   <properties>
     <title>$overviewPageTitle</title>
diff --git a/multiproject/xdocs/changes.xml b/multiproject/xdocs/changes.xml
index 394a3c92..574fe8c2 100644
--- a/multiproject/xdocs/changes.xml
+++ b/multiproject/xdocs/changes.xml
@@ -6,7 +6,12 @@
   </properties>
 
   <body>
-    <release version="1.1" date="In CVS">
+    <release version="1.2" date="In CVS">
+      <action dev="evenisse" type="fix">
+        Fix MAVEN-866. Fix encoding.
+      </action>
+    </release>
+    <release version="1.1" date="2003-09-29">
       <action dev="evenisse" type="fix" due-to="Andy Jefferson">
         Fix MAVEN-782.
       </action>