You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2015/12/28 16:45:42 UTC
svn commit: r1721941 - in /maven/plugins/trunk/maven-site-plugin/src:
it/doxia-formats/pom.xml it/doxia-formats/verify.groovy
main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java
Author: hboutemy
Date: Mon Dec 28 15:45:42 2015
New Revision: 1721941
URL: http://svn.apache.org/viewvc?rev=1721941&view=rev
Log:
[MSITE-756] renamed saveVelocityDocument parameter to more generic saveProcessedContent
Modified:
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/pom.xml
maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/verify.groovy
maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java
Modified: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/pom.xml?rev=1721941&r1=1721940&r2=1721941&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/pom.xml (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/pom.xml Mon Dec 28 15:45:42 2015
@@ -41,7 +41,7 @@ under the License.
<artifactId>maven-site-plugin</artifactId>
<version>@project.version@</version>
<configuration>
- <saveVelocityDocument>true</saveVelocityDocument>
+ <saveProcessedContent>true</saveProcessedContent>
</configuration>
</plugin>
</plugins>
Modified: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/verify.groovy
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/verify.groovy?rev=1721941&r1=1721940&r2=1721941&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/verify.groovy (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/verify.groovy Mon Dec 28 15:45:42 2015
@@ -30,6 +30,6 @@ assert content.contains( 'href="#Subsect
ignore = new File( basedir, 'target/site/ignore.txt' );
assert !ignore.exists();
-assert new File( basedir, 'target/generated-site/velocity/velocity-context.apt' ).exists();
+assert new File( basedir, 'target/generated-site/processed/velocity-context.apt' ).exists();
return true;
\ No newline at end of file
Modified: maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java?rev=1721941&r1=1721940&r2=1721941&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java (original)
+++ maven/plugins/trunk/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/render/AbstractSiteRenderingMojo.java Mon Dec 28 15:45:42 2015
@@ -190,12 +190,13 @@ public abstract class AbstractSiteRender
private boolean generateProjectInfo;
/**
- * Whether to save Velocity processed Doxia documents to <code>${generatedSiteDirectory}/velocity</code>.
+ * Whether to save Velocity processed Doxia content (<code>*.<ext>.vm</code>)
+ * to <code>${generatedSiteDirectory}/processed</code>.
*
* @since 3.5
*/
@Parameter
- private boolean saveVelocityDocument;
+ private boolean saveProcessedContent;
/** {@inheritDoc} */
public void contextualize( Context context )
@@ -359,9 +360,9 @@ public abstract class AbstractSiteRender
context.setModuleExcludes( moduleExcludes );
}
- if ( saveVelocityDocument )
+ if ( saveProcessedContent )
{
- context.setVelocityDocumentOutput( new File( generatedSiteDirectory, "velocity" ) );
+ context.setProcessedContentOutput( new File( generatedSiteDirectory, "processed" ) );
}
return context;