You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by lt...@apache.org on 2011/03/16 12:31:15 UTC

svn commit: r1082129 - /maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java

Author: ltheussl
Date: Wed Mar 16 11:31:14 2011
New Revision: 1082129

URL: http://svn.apache.org/viewvc?rev=1082129&view=rev
Log:
url-encode project urls

Modified:
    maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java

Modified: maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java?rev=1082129&r1=1082128&r2=1082129&view=diff
==============================================================================
--- maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java (original)
+++ maven/shared/trunk/maven-doxia-tools/src/main/java/org/apache/maven/doxia/tools/DefaultSiteTool.java Wed Mar 16 11:31:14 2011
@@ -1446,7 +1446,7 @@ public class DefaultSiteTool
         if ( project.getDistributionManagement() != null
             && project.getDistributionManagement().getSite() != null )
         {
-            return project.getDistributionManagement().getSite().getUrl();
+            return urlEncode( project.getDistributionManagement().getSite().getUrl() );
         }
 
         return null;
@@ -1463,12 +1463,24 @@ public class DefaultSiteTool
         if ( model.getDistributionManagement() != null
             && model.getDistributionManagement().getSite() != null )
         {
-            return model.getDistributionManagement().getSite().getUrl();
+            return urlEncode( model.getDistributionManagement().getSite().getUrl() );
         }
 
         return null;
     }
 
+    private static String urlEncode( final String url )
+    {
+        try
+        {
+            return new File( url ).toURI().toURL().toExternalForm();
+        }
+        catch ( MalformedURLException ex )
+        {
+            return url; // this will then throw somewhere else
+        }
+    }
+
     private static void setDistMgmntSiteUrl( Model model, String url )
     {
         if ( model.getDistributionManagement() == null )