You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2010/08/11 00:33:03 UTC
svn commit: r984248 - in /maven/plugins/branches/maven-site-plugin-3.x:
pom.xml src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java
Author: olamy
Date: Tue Aug 10 22:33:03 2010
New Revision: 984248
URL: http://svn.apache.org/viewvc?rev=984248&view=rev
Log:
[MSITE-494] deploying with weddav doesn't work
Modified:
maven/plugins/branches/maven-site-plugin-3.x/pom.xml
maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java
Modified: maven/plugins/branches/maven-site-plugin-3.x/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/pom.xml?rev=984248&r1=984247&r2=984248&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/pom.xml (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/pom.xml Tue Aug 10 22:33:03 2010
@@ -338,15 +338,13 @@ under the License.
<artifactId>wagon-ftp</artifactId>
<version>${wagonVersion}</version>
</dependency>
- <!--
- disabled webdav as commons-httpclient failed with a java.lang.NoClassDefFoundError
- clash with core.
+
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav-jackrabbit</artifactId>
<version>${wagonVersion}</version>
</dependency>
- -->
+
<!-- Plexus -->
<dependency>
<groupId>org.codehaus.plexus</groupId>
Modified: maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java?rev=984248&r1=984247&r2=984248&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java (original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java Tue Aug 10 22:33:03 2010
@@ -21,6 +21,7 @@ package org.apache.maven.plugins.site;
import java.io.File;
+import org.apache.commons.lang.StringUtils;
import org.apache.maven.artifact.manager.WagonManager;
import org.apache.maven.model.DistributionManagement;
import org.apache.maven.model.Site;
@@ -203,9 +204,10 @@ public class SiteDeployMojo
wagon.addTransferListener( debug );
- /*
- FIXME proxy Info
ProxyInfo proxyInfo = getProxyInfo( repository, wagonManager );
+ getLog().debug( "found proxyInfo "
+ + ( proxyInfo == null ? "null" : "host:port " + proxyInfo.getHost() + ":"
+ + proxyInfo.getPort() + ", " + proxyInfo.getUserName() ) );
if ( proxyInfo != null )
{
wagon.connect( repository, wagonManager.getAuthenticationInfo( id ), proxyInfo );
@@ -214,7 +216,7 @@ public class SiteDeployMojo
{
wagon.connect( repository, wagonManager.getAuthenticationInfo( id ) );
}
- */
+
wagon.connect( repository );
@@ -284,8 +286,6 @@ public class SiteDeployMojo
*/
public static ProxyInfo getProxyInfo( Repository repository, WagonManager wagonManager )
{
- return null;
- /*
ProxyInfo proxyInfo = wagonManager.getProxy( repository.getProtocol() );
if ( proxyInfo == null )
@@ -328,9 +328,8 @@ public class SiteDeployMojo
return null;
}
}
-
return proxyInfo;
- */
+
}
/**