PR: MNG-1046

fixes for the mailing list page


git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@294969 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-10-05 01:51:48 +00:00
parent 8abf710b89
commit 4e7dca56c6
3 changed files with 29 additions and 14 deletions

View File

@ -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>

View File

@ -26,7 +26,6 @@ import org.codehaus.doxia.sink.Sink;
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;
@ -225,10 +224,24 @@ public class MailingListsReport
textRow.add( createLinkPatternedText( unsubscribe, mailingList.getUnsubscribe() ) );
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() ) )
{
@ -304,7 +317,7 @@ public class MailingListsReport
{
if ( StringUtils.isEmpty( uri ) )
{
return "???UNKWOWN???";
return "???UNKNOWN???";
}
int at = uri.indexOf( "//" );

View File

@ -456,7 +456,9 @@ public abstract class AbstractMavenReportRenderer
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;
}