[ http://jira.codehaus.org/browse/MSITE-91?page=all ]

Franz Allan Valencia See updated MSITE-91:
------------------------------------------

    Attachment: MSITE-91-maven-site-plugin.patch

Contents of MSITE-91-maven-site-plugin.patch
* modified 
org.apache.maven.plugins.site.AbstractSiteMojo#getSiteDescriptorFile( 
java.io.File, java.util.Locale) to become #getSiteDescriptorFile( 
java.util.Locale) so that it uses the siteDirectory as the base directory to 
search for site_<locale lang>.xml or site.xml (and updated its javadoc).
* changed method calls to getSiteDescriptorFile( java.io.File, 
java.util.Locale) to getSiteDescriptorFile( java.util.Locale)
* updated javadoc of 
org.apache.maven.plugins.site.AbstractSiteMojo#siteDirectory.
* provided a site-plugin-siteDirectory-custom under src/test/projects which has 
the following contents

site-plugin-siteDirectory-custom
 |-- site
 |    |-- apt
 |    |     `-- test.apt
 |    `-- site.xml
 `-- pom.xml

where pom.xml has maven-site-plugin's siteDirectory set to "site".

> "src/site/site.xml" hardcoded in AbstractSiteMojo.java
> ------------------------------------------------------
>
>                 Key: MSITE-91
>                 URL: http://jira.codehaus.org/browse/MSITE-91
>             Project: Maven 2.x Site Plugin
>          Issue Type: Bug
>    Affects Versions: 2.0-beta-4
>            Reporter: Fabrice BELLINGARD
>         Assigned To: Dennis Lundberg
>             Fix For: 2.0
>
>         Attachments: MSITE-91-maven-site-plugin.patch, MSITE-91.patch
>
>
> There's a todo in the code, so this issue is more a reminder than an unknown 
> bug.
> In AbstractSiteMojo.java, there's:
>     protected File getSiteDescriptorFile( File basedir, Locale locale )
>     {
>         // TODO: get proper siteDirectory from site configuration of the 
> project this relates to
>         File siteDescriptor = new File( basedir, "src/site/site_" + 
> locale.getLanguage() + ".xml" );
>         if ( !siteDescriptor.exists() )
>         {
>             siteDescriptor = new File( basedir, "src/site/site.xml" );
>         }
>         return siteDescriptor;
>     }

-- 
This message is automatically generated by JIRA.
-
If you think it was sent incorrectly contact one of the administrators: 
http://jira.codehaus.org/secure/Administrators.jspa
-
For more information on JIRA, see: http://www.atlassian.com/software/jira

        

Reply via email to