svn commit: r944145 - in /maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site: SiteStageMojo.java wagon/ wagon/PathUtils.java wagon/repository/ wagon/repository/Repository.java

[de...@apache.org]

Author: dennisl
Date: Fri May 14 07:21:30 2010
New Revision: 944145

URL: http://svn.apache.org/viewvc?rev=944145&view=rev
Log:
[MSITE-477] <menu ref="modules"/> href's drop the leading character in the href when staging a site

o I had to copy a couple of classes from Wagon to be able to fix this issue

Added:
    maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/wagon/
    maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/wagon/PathUtils.java
      - copied, changed from r944139, maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/PathUtils.java
    maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/wagon/repository/
    maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/wagon/repository/Repository.java
      - copied, changed from r943993, maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/repository/Repository.java
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=944145&r1=944144&r2=944145&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 Fri May 14 07:21:30 2010
@@ -23,7 +23,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;
 

Copied: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/wagon/PathUtils.java (from r944139, maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/PathUtils.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/wagon/PathUtils.java?p2=maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/wagon/PathUtils.java&p1=maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/PathUtils.java&r1=944139&r2=944145&rev=944145&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/PathUtils.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/wagon/PathUtils.java Fri May 14 07:21:30 2010
@@ -1,4 +1,4 @@
-package org.apache.maven.wagon;
+package org.apache.maven.plugins.site.wagon;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,11 +19,16 @@ package org.apache.maven.wagon;
  * under the License.
  */
 
+import org.apache.maven.wagon.WagonConstants;
+
 import java.io.File;
 import java.util.StringTokenizer;
 
 /**
- * Various path (URL) manipulation routines
+ * Various path (URL) manipulation routines.
+ *
+ * <strong>Note: </strong> This is a copy of a file from Wagon. It was copied here to be able to work around WAGON-307.
+ * This class can be removed when the prerequisite Maven version uses wagon-provider-api:1.0-beta-7.
  *
  * @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
  * @version $Id$

Copied: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/wagon/repository/Repository.java (from r943993, maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/repository/Repository.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/wagon/repository/Repository.java?p2=maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/wagon/repository/Repository.java&p1=maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/repository/Repository.java&r1=943993&r2=944145&rev=944145&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-provider-api/src/main/java/org/apache/maven/wagon/repository/Repository.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/wagon/repository/Repository.java Fri May 14 07:21:30 2010
@@ -1,4 +1,4 @@
-package org.apache.maven.wagon.repository;
+package org.apache.maven.plugins.site.wagon.repository;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -19,8 +19,9 @@ package org.apache.maven.wagon.repositor
  * under the License.
  */
 
-import org.apache.maven.wagon.PathUtils;
+import org.apache.maven.plugins.site.wagon.PathUtils;
 import org.apache.maven.wagon.WagonConstants;
+import org.apache.maven.wagon.repository.RepositoryPermissions;
 import org.codehaus.plexus.util.StringUtils;
 
 import java.io.Serializable;
@@ -30,6 +31,9 @@ import java.util.Properties;
  * This class is an abstraction of the location from/to resources
  * can be transfered.
  *
+ * <strong>Note: </strong> This is a copy of a file from Wagon. It was copied here to be able to work around WAGON-307.
+ * This class can be removed when the prerequisite Maven version uses wagon-provider-api:1.0-beta-7.
+ *
  * @author <a href="michal.maczka@dimatics.com">Michal Maczka</a>
  * @version $Id$
  * @todo [BP] some things are specific to certain wagons (eg key stuff in authInfo, permissions)