You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2015/11/28 17:24:28 UTC
svn commit: r1716996 - in
/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools:
AbstractDistCheckMojo.java DistCheckIndexPageMojo.java
DistCheckSiteMojo.java DistCheckSourceReleaseMojo.java
Author: hboutemy
Date: Sat Nov 28 16:24:28 2015
New Revision: 1716996
URL: http://svn.apache.org/viewvc?rev=1716996&view=rev
Log:
added anchors
Modified:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java
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/AbstractDistCheckMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java?rev=1716996&r1=1716995&r2=1716996&view=diff
==============================================================================
--- maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java (original)
+++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java Sat Nov 28 16:24:28 2015
@@ -386,22 +386,22 @@ public abstract class AbstractDistCheckM
* @param cli
* @param version
* @param ignore
- * @param error
+ * @param message
*/
- protected void addErrorLine( ConfigurationLineInfo cli, String version, List<String> ignore, String error )
+ protected void addErrorLine( ConfigurationLineInfo cli, String version, List<String> ignore, String message )
{
if ( ( ignore != null )
&& ( ignore.contains( cli.getArtifactId() + ':' + version ) || ignore.contains( cli.getArtifactId() ) ) )
{
- getLog().warn( error );
+ getLog().warn( message );
}
else
{
- getLog().error( error );
+ getLog().error( message );
try ( PrintWriter output = new PrintWriter( new FileWriter( getFailuresFile(), true ) ) )
{
- output.printf( "%s%s", error, EOL );
+ output.printf( "%s%s", message, EOL );
}
catch ( Exception e )
{
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=1716996&r1=1716995&r2=1716996&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 Sat Nov 28 16:24:28 2015
@@ -151,7 +151,9 @@ public class DistCheckIndexPageMojo
sink.tableRow();
sink.tableCell();
- sink.rawText( cipr.getConfigurationLine().getArtifactId() );
+ sink.anchor( cli.getArtifactId() );
+ sink.rawText( cli.getArtifactId() );
+ sink.anchor_();
sink.tableCell_();
// maven-metadata.xml column
@@ -159,7 +161,7 @@ public class DistCheckIndexPageMojo
sink.link( cli.getMetadataFileURL( repoBaseUrl ) );
sink.rawText( "maven-metadata.xml" );
sink.link_();
- sink.rawText( ": " + cipr.getConfigurationLine().getReleaseDateFromMetadata() + " - " + cipr.indexVersion );
+ sink.rawText( ": " + cli.getReleaseDateFromMetadata() + " - " + cipr.indexVersion );
sink.tableCell_();
// index page column
@@ -167,7 +169,7 @@ public class DistCheckIndexPageMojo
if ( displayDate )
{
sink.rawText( cipr.indexDate );
- if ( isDateSimilar( cipr.getConfigurationLine().getReleaseDateFromMetadata(), cipr.indexDate ) )
+ if ( isDateSimilar( cli.getReleaseDateFromMetadata(), cipr.indexDate ) )
{
iconSuccess( sink );
}
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=1716996&r1=1716995&r2=1716996&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 Sat Nov 28 16:24:28 2015
@@ -335,13 +335,15 @@ public class DistCheckSiteMojo
String directory = null;
for ( CheckSiteResult csr : results )
{
- if ( !csr.getConfigurationLine().getDirectory().equals( directory ) )
+ ConfigurationLineInfo cli = csr.getConfigurationLine();
+
+ if ( !cli.getDirectory().equals( directory ) )
{
- directory = csr.getConfigurationLine().getDirectory();
+ directory = cli.getDirectory();
sink.tableRow();
sink.tableHeaderCell();
// shorten groupid
- sink.rawText( csr.getConfigurationLine().getGroupId().replaceAll( "org.apache.maven", "o.a.m" ) );
+ sink.rawText( cli.getGroupId().replaceAll( "org.apache.maven", "o.a.m" ) );
sink.tableHeaderCell_();
for ( int i = 0; i < 5 ; i++ )
{
@@ -354,7 +356,9 @@ public class DistCheckSiteMojo
sink.tableRow();
sink.tableCell();
- sink.rawText( csr.getConfigurationLine().getArtifactId() );
+ sink.anchor( cli.getArtifactId() );
+ sink.rawText( cli.getArtifactId() );
+ sink.anchor_();
sink.tableCell_();
sink.tableCell();
@@ -362,7 +366,7 @@ public class DistCheckSiteMojo
sink.tableCell_();
sink.tableCell();
- sink.rawText( csr.getConfigurationLine().getReleaseDateFromMetadata() );
+ sink.rawText( cli.getReleaseDateFromMetadata() );
sink.tableCell_();
sink.tableCell();
if ( csr.getStatusCode() != HTTP_OK )
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=1716996&r1=1716995&r2=1716996&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 Sat Nov 28 16:24:28 2015
@@ -163,7 +163,9 @@ public class DistCheckSourceReleaseMojo
sink.tableRow();
sink.tableCell();
- sink.rawText( csrr.getConfigurationLine().getArtifactId() );
+ sink.anchor( cli.getArtifactId() );
+ sink.rawText( cli.getArtifactId() );
+ sink.anchor_();
sink.tableCell_();
// LATEST column
@@ -175,7 +177,7 @@ public class DistCheckSourceReleaseMojo
// DATE column
sink.tableCell();
- sink.rawText( csrr.getConfigurationLine().getReleaseDateFromMetadata() );
+ sink.rawText( cli.getReleaseDateFromMetadata() );
sink.tableCell_();
// dist column