Inheritance of elements from site descriptor quite broken

The fix for MSITE-91 in r473599 was the cause for this issue, more precisely the following lines from getSiteDescriptorFile():

String relativePath = getRelativePath( siteDirectory.getAbsolutePath(), basedir.getAbsolutePath() );
File siteDescriptor = new File( relativePath, "site_" + locale.getLanguage() + ".xml" );

The METHOD parameter "basedir" may refer to an ancestor project while the MOJO parameter siteDirectory always refers to the currently executed sub project. And just to bring in another directory, the final path siteDescriptor is setup using a relative path which gets resolved against the user's current working directory which might be anything (though usually the root of a reactor build).

Here is a fix.

Fixing this against maven-doxia-tools is not that easy because the only chance I see is an API redesign.

Unlike my first approach for the maven-site-plugin, I chose to change the siteDirectory parameter for the doxia-tools methods to be a string denoting the relative path to the site directory, eg. "src/site", instead of passing around the base directory of the original project from which the siteDirectory mojo parameter was taken. Callers of the doxia-tools like the maven-site-plugin should be able to easily create this string from their (absolute) java.io.File-based mojo parameter via SiteTool.getRelativePath( siteDirectory.getAbsolutePath(), basedir.getAbsolutePath() ). Doing this once in the plugin for the current project and not for each ancestor project is the key to fix the issue.

Of course, a relative path could be encoded via java.io.File as well but I see the risk that people errorneously pass in absolute paths that they got from Maven's path translation.

BTW, JUnit assertions are written in the order (expected, actual).

new patch applied and updated code in site-plugin

Hi,

I've dowloaded the current version of the maven-site-plugin from the svn trunk.

I still observe the problem that menus are not inherited from the parent.

Moreover, if I do not specify some "<url>" tag in the parent pom.xml, I now observe an exception I did not obtain before. I am enclosing 3 files :
exception.txt shows the new exception raised when no url tag is defined
bug1.zip : the project without url tag defined (modules sites are not built if typing mvn clean then mvn site)
bug2.zip : url tag define (modules sites are built but "menu1" is not inherited by modules)

with current version of maven-site-plugin rebuilt from svn trunk, module site is not built when typing mvn clean then mvn site

exceptionraised when trying to build the site (bug1.zip)

modules sites are built but a menu that should be inherited is not

Moreover, if I do not specify some "<url>" tag in the parent pom.xml, I now observe an exception I did not obtain before.

Looks like you ran into MSITE-180.

"Looks like you ran into MSITE-180."
it may be related however symptoms are not the same: it's not that "IF none of the poms (module or parent) don't have an url tag,
THEN site inheritence quitely isn't applied, for example in the parent's site.xml".
what I observe is : the child's site is not built at all if the url tag is missing. and an exception is raised (exception.txt).

a difficulty for reporting these issues correctly is that behaviour of inheritance seems quite instable. Sometimes, menus are not inherited, sometimes, only menus from parents are shown. Sometimes, skins are not inherited, or partially, sometimes they are...

In the example bug2.zip, with the site plugin checked out from trunk and rebuilt yesterday,if I run "mvn site" in the parent's folders, menu "menu1" is not inherited.

And I'm sorry for the numerous small posts of yesterday : I tried to add a comment to each uploaded file, but clearly it does not work like that !