maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ltheu...@apache.org
Subject svn commit: r890109 - in /maven/plugins/trunk/maven-project-info-reports-plugin/src: main/java/org/apache/maven/report/projectinfo/ main/java/org/apache/maven/report/projectinfo/dependencies/ main/java/org/apache/maven/report/projectinfo/dependencies/r...
Date Sun, 13 Dec 2009 19:57:29 GMT
Author: ltheussl
Date: Sun Dec 13 19:57:28 2009
New Revision: 890109

URL: http://svn.apache.org/viewvc?rev=890109&view=rev
Log:
clean up some API usage and javadocs

Modified:
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/Dependencies.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/DependenciesReportConfiguration.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/ManagementDependencies.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/CimReportTest.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependenciesReportTest.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependencyConvergenceReportTest.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependencyManagementReportTest.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/IssueTrackingReportTest.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/LicenseReportTest.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/MailingListsReportTest.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/PluginManagementReportTest.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ProjectIndexPageReportTest.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ProjectSummaryReportTest.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ScmReportTest.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/TeamListReportTest.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/DefaultArtifactHandlerStub.java
    maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/DependencyConvergenceStub.java

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java?rev=890109&r1=890108&r2=890109&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
(original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
Sun Dec 13 19:57:28 2009
@@ -159,7 +159,7 @@
             RenderingContext context = new RenderingContext( outputDirectory, getOutputName()
+ ".html" );
 
             SiteRendererSink sink = new SiteRendererSink( context );
-            generate( sink, locale );
+            generate( (org.apache.maven.doxia.sink.Sink) sink, null, locale );
 
             outputDirectory.mkdirs();
 

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java?rev=890109&r1=890108&r2=890109&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
(original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
Sun Dec 13 19:57:28 2009
@@ -20,6 +20,7 @@
  */
 
 import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.SinkEventAttributeSet;
 import org.apache.maven.model.Dependency;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.reporting.MavenReportException;
@@ -208,7 +209,7 @@
         {
             String version = (String) it.next();
             sink.tableRow();
-            sink.tableCell( "25%" );
+            sink.tableCell( new SinkEventAttributeSet( new String[] {SinkEventAttributeSet.WIDTH,
"25%"} ) );
             sink.text( version );
             sink.tableCell_();
 
@@ -496,9 +497,9 @@
         Iterator iterator = reactorProjects.iterator();
         while ( iterator.hasNext() )
         {
-            MavenProject project = (MavenProject) iterator.next();
-            if ( project.getGroupId().equals( dependency.getGroupId() )
-                && project.getArtifactId().equals( dependency.getArtifactId() ) )
+            MavenProject mavenProject = (MavenProject) iterator.next();
+            if ( mavenProject.getGroupId().equals( dependency.getGroupId() )
+                && mavenProject.getArtifactId().equals( dependency.getArtifactId()
) )
             {
                 if ( getLog().isDebugEnabled() )
                 {

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java?rev=890109&r1=890108&r2=890109&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java
(original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java
Sun Dec 13 19:57:28 2009
@@ -141,11 +141,10 @@
      * @param project not null
      * @param url not null
      * @return a valid URL object from the url string
-     * @throws MalformedURLException if any
      * @throws IOException if any
      */
     protected static URL getLicenseURL( MavenProject project, String url )
-        throws MalformedURLException, IOException
+        throws IOException
     {
         URL licenseUrl = null;
         UrlValidator urlValidator = new UrlValidator( UrlValidator.ALLOW_ALL_SCHEMES );
@@ -180,7 +179,7 @@
             }
             try
             {
-                licenseUrl = licenseFile.toURL();
+                licenseUrl = licenseFile.toURI().toURL();
             }
             catch ( MalformedURLException e )
             {

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/Dependencies.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/Dependencies.java?rev=890109&r1=890108&r2=890109&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/Dependencies.java
(original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/Dependencies.java
Sun Dec 13 19:57:28 2009
@@ -79,9 +79,9 @@
     /**
      * Default constructor
      *
-     * @param project
-     * @param dependencyTreeNode
-     * @param classesAnalyzer
+     * @param project the MavenProject.
+     * @param dependencyTreeNode the DependencyNode.
+     * @param classesAnalyzer the JarClassesAnalysis.
      */
     public Dependencies( MavenProject project, DependencyNode dependencyTreeNode,
                          JarClassesAnalysis classesAnalyzer )
@@ -262,7 +262,7 @@
     }
 
     /**
-     * @param artifact
+     * @param artifact the artifact.
      * @return the jardata object from the artifact
      * @throws IOException if any
      */

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/DependenciesReportConfiguration.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/DependenciesReportConfiguration.java?rev=890109&r1=890108&r2=890109&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/DependenciesReportConfiguration.java
(original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/DependenciesReportConfiguration.java
Sun Dec 13 19:57:28 2009
@@ -32,8 +32,8 @@
     private boolean dependencyLocationsEnabled;
 
     /**
-     * @param detailsEnabled
-     * @param locationEnabled
+     * @param detailsEnabled whether details is enabled.
+     * @param locationEnabled whether location is enabled.
      */
     public DependenciesReportConfiguration( boolean detailsEnabled, boolean locationEnabled
)
     {

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/ManagementDependencies.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/ManagementDependencies.java?rev=890109&r1=890108&r2=890109&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/ManagementDependencies.java
(original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/ManagementDependencies.java
Sun Dec 13 19:57:28 2009
@@ -38,7 +38,7 @@
     private final List managementDependencies;
 
     /**
-     * @param projectDependencies
+     * @param projectDependencies the list of dependencies.
      */
     public ManagementDependencies( List projectDependencies )
     {

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java?rev=890109&r1=890108&r2=890109&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
(original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
Sun Dec 13 19:57:28 2009
@@ -1294,8 +1294,8 @@
         {
             String repokey = (String) itrepo.next();
 
-            Integer dependencies = (Integer) totalByRepo.get( repokey );
-            totalRow[idnum++] = dependencies != null ? dependencies.toString() : "0";
+            Integer deps = (Integer) totalByRepo.get( repokey );
+            totalRow[idnum++] = deps != null ? deps.toString() : "0";
         }
 
         tableRow( totalRow );
@@ -1453,23 +1453,23 @@
             if ( fs > 1024 * 1024 * 1024 )
             {
                 result = super.format( (float) fs / ( 1024 * 1024 * 1024 ), result, fieldPosition
);
-                result.append( " " ).append( getString( i18n, "report.dependencies.file.details.column.size.gb"
) );
+                result.append( " " ).append( getString( "report.dependencies.file.details.column.size.gb"
) );
                 return result;
             }
 
             if ( fs > 1024 * 1024 )
             {
                 result = super.format( (float) fs / ( 1024 * 1024 ), result, fieldPosition
);
-                result.append( " " ).append( getString( i18n, "report.dependencies.file.details.column.size.mb"
) );
+                result.append( " " ).append( getString( "report.dependencies.file.details.column.size.mb"
) );
                 return result;
             }
 
             result = super.format( (float) fs / ( 1024 ), result, fieldPosition );
-            result.append( " " ).append( getString( i18n, "report.dependencies.file.details.column.size.kb"
) );
+            result.append( " " ).append( getString( "report.dependencies.file.details.column.size.kb"
) );
             return result;
         }
 
-        private String getString( I18N i18n, String key )
+        private String getString( String key )
         {
             return i18n.getString( "project-info-report", locale, key );
         }
@@ -1546,9 +1546,9 @@
 
         String getTotalString( int index )
         {
-            long total = getTotal( index );
+            long totalString = getTotal( index );
 
-            if ( total <= 0 )
+            if ( totalString <= 0 )
             {
                 return "";
             }

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java?rev=890109&r1=890108&r2=890109&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java
(original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/AbstractProjectInfoTestCase.java
Sun Dec 13 19:57:28 2009
@@ -105,7 +105,6 @@
      *
      * @param key the key for the desired string
      * @return the string for the given key
-     * @throws IllegalArgumentException if the parameter is empty.
      */
     protected String getString( String key )
     {
@@ -130,6 +129,7 @@
     /**
      * Get the generated report as file in the test maven project.
      *
+     * @param name the name of the report.
      * @return the generated report as file
      * @throws IOException if the return file doesnt exist
      */
@@ -150,8 +150,8 @@
     /**
      * Generate the report and return the generated file
      *
-     * @param goal
-     * @param pluginXml
+     * @param goal the mojo goal.
+     * @param pluginXml the name of the xml file in "src/test/resources/plugin-configs/".
      * @return the generated HTML file
      * @throws Exception if any
      */
@@ -165,7 +165,7 @@
         mojo.execute();
 
         MavenProjectBuilder builder = (MavenProjectBuilder) lookup( MavenProjectBuilder.ROLE
);
-        ProfileManager profileManager = new DefaultProfileManager( getContainer() );
+        ProfileManager profileManager = new DefaultProfileManager( getContainer(), null,
null );
 
         ArtifactRepository localRepository = (ArtifactRepository) getVariableValueFromObject(
mojo,
                                                                                         
     "localRepository" );

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/CimReportTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/CimReportTest.java?rev=890109&r1=890108&r2=890109&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/CimReportTest.java
(original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/CimReportTest.java
Sun Dec 13 19:57:28 2009
@@ -51,7 +51,7 @@
         generateReport( "cim", "cim-plugin-config.xml" );
         assertTrue( "Test html generated", getGeneratedReport( "integration.html" ).exists()
);
 
-        URL reportURL = getGeneratedReport( "integration.html" ).toURL();
+        URL reportURL = getGeneratedReport( "integration.html" ).toURI().toURL();
         assertNotNull( reportURL );
 
         // HTTPUnit

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependenciesReportTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependenciesReportTest.java?rev=890109&r1=890108&r2=890109&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependenciesReportTest.java
(original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependenciesReportTest.java
Sun Dec 13 19:57:28 2009
@@ -52,7 +52,7 @@
         generateReport( "dependencies", "dependencies-plugin-config.xml" );
         assertTrue( "Test html generated", getGeneratedReport( "dependencies.html" ).exists()
);
 
-        URL reportURL = getGeneratedReport( "dependencies.html" ).toURL();
+        URL reportURL = getGeneratedReport( "dependencies.html" ).toURI().toURL();
         assertNotNull( reportURL );
 
         // HTTPUnit

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependencyConvergenceReportTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependencyConvergenceReportTest.java?rev=890109&r1=890108&r2=890109&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependencyConvergenceReportTest.java
(original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependencyConvergenceReportTest.java
Sun Dec 13 19:57:28 2009
@@ -51,7 +51,7 @@
         generateReport( "dependency-convergence", "dependency-convergence-plugin-config.xml"
);
         assertTrue( "Test html generated", getGeneratedReport( "dependency-convergence.html"
).exists() );
 
-        URL reportURL = getGeneratedReport( "dependency-convergence.html" ).toURL();
+        URL reportURL = getGeneratedReport( "dependency-convergence.html" ).toURI().toURL();
         assertNotNull( reportURL );
 
         // HTTPUnit

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependencyManagementReportTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependencyManagementReportTest.java?rev=890109&r1=890108&r2=890109&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependencyManagementReportTest.java
(original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependencyManagementReportTest.java
Sun Dec 13 19:57:28 2009
@@ -52,7 +52,7 @@
         generateReport( "dependency-management", "dependency-management-plugin-config.xml"
);
         assertTrue( "Test html generated", getGeneratedReport( "dependency-management.html"
).exists() );
 
-        URL reportURL = getGeneratedReport( "dependency-management.html" ).toURL();
+        URL reportURL = getGeneratedReport( "dependency-management.html" ).toURI().toURL();
         assertNotNull( reportURL );
 
         // HTTPUnit

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/IssueTrackingReportTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/IssueTrackingReportTest.java?rev=890109&r1=890108&r2=890109&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/IssueTrackingReportTest.java
(original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/IssueTrackingReportTest.java
Sun Dec 13 19:57:28 2009
@@ -52,7 +52,7 @@
         generateReport( "issue-tracking", "issue-tracking-plugin-config.xml" );
         assertTrue( "Test html generated", getGeneratedReport( "issue-tracking.html" ).exists()
);
 
-        URL reportURL = getGeneratedReport( "issue-tracking.html" ).toURL();
+        URL reportURL = getGeneratedReport( "issue-tracking.html" ).toURI().toURL();
         assertNotNull( reportURL );
 
         // HTTPUnit

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/LicenseReportTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/LicenseReportTest.java?rev=890109&r1=890108&r2=890109&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/LicenseReportTest.java
(original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/LicenseReportTest.java
Sun Dec 13 19:57:28 2009
@@ -51,7 +51,7 @@
         generateReport( "license", "license-plugin-config.xml" );
         assertTrue( "Test html generated", getGeneratedReport( "license.html" ).exists()
);
 
-        URL reportURL = getGeneratedReport( "license.html" ).toURL();
+        URL reportURL = getGeneratedReport( "license.html" ).toURI().toURL();
         assertNotNull( reportURL );
 
         // HTTPUnit

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/MailingListsReportTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/MailingListsReportTest.java?rev=890109&r1=890108&r2=890109&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/MailingListsReportTest.java
(original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/MailingListsReportTest.java
Sun Dec 13 19:57:28 2009
@@ -56,7 +56,7 @@
         generateReport( "mailing-list", "mailing-list-plugin-config.xml" );
         assertTrue( "Test html generated", getGeneratedReport( "mail-lists.html" ).exists()
);
 
-        URL reportURL = getGeneratedReport( "mail-lists.html" ).toURL();
+        URL reportURL = getGeneratedReport( "mail-lists.html" ).toURI().toURL();
         assertNotNull( reportURL );
 
         // HTTPUnit
@@ -101,7 +101,6 @@
     }
 
     /**
-     * @throws Exception if any
      * @throws Throwable if any
      */
     public void testGetArchiveServer()

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/PluginManagementReportTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/PluginManagementReportTest.java?rev=890109&r1=890108&r2=890109&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/PluginManagementReportTest.java
(original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/PluginManagementReportTest.java
Sun Dec 13 19:57:28 2009
@@ -52,7 +52,7 @@
         generateReport( "plugin-management", "plugin-management-plugin-config.xml" );
         assertTrue( "Test html generated", getGeneratedReport( "plugin-management.html" ).exists()
);
 
-        URL reportURL = getGeneratedReport( "plugin-management.html" ).toURL();
+        URL reportURL = getGeneratedReport( "plugin-management.html" ).toURI().toURL();
         assertNotNull( reportURL );
 
         // HTTPUnit

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ProjectIndexPageReportTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ProjectIndexPageReportTest.java?rev=890109&r1=890108&r2=890109&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ProjectIndexPageReportTest.java
(original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ProjectIndexPageReportTest.java
Sun Dec 13 19:57:28 2009
@@ -51,7 +51,7 @@
         generateReport( "index", "index-plugin-config.xml" );
         assertTrue( "Test html generated", getGeneratedReport( "index.html" ).exists() );
 
-        URL reportURL = getGeneratedReport( "index.html" ).toURL();
+        URL reportURL = getGeneratedReport( "index.html" ).toURI().toURL();
         assertNotNull( reportURL );
 
         // HTTPUnit

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ProjectSummaryReportTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ProjectSummaryReportTest.java?rev=890109&r1=890108&r2=890109&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ProjectSummaryReportTest.java
(original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ProjectSummaryReportTest.java
Sun Dec 13 19:57:28 2009
@@ -51,7 +51,7 @@
         generateReport( "summary", "summary-plugin-config.xml" );
         assertTrue( "Test html generated", getGeneratedReport( "project-summary.html" ).exists()
);
 
-        URL reportURL = getGeneratedReport( "project-summary.html" ).toURL();
+        URL reportURL = getGeneratedReport( "project-summary.html" ).toURI().toURL();
         assertNotNull( reportURL );
 
         // HTTPUnit

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ScmReportTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ScmReportTest.java?rev=890109&r1=890108&r2=890109&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ScmReportTest.java
(original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ScmReportTest.java
Sun Dec 13 19:57:28 2009
@@ -54,7 +54,7 @@
         generateReport( "scm", "scm-plugin-config.xml" );
         assertTrue( "Test html generated", getGeneratedReport( "source-repository.html" ).exists()
);
 
-        URL reportURL = getGeneratedReport( "source-repository.html" ).toURL();
+        URL reportURL = getGeneratedReport( "source-repository.html" ).toURI().toURL();
         assertNotNull( reportURL );
 
         // HTTPUnit
@@ -90,7 +90,8 @@
     public void testReportWithWrongUrl()
         throws Exception
     {
-        File pluginXmlFile = new File( getBasedir(), "src/test/resources/plugin-configs/"
+ "scm-wrong-url-plugin-config.xml" );
+        File pluginXmlFile = new File( getBasedir(), "src/test/resources/plugin-configs/"
+                + "scm-wrong-url-plugin-config.xml" );
         Mojo mojo = lookupMojo( "scm", pluginXmlFile );
         assertNotNull( "Mojo found.", mojo );
 

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/TeamListReportTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/TeamListReportTest.java?rev=890109&r1=890108&r2=890109&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/TeamListReportTest.java
(original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/TeamListReportTest.java
Sun Dec 13 19:57:28 2009
@@ -51,7 +51,7 @@
         generateReport( "project-team", "project-team-plugin-config.xml" );
         assertTrue( "Test html generated", getGeneratedReport( "team-list.html" ).exists()
);
 
-        URL reportURL = getGeneratedReport( "team-list.html" ).toURL();
+        URL reportURL = getGeneratedReport( "team-list.html" ).toURI().toURL();
         assertNotNull( reportURL );
 
         // HTTPUnit

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/DefaultArtifactHandlerStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/DefaultArtifactHandlerStub.java?rev=890109&r1=890108&r2=890109&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/DefaultArtifactHandlerStub.java
(original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/DefaultArtifactHandlerStub.java
Sun Dec 13 19:57:28 2009
@@ -42,7 +42,7 @@
     }
 
     /**
-     * @param language
+     * @param language the language. Defaults to "java".
      */
     public void setLanguage( String language )
     {

Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/DependencyConvergenceStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/DependencyConvergenceStub.java?rev=890109&r1=890108&r2=890109&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/DependencyConvergenceStub.java
(original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/DependencyConvergenceStub.java
Sun Dec 13 19:57:28 2009
@@ -1,8 +1,5 @@
 package org.apache.maven.report.projectinfo.stubs;
 
-import java.util.Collections;
-import java.util.List;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -22,6 +19,9 @@
  * under the License.
  */
 
+import java.util.Collections;
+import java.util.List;
+
 /**
  * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
  * @version $Id$



Mime
View raw message