svn commit: r803847 - in /maven/plugins/trunk/maven-dependency-plugin: pom.xml src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportView.java

[vsiveton]

Author: vsiveton
Date: Thu Aug 13 11:36:45 2009
New Revision: 803847

URL: http://svn.apache.org/viewvc?rev=803847&view=rev
Log:
MDEP-228: Review the Doxia Sink calls

o updated to Doxia 1.0
o fixed sink calls

Modified:
    maven/plugins/trunk/maven-dependency-plugin/pom.xml
    
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportView.java

Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?rev=803847&r1=803846&r2=803847&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Thu Aug 13 11:36:45 2009
@@ -83,6 +83,7 @@
 
   <properties>
     <mavenVersion>2.0.9</mavenVersion>
+    <doxiaVersion>1.0</doxiaVersion>
   </properties>
 
   <dependencies>
@@ -112,6 +113,28 @@
       <artifactId>maven-core</artifactId>
       <version>${mavenVersion}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven.reporting</groupId>
+      <artifactId>maven-reporting-api</artifactId>
+      <version>${mavenVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.reporting</groupId>
+      <artifactId>maven-reporting-impl</artifactId>
+      <version>2.0.4.2</version>
+    </dependency>
+
+    <!-- doxia -->
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-sink-api</artifactId>
+      <version>${doxiaVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-site-renderer</artifactId>
+      <version>${doxiaVersion}</version>
+    </dependency>
 
     <!-- plexus -->
     <dependency>
@@ -177,18 +200,6 @@
       <version>1.0</version>
     </dependency>
 
-    <!-- Dependencies for Analyze-report mojo -->
-    <dependency>
-      <groupId>org.apache.maven.reporting</groupId>
-      <artifactId>maven-reporting-api</artifactId>
-      <version>2.0.6</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.reporting</groupId>
-      <artifactId>maven-reporting-impl</artifactId>
-      <version>2.0.4</version>
-    </dependency>
-
     <!-- test -->
     <dependency>
       <groupId>junit</groupId>

Modified: 
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportView.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportView.java?rev=803847&r1=803846&r2=803847&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportView.java
 (original)
+++ 
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeReportView.java
 Thu Aug 13 11:36:45 2009
@@ -49,8 +49,6 @@
         sink.sectionTitle1();
         sink.text( bundle.getString( "analyze.report.mainTitle" ) );
         sink.sectionTitle1_();
-        sink.section1_();
-        sink.lineBreak();
 
         // Generate Used Declared dependencies:
         sink.section2();
@@ -59,7 +57,9 @@
         sink.sectionTitle2_();
         if ( analysis.getUsedDeclaredArtifacts().isEmpty() )
         {
+            sink.paragraph();
             sink.text( bundle.getString( "analyze.report.noDependency" ) );
+            sink.paragraph_();
             sink.horizontalRule();
         }
         else
@@ -76,7 +76,9 @@
         sink.sectionTitle2_();
         if ( analysis.getUsedUndeclaredArtifacts().isEmpty() )
         {
+            sink.paragraph();
             sink.text( bundle.getString( "analyze.report.noDependency" ) );
+            sink.paragraph_();
             sink.horizontalRule();
         }
         else
@@ -93,7 +95,9 @@
         sink.sectionTitle2_();
         if ( analysis.getUnusedDeclaredArtifacts().isEmpty() )
         {
+            sink.paragraph();
             sink.text( bundle.getString( "analyze.report.noDependency" ) );
+            sink.paragraph_();
             sink.horizontalRule();
         }
         else
@@ -103,6 +107,8 @@
         }
         sink.section2_();
 
+        sink.section1_();
+
         // Closing the report
         sink.body_();
         sink.flush();