You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by vs...@apache.org on 2008/06/19 13:02:20 UTC
svn commit: r669449 - in
/maven/plugins/trunk/maven-project-info-reports-plugin: pom.xml
src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
Author: vsiveton
Date: Thu Jun 19 04:02:19 2008
New Revision: 669449
URL: http://svn.apache.org/viewvc?rev=669449&view=rev
Log:
MPIR-104: Regression in 2.1-SNAPSHOT: SVN is no more recognized
o added missing SVN and CVS repository
o added debug message when NoSuchScmProviderException is thrown
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml?rev=669449&r1=669448&r2=669449&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/pom.xml Thu Jun 19 04:02:19 2008
@@ -218,9 +218,24 @@
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-provider-svnexe</artifactId>
+ <version>${scmVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
<artifactId>maven-scm-provider-cvs-commons</artifactId>
<version>${scmVersion}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-provider-cvsexe</artifactId>
+ <version>${scmVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-provider-cvsjava</artifactId>
+ <version>${scmVersion}</version>
+ </dependency>
<!-- Doxia -->
<dependency>
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java?rev=669449&r1=669448&r2=669449&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java Thu Jun 19 04:02:19 2008
@@ -22,6 +22,7 @@
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.model.Model;
import org.apache.maven.model.Scm;
+import org.apache.maven.plugin.logging.Log;
import org.apache.maven.reporting.AbstractMavenReportRenderer;
import org.apache.maven.scm.manager.NoSuchScmProviderException;
import org.apache.maven.scm.manager.ScmManager;
@@ -108,7 +109,7 @@
public void executeReport( Locale locale )
{
ScmRenderer r =
- new ScmRenderer( scmManager, getSink(), getProject().getModel(), i18n, locale, checkoutDirectoryName,
+ new ScmRenderer( getLog(), scmManager, getSink(), getProject().getModel(), i18n, locale, checkoutDirectoryName,
webAccessUrl, anonymousConnection, developerConnection );
r.render();
@@ -127,6 +128,8 @@
private static class ScmRenderer
extends AbstractMavenReportRenderer
{
+ private Log log;
+
private Model model;
private I18N i18n;
@@ -146,11 +149,13 @@
private String webAccessUrl;
- ScmRenderer( ScmManager scmManager, Sink sink, Model model, I18N i18n, Locale locale, String checkoutDirName,
+ ScmRenderer( Log log, ScmManager scmManager, Sink sink, Model model, I18N i18n, Locale locale, String checkoutDirName,
String webAccessUrl, String anonymousConnection, String devConnection )
{
super( sink );
+ this.log = log;
+
this.scmManager = scmManager;
this.model = model;
@@ -669,13 +674,20 @@
}
catch ( NoSuchScmProviderException e )
{
- // ignore
+ if ( log.isDebugEnabled() )
+ {
+ log.debug( e.getMessage(), e );
+ }
}
catch ( ScmRepositoryException e )
{
- // ignore
+ if ( log.isDebugEnabled() )
+ {
+ log.debug( e.getMessage(), e );
+ }
}
}
+
return repo;
}