evenisse 2003/09/29 12:22:56
Modified: src/plugins-build/multiproject plugin.jelly project.xml
src/plugins-build/multiproject/src/plugin-resources/templates
dependency-convergence-report.xml
navigation-aggregate.xml navigation-independent.xml
projects-overview.xml
src/plugins-build/multiproject/xdocs changes.xml
Log:
Fix MAVEN-866. Fix encoding.
Revision Changes Path
1.32 +20 -5 maven/src/plugins-build/multiproject/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/multiproject/plugin.jelly,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- plugin.jelly 24 Sep 2003 04:38:17 -0000 1.31
+++ plugin.jelly 29 Sep 2003 19:22:56 -0000 1.32
@@ -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 @@
<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>
1.13 +11 -1 maven/src/plugins-build/multiproject/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/multiproject/project.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- project.xml 29 Sep 2003 05:19:13 -0000 1.12
+++ project.xml 29 Sep 2003 19:22:56 -0000 1.13
@@ -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>
@@ -43,6 +43,16 @@
<roles>
<role>Java Developer</role>
</roles>
+ </developer>
+ <developer>
+ <name>Emmanuel Venisse</name>
+ <id>evenisse</id>
+ <email>[EMAIL PROTECTED]</email>
+ <organization/>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ <timezone>+18</timezone>
</developer>
</developers>
<dependencies>
1.3 +1 -1
maven/src/plugins-build/multiproject/src/plugin-resources/templates/dependency-convergence-report.xml
Index: dependency-convergence-report.xml
===================================================================
RCS file:
/home/cvs/maven/src/plugins-build/multiproject/src/plugin-resources/templates/dependency-convergence-report.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dependency-convergence-report.xml 30 Aug 2003 08:11:39 -0000 1.2
+++ dependency-convergence-report.xml 29 Sep 2003 19:22:56 -0000 1.3
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="$encoding"?>
<document>
<properties>
<title>Multiproject Dependency Convergence Report</title>
1.5 +1 -1
maven/src/plugins-build/multiproject/src/plugin-resources/templates/navigation-aggregate.xml
Index: navigation-aggregate.xml
===================================================================
RCS file:
/home/cvs/maven/src/plugins-build/multiproject/src/plugin-resources/templates/navigation-aggregate.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- navigation-aggregate.xml 28 Jul 2003 19:56:48 -0000 1.4
+++ navigation-aggregate.xml 29 Sep 2003 19:22:56 -0000 1.5
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="$encoding"?>
<project name="$pom.name">
1.4 +1 -1
maven/src/plugins-build/multiproject/src/plugin-resources/templates/navigation-independent.xml
Index: navigation-independent.xml
===================================================================
RCS file:
/home/cvs/maven/src/plugins-build/multiproject/src/plugin-resources/templates/navigation-independent.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- navigation-independent.xml 28 Jul 2003 19:56:48 -0000 1.3
+++ navigation-independent.xml 29 Sep 2003 19:22:56 -0000 1.4
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="$encoding"?>
<project name="$pom.name">
1.4 +1 -1
maven/src/plugins-build/multiproject/src/plugin-resources/templates/projects-overview.xml
Index: projects-overview.xml
===================================================================
RCS file:
/home/cvs/maven/src/plugins-build/multiproject/src/plugin-resources/templates/projects-overview.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- projects-overview.xml 5 Sep 2003 10:02:55 -0000 1.3
+++ projects-overview.xml 29 Sep 2003 19:22:56 -0000 1.4
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="$encoding"?>
<document>
<properties>
<title>$overviewPageTitle</title>
1.9 +6 -1 maven/src/plugins-build/multiproject/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/multiproject/xdocs/changes.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- changes.xml 5 Sep 2003 10:02:55 -0000 1.8
+++ changes.xml 29 Sep 2003 19:22:56 -0000 1.9
@@ -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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
