filename with dot have a false output name

fixed in rev 586714

fix in branch too.(rev 586732)

This patch breaks the velocity template functionality. This new code changes the output filenames of these files so that they are different than before. An example of this is https://svn.apache.org/repos/asf/maven/site/trunk/src/site/apt/download.apt.vm, which with this code gets the output filename download.apt.html instead of download.html.

I have reverted the patch on the alpha-branch, but this code is still present in trunk.

Sorry didn't know this feature with velocity files.
To really solve this we have to know the file extension in o.a.m.d.m.x.d.r.RenderingContext with adding a new constructor with this.
This means a change o.a.m.d.s.DefaultSiteRenderer to use this new constructor with module.getExtension().

committed in rev 587277 for doxia-1.0-alpha-x branch.
committed in rev 587278 for doxia-sitetools-1.0-alpha-x branch.
Leave it open until merge in doxia/doxia-sitetools trunks.

Dennis can you deploy new snapshots or fix perms

 
$ pwd
/www/people.apache.org/repo/m2-snapshot-repository/org/apache/maven/doxia/doxia/1.0-alpha-10-SNAPSHOT
[olamy@minotaur /www/people.apache.org/repo/m2-snapshot-repository/org/apache/maven/doxia/doxia/1.0-alpha-10-SNAPSHOT]$ ls -lrt maven-*
-rw-r--r--  1 dennisl  apcvs  368 Oct 22 21:31 maven-metadata.xml
-rw-r--r--  1 dennisl  apcvs   32 Oct 22 21:31 maven-metadata.xml.md5
-rw-r--r--  1 dennisl  apcvs   40 Oct 22 21:31 maven-metadata.xml.sha1

[olamy@minotaur /www/people.apache.org/repo/m2-snapshot-repository/org/apache/maven/doxia/doxia-sitetools]$ pwd
/www/people.apache.org/repo/m2-snapshot-repository/org/apache/maven/doxia/doxia-sitetools
[olamy@minotaur /www/people.apache.org/repo/m2-snapshot-repository/org/apache/maven/doxia/doxia-sitetools]$ ls -lrt maven-me*
-rw-r--r--  1 dennisl  apcvs  435 Oct 20 19:40 maven-metadata.xml
-rw-r--r--  1 dennisl  apcvs   32 Oct 20 19:40 maven-metadata.xml.md5
-rw-r--r--  1 dennisl  apcvs   40 Oct 20 19:40 maven-metadata.xml.sha1

If all is fine with you I will merge this to trunks.

Thanks.

As per the comments on the <users@maven.apache.org> list ("Site Plugin 2.0-beta-6-SNAPSHOT ".vm" filtering fails now"), this seems to be fixed in the latest snapshot available from http://people.apache.org/repo/m2-snapshot-repository.

Thanks!

Olivier, I removed you patch from the alpha-branch because it broke the site plugin for people. Could you please apply your changes to the trunk instead. When you have that working we can merge it to the branch, if there will be more releases from that branch.

The alpha-10 release is meant to fix regressions in alpha-9. So only things that did work in alpha-8, but didn't work in alpha-9 should go into alpha-10. We need to get a stable release of doxia out as soon as possible.

I'm not sure why the permissions are screwed up in the SNAPSHOT repo. I'll try to fix that now. But I will not publish new SNAPSHOTS for the above reasons.

I understand for rev 586732.

But have you looked at ? :

• rev 587277 for doxia-1.0-alpha-x branch.
• rev 587278 for doxia-sitetools-1.0-alpha-x branch.

It fixed with :

• rev 587277 for doxia-1.0-alpha-x branch.
• rev 587278 for doxia-sitetools-1.0-alpha-x branch.

it added in site plugin (rev 587811) concerning the use of files like download.apt.vm.
I will close when the merge in trunk will be done.

merge in trunks done :

• 588051 for doxia-sitetools
• 588049 for doxia