maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From denn...@apache.org
Subject svn commit: r666335 - /maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java
Date Tue, 10 Jun 2008 21:36:24 GMT
Author: dennisl
Date: Tue Jun 10 14:36:24 2008
New Revision: 666335

URL: http://svn.apache.org/viewvc?rev=666335&view=rev
Log:
o Reuse the siteDirectory variable so that the SiteStageDeployMojo will copy from the correct
directory.

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

Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java?rev=666335&r1=666334&r2=666335&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java
(original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java
Tue Jun 10 14:36:24 2008
@@ -43,7 +43,7 @@
 public class SiteStageMojo
     extends SiteMojo
 {
-    private static final String DEFAULT_STAGING_DIRECTORY = "staging";
+    protected static final String DEFAULT_STAGING_DIRECTORY = "staging";
 
     /**
      * Staging directory location. This needs to be an absolute path, like
@@ -67,10 +67,10 @@
             throw new MojoExecutionException( "Missing site information." );
         }
 
-        File calculatedStagingDirectory = getStagingDirectory( project, reactorProjects,
stagingDirectory );
-        getLog().info( "Using this directory for staging: " + calculatedStagingDirectory
);
+        stagingDirectory = getStagingDirectory( project, reactorProjects, stagingDirectory
);
+        getLog().info( "Using this directory for staging: " + stagingDirectory );
 
-        outputDirectory = new File( calculatedStagingDirectory, structureProject );
+        outputDirectory = new File( stagingDirectory, structureProject );
 
         // Safety
         if ( !outputDirectory.exists() )
@@ -78,7 +78,7 @@
             outputDirectory.mkdirs();
         }
 
-        String outputRelativePath = PathTool.getRelativePath( calculatedStagingDirectory.getAbsolutePath(),
new File(
+        String outputRelativePath = PathTool.getRelativePath( stagingDirectory.getAbsolutePath(),
new File(
             outputDirectory, "dummy.html" ).getAbsolutePath() );
         project.setUrl( outputRelativePath + "/" + structureProject );
 
@@ -155,7 +155,7 @@
      * @param reactorProjects The projects in the reactor
      * @return The top level project in the reactor, or <code>null</code> if
none can be found
      */
-    private MavenProject getTopLevelProject( List reactorProjects )
+    protected MavenProject getTopLevelProject( List reactorProjects )
     {
         MavenProject topLevelProject = null;
         if ( reactorProjects != null )



Mime
View raw message