svn commit: r1539141 - in /maven/sandbox/trunk/dist-tools/dist-tool-plugin: pom.xml src/main/java/org/apache/maven/dist/tools/DistCheckSiteMojo.java

[rfscholte]

Author: rfscholte
Date: Tue Nov  5 21:47:24 2013
New Revision: 1539141

URL: http://svn.apache.org/r1539141
Log:
Use Properties instead of Map, so the key can contain a ':', which would 
otherwise be a namespace within the XML configuration.

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/DistCheckSiteMojo.java

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=1539141&r1=1539140&r2=1539141&view=diff
==============================================================================
--- maven/sandbox/trunk/dist-tools/dist-tool-plugin/pom.xml (original)
+++ maven/sandbox/trunk/dist-tools/dist-tool-plugin/pom.xml Tue Nov  5 21:47:24 
2013
@@ -270,10 +270,22 @@
             
<ignoreDistFailure>apache-license-header-resource-bundle:1.1</ignoreDistFailure>
           </ignoreDistFailures>
           <sites>
-            <apache>http://maven.apache.org/pom/asf/</apache>
-            <maven-parent>http://maven.apache.org/pom/maven/</maven-parent>
-            
<apache-maven:2.0.11>http://maven.apache.org/ref/2.0.11/</apache-maven:2.0.11>
-            
<apache-maven:2.2.1>http://maven.apache.org/ref/2.2.1/</apache-maven:2.2.1>
+            <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>
           <paths>
             <apache>/asf/</apache>

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=1539141&r1=1539140&r2=1539141&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
 Tue Nov  5 21:47:24 2013
@@ -25,6 +25,7 @@ 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;
@@ -105,13 +106,19 @@ public class DistCheckSiteMojo
      * The configuration looks like this:
      * <pre>
      *   &lt;sites&gt;
-     *     &lt;artifact-id&gt;site url&lt;/artifact-id&gt;
-     *     &lt;artifact-id:version&gt;site url&lt;/artifact-id:version&gt;
+     *     &lt;property&gt;
+     *       &lt;name&gt;artifact-id&lt;/name&gt;
+     *       &lt;value&gt;site url&lt;/value&gt;
+     *     &lt;/property&gt;
+     *     &lt;property&gt;
+     *       &lt;name&gt;artifact-id:version&lt;/name&gt;
+     *       &lt;value&gt;site url&lt;/value&gt;
+     *     &lt;/property&gt;
      *   &lt;/sites&gt;
      * </pre>
      */
     @Parameter
-    private Map<String, String> sites;
+    private Properties sites;
 
     @Override
     boolean isIndexPageCheck()
@@ -434,10 +441,10 @@ public class DistCheckSiteMojo
             MavenProject artifactProject =
                 mavenProjectBuilder.buildFromRepository( artifact, 
artifactRepositories, localRepository, false );
 
-            String siteUrl = sites.get( cli.getArtifactId() );
+            String siteUrl = sites.getProperty( cli.getArtifactId() );
             if ( siteUrl == null )
             {
-                siteUrl = sites.get( cli.getArtifactId() + ':' + version );
+                siteUrl = sites.getProperty( cli.getArtifactId() + ':' + 
version );
                 if ( siteUrl == null )
                 {
                     siteUrl = artifactProject.getUrl();