Author: hboutemy
Date: Mon Dec 6 00:37:18 2010
New Revision: 1042496
URL: http://svn.apache.org/viewvc?rev=1042496&view=rev
Log:
renamed util method name to better match the intent
Modified:
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/ProjectInfoReportUtils.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/ProjectInfoReportUtilsTest.java
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=1042496&r1=1042495&r2=1042496&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
Mon Dec 6 00:37:18 2010
@@ -293,7 +293,7 @@ public class LicenseReport
try
{
// All licenses are supposed in English...
- licenseContent =
ProjectInfoReportUtils.getInputStream( licenseUrl, settings );
+ licenseContent =
ProjectInfoReportUtils.getContent( licenseUrl, settings );
}
catch ( IOException e )
{
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java?rev=1042496&r1=1042495&r2=1042496&view=diff
==============================================================================
---
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java
(original)
+++
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtils.java
Mon Dec 6 00:37:18 2010
@@ -78,12 +78,12 @@ public class ProjectInfoReportUtils
* @param settings not null to handle proxy settings
* @return the ISO-8859-1 inputstream found.
* @throws IOException if any
- * @see #getInputStream(URL, Settings, String)
+ * @see #getContent(URL, Settings, String)
*/
- public static String getInputStream( URL url, Settings settings )
+ public static String getContent( URL url, Settings settings )
throws IOException
{
- return getInputStream( url, settings, "ISO-8859-1" );
+ return getContent( url, settings, "ISO-8859-1" );
}
/**
@@ -95,10 +95,10 @@ public class ProjectInfoReportUtils
* @return the inputstream found depending the wanted encoding.
* @throws IOException if any
*/
- public static String getInputStream( URL url, Settings settings, String
encoding )
+ public static String getContent( URL url, Settings settings, String
encoding )
throws IOException
{
- return getInputStream( url, null, settings, encoding );
+ return getContent( url, null, settings, encoding );
}
/**
@@ -112,7 +112,7 @@ public class ProjectInfoReportUtils
* @throws IOException if any
* @since 2.3
*/
- public static String getInputStream( URL url, MavenProject project,
Settings settings, String encoding )
+ public static String getContent( URL url, MavenProject project, Settings
settings, String encoding )
throws IOException
{
String scheme = url.getProtocol();
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=1042496&r1=1042495&r2=1042496&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
Mon Dec 6 00:37:18 2010
@@ -687,7 +687,7 @@ public class DependenciesRenderer
try
{
URL repoUrl = new URL( repo.getUrl() );
- if ( ProjectInfoReportUtils.getInputStream( repoUrl,
settings ) == null )
+ if ( ProjectInfoReportUtils.getContent( repoUrl,
settings ) == null )
{
log.warn( "The repository url '" + repoUrl + "'
has no stream - Repository '"
+ repo.getId() + "' will be blacklisted." );
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtilsTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtilsTest.java?rev=1042496&r1=1042495&r2=1042496&view=diff
==============================================================================
---
maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtilsTest.java
(original)
+++
maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/ProjectInfoReportUtilsTest.java
Mon Dec 6 00:37:18 2010
@@ -47,7 +47,7 @@ import org.mortbay.jetty.webapp.WebAppCo
/**
* @author <a href="mailto:[email protected]";>Vincent Siveton</a>
- * @version $Id:$
+ * @version $Id$
*/
public class ProjectInfoReportUtilsTest
extends AbstractMojoTestCase
@@ -140,7 +140,7 @@ public class ProjectInfoReportUtilsTest
// file
URL url = new File( getBasedir(),
"/target/classes/project-info-report.properties" ).toURI().toURL();
- String content = ProjectInfoReportUtils.getInputStream( url,
projectStub, settingsStub, null );
+ String content = ProjectInfoReportUtils.getContent( url, projectStub,
settingsStub, null );
Assert.assertNotNull( content );
Assert.assertTrue( content.contains( "Licensed to the Apache Software
Foundation" ) );
@@ -149,7 +149,7 @@ public class ProjectInfoReportUtilsTest
url = new URL( "http://localhost:8080/project-info-report.properties";
);
- content = ProjectInfoReportUtils.getInputStream( url, projectStub,
settingsStub, null );
+ content = ProjectInfoReportUtils.getContent( url, projectStub,
settingsStub, null );
Assert.assertNotNull( content );
Assert.assertTrue( content.contains( "Licensed to the Apache Software
Foundation" ) );
@@ -160,7 +160,7 @@ public class ProjectInfoReportUtilsTest
url = new URL( "http://localhost:8080/project-info-report.properties";
);
- content = ProjectInfoReportUtils.getInputStream( url, projectStub,
settingsStub, null );
+ content = ProjectInfoReportUtils.getContent( url, projectStub,
settingsStub, null );
Assert.assertNotNull( content );
Assert.assertTrue( content.contains( "Licensed to the Apache Software
Foundation" ) );
@@ -171,7 +171,7 @@ public class ProjectInfoReportUtilsTest
url = new URL( "https://localhost:8443/project-info-report.properties";
);
- content = ProjectInfoReportUtils.getInputStream( url, projectStub,
settingsStub, null );
+ content = ProjectInfoReportUtils.getContent( url, projectStub,
settingsStub, null );
Assert.assertNotNull( content );
Assert.assertTrue( content.contains( "Licensed to the Apache Software
Foundation" ) );
@@ -182,7 +182,7 @@ public class ProjectInfoReportUtilsTest
url = new URL( "https://localhost:8443/project-info-report.properties";
);
- content = ProjectInfoReportUtils.getInputStream( url, projectStubSec,
settingsStub, null );
+ content = ProjectInfoReportUtils.getContent( url, projectStubSec,
settingsStub, null );
Assert.assertNotNull( content );
Assert.assertTrue( content.contains( "Licensed to the Apache Software
Foundation" ) );
