# This patch file was generated by NetBeans IDE
# Following Index: paths are relative to: D:\coding\maven-site-plugin-2.0-beta-7
# This patch can be applied using context Tools: Patch action on respective folder.
# It uses platform neutral UTF-8 encoding and \n newlines.
# Above lines and this line are ignored by the patching process.
Index: pom.xml
--- pom.xml Base (BASE)
+++ pom.xml Locally Modified (Based On LOCAL)
@@ -383,6 +383,6 @@
1.0-alpha-11
1.0-alpha-11
- 1.0-beta-2
+ 1.0-beta-4
Index: src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java
--- src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java Base (BASE)
+++ src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java Locally Modified (Based On LOCAL)
@@ -56,6 +56,7 @@
import org.codehaus.plexus.util.xml.Xpp3Dom;
import java.io.File;
+import org.apache.maven.wagon.proxy.ProxyInfoProvider;
/**
* Deploys the generated site using scp
or file
@@ -174,15 +175,21 @@
wagon.addTransferListener( debug );
- ProxyInfo proxyInfo = getProxyInfo( repository, wagonManager );
- if ( proxyInfo != null )
+// ProxyInfo proxyInfo = getProxyInfo( repository, wagonManager );
+// if ( proxyInfo != null )
+// {
+ wagon.connect( repository, wagonManager.getAuthenticationInfo( id ), new ProxyInfoProvider()
{
- wagon.connect( repository, wagonManager.getAuthenticationInfo( id ), proxyInfo );
- }
- else
+ public ProxyInfo getProxyInfo( String protocol )
{
- wagon.connect( repository, wagonManager.getAuthenticationInfo( id ) );
+ return wagonManager.getProxy( protocol );
}
+ });
+// }
+// else
+// {
+// wagon.connect( repository, wagonManager.getAuthenticationInfo( id ) );
+// }
wagon.putDirectory( inputDirectory, "." );