svn commit: r949298 - in /maven/plugins/branches/maven-site-plugin-3.x: ./ src/main/java/org/apache/maven/plugins/site/ src/main/java/org/apache/maven/plugins/site/wagon/ src/main/java/org/apache/maven/plugins/site/wagon/repository/

[olamy]

Author: olamy
Date: Fri May 28 21:23:19 2010
New Revision: 949298

URL: http://svn.apache.org/viewvc?rev=949298&view=rev
Log:
[MSITE-477] merge -r 944144:944145 from trunk

Added:
    
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/wagon/
      - copied from r944145, 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/wagon/
    
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/wagon/PathUtils.java
      - copied unchanged from r944145, 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/wagon/PathUtils.java
    
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/wagon/repository/
      - copied from r944145, 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/wagon/repository/
    
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/wagon/repository/Repository.java
      - copied unchanged from r944145, 
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/wagon/repository/Repository.java
Modified:
    maven/plugins/branches/maven-site-plugin-3.x/   (props changed)
    
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java

Propchange: maven/plugins/branches/maven-site-plugin-3.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri May 28 21:23:19 2010
@@ -1 +1 @@
-/maven/plugins/trunk/maven-site-plugin:806898-806906,807943-808180,809252,810298,886844,886847,890094,890124,942622
+/maven/plugins/trunk/maven-site-plugin:806898-806906,807943-808180,809252,810298,886844,886847,890094,890124,942622,944145

Modified: 
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java
URL: 
http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java?rev=949298&r1=949297&r2=949298&view=diff
==============================================================================
--- 
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java
 (original)
+++ 
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java
 Fri May 28 21:23:19 2010
@@ -26,7 +26,7 @@ import org.apache.maven.model.Site;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.project.MavenProject;
-import org.apache.maven.wagon.repository.Repository;
+import org.apache.maven.plugins.site.wagon.repository.Repository;
 import org.codehaus.plexus.util.PathTool;
 import org.codehaus.plexus.util.StringUtils;