From bb7609f89c963751d8ed677d6e7fae069b313c80 Mon Sep 17 00:00:00 2001
From: aheritier <aheritier@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 4 Sep 2005 00:41:06 +0000
Subject: [PATCH] MPXDOC-163 : Dependencies comment (MPXDOC-129) feature
 disappeared. Tests are re-enabled.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@267528 13f79535-47bb-0310-9956-ffa450edef68
---
 .../templates/dependencies.xml                |  9 +++++++
 .../templates/templates.properties            |  1 +
 .../templates/templates_de.properties         |  1 +
 .../templates/templates_fr.properties         |  1 +
 .../testDependenciesComment/maven.xml         | 24 ++++++-------------
 xdoc/xdocs/changes.xml                        |  3 ++-
 6 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/xdoc/src/plugin-resources/templates/dependencies.xml b/xdoc/src/plugin-resources/templates/dependencies.xml
index 1bd81389..84c7cedf 100644
--- a/xdoc/src/plugin-resources/templates/dependencies.xml
+++ b/xdoc/src/plugin-resources/templates/dependencies.xml
@@ -60,6 +60,10 @@
                             <message key="template.dependencies.section.url"
                                 bundle="plugin-resources.templates.templates" />
                         </th>
+                        <th>
+                            <message key="template.dependencies.section.comment"
+                                bundle="plugin-resources.templates.templates" />
+                        </th>
                     </tr>
                 </thead>
                 <tbody>
@@ -73,6 +77,11 @@
                             <a href="${dep.Url}">${dep.Url}</a>
                             #end
                         </td>
+                        <td>
+                            #if(${dep.comment})
+                            ${dep.comment}
+                            #end
+                        </td>
                     </tr>
                     #end
                 </tbody>
diff --git a/xdoc/src/plugin-resources/templates/templates.properties b/xdoc/src/plugin-resources/templates/templates.properties
index f4091195..44d7d8be 100644
--- a/xdoc/src/plugin-resources/templates/templates.properties
+++ b/xdoc/src/plugin-resources/templates/templates.properties
@@ -61,6 +61,7 @@ template.dependencies.section.artifactID=Artifact ID
 template.dependencies.section.type=Type
 template.dependencies.section.version=Version
 template.dependencies.section.url=URL
+template.dependencies.section.comment=Comment
 
 # For issue-tracking.xml
 template.issue_tracking.title=Issue Tracking
diff --git a/xdoc/src/plugin-resources/templates/templates_de.properties b/xdoc/src/plugin-resources/templates/templates_de.properties
index 2c9862c5..7ad898f6 100644
--- a/xdoc/src/plugin-resources/templates/templates_de.properties
+++ b/xdoc/src/plugin-resources/templates/templates_de.properties
@@ -63,6 +63,7 @@ template.dependencies.section.artifactID = Artifact ID
 template.dependencies.section.type = Typ
 template.dependencies.section.version = Version
 template.dependencies.section.url = URL
+template.dependencies.section.comment=Kommentar
 
 # For issue-tracking.xml
 template.issue_tracking.title = Fehlerbehandlung
diff --git a/xdoc/src/plugin-resources/templates/templates_fr.properties b/xdoc/src/plugin-resources/templates/templates_fr.properties
index 2bbae80b..4c8d4e0a 100644
--- a/xdoc/src/plugin-resources/templates/templates_fr.properties
+++ b/xdoc/src/plugin-resources/templates/templates_fr.properties
@@ -63,6 +63,7 @@ template.dependencies.section.artifactID=Artefact ID
 template.dependencies.section.type=Type
 template.dependencies.section.version=Version
 template.dependencies.section.url=URL
+template.dependencies.section.comment=Commentaire
 
 # For issue-tracking.xml
 template.issue_tracking.title=Suivi des incidents
diff --git a/xdoc/src/plugin-test/testDependenciesComment/maven.xml b/xdoc/src/plugin-test/testDependenciesComment/maven.xml
index 089677e1..4d1afb58 100644
--- a/xdoc/src/plugin-test/testDependenciesComment/maven.xml
+++ b/xdoc/src/plugin-test/testDependenciesComment/maven.xml
@@ -15,40 +15,30 @@
  * limitations under the License.
  */
  -->
-<project default="testPlugin"
-  xmlns:util="jelly:util"
-  xmlns:j="jelly:core"
-  xmlns:assert="assert"
-  xmlns:doc="doc"
-  xmlns:x="jelly:xml">
-
+<project default="testPlugin" xmlns:util="jelly:util" xmlns:j="jelly:core" xmlns:assert="assert" xmlns:doc="doc" xmlns:x="jelly:xml">
   <goal name="testPlugin" prereqs="clean,xdoc:generate-from-pom, dependenciesTest"/>
-
   <goal name="dependenciesTest">
     <j:set var="depXmlPath" value="${maven.gen.docs}/dependencies.xml"/>
     <assert:assertFileExists file="${depXmlPath}"/>
     <util:file var="depXmlFile" name="${depXmlPath}"/>
     <x:parse var="depXmlDom" xml="${depXmlFile}"/>
-<!--
     <x:set var="headerComment" select="string($depXmlDom/document/body/section[@name='Dependencies']/table/thead/tr/th[5])"/>
     <assert:assertEquals expected="Comment" value="${headerComment}"/>
     <x:forEach var="tr" select="$depXmlDom/document/body/section[@name='Dependencies']/table/tbody/*">
       <x:set var="depName" select="string($tr/td[1])"/>
       <x:set var="comment" select="string($tr/td[5])"/>
       <j:if test="${depName=='dom4j'}">
-         <echo>Checking comment for dependency dom4j</echo>
-         <assert:assertEquals expected="Simple comment" value="${comment.trim()}"/>
+        <echo>Checking comment for dependency dom4j</echo>
+        <assert:assertEquals expected="Simple comment" value="${comment.trim()}"/>
       </j:if>
       <j:if test="${depName=='commons-jelly'}">
-         <echo>Checking comment for dependency commons-jelly</echo>
-         <assert:assertEquals expected="" value="${comment.trim()}"/>
+        <echo>Checking comment for dependency commons-jelly</echo>
+        <assert:assertEquals expected="" value="${comment.trim()}"/>
       </j:if>
       <j:if test="${depName=='velocity-dvsl'}">
-         <echo>Checking comment for dependency velocity-dvsl</echo>
-         <assert:assertEquals expected="" value="${comment.trim()}"/>
+        <echo>Checking comment for dependency velocity-dvsl</echo>
+        <assert:assertEquals expected="" value="${comment.trim()}"/>
       </j:if>
     </x:forEach>
--->
   </goal>
-  
 </project>
diff --git a/xdoc/xdocs/changes.xml b/xdoc/xdocs/changes.xml
index 96d53bac..4d19bfc9 100644
--- a/xdoc/xdocs/changes.xml
+++ b/xdoc/xdocs/changes.xml
@@ -26,6 +26,7 @@
   </properties>
   <body>
     <release version="1.9.2-SNAPSHOT" date="In SVN">
+      <action dev="aheritier" type="fix" issue="MPXDOC-163">Dependencies comment (MPXDOC-129) feature disappeared.</action>
       <action dev="aheritier" type="fix" issue="MPXDOC-162" due-to="Lukas Theussl">Special characters in menu ids aren't escaped.</action>
       <action dev="aheritier" type="fix" issue="MPXDOC-156" due-to="Jeff Jensen">Add documentation about "external links" and "new windows".</action>
       <action dev="aheritier" type="fix" issue="MPXDOC-155" due-to="Lukas Theussl">Xdoc plugin >= 1.9 not compatible with older customised site.jsl.</action>
@@ -39,7 +40,7 @@
       <action dev="aheritier" type="add" issue="MPXDOC-131" due-to="Ignacio G. Mac Dowell">Allow i18n links.</action>
       <action dev="aheritier" type="fix">i18n : html code removed from bundles.</action>
       <action dev="aheritier" type="fix">i18n : doc title wasn't printed in breadcrumbs.</action>
-      <action dev="aheritier" type="update">breadcrumbs : add a link to the site on the project name.</action>
+      <action dev="aheritier" type="update">breadcrumbs : add a link to the site on the project name.</action>      
     </release>
     <release version="1.9.1" date="2005-06-16">
       <action dev="brett" type="fix">Don't override the Maven library. This makes the plugin compatible with both Maven 1.0.2 and Maven 1.1</action>