You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2005/10/24 04:25:52 UTC
svn commit: r327916 -
/maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
Author: brett
Date: Sun Oct 23 19:25:50 2005
New Revision: 327916
URL: http://svn.apache.org/viewcvs?rev=327916&view=rev
Log:
PR: MNG-765
Submitted by: Allan Ramirez
render docs in the ./xdocs directory for m1 compatibility
Modified:
maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
Modified: maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java?rev=327916&r1=327915&r2=327916&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java Sun Oct 23 19:25:50 2005
@@ -30,6 +30,7 @@
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.doxia.module.xdoc.XdocSiteModule;
import java.io.File;
import java.io.FileOutputStream;
@@ -80,6 +81,14 @@
* @required
*/
private File siteDirectory;
+
+ /**
+ * Alternative directory for xdoc source, useful for m1 to m2 migration
+ *
+ * @parameter expression="${basedir}/xdocs"
+ * @required
+ */
+ private File xdocDirectory;
/**
* Directory containing generated documentation.
@@ -271,9 +280,12 @@
// Generate static site
File siteDirectoryFile = siteDirectory;
+ File xdocDirectoryFile = xdocDirectory;
if ( !locale.getLanguage().equals( defaultLocale.getLanguage() ) )
{
siteDirectoryFile = new File( siteDirectory, locale.getLanguage() );
+
+ xdocDirectoryFile = new File( xdocDirectory, locale.getLanguage() );
}
// Try to find duplicate files
@@ -345,6 +357,20 @@
siteRenderer.render( siteDirectoryFile, outputDirectory, siteDescriptor, template, attributes, locale );
+ // Check if ${basedir}/xdocs is existing
+ if( xdocDirectory.exists() )
+ {
+ File[] fileNames = xdocDirectoryFile.listFiles();
+
+ if( fileNames.length > 0 )
+ {
+ XdocSiteModule xdoc = new XdocSiteModule();
+
+ siteRenderer.render( xdocDirectoryFile, outputDirectory, xdoc.getSourceDirectory(), xdoc.getExtension(), xdoc.getParserId(),
+ siteDescriptor, template, attributes, locale, "UTF-8" );
+ }
+ }
+
copyResources( outputDirectory );
// Copy site resources
@@ -387,6 +413,8 @@
{
siteRenderer.render( generatedSiteDirectory, outputDirectory, siteDescriptor, template, attributes,
locale );
+
+
}
}
}
Re: svn commit: r327916 - /maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
Posted by Brett Porter <br...@apache.org>.
I was applying a patch, sorry I missed that. Please feel free to correct it.
- Brett
Vincent Siveton wrote:
> Hi Brett,
>
>
>>+ siteRenderer.render( xdocDirectoryFile,
>>outputDirectory, xdoc.getSourceDirectory(), xdoc.getExtension(),
>>xdoc.getParserId(),
>>+ siteDescriptor, template,
>>attributes, locale, "UTF-8" );
>
>
> Is it normal to use "UTF-8" and not outputEncoding variable?
>
> Cheers,
>
> Vincent
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
RE: svn commit: r327916 - /maven/components/trunk/maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
Posted by Vincent Siveton <vi...@gmail.com>.
Hi Brett,
> + siteRenderer.render( xdocDirectoryFile,
> outputDirectory, xdoc.getSourceDirectory(), xdoc.getExtension(),
> xdoc.getParserId(),
> + siteDescriptor, template,
> attributes, locale, "UTF-8" );
Is it normal to use "UTF-8" and not outputEncoding variable?
Cheers,
Vincent
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org