You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2005/10/05 03:51:58 UTC
svn commit: r294969 - in /maven/components/trunk:
maven-plugins/maven-project-info-reports-plugin/
maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/
maven-reporting/maven-reporting-impl/src/main/java/org...
Author: brett
Date: Tue Oct 4 18:51:48 2005
New Revision: 294969
URL: http://svn.apache.org/viewcvs?rev=294969&view=rev
Log:
PR: MNG-1046
fixes for the mailing list page
Modified:
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/pom.xml
maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java
maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
Modified: maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/pom.xml?rev=294969&r1=294968&r2=294969&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/pom.xml (original)
+++ maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/pom.xml Tue Oct 4 18:51:48 2005
@@ -57,7 +57,7 @@
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-impl</artifactId>
- <version>2.0-beta-1</version>
+ <version>2.0-beta-4-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven.scm</groupId>
@@ -80,4 +80,4 @@
<version>1.0-alpha-2</version>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java?rev=294969&r1=294968&r2=294969&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java (original)
+++ maven/components/trunk/maven-plugins/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java Tue Oct 4 18:51:48 2005
@@ -26,7 +26,6 @@
import org.codehaus.doxia.site.renderer.SiteRenderer;
import org.codehaus.plexus.util.StringUtils;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -44,7 +43,7 @@
{
/**
* Report output directory.
- *
+ *
* @parameter expression="${project.build.directory}/site"
* @required
*/
@@ -52,7 +51,7 @@
/**
* Doxia Site Renderer.
- *
+ *
* @parameter expression="${component.org.codehaus.doxia.site.renderer.SiteRenderer}"
* @required
* @readonly
@@ -61,7 +60,7 @@
/**
* The Maven Project.
- *
+ *
* @parameter expression="${project}"
* @required
* @readonly
@@ -205,11 +204,11 @@
if ( otherArchives )
{
- tableHeader( new String[] { name, subscribe, unsubscribe, post, archive, archivesOther } );
+ tableHeader( new String[]{name, subscribe, unsubscribe, post, archive, archivesOther} );
}
else
{
- tableHeader( new String[] { name, subscribe, unsubscribe, post, archive } );
+ tableHeader( new String[]{name, subscribe, unsubscribe, post, archive} );
}
for ( Iterator i = model.getMailingLists().iterator(); i.hasNext(); )
@@ -225,10 +224,24 @@
textRow.add( createLinkPatternedText( unsubscribe, mailingList.getUnsubscribe() ) );
- textRow.add( createLinkPatternedText( post, mailingList.getPost() ) );
+ if ( mailingList.getPost() != null && mailingList.getPost().length() > 0 )
+ {
+ textRow.add( createLinkPatternedText( post, mailingList.getPost() ) );
+ }
+ else
+ {
+ textRow.add( "-" );
+ }
- textRow.add( createLinkPatternedText( getArchiveServer( mailingList.getArchive() ), mailingList
- .getArchive() ) );
+ if ( mailingList.getArchive() != null && mailingList.getArchive().length() > 0 )
+ {
+ textRow.add( createLinkPatternedText( getArchiveServer( mailingList.getArchive() ),
+ mailingList.getArchive() ) );
+ }
+ else
+ {
+ textRow.add( "-" );
+ }
if ( ( ( mailingList.getOtherArchives() != null ) ) && ( !mailingList.getOtherArchives().isEmpty() ) )
{
@@ -296,7 +309,7 @@
* For instance, if the archive uri is
* <code>http://www.mail-archive.com/dev@maven.apache.org</code>, this
* method return <code>www.mail-archive.com</code>
- *
+ *
* @param uri
* @return the server name of a web-based mailing list archive server
*/
@@ -304,7 +317,7 @@
{
if ( StringUtils.isEmpty( uri ) )
{
- return "???UNKWOWN???";
+ return "???UNKNOWN???";
}
int at = uri.indexOf( "//" );
Modified: maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java?rev=294969&r1=294968&r2=294969&view=diff
==============================================================================
--- maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java (original)
+++ maven/components/trunk/maven-reporting/maven-reporting-impl/src/main/java/org/apache/maven/reporting/AbstractMavenReportRenderer.java Tue Oct 4 18:51:48 2005
@@ -456,7 +456,9 @@
String[] schemes = {"http", "https"};
UrlValidator urlValidator = new UrlValidator( schemes );
- if ( EmailValidator.getInstance().isValid( href ) )
+ if ( ( EmailValidator.getInstance().isValid( href ) ) ||
+ ( ( href.indexOf( "?" ) != -1 ) &&
+ ( EmailValidator.getInstance().isValid( href.substring( 0, href.indexOf( "?" ) ) ) ) ) )
{
return "mailto:" + href;
}