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/17 00:01:00 UTC
svn commit: r1542609 - in /maven/sandbox/trunk/dist-tools/dist-tool-plugin:
pom.xml src/main/java/org/apache/maven/dist/tools/AbstractDistCheckMojo.java
src/main/java/org/apache/maven/dist/tools/DistCheckSiteMojo.java
src/main/resources/dist-tool.conf
Author: hboutemy
Date: Sat Nov 16 23:01:00 2013
New Revision: 1542609
URL: http://svn.apache.org/r1542609
Log:
configure site url in dist-tool.conf instead of pom.xml
Modified:
maven/sandbox/trunk/dist-tools/dist-tool-plugin/pom.xml
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/DistCheckSiteMojo.java
maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/dist-tool.conf
Modified: maven/sandbox/trunk/dist-tools/dist-tool-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/pom.xml?rev=1542609&r1=1542608&r2=1542609&view=diff
==============================================================================
--- maven/sandbox/trunk/dist-tools/dist-tool-plugin/pom.xml (original)
+++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/pom.xml Sat Nov 16 23:01:00 2013
@@ -275,24 +275,6 @@
<ignoreDistFailure>apache-jar-resource-bundle:1.4</ignoreDistFailure>
<ignoreDistFailure>apache-license-header-resource-bundle:1.1</ignoreDistFailure>
</ignoreDistFailures>
- <sites>
- <property>
- <name>apache</name>
- <value>http://maven.apache.org/pom/asf/</value>
- </property>
- <property>
- <name>maven-parent</name>
- <value>http://maven.apache.org/pom/maven/</value>
- </property>
- <property>
- <name>apache-maven:2.0.11</name>
- <value>http://maven.apache.org/ref/2.0.11/</value>
- </property>
- <property>
- <name>apache-maven:2.2.1</name>
- <value>http://maven.apache.org/ref/2.2.1/</value>
- </property>
- </sites>
</configuration>
<reportSets>
<reportSet>
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=1542609&r1=1542608&r2=1542609&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 16 23:01:00 2013
@@ -112,6 +112,14 @@ public abstract class AbstractDistCheckM
protected Map<String, String> paths = new HashMap<String, String>();
/**
+ * Site url mapping, when site url read in pom doesn't get the expected value
+ * The configuration in <code>dist-tool.conf</code> looks like this:
+ * <pre>artifact-id site = site url
+ *artifact-id:version site = site url</pre>
+ */
+ protected Map<String, String> sites = new HashMap<String, String>();
+
+ /**
* is it index page check mojo?
* necessary to only check index page information for plugins marked with asterisk * in db,
* because they are released as part of a global component (archetype, scm, release, ...)
@@ -223,6 +231,10 @@ public abstract class AbstractDistCheckM
{
paths.put( artifactId, value );
}
+ else if ( "site".equals( param ) )
+ {
+ sites.put( artifactId, value );
+ }
else
{
throw new MojoExecutionException( "unknown parameter '" + param + "' in configuration line: "
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=1542609&r1=1542608&r2=1542609&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 16 23:01:00 2013
@@ -25,7 +25,6 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import java.util.Properties;
import org.apache.commons.io.FileUtils;
import org.apache.maven.artifact.Artifact;
@@ -101,25 +100,6 @@ public class DistCheckSiteMojo
*/
protected static final int HTTP_OK = 200;
- /**
- * Site url mapping, when site url read in pom doesn't get the expected value
- * The configuration looks like this:
- * <pre>
- * <sites>
- * <property>
- * <name>artifact-id</name>
- * <value>site url</value>
- * </property>
- * <property>
- * <name>artifact-id:version</name>
- * <value>site url</value>
- * </property>
- * </sites>
- * </pre>
- */
- @Parameter
- private Properties sites;
-
@Override
boolean isIndexPageCheck()
{
@@ -437,10 +417,10 @@ public class DistCheckSiteMojo
MavenProject artifactProject =
mavenProjectBuilder.buildFromRepository( artifact, artifactRepositories, localRepository, false );
- String siteUrl = sites.getProperty( cli.getArtifactId() );
+ String siteUrl = sites.get( cli.getArtifactId() );
if ( siteUrl == null )
{
- siteUrl = sites.getProperty( cli.getArtifactId() + ':' + version );
+ siteUrl = sites.get( cli.getArtifactId() + ':' + version );
if ( siteUrl == null )
{
siteUrl = artifactProject.getUrl();
Modified: maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/dist-tool.conf
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/dist-tool.conf?rev=1542609&r1=1542608&r2=1542609&view=diff
==============================================================================
--- maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/dist-tool.conf (original)
+++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/src/main/resources/dist-tool.conf Sat Nov 16 23:01:00 2013
@@ -6,7 +6,11 @@
dist-area = http://www.apache.org/dist/maven/
apache index-path = /asf/
+apache site = http://maven.apache.org/pom/asf/
+apache-maven:2.0.11 site = http://maven.apache.org/ref/2.0.11/
+apache-maven:2.2.1 site = http://maven.apache.org/ref/2.2.1/
maven-parent index-path = /maven/
+maven-parent site = http://maven.apache.org/pom/maven/
maven-skins index-path = /skins/
/_not_in_distribution_area_: org.apache.maven http://maven.apache.org/pom/