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

2009-01-25 Thread dennisl 
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/pom.xml

maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java

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

maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/src/main/mdo/decoration.mdo

maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/src/test/resources/child.xml

maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/src/test/resources/merged.xml

maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/src/test/resources/parent.xml

maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/src/test/resources/relative-urls-resolved.xml

Modified: 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/pom.xml?rev=737595&r1=737594&r2=737595&view=diff
==
--- 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/pom.xml
 (original)
+++ 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/pom.xml
 Sun Jan 25 22:32:15 2009
@@ -41,16 +41,6 @@
   
 
   
-
-  
-
-
-  org.codehaus.modello
-  modello-maven-plugin
-  1.0-alpha-17
-
-  
-
 
   
 org.codehaus.modello

Modified: 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java?rev=737595&r1=737594&r2=737595&view=diff
==
--- 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
 (original)
+++ 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
 Sun Jan 25 22:32:15 2009
@@ -31,6 +31,7 @@
 import org.apache.maven.doxia.site.decoration.Logo;
 import org.apache.maven.doxia.site.decoration.Menu;
 import org.apache.maven.doxia.site.decoration.MenuItem;
+import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.util.xml.Xpp3Dom;
 
 /**
@@ -38,6 +39,7 @@
  *
  * @author mailto:br...@apache.org";>Brett Porter
  * @author mailto:henn...@apache.org";>Henning P. Schmiedehausen
+ * @version $Id$
  * @plexus.component 
role="org.apache.maven.doxia.site.decoration.inheritance.DecorationModelInheritanceAssembler"
  */
 public class DefaultDecorationModelInheritanceAssembler implements 
DecorationModelInheritanceAssembler
@@ -250,9 +252,13 @@
 
 private void resolveLinkItemPaths( LinkItem item, final URLContainer 
urlContainer )
 {
-if ( item.getHref() != null )
+if ( StringUtils.isNotEmpty( item.getHref() ) )
 {
-item.setHref( convertPath( item.getHref(), urlContainer ) );
+String href = convertPath( item.getHref(), urlContainer );
+if ( StringUtils.isNotEmpty( href ) )
+{
+item.setHref( href );
+}
 }
 else
 {

Modified: 
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
URL: 
http://svn.apache.org/viewvc/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?rev=737595&r1=737594&r2=737595&view=diff
==
--- 
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
 (original)
+++ 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-deco

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

2009-01-25 Thread dennisl 
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/branches/doxia-sitetools-1.0.x/
--
svn:mergeinfo = 
/maven/doxia/doxia-sitetools/trunk:629097,736603,736628,736630

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

2009-01-25 Thread dennisl 
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/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-doc-renderer/src/main/mdo/document.mdo

Modified: 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-doc-renderer/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-doc-renderer/pom.xml?rev=737597&r1=737596&r2=737597&view=diff
==
--- 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-doc-renderer/pom.xml
 (original)
+++ 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-doc-renderer/pom.xml
 Sun Jan 25 22:42:32 2009
@@ -115,7 +115,9 @@
 
 
   1.0.0
-  src/main/mdo/document.mdo
+  
+src/main/mdo/document.mdo
+  
 
   
 

Modified: 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-doc-renderer/src/main/mdo/document.mdo
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-doc-renderer/src/main/mdo/document.mdo?rev=737597&r1=737596&r2=737597&view=diff
==
--- 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-doc-renderer/src/main/mdo/document.mdo
 (original)
+++ 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-doc-renderer/src/main/mdo/document.mdo
 Sun Jan 25 22:42:32 2009
@@ -86,7 +86,7 @@
   
 
 
-
+
   DocumentTOC
   A Table Of Content for the document.
   1.0.0

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

2009-01-25 Thread dennisl 
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/branches/doxia-sitetools-1.0.x/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritanceAssembler.java

maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritenceAssemblerTest.java

maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/Doxia91Test.java

maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/PathDescriptorTest.java

Propchange: maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 25 23:14:52 2009
@@ -1 +1 @@
-/maven/doxia/doxia-sitetools/trunk:629097,736603,736628,736630
+/maven/doxia/doxia-sitetools/trunk:629097,736602-736603,736628-736630

Modified: 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritanceAssembler.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritanceAssembler.java?rev=737601&r1=737600&r2=737601&view=diff
==
--- 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritanceAssembler.java
 (original)
+++ 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritanceAssembler.java
 Sun Jan 25 23:14:52 2009
@@ -25,13 +25,30 @@
  * Manage inheritance of the decoration model.
  *
  * @author mailto:br...@apache.org";>Brett Porter
+ * @version $Id$
  */
 public interface DecorationModelInheritanceAssembler
 {
+/** Plexus lookup role. */
 String ROLE = DecorationModelInheritanceAssembler.class.getName();
 
-void assembleModelInheritance( String name, DecorationModel child, 
DecorationModel parent, String childBaseUrl,
-   String parentBaseUrl );
+/**
+ * Manage inheritance of the decoration model between a parent and child.
+ *
+ * @param name a name, used for breadcrumb.
+ * @param child the child DecorationModel to be merged with parent.
+ * @param parent the parent DecorationModel not null.
+ * @param childBaseUrl the child base URL.
+ * @param parentBaseUrl the parent base URL.
+ */
+void assembleModelInheritance( String name, DecorationModel child, 
DecorationModel parent,
+   String childBaseUrl, String parentBaseUrl );
 
+/**
+ * Resolve relative paths for a DecorationModel given a base URL.
+ *
+ * @param decoration  the DecorationModel.
+ * @param baseUrl the base URL.
+ */
 void resolvePaths( DecorationModel decoration, String baseUrl );
 }

Modified: 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritenceAssemblerTest.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritenceAssemblerTest.java?rev=737601&r1=737600&r2=737601&view=diff
==
--- 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritenceAssemblerTest.java
 (original)
+++ 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/src/test/java/org/apache/maven/doxia/site/decoration/inheritance/DecorationModelInheritenceAssemblerTest.java
 Sun Jan 25 23:14:52 2009
@@ -36,6 +36,7 @@
  * Test the inheritance assembler.
  *
  * @author mailto:br...@apache.org";>Brett Porter
+ * @version $Id$
  */
 public class DecorationModelInheritenceAssemblerTest
 extends TestCase
@@ -52,8 +53,8 @@
 
 assembler.assembleModelInheritance( NAME, childModel, parentModel, 
"http://maven.apache.org/doxia";,

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

2009-01-25 Thread dennisl 
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-sitetools-1.0.x/doxia-decoration-model/pom.xml

maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-doc-renderer/pom.xml

maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/pom.xml

Propchange: maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 25 23:19:32 2009
@@ -1 +1 @@
-/maven/doxia/doxia-sitetools/trunk:629097,736602-736603,736628-736630
+/maven/doxia/doxia-sitetools/trunk:629097,641296,736602-736603,736628-736630

Modified: 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/pom.xml?rev=737603&r1=737602&r2=737603&view=diff
==
--- 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/pom.xml
 (original)
+++ 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/pom.xml
 Sun Jan 25 23:19:32 2009
@@ -30,7 +30,7 @@
   
 
   doxia-decoration-model
-  Doxia Decoration Model
+  Doxia Sitetools :: Decoration Model
   The Decoration Model handles the site descriptor, also known as 
site.xml.
 
   

Modified: 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-doc-renderer/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-doc-renderer/pom.xml?rev=737603&r1=737602&r2=737603&view=diff
==
--- 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-doc-renderer/pom.xml
 (original)
+++ 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-doc-renderer/pom.xml
 Sun Jan 25 23:19:32 2009
@@ -30,7 +30,7 @@
   
 
   doxia-doc-renderer
-  Doxia Document Renderer Component
+  Doxia Sitetools :: Document Renderer Component
   The Document Renderer handles the rendering of documents, in 
formats like PDF and RTF.
 
   

Modified: 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/pom.xml?rev=737603&r1=737602&r2=737603&view=diff
==
--- 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/pom.xml
 (original)
+++ 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/pom.xml
 Sun Jan 25 23:19:32 2009
@@ -30,7 +30,7 @@
   
 
   doxia-site-renderer
-  Doxia Site Renderer Component
+  Doxia Sitetools :: Site Renderer Component
   The Site Renderer handles the rendering of sites.

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/

2009-01-25 Thread dennisl 
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-sitetools-1.0.x/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java

maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DocumentRenderer.java

maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DoxiaDocumentRenderer.java

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

maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/RendererException.java

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

Propchange: maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 25 23:38:30 2009
@@ -1 +1 @@
-/maven/doxia/doxia-sitetools/trunk:629097,641296,736602-736603,736628-736630
+/maven/doxia/doxia-sitetools/trunk:629097,641296,693844,736602-736603,736628-736630

Modified: 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java?rev=737608&r1=737607&r2=737608&view=diff
==
--- 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
 (original)
+++ 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
 Sun Jan 25 23:38:30 2009
@@ -19,6 +19,40 @@
  * under the License.
  */
 
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.LineNumberReader;
+import java.io.OutputStreamWriter;
+import java.io.Reader;
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.io.UnsupportedEncodingException;
+import java.io.Writer;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+
+import java.text.DateFormat;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
 import org.apache.maven.doxia.Doxia;
 import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext;
 import org.apache.maven.doxia.parser.ParseException;
@@ -29,23 +63,23 @@
 import org.apache.maven.doxia.module.site.manager.SiteModuleManager;
 import org.apache.maven.doxia.module.site.manager.SiteModuleNotFoundException;
 import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
+
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.context.Context;
+
 import org.codehaus.plexus.i18n.I18N;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
-import org.codehaus.plexus.util.*;
+import org.codehaus.plexus.util.DirectoryScanner;
+import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.Os;
+import org.codehaus.plexus.util.PathTool;
+import org.codehaus.plexus.util.ReaderFactory;
+import org.codehaus.plexus.util.StringUtils;
 import org.codehaus.plexus.velocity.SiteResourceLoader;
 import org.codehaus.plexus.velocity.VelocityComponent;
 
-import java.io.*;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.text.DateFormat;
-import java.util.*;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
 
 /**
  * @author mailto:eveni...@codehaus.org";>Emmanuel Venisse
@@ -565,7 +599,7 @@
 SiteRenderingContext context = new SiteRenderingContext();
 
 context.setTemplateName( templateFile.getName() );
-context.setTemplateClassLoader( new URLClassLoader( new 
URL[]{templat

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

2009-01-25 Thread dennisl 
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/Renderer.java

maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/sink/SiteRendererSink.java

Modified: 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/Renderer.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/Renderer.java?rev=737610&r1=737609&r2=737610&view=diff
==
--- 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/Renderer.java
 (original)
+++ 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/Renderer.java
 Sun Jan 25 23:43:01 2009
@@ -34,7 +34,7 @@
 import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink;
 
 /**
- * @author mailto:eveni...@codehaus.org>Emmanuel Venisse
+ * @author mailto:eveni...@codehaus.org";>Emmanuel Venisse
  * @version $Id:Renderer.java 348612 2005-11-24 12:54:19 +1100 (Thu, 24 Nov 
2005) brett $
  */
 public interface Renderer

Modified: 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/sink/SiteRendererSink.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/sink/SiteRendererSink.java?rev=737610&r1=737609&r2=737610&view=diff
==
--- 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/sink/SiteRendererSink.java
 (original)
+++ 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/sink/SiteRendererSink.java
 Sun Jan 25 23:43:01 2009
@@ -29,7 +29,7 @@
 import java.util.List;
 
 /**
- * @author mailto:eveni...@codehaus.org>Emmanuel Venisse
+ * @author mailto:eveni...@codehaus.org";>Emmanuel Venisse
  * @version $Id$
  */
 public class SiteRendererSink

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

2009-01-25 Thread dennisl 
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/SiteRenderingContext.java

Modified: 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java?rev=737611&r1=737610&r2=737611&view=diff
==
--- 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java
 (original)
+++ 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SiteRenderingContext.java
 Sun Jan 25 23:43:24 2009
@@ -30,7 +30,7 @@
 
 /**
  * @author mailto:br...@apache.org";>Brett Porter
- * @version $Id:DefaultSiteRenderer.java 348612 2005-11-24 12:54:19 +1100 
(Thu, 24 Nov 2005) brett $
+ * @version $Id$
  */
 public class SiteRenderingContext
 {

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

2009-01-25 Thread dennisl 
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/Renderer.java

Modified: 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/Renderer.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/Renderer.java?rev=737612&r1=737611&r2=737612&view=diff
==
--- 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/Renderer.java
 (original)
+++ 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/Renderer.java
 Sun Jan 25 23:44:18 2009
@@ -35,7 +35,7 @@
 
 /**
  * @author mailto:eveni...@codehaus.org";>Emmanuel Venisse
- * @version $Id:Renderer.java 348612 2005-11-24 12:54:19 +1100 (Thu, 24 Nov 
2005) brett $
+ * @version $Id$
  */
 public interface Renderer
 {

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

2009-01-25 Thread dennisl 
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-sitetools-1.0.x/doxia-decoration-model/pom.xml

maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/src/main/mdo/decoration.mdo

Propchange: maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 25 23:55:51 2009
@@ -1 +1 @@
-/maven/doxia/doxia-sitetools/trunk:629097,641296,693844,736602-736603,736628-736630
+/maven/doxia/doxia-sitetools/trunk:629097,641296,693844,736602-736603,736628-736630,736929

Modified: 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/pom.xml?rev=737614&r1=737613&r2=737614&view=diff
==
--- 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/pom.xml
 (original)
+++ 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/pom.xml
 Sun Jan 25 23:55:51 2009
@@ -1,4 +1,4 @@
-
+

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/

2009-01-25 Thread dennisl 
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-sitetools-1.0.x/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java

maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/PathDescriptor.java

Propchange: maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 26 00:02:26 2009
@@ -1 +1 @@
-/maven/doxia/doxia-sitetools/trunk:629097,641296,693844,736602-736603,736628-736630,736929
+/maven/doxia/doxia-sitetools/trunk:629097,641296,693844,733390,736602-736603,736628-736630,736929

Modified: 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java?rev=737615&r1=737614&r2=737615&view=diff
==
--- 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
 (original)
+++ 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/DefaultDecorationModelInheritanceAssembler.java
 Mon Jan 26 00:02:26 2009
@@ -44,6 +44,7 @@
  */
 public class DefaultDecorationModelInheritanceAssembler implements 
DecorationModelInheritanceAssembler
 {
+/** {...@inheritdoc} */
 public void assembleModelInheritance( String name, DecorationModel child, 
DecorationModel parent,
   String childBaseUrl, String 
parentBaseUrl )
 {
@@ -88,9 +89,10 @@
 }
 }
 
-public void resolvePaths( final DecorationModel decoration, final String 
childBaseUrl )
+/** {...@inheritdoc} */
+public void resolvePaths( final DecorationModel decoration, final String 
baseUrl )
 {
-URLContainer urlContainer = new URLContainer( null, childBaseUrl );
+URLContainer urlContainer = new URLContainer( null, baseUrl );
 
 if ( decoration.getBannerLeft() != null )
 {
@@ -139,8 +141,7 @@
  * to the oldBaseUrl, these are changed to the newBannerUrl.
  *
  * @param banner
- * @param prefix
- * @param baseUrl
+ * @param urlContainer
  */
 private void resolveBannerPaths( final Banner banner, final URLContainer 
urlContainer )
 {
@@ -151,7 +152,7 @@
 }
 }
 
-private void assembleCustomInheritance( DecorationModel child, 
DecorationModel parent )
+private void assembleCustomInheritance( final DecorationModel child, final 
DecorationModel parent )
 {
 if ( child.getCustom() == null )
 {
@@ -250,7 +251,7 @@
 }
 }
 
-private void resolveLinkItemPaths( LinkItem item, final URLContainer 
urlContainer )
+private void resolveLinkItemPaths( final LinkItem item, final URLContainer 
urlContainer )
 {
 if ( StringUtils.isNotEmpty( item.getHref() ) )
 {
@@ -347,6 +348,9 @@
 }
 }
 
+/**
+ * Contains an old and a new path.
+ */
 public final class URLContainer
 {
 
@@ -354,17 +358,33 @@
 
 private final String newPath;
 
+/**
+ * Construct a URLContainer.
+ *
+ * @param oldPath the old path.
+ * @param newPath the new path.
+ */
 public URLContainer( final String oldPath, final String newPath )
 {
 this.oldPath = oldPath;
 this.newPath = newPath;
 }
 
+/**
+ * Get the new path.
+ *
+ * @return the new path.
+ */
 public String getNewPath()
 {
 return this.newPath;
 }
 
+/**
+ * Get the old path.
+ *
+ * @return the old path.
+ */
 public String getOldPath()
 {
 return this.oldPath;

Modified: 
maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/PathDescriptor.java
URL: 
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/doxia-decoration-model/src/main/j

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

2009-01-25 Thread dennisl 
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-sitetools-1.0.x/doxia-decoration-model/src/main/java/org/apache/maven/doxia/site/decoration/inheritance/PathUtils.java

Propchange: maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 26 00:10:32 2009
@@ -1 +1 @@
-/maven/doxia/doxia-sitetools/trunk:629097,641296,693844,733390,736602-736603,736628-736630,736929
+/maven/doxia/doxia-sitetools/trunk:629097,641296,693844,732668,733390,736602-736603,736628-736630,736929

Modified: 
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
URL: 
http://svn.apache.org/viewvc/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?rev=737616&r1=737615&r2=737616&view=diff
==
--- 
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
 (original)
+++ 
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
 Mon Jan 26 00:10:32 2009
@@ -33,9 +33,12 @@
  */
 public abstract class PathUtils
 {
+/**
+ * Private constructor.
+ */
 private PathUtils()
 {
-// nop
+// do not instantiate
 }
 
 /**
@@ -102,7 +105,7 @@
 && ( newUrl.getHost().equalsIgnoreCase( 
oldUrl.getHost() ) )
 && ( newUrl.getPort() == oldUrl.getPort() ) )
 {
-// Both pathes point to the same site. So we can use relative 
pathes.
+// Both paths point to the same site. So we can use relative 
paths.
 
 String oldPath = oldPathDescriptor.getPath();
 String newPath = newPathDescriptor.getPath();

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

2009-01-25 Thread dennisl 
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 
changed)

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

Propchange: maven/doxia/doxia-sitetools/branches/doxia-sitetools-1.0.x/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 26 00:28:52 2009
@@ -1 +1 @@
-/maven/doxia/doxia-sitetools/trunk:629097,641296,693844,732668,733390,736602-736603,736628-736630,736929
+/maven/doxia/doxia-sitetools/trunk:629097,641296,693844,732668,732684,733390,736602-736603,736628-736630,736929

Modified: 
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
URL: 
http://svn.apache.org/viewvc/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?rev=737617&r1=737616&r2=737617&view=diff
==
--- 
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
 (original)
+++ 
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
 Mon Jan 26 00:28:52 2009
@@ -289,6 +289,7 @@
 
 http://www.w3.org/1999/xhtml";>
   
+
 $title