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 2013/11/02 17:01:24 UTC
svn commit: r1538209 - in
/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main:
java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java
java/org/apache/maven/dist/tools/DistCheckSourceReleaseMojo.java
resources/db/mavendb.txt
Author: hboutemy
Date: Sat Nov 2 16:01:24 2013
New Revision: 1538209
URL: http://svn.apache.org/r1538209
Log:
replaced hardcoded distribution area url with info from mavendb.txt
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/DistCheckSourceReleaseMojo.java
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/db/mavendb.txt
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=1538209&r1=1538208&r2=1538209&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 2 16:01:24 2013
@@ -99,7 +99,9 @@ public abstract class AbstractDistCheckM
* list of artifacts repositories.
*/
protected List<ArtifactRepository> artifactRepositories = new LinkedList<>();
-
+
+ protected String distributionAreaUrl;
+
/**
* is it index page check mojo?
* necessary to only check index page information for plugins marked with asterisk * in db,
@@ -194,6 +196,10 @@ public abstract class AbstractDistCheckM
{
getLog().info( line );
}
+ else if ( distributionAreaUrl == null )
+ {
+ distributionAreaUrl = line.trim();
+ }
else if ( !line.startsWith( " " ) )
{
currentGroup = new ConfigurationLineInfo( line.split( " " ) );
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=1538209&r1=1538208&r2=1538209&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 2 16:01:24 2013
@@ -39,8 +39,7 @@ import org.jsoup.nodes.Element;
import org.jsoup.select.Elements;
/**
- *
- * Check presence of source-release.zip in dist repo and central repo
+ * Check presence of source-release.zip in distribution area and central repo
*
* @author skygo
*/
@@ -50,9 +49,6 @@ public class DistCheckSourceReleaseMojo
{
static final String FAILURES_FILENAME = "check-source-release.log";
- private static final String DIST_AREA = "http://www.apache.org/dist/maven/";
- //private static final String DIST_SVNPUBSUB = "https://dist.apache.org/repos/dist/release/maven/";
-
@Override
boolean isIndexPageCheck()
{
@@ -203,7 +199,7 @@ public class DistCheckSourceReleaseMojo
// dist column
sink.tableCell();
String directory = cli.getDirectory() + ( cli.isSrcBin() ? ( "/" + csrr.getVersion() + "/source" ) : "" );
- sink.link( DIST_AREA + directory );
+ sink.link( distributionAreaUrl + directory );
sink.text( directory );
sink.link_();
sink.text( "source-release" );
@@ -323,7 +319,7 @@ public class DistCheckSourceReleaseMojo
sink.link_();
sink.listItem_();
sink.listItem();
- sink.link( DIST_AREA );
+ sink.link( distributionAreaUrl );
sink.text( "Apache distribution area" );
sink.link_();
sink.listItem_();
@@ -518,7 +514,7 @@ public class DistCheckSourceReleaseMojo
// dist
String distUrl =
- DIST_AREA + configLine.getDirectory() + ( configLine.isSrcBin() ? ( "/" + version + "/source" ) : "" );
+ distributionAreaUrl + configLine.getDirectory() + ( configLine.isSrcBin() ? ( "/" + version + "/source" ) : "" );
result.setMissingDistSourceRelease( checkDirectoryIndex( distUrl, configLine, version, true ) );
result.setDistOlderSourceRelease( checkContainsOld( distUrl, configLine, version ) );
}
Modified: maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/db/mavendb.txt
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/db/mavendb.txt?rev=1538209&r1=1538208&r2=1538209&view=diff
==============================================================================
--- maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/db/mavendb.txt (original)
+++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/db/mavendb.txt Sat Nov 2 16:01:24 2013
@@ -6,6 +6,7 @@
#### IP1 site2X
#### IP4 ASF (skin and parent find pattern hardcoded)
+http://www.apache.org/dist/maven/
ant-tasks org.apache.maven src+bin
maven-ant-tasks