svn commit: r737595 - in /maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model: ./ src/main/java/org/apache/maven/doxia/site/decoration/inheritance/ src/main/mdo/ src/test

Author: dennisl Date: Sun Jan 25 22:32:15 2009 New Revision: 737595 URL: http://svn.apache.org/viewvc?rev=737595&view=rev Log: [DOXIA-254] Merge revisions 629097, 736603, 736628 and 736630 from trunk. Modified: maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model

svn commit: r737596 - /maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/

Author: dennisl Date: Sun Jan 25 22:38:36 2009 New Revision: 737596 URL: http://svn.apache.org/viewvc?rev=737596&view=rev Log: Commit the mergeinfo as well. Modified: maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/ (props changed) Propchange: maven/doxia/doxia-sitetools/branch

svn commit: r737597 - in /maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-doc-renderer: pom.xml src/main/mdo/document.mdo

Author: dennisl Date: Sun Jan 25 22:42:32 2009 New Revision: 737597 URL: http://svn.apache.org/viewvc?rev=737597&view=rev Log: [DOXIA-254] Using the last version of modello-maven-plugin Modified: maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-doc-renderer/pom.xml maven

svn commit: r737601 - in /maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x: ./ doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/ doxia-decoration-model

Author: dennisl Date: Sun Jan 25 23:14:52 2009 New Revision: 737601 URL: http://svn.apache.org/viewvc?rev=737601&view=rev Log: Merge revisions 736602,736629 from trunk. Modified: maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/ (props changed) maven/doxia/doxia-sitetools/br

svn commit: r737603 - in /maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x: ./ doxia-decoration-model/pom.xml doxia-doc-renderer/pom.xml doxia-site-renderer/pom.xml

Author: dennisl Date: Sun Jan 25 23:19:32 2009 New Revision: 737603 URL: http://svn.apache.org/viewvc?rev=737603&view=rev Log: Merge r641296 from trunk. Modified: maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/ (props changed) maven/doxia/doxia-sitetools/branches/doxia-sit

svn commit: r737608 - in /maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x: ./ doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/

Author: dennisl Date: Sun Jan 25 23:38:30 2009 New Revision: 737608 URL: http://svn.apache.org/viewvc?rev=737608&view=rev Log: Merge r693844 from trunk. Modified: maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/ (props changed) maven/doxia/doxia-sitetools/branches/doxia-sit

svn commit: r737610 - in /maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer: Renderer.java sink/SiteRendererSink.java

Author: dennisl Date: Sun Jan 25 23:43:01 2009 New Revision: 737610 URL: http://svn.apache.org/viewvc?rev=737610&view=rev Log: o Fix author tags. Modified: maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/Rendere

svn commit: r737611 - /maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java

Author: dennisl Date: Sun Jan 25 23:43:24 2009 New Revision: 737611 URL: http://svn.apache.org/viewvc?rev=737611&view=rev Log: Fix id svn keyword. Modified: maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRe

svn commit: r737612 - /maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/Renderer.java

Author: dennisl Date: Sun Jan 25 23:44:18 2009 New Revision: 737612 URL: http://svn.apache.org/viewvc?rev=737612&view=rev Log: o Fix id svn keyword. Modified: maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/Rend

svn commit: r737614 - in /maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x: ./ doxia-decoration-model/pom.xml doxia-decoration-model/src/main/mdo/decoration.mdo

Author: dennisl Date: Sun Jan 25 23:55:51 2009 New Revision: 737614 URL: http://svn.apache.org/viewvc?rev=737614&view=rev Log: Merge r736929 from trunk. Modified: maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/ (props changed) maven/doxia/doxia-sitetools/branches/doxia-sit

svn commit: r737615 - in /maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x: ./ doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/

Author: dennisl Date: Mon Jan 26 00:02:26 2009 New Revision: 737615 URL: http://svn.apache.org/viewvc?rev=737615&view=rev Log: o Merge r733390 from trunk. Modified: maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/ (props changed) maven/doxia/doxia-sitetools/branches/doxia-s

svn commit: r737616 - in /maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x: ./ doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/PathUtils.java

Author: dennisl Date: Mon Jan 26 00:10:32 2009 New Revision: 737616 URL: http://svn.apache.org/viewvc?rev=737616&view=rev Log: o Merge r732668 from trunk. Modified: maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/ (props changed) maven/doxia/doxia-sitetools/branches/doxia-s

svn commit: r737617 - in /maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x: ./ doxia-site-renderer/src/main/resources/org/apache/maven/doxia/siterenderer/resources/default-site.vm

Author: dennisl Date: Mon Jan 26 00:28:52 2009 New Revision: 737617 URL: http://svn.apache.org/viewvc?rev=737617&view=rev Log: [DOXIASITETOOLS-8] Move charset encoding info to top of . o Merge r732684 from trunk. Modified: maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/ (props