Author: hboutemy
Date: Sun Sep 2 21:00:00 2012
New Revision: 1380054
URL: http://svn.apache.org/viewvc?rev=1380054&view=rev
Log:
[MSITE-652] keep site staging when skipDeploy=true
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/site-skip/skip-site-deploy/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/site-skip/skip-site/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/site-skip/verify.bsh
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteStageMojo.java
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/site-skip/skip-site-deploy/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-skip/skip-site-deploy/pom.xml?rev=1380054&r1=1380053&r2=1380054&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/it/site-skip/skip-site-deploy/pom.xml
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/it/site-skip/skip-site-deploy/pom.xml
Sun Sep 2 21:00:00 2012
@@ -29,7 +29,7 @@ under the License.
<version>1.0-SNAPSHOT</version>
</parent>
- <artifactId>site-deploy-skip</artifactId>
+ <artifactId>skip-site-deploy</artifactId>
<packaging>pom</packaging>
<name>Skip Site Deploy</name>
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/site-skip/skip-site/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-skip/skip-site/pom.xml?rev=1380054&r1=1380053&r2=1380054&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/site-skip/skip-site/pom.xml
(original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/site-skip/skip-site/pom.xml
Sun Sep 2 21:00:00 2012
@@ -29,7 +29,7 @@ under the License.
<version>1.0-SNAPSHOT</version>
</parent>
- <artifactId>site-skip</artifactId>
+ <artifactId>skip-site</artifactId>
<packaging>pom</packaging>
<name>Skip Site</name>
Modified: maven/plugins/trunk/maven-site-plugin/src/it/site-skip/verify.bsh
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/site-skip/verify.bsh?rev=1380054&r1=1380053&r2=1380054&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/site-skip/verify.bsh (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/site-skip/verify.bsh Sun Sep
2 21:00:00 2012
@@ -129,9 +129,9 @@ try
}
stageDir = new File( stageDirectory, "skip-site-deploy" );
- if ( stageDir.exists() )
+ if ( !stageDir.exists() )
{
- System.err.println( "skip-site-deploy stage site exists." );
+ System.err.println( "skip-site-deploy stage site should still exist."
);
result = false;
}
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java?rev=1380054&r1=1380053&r2=1380054&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/AbstractDeployMojo.java
Sun Sep 2 21:00:00 2012
@@ -155,7 +155,7 @@ public abstract class AbstractDeployMojo
public void execute()
throws MojoExecutionException
{
- if ( skipDeploy )
+ if ( skipDeploy && isDeploy() )
{
getLog().info( "maven.site.deploy.skip = true: Skipping site
deployment" );
return;
@@ -848,6 +848,16 @@ public abstract class AbstractDeployMojo
return site;
}
+ /**
+ * Detect if the mojo is staging or deploying.
+ *
+ * @return rue if the mojo is for deploy and not staging
+ */
+ protected boolean isDeploy()
+ {
+ return true;
+ }
+
private static class URIEncoder
{
private static final String MARK = "-_.!~*'()";
Modified:
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java?rev=1380054&r1=1380053&r2=1380054&view=diff
==============================================================================
---
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
(original)
+++
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
Sun Sep 2 21:00:00 2012
@@ -85,7 +85,7 @@ public class SiteMojo
private boolean validate;
/**
- * Set this to 'true' to skip site generation.
+ * Set this to 'true' to skip site generation and staging.
*
* @since 3.0
*/
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=1380054&r1=1380053&r2=1380054&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
Sun Sep 2 21:00:00 2012
@@ -51,6 +51,14 @@ public class SiteStageMojo
@Parameter( property = "stagingDirectory" )
private File stagingDirectory;
+ /**
+ * Set this to 'true' to skip site generation and staging.
+ *
+ * @since 3.2
+ */
+ @Parameter( property = "maven.site.skip", defaultValue = "false" )
+ private boolean skip;
+
@Override
protected String getDeployRepositoryID()
throws MojoExecutionException
@@ -77,6 +85,24 @@ public class SiteStageMojo
return "file://" + outputDirectory.getAbsolutePath();
}
+ public void execute()
+ throws MojoExecutionException
+ {
+ if ( skip )
+ {
+ getLog().info( "maven.site.skip = true: Skipping site staging" );
+ return;
+ }
+
+ super.execute();
+ }
+
+ protected boolean isDeploy()
+ {
+ // this mojo is for staging, not deploy
+ return false;
+ }
+
/**
* Find the directory where staging will take place.
*
