maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ol...@apache.org
Subject svn commit: r807810 - in /maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site: SiteDeployMojo.java SiteStageDeployMojo.java
Date Tue, 25 Aug 2009 21:30:41 GMT
Author: olamy
Date: Tue Aug 25 21:30:41 2009
New Revision: 807810

URL: http://svn.apache.org/viewvc?rev=807810&view=rev
Log:
fix site-deploy it.

Modified:
    maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteDeployMojo.java
    maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java

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=807810&r1=807809&r2=807810&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 25 21:30:41 2009
@@ -38,6 +38,7 @@
 import org.apache.maven.wagon.TransferFailedException;
 import org.apache.maven.wagon.UnsupportedProtocolException;
 import org.apache.maven.wagon.Wagon;
+import org.apache.maven.wagon.authentication.AuthenticationException;
 import org.apache.maven.wagon.authorization.AuthorizationException;
 import org.apache.maven.wagon.observers.Debug;
 import org.apache.maven.wagon.proxy.ProxyInfo;
@@ -132,6 +133,7 @@
 
     private PlexusContainer container;
 
+    // FIXME too much duplicate code with SiteStageDeployMojo
     /** {@inheritDoc} */
     public void execute()
         throws MojoExecutionException
@@ -213,6 +215,9 @@
                 wagon.connect( repository, wagonManager.getAuthenticationInfo( id ) );
             }
             */
+            
+            wagon.connect( repository );
+            
             wagon.putDirectory( inputDirectory, "." );
             
             if ( chmod && wagon instanceof CommandExecutor )
@@ -233,14 +238,14 @@
         {
             throw new MojoExecutionException( "Error uploading site", e );
         }
-        /*catch ( ConnectionException e )
+        catch ( ConnectionException e )
         {
             throw new MojoExecutionException( "Error uploading site", e );
         }
         catch ( AuthenticationException e )
         {
             throw new MojoExecutionException( "Error uploading site", e );
-        }*/
+        }
         catch ( CommandExecutionException e )
         {
             throw new MojoExecutionException( "Error uploading site", e );

Modified: maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java?rev=807810&r1=807809&r2=807810&view=diff
==============================================================================
--- maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
(original)
+++ maven/plugins/branches/maven-site-plugin-3.x/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
Tue Aug 25 21:30:41 2009
@@ -129,6 +129,9 @@
         deployStagingSite();
     }
 
+    
+    // FIXME too much duplicate code with SiteDeployMojo
+    
     /**
      * Deploy the staging directory using the stagingSiteURL.
      *
@@ -184,7 +187,6 @@
             wagon.addTransferListener( debug );
 
             /*
-             FIXME take care about proxy use
             ProxyInfo proxyInfo = SiteDeployMojo.getProxyInfo( repository, wagonManager );
             if ( proxyInfo != null )
             {
@@ -195,6 +197,7 @@
                 wagon.connect( repository, wagonManager.getAuthenticationInfo( stagingRepositoryId
) );
             }
             */
+            wagon.connect( repository );
             wagon.putDirectory( new File( stagingDirectory, getStructure( project, false
) ), "." );
 
             getLog().debug( "putDirectory end ok " );
@@ -216,14 +219,14 @@
         {
             throw new MojoExecutionException( "Error uploading site", e );
         }
-        /*catch ( ConnectionException e )
+        catch ( ConnectionException e )
         {
             throw new MojoExecutionException( "Error uploading site", e );
         }
         catch ( AuthenticationException e )
         {
             throw new MojoExecutionException( "Error uploading site", e );
-        }*/
+        }
         catch ( CommandExecutionException e )
         {
             throw new MojoExecutionException( "Error uploading site", e );



Mime
View raw message