Author: dennisl
Date: Sun Mar 22 22:25:53 2009
New Revision: 757267
URL: http://svn.apache.org/viewvc?rev=757267&view=rev
Log:
[MSITE-394] Deploying a staging site doesn't set the same permissions as when
deploying a site
o Copy code from the site:deploy mojo so that permissions are set in the same
way.
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java?rev=757267&r1=757266&r2=757267&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageDeployMojo.java
Sun Mar 22 22:25:53 2009
@@ -25,6 +25,8 @@
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.project.MavenProject;
import org.apache.maven.settings.Settings;
+import org.apache.maven.wagon.CommandExecutionException;
+import org.apache.maven.wagon.CommandExecutor;
import org.apache.maven.wagon.ConnectionException;
import org.apache.maven.wagon.ResourceDoesNotExistException;
import org.apache.maven.wagon.TransferFailedException;
@@ -156,6 +158,14 @@
}
wagon.putDirectory( new File( stagingDirectory, getStructure(
project, false ) ), "." );
+
+ // TODO: current wagon uses zip which will use the umask on remote
host instead of honouring our settings
+ // Force group writeable
+ if ( wagon instanceof CommandExecutor )
+ {
+ CommandExecutor exec = (CommandExecutor) wagon;
+ exec.executeCommand( "chmod -Rf g+w,a+rX " +
repository.getBasedir() );
+ }
}
catch ( ResourceDoesNotExistException e )
{
@@ -177,6 +187,10 @@
{
throw new MojoExecutionException( "Error uploading site", e );
}
+ catch ( CommandExecutionException e )
+ {
+ throw new MojoExecutionException( "Error uploading site", e );
+ }
finally
{
try
