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/16 23:53:05 UTC
svn commit: r1542607 - in /maven/sandbox/trunk/dist-tools/dist-tool-plugin:
./ src/main/java/org/apache/maven/dist/tools/ src/main/resources/
Author: hboutemy
Date: Sat Nov 16 22:53:05 2013
New Revision: 1542607
URL: http://svn.apache.org/r1542607
Log:
configure index path 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/DistCheckIndexPageMojo.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=1542607&r1=1542606&r2=1542607&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 22:53:05 2013
@@ -293,11 +293,6 @@
<value>http://maven.apache.org/ref/2.2.1/</value>
</property>
</sites>
- <paths>
- <apache>/asf/</apache>
- <maven-parent>/maven/</maven-parent>
- <maven-skins>/skins/</maven-skins>
- </paths>
</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=1542607&r1=1542606&r2=1542607&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 22:53:05 2013
@@ -30,8 +30,10 @@ import java.io.PrintWriter;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy;
@@ -103,6 +105,13 @@ public abstract class AbstractDistCheckM
protected String distributionAreaUrl;
/**
+ * Path in index page mapping, when path is not the classical /artifact-id/
+ * The configuration in <code>dist-tool.conf</code> looks like this:
+ * <pre>artifact-id index-path = /directory/</pre>
+ */
+ protected Map<String, String> paths = 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, ...)
@@ -204,6 +213,26 @@ public abstract class AbstractDistCheckM
{
distributionAreaUrl = value;
}
+ else if ( param.contains( " " ) )
+ {
+ index = param.indexOf( ' ' );
+ String artifactId = param.substring( 0, index );
+ param = param.substring( index ).trim();
+
+ if ( "index-path".equals( param ) )
+ {
+ paths.put( artifactId, value );
+ }
+ else
+ {
+ throw new MojoExecutionException( "unknown parameter '" + param + "' in configuration line: "
+ + line );
+ }
+ }
+ else
+ {
+ throw new MojoExecutionException( "unparseable configuration line: " + line );
+ }
continue;
}
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=1542607&r1=1542606&r2=1542607&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 16 22:53:05 2013
@@ -58,18 +58,6 @@ public class DistCheckIndexPageMojo
private static final Map<String, IndexPage> INDEX_PAGES_REF;
- /**
- * Path in index page mapping, when path is not the classical /artifact-id/
- * The configuration looks like this:
- * <pre>
- * <paths>
- * <artifact-id>/directory/</artifact-id>
- * </paths>
- * </pre>
- */
- @Parameter
- private Map<String, String> paths;
-
private static class IndexPage
{
final String url;
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=1542607&r1=1542606&r2=1542607&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 22:53:05 2013
@@ -5,6 +5,10 @@
dist-area = http://www.apache.org/dist/maven/
+apache index-path = /asf/
+maven-parent index-path = /maven/
+maven-skins index-path = /skins/
+
/_not_in_distribution_area_: org.apache.maven http://maven.apache.org/pom/
maven-parent
/_not_in_distribution_area_: org.apache http://maven.apache.org/pom/