Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PR: MNG-765 

Submitted by: Allan Ramirez
render docs in the ./xdocs directory for m1 compatibility



git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@327916 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-10-24 02:25:50 +00:00
parent c6b56c0e4e
commit 40f9ee50eb
1 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
maven-plugins/maven-site-plugin/src/main/java/org/apache/maven/plugins/site/SiteMojo.java
View File

@ -30,6 +30,7 @@ import org.codehaus.plexus.util.DirectoryScanner;
import org.codehaus.plexus.util.FileUtils; import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.IOUtil; import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.StringUtils;
import org.codehaus.doxia.module.xdoc.XdocSiteModule;
import java.io.File; import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;
@ -80,6 +81,14 @@ public class SiteMojo
* @required * @required
*/ */
private File siteDirectory; 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. * Directory containing generated documentation.
@ -271,9 +280,12 @@ public class SiteMojo
// Generate static site // Generate static site
File siteDirectoryFile = siteDirectory; File siteDirectoryFile = siteDirectory;
File xdocDirectoryFile = xdocDirectory;
if ( !locale.getLanguage().equals( defaultLocale.getLanguage() ) ) if ( !locale.getLanguage().equals( defaultLocale.getLanguage() ) )
{ {
siteDirectoryFile = new File( siteDirectory, locale.getLanguage() ); siteDirectoryFile = new File( siteDirectory, locale.getLanguage() );
xdocDirectoryFile = new File( xdocDirectory, locale.getLanguage() );
} }
// Try to find duplicate files // Try to find duplicate files
@ -345,6 +357,20 @@ public class SiteMojo
siteRenderer.render( siteDirectoryFile, outputDirectory, siteDescriptor, template, attributes, locale ); 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 ); copyResources( outputDirectory );
// Copy site resources // Copy site resources
@ -387,6 +413,8 @@ public class SiteMojo
{ {
siteRenderer.render( generatedSiteDirectory, outputDirectory, siteDescriptor, template, attributes, siteRenderer.render( generatedSiteDirectory, outputDirectory, siteDescriptor, template, attributes,
locale ); locale );
} }
} }
} }