Author: hboutemy
Date: Fri Nov 1 13:34:03 2013
New Revision: 1537935
URL: http://svn.apache.org/r1537935
Log:
improved output
Modified:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckIndexPageMojo.java
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSiteMojo.java
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSourceReleaseMojo.java
Modified:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckIndexPageMojo.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckIndexPageMojo.java?rev=1537935&r1=1537934&r2=1537935&view=diff
==============================================================================
---
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckIndexPageMojo.java
(original)
+++
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckIndexPageMojo.java
Fri Nov 1 13:34:03 2013
@@ -109,14 +109,14 @@ public class DistCheckIndexPageMojo
}
- private static class DistCheckIndexPage
+ private static class CheckIndexPageResult
extends AbstractCheckResult
{
private String indexVersion;
private String indexDate;
- public DistCheckIndexPage( ConfigurationLineInfo r, String version )
+ public CheckIndexPageResult( ConfigurationLineInfo r, String version )
{
super( r, version );
}
@@ -131,31 +131,32 @@ public class DistCheckIndexPageMojo
this.indexDate = ownText;
}
}
- private final Map<String, List<DistCheckIndexPage>> results = new
HashMap<>();
+ private final Map<String, List<CheckIndexPageResult>> results = new
HashMap<>();
- private void reportLine( Sink sink, DistCheckIndexPage csr , boolean
displayDate )
+ private void reportLine( Sink sink, CheckIndexPageResult cipr , boolean
displayDate )
{
- ConfigurationLineInfo cli = csr.getConfigurationLine();
+ ConfigurationLineInfo cli = cipr.getConfigurationLine();
sink.tableRow();
sink.tableCell();
- sink.rawText( csr.getConfigurationLine().getArtifactId() );
+ sink.rawText( cipr.getConfigurationLine().getArtifactId() );
sink.tableCell_();
// LATEST column
sink.tableCell();
sink.link( cli.getMetadataFileURL( repoBaseUrl ) );
- sink.rawText( csr.getVersion() );
+ sink.rawText( cipr.getVersion() );
sink.link_();
- if ( csr.getVersion().equals( csr.indexVersion ) )
+ if ( cipr.getVersion().equals( cipr.indexVersion ) )
{
iconSuccess( sink );
}
else
{
iconError( sink );
- sink.rawText( csr.indexVersion );
+ sink.lineBreak();
+ sink.rawText( cipr.indexVersion + " in index page" );
}
sink.tableCell_();
@@ -163,15 +164,16 @@ public class DistCheckIndexPageMojo
if ( displayDate )
{
sink.tableCell();
- sink.rawText(
csr.getConfigurationLine().getReleaseDateFromMetadata() );
- if (
csr.getConfigurationLine().getReleaseDateFromMetadata().equals( csr.indexDate )
)
+ sink.rawText(
cipr.getConfigurationLine().getReleaseDateFromMetadata() );
+ if (
cipr.getConfigurationLine().getReleaseDateFromMetadata().equals( cipr.indexDate
) )
{
iconSuccess( sink );
}
else
{
iconError( sink );
- sink.rawText( csr.indexDate );
+ sink.lineBreak();
+ sink.rawText( cipr.indexDate + " in index page" );
}
sink.tableCell_();
}
@@ -211,28 +213,39 @@ public class DistCheckIndexPageMojo
sink.paragraph_();
sink.section1_();
- for ( String key : results.keySet() )
+ for ( Map.Entry<String, List<CheckIndexPageResult>> result:
results.entrySet() )
{
- sink.paragraph();
- sink.text( (String) INDEXES_REF.get( key )[1] );
- sink.paragraph_();
+ String indexPageId = result.getKey();
+ Object[] indexPageInfo = INDEXES_REF.get( indexPageId );
+ String indexPageUrl = (String) indexPageInfo[0];
+ String indexPageName = (String) indexPageInfo[1];
+ List<CheckIndexPageResult> indexPageResults = result.getValue();
+
+ sink.sectionTitle2();
+ sink.text( indexPageName + " index page: " );
+ sink.anchor( indexPageUrl );
+ sink.text( indexPageUrl );
+ sink.anchor_();
+ sink.sectionTitle2_();
+
sink.table();
sink.tableRow();
sink.tableHeaderCell();
- sink.rawText( "LATEST" );
+ sink.rawText( "Component" );
+ sink.tableHeaderCell_();
+ sink.tableHeaderCell();
+ sink.rawText( "VERSION" );
sink.tableHeaderCell_();
- boolean displayDate = INDEXES_REF.get( key )[3] != null;
+ boolean displayDate = indexPageInfo[3] != null;
if ( displayDate )
{
sink.tableHeaderCell();
sink.rawText( "DATE" );
sink.tableHeaderCell_();
}
- sink.tableHeaderCell();
- sink.rawText( "VERSION" );
- sink.tableHeaderCell_();
sink.tableRow_();
- for ( DistCheckIndexPage csr : results.get( key ) )
+
+ for ( CheckIndexPageResult csr : indexPageResults )
{
reportLine( sink, csr, displayDate );
}
@@ -244,7 +257,7 @@ public class DistCheckIndexPageMojo
sink.close();
}
- private void updateIndexPageInfo( ConfigurationLineInfo cli,
DistCheckIndexPage r, Object[] inf )
+ private void updateIndexPageInfo( ConfigurationLineInfo cli,
CheckIndexPageResult r, Object[] inf )
throws IOException
{
try
@@ -292,13 +305,13 @@ public class DistCheckIndexPageMojo
{
try
{
- DistCheckIndexPage result = new DistCheckIndexPage( configLine,
version );
+ CheckIndexPageResult result = new CheckIndexPageResult(
configLine, version );
if ( configLine.getIndexPageId() != null )
{
if ( results.get( configLine.getIndexPageId() ) == null )
{
- results.put( configLine.getIndexPageId(), new
LinkedList<DistCheckIndexPage>() );
+ results.put( configLine.getIndexPageId(), new
LinkedList<CheckIndexPageResult>() );
}
results.get( configLine.getIndexPageId() ).add( result );
updateIndexPageInfo( configLine, result, INDEXES_REF.get(
configLine.getIndexPageId() ) );
Modified:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSiteMojo.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSiteMojo.java?rev=1537935&r1=1537934&r2=1537935&view=diff
==============================================================================
---
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSiteMojo.java
(original)
+++
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSiteMojo.java
Fri Nov 1 13:34:03 2013
@@ -127,7 +127,8 @@ public class DistCheckSiteMojo
return "Verification of various maven web sites";
}
- class DistCheckSiteResult extends AbstractCheckResult
+ class CheckSiteResult
+ extends AbstractCheckResult
{
private String url;
@@ -136,7 +137,7 @@ public class DistCheckSiteMojo
private Document document;
private String screenshotName;
- public DistCheckSiteResult( ConfigurationLineInfo r, String version )
+ public CheckSiteResult( ConfigurationLineInfo r, String version )
{
super( r, version );
}
@@ -272,7 +273,7 @@ public class DistCheckSiteMojo
}
// keep result
- private List<DistCheckSiteResult> results = new LinkedList<>();
+ private List<CheckSiteResult> results = new LinkedList<>();
private final List<HTMLChecker> checker = HTMLCheckerFactory.getCheckers();
private WebDriver driver;
@@ -336,7 +337,7 @@ public class DistCheckSiteMojo
sink.tableRow_();
String directory = null;
- for ( DistCheckSiteResult csr : results )
+ for ( CheckSiteResult csr : results )
{
if ( !csr.getConfigurationLine().getDirectory().equals( directory
) )
{
@@ -415,7 +416,7 @@ public class DistCheckSiteMojo
private void checkSite( ConfigurationLineInfo cli, String version )
{
- DistCheckSiteResult result = new DistCheckSiteResult( cli, version );
+ CheckSiteResult result = new CheckSiteResult( cli, version );
results.add( result );
try
{
Modified:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSourceReleaseMojo.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSourceReleaseMojo.java?rev=1537935&r1=1537934&r2=1537935&view=diff
==============================================================================
---
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSourceReleaseMojo.java
(original)
+++
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/DistCheckSourceReleaseMojo.java
Fri Nov 1 13:34:03 2013
@@ -86,7 +86,7 @@ public class DistCheckSourceReleaseMojo
return "Verification of source release";
}
- private static class DistCheckSourceRelease
+ private static class CheckSourceReleaseResult
extends AbstractCheckResult
{
@@ -94,7 +94,7 @@ public class DistCheckSourceReleaseMojo
private List<String> dist;
private List<String> distOlder;
- public DistCheckSourceRelease( ConfigurationLineInfo r, String version
)
+ public CheckSourceReleaseResult( ConfigurationLineInfo r, String
version )
{
super( r, version );
}
@@ -114,7 +114,7 @@ public class DistCheckSourceReleaseMojo
distOlder = checkRepos;
}
}
- private final List<DistCheckSourceRelease> results = new LinkedList<>();
+ private final List<CheckSourceReleaseResult> results = new LinkedList<>();
private static class DirectoryStatistics
{
@@ -130,12 +130,12 @@ public class DistCheckSourceReleaseMojo
this.directory = directory;
}
- public boolean contains( DistCheckSourceRelease csr )
+ public boolean contains( CheckSourceReleaseResult csrr )
{
- return csr.getConfigurationLine().getDirectory().equals( directory
);
+ return csrr.getConfigurationLine().getDirectory().equals(
directory );
}
- public void addArtifact( DistCheckSourceRelease result )
+ public void addArtifact( CheckSourceReleaseResult result )
{
artifactsCount++;
if ( !result.central.isEmpty() )
@@ -157,25 +157,25 @@ public class DistCheckSourceReleaseMojo
}
}
- private void reportLine( Sink sink, DistCheckSourceRelease csr )
+ private void reportLine( Sink sink, CheckSourceReleaseResult csrr )
{
- ConfigurationLineInfo cli = csr.getConfigurationLine();
+ ConfigurationLineInfo cli = csrr.getConfigurationLine();
sink.tableRow();
sink.tableCell();
- sink.rawText( csr.getConfigurationLine().getArtifactId() );
+ sink.rawText( csrr.getConfigurationLine().getArtifactId() );
sink.tableCell_();
// LATEST column
sink.tableCell();
sink.link( cli.getMetadataFileURL( repoBaseUrl ) );
- sink.rawText( csr.getVersion() );
+ sink.rawText( csrr.getVersion() );
sink.link_();
sink.tableCell_();
// DATE column
sink.tableCell();
- sink.rawText( csr.getConfigurationLine().getReleaseDateFromMetadata()
);
+ sink.rawText( csrr.getConfigurationLine().getReleaseDateFromMetadata()
);
sink.tableCell_();
// central column
@@ -184,11 +184,11 @@ public class DistCheckSourceReleaseMojo
sink.text( "artifact" );
sink.link_();
sink.text( "/" );
- sink.link( cli.getVersionnedFolderURL( repoBaseUrl, csr.getVersion() )
);
- sink.text( csr.getVersion() );
+ sink.link( cli.getVersionnedFolderURL( repoBaseUrl, csrr.getVersion()
) );
+ sink.text( csrr.getVersion() );
sink.link_();
sink.text( "/" );
- if ( csr.central.isEmpty() )
+ if ( csrr.central.isEmpty() )
{
iconSuccess( sink );
}
@@ -196,7 +196,7 @@ public class DistCheckSourceReleaseMojo
{
iconWarning( sink );
}
- for ( String missing : csr.central )
+ for ( String missing : csrr.central )
{
sink.lineBreak();
iconError( sink );
@@ -206,12 +206,12 @@ public class DistCheckSourceReleaseMojo
// dist column
sink.tableCell();
- String directory = cli.getDirectory() + ( cli.isSrcBin() ? ( "/" +
csr.getVersion() + "/source" ) : "" );
+ String directory = cli.getDirectory() + ( cli.isSrcBin() ? ( "/" +
csrr.getVersion() + "/source" ) : "" );
sink.link( DIST_AREA + directory );
sink.text( directory );
sink.link_();
sink.text( "source-release" );
- if ( csr.dist.isEmpty() && csr.distOlder.isEmpty() )
+ if ( csrr.dist.isEmpty() && csrr.distOlder.isEmpty() )
{
iconSuccess( sink );
}
@@ -220,15 +220,15 @@ public class DistCheckSourceReleaseMojo
iconWarning( sink );
}
StringBuilder cliMissing = new StringBuilder();
- for ( String missing : csr.dist )
+ for ( String missing : csrr.dist )
{
sink.lineBreak();
iconError( sink );
sink.rawText( missing );
- if ( !csr.central.contains( missing ) )
+ if ( !csrr.central.contains( missing ) )
{
// if the release distribution is in central repository, we
can get it from there...
- cliMissing.append( "\nwget " ).append(
cli.getVersionnedFolderURL( repoBaseUrl, csr.getVersion() ) ).
+ cliMissing.append( "\nwget " ).append(
cli.getVersionnedFolderURL( repoBaseUrl, csrr.getVersion() ) ).
append( "/" ).append( missing );
cliMissing.append( "\nsvn add " ).append( missing );
}
@@ -249,7 +249,7 @@ public class DistCheckSourceReleaseMojo
}
StringBuilder cliOlder = new StringBuilder();
- for ( String missing : csr.distOlder )
+ for ( String missing : csrr.distOlder )
{
sink.lineBreak();
iconRemove( sink );
@@ -296,15 +296,15 @@ public class DistCheckSourceReleaseMojo
List<DirectoryStatistics> statistics = new ArrayList<>();
DirectoryStatistics current = null;
- for ( DistCheckSourceRelease csr : results )
+ for ( CheckSourceReleaseResult csrr : results )
{
- if ( ( current == null ) || !current.contains( csr ) )
+ if ( ( current == null ) || !current.contains( csrr ) )
{
- current = new DirectoryStatistics(
csr.getConfigurationLine().getDirectory() );
+ current = new DirectoryStatistics(
csrr.getConfigurationLine().getDirectory() );
statistics.add( current );
}
- current.addArtifact( csr );
- stats.addArtifact( csr );
+ current.addArtifact( csrr );
+ stats.addArtifact( csrr );
}
Sink sink = getSink();
@@ -353,16 +353,16 @@ public class DistCheckSourceReleaseMojo
Iterator<DirectoryStatistics> dirs = statistics.iterator();
current = null;
- for ( DistCheckSourceRelease csr : results )
+ for ( CheckSourceReleaseResult csrr : results )
{
- if ( ( current == null ) || !current.contains( csr ) )
+ if ( ( current == null ) || !current.contains( csrr ) )
{
current = dirs.next();
sink.tableRow();
sink.tableHeaderCell();
// shorten groupid
- sink.rawText(
csr.getConfigurationLine().getGroupId().replaceAll( "org.apache.maven", "o.a.m"
) + ": "
+ sink.rawText(
csrr.getConfigurationLine().getGroupId().replaceAll( "org.apache.maven",
"o.a.m" ) + ": "
+ String.valueOf( current.artifactsCount ) );
sink.tableHeaderCell_();
sink.tableHeaderCell();
@@ -375,7 +375,7 @@ public class DistCheckSourceReleaseMojo
sink.tableRow_();
}
- reportLine( sink, csr );
+ reportLine( sink, csrr );
}
sink.table_();
@@ -513,7 +513,7 @@ public class DistCheckSourceReleaseMojo
{
try
{
- DistCheckSourceRelease result = new DistCheckSourceRelease(
configLine, version );
+ CheckSourceReleaseResult result = new CheckSourceReleaseResult(
configLine, version );
results.add( result );
// central
