maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From denn...@apache.org
Subject svn commit: r1154538 - /maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
Date Sat, 06 Aug 2011 16:42:45 GMT
Author: dennisl
Date: Sat Aug  6 16:42:45 2011
New Revision: 1154538

URL: http://svn.apache.org/viewvc?rev=1154538&view=rev
Log:
Do not modify the stagingSiteURL parameter.

Modified:
    maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java

Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java?rev=1154538&r1=1154537&r2=1154538&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
(original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
Sat Aug  6 16:42:45 2011
@@ -85,11 +85,11 @@ public class SiteStageDeployMojo
     protected String getDeployRepositoryURL()
         throws MojoExecutionException
     {
-        stagingSiteURL = stagingSiteURL( stagingSiteURL );
+        String stagingURL = determineStagingSiteURL( stagingSiteURL );
 
-        getLog().info( "Using this base URL for stage deploy: " + stagingSiteURL );
+        getLog().info( "Using this base URL for stage deploy: " + stagingURL );
 
-        return stagingSiteURL;
+        return stagingURL;
     }
 
     /**
@@ -99,7 +99,7 @@ public class SiteStageDeployMojo
      * 
      * @return the site URL for staging
      */
-    private String stagingSiteURL( final String usersStagingSiteURL )
+    private String determineStagingSiteURL( final String usersStagingSiteURL )
         throws MojoExecutionException
     {
         String topLevelURL = null;
@@ -112,7 +112,7 @@ public class SiteStageDeployMojo
         }
         else
         {
-            // The user didn't specify a URL, use the top level target dir
+            // The user didn't specify a URL, use the top level site distribution URL and
add "[/]staging/" to it
             topLevelURL = appendSlash( getRootSite( project ).getUrl() )
                 + DEFAULT_STAGING_DIRECTORY;
             getLog().debug( "stagingSiteURL NOT specified, using the top level project: "
+ topLevelURL );



Mime
View raw message