From 947857a170cd290cdea331187cf9d071238a8ae0 Mon Sep 17 00:00:00 2001
From: ltheussl <ltheussl@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 14 Feb 2006 00:37:37 +0000
Subject: [PATCH] PR: MPXDOC-191 Include dependencies' scope in dependencies
 page.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@377551 13f79535-47bb-0310-9956-ffa450edef68
---
 .../main/org/apache/maven/DescribedDependency.java    |  8 ++++++++
 xdoc/src/plugin-resources/templates/dependencies.xml  | 11 +++++++++++
 .../plugin-resources/templates/templates.properties   |  1 +
 .../templates/templates_de.properties                 |  1 +
 .../templates/templates_fr.properties                 |  1 +
 xdoc/xdocs/changes.xml                                |  1 +
 xdoc/xdocs/properties.xml                             |  7 +++++--
 7 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/xdoc/src/main/org/apache/maven/DescribedDependency.java b/xdoc/src/main/org/apache/maven/DescribedDependency.java
index 6acdd854..7b919881 100644
--- a/xdoc/src/main/org/apache/maven/DescribedDependency.java
+++ b/xdoc/src/main/org/apache/maven/DescribedDependency.java
@@ -229,4 +229,12 @@ public class DescribedDependency implements Comparable
     public String getComment() {
         return dependency.getProperty("comment");
     }
+
+    /**
+     * Delegate method from Dependency.getProperty("scope")
+     */
+    public String getScope()
+    {
+        return dependency.getProperty("scope");
+    }
 }
diff --git a/xdoc/src/plugin-resources/templates/dependencies.xml b/xdoc/src/plugin-resources/templates/dependencies.xml
index 84c7cedf..650fed57 100644
--- a/xdoc/src/plugin-resources/templates/dependencies.xml
+++ b/xdoc/src/plugin-resources/templates/dependencies.xml
@@ -56,6 +56,12 @@
                             <message key="template.dependencies.section.version"
                                 bundle="plugin-resources.templates.templates" />
                         </th>
+                        
+                        <th>
+                            <message key="template.dependencies.section.scope"
+                                bundle="plugin-resources.templates.templates" />
+                        </th>
+                        
                         <th>
                             <message key="template.dependencies.section.url"
                                 bundle="plugin-resources.templates.templates" />
@@ -72,6 +78,11 @@
                         <td>${dep.ArtifactId}</td>
                         <td>${dep.Type}</td>
                         <td>${dep.Version}</td>
+                        <td>
+                            #if (${dep.scope})
+                            ${dep.scope}
+                            #end
+                        </td>
                         <td>
                             #if ($dep.Url)
                             <a href="${dep.Url}">${dep.Url}</a>
diff --git a/xdoc/src/plugin-resources/templates/templates.properties b/xdoc/src/plugin-resources/templates/templates.properties
index 389d2281..6210a1a7 100644
--- a/xdoc/src/plugin-resources/templates/templates.properties
+++ b/xdoc/src/plugin-resources/templates/templates.properties
@@ -72,6 +72,7 @@ template.dependencies.section.dependencies=The following is a list of dependenci
 template.dependencies.section.artifactID=Artifact ID
 template.dependencies.section.type=Type
 template.dependencies.section.version=Version
+template.dependencies.section.scope=Scope
 template.dependencies.section.url=URL
 template.dependencies.section.comment=Comment
 
diff --git a/xdoc/src/plugin-resources/templates/templates_de.properties b/xdoc/src/plugin-resources/templates/templates_de.properties
index 8c2ab51e..1bd91ddb 100644
--- a/xdoc/src/plugin-resources/templates/templates_de.properties
+++ b/xdoc/src/plugin-resources/templates/templates_de.properties
@@ -73,6 +73,7 @@ template.dependencies.section.dependencies = Im Folgenden finden Sie eine Liste
 template.dependencies.section.artifactID = Artifact ID
 template.dependencies.section.type = Typ
 template.dependencies.section.version = Version
+template.dependencies.section.scope=Scope
 template.dependencies.section.url = URL
 template.dependencies.section.comment=Kommentar
 
diff --git a/xdoc/src/plugin-resources/templates/templates_fr.properties b/xdoc/src/plugin-resources/templates/templates_fr.properties
index 45b96029..e4e8092c 100644
--- a/xdoc/src/plugin-resources/templates/templates_fr.properties
+++ b/xdoc/src/plugin-resources/templates/templates_fr.properties
@@ -73,6 +73,7 @@ template.dependencies.section.dependencies=Ce qui suit est une liste des d
 template.dependencies.section.artifactID=Artefact ID
 template.dependencies.section.type=Type
 template.dependencies.section.version=Version
+template.dependencies.section.scope=Scope
 template.dependencies.section.url=URL
 template.dependencies.section.comment=Commentaire
 
diff --git a/xdoc/xdocs/changes.xml b/xdoc/xdocs/changes.xml
index f70afc69..f2010d43 100644
--- a/xdoc/xdocs/changes.xml
+++ b/xdoc/xdocs/changes.xml
@@ -27,6 +27,7 @@
   </properties>
   <body>
     <release version="1.10-SNAPSHOT" date="in SVN">
+      <action dev="ltheussl" type="add" issue="MPXDOC-191">Include dependencies' scope in dependencies page.</action>
       <action dev="ltheussl" type="add" issue="MPXDOC-190">Include the new theme <code>maven-stylus.css</code>.</action>
       <action dev="ltheussl" type="add" issue="MPXDOC-189">Document the use of pom settings by the xdoc plugin.</action>
       <action dev="ltheussl" type="fix" issue="MPXDOC-130">CVS usage page is blank when using Subversion.</action>
diff --git a/xdoc/xdocs/properties.xml b/xdoc/xdocs/properties.xml
index 558e8d77..ecc35532 100644
--- a/xdoc/xdocs/properties.xml
+++ b/xdoc/xdocs/properties.xml
@@ -761,8 +761,11 @@
         The contents of the
         <a href="http://maven.apache.org/maven-1.x/reference/project-descriptor.html#class_Dependency"><code>&lt;dependency&gt;</code></a>
         element are used in the <code>Dependencies</code> page.
-        Note in particular that the optional <code>comment</code> is generated by a
-        <code>&lt;comment&gt;</code> element in the <code>&lt;properties&gt;</code> section.
+        Note in particular that the optional <code>comment</code> and <code>scope</code> entries are generated by
+        <code>&lt;comment&gt;</code> and <code>&lt;scope&gt;</code> elements in the <code>&lt;properties&gt;</code> section of each dependency.
+        The <code>scope</code> parameter is not used in Maven 1 but it is
+        <a href="http://mavenbook.xwiki.com/xwiki/bin/view/Main/BeMaven2Friendly">recommended</a>
+        to specify it in order to make the transition to Maven 2 easier.
       </p>
       <p>
         The contents of the