You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2008/03/09 22:58:04 UTC

svn commit: r635376 - in /geronimo/genesis/trunk: ./ config/geronimo-skin/src/main/resources/META-INF/maven/ config/project-config/ config/project-config/src/site/ config/src/site/ plugins/tools-maven-plugin/ src/site/

Author: djencks
Date: Sun Mar  9 14:57:58 2008
New Revision: 635376

URL: http://svn.apache.org/viewvc?rev=635376&view=rev
Log:
specify site plugin version. Make the site.vm closely match the default.  Fiddle with a couple other little site things

Removed:
    geronimo/genesis/trunk/plugins/tools-maven-plugin/NOTICE.txt
Modified:
    geronimo/genesis/trunk/config/geronimo-skin/src/main/resources/META-INF/maven/site.vm
    geronimo/genesis/trunk/config/project-config/pom.xml
    geronimo/genesis/trunk/config/project-config/src/site/site.xml
    geronimo/genesis/trunk/config/src/site/site.xml
    geronimo/genesis/trunk/pom.xml
    geronimo/genesis/trunk/src/site/site.xml

Modified: geronimo/genesis/trunk/config/geronimo-skin/src/main/resources/META-INF/maven/site.vm
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/config/geronimo-skin/src/main/resources/META-INF/maven/site.vm?rev=635376&r1=635375&r2=635376&view=diff
==============================================================================
--- geronimo/genesis/trunk/config/geronimo-skin/src/main/resources/META-INF/maven/site.vm (original)
+++ geronimo/genesis/trunk/config/geronimo-skin/src/main/resources/META-INF/maven/site.vm Sun Mar  9 14:57:58 2008
@@ -23,25 +23,33 @@
 #macro (spacer $width $height)
     <img src="images/spacer.gif" width="$width" height="$height" border="0">
 #end
-##
-#macro (banner $banner $id)
-  #if ($banner)
-    #if($banner.href)
-        <a href="$banner.href" id="$id">
+
+#macro ( link $href $name )
+  #if ( ( $href.toLowerCase().startsWith("http") || $href.toLowerCase().startsWith("https") ) )
+    <a href="$href" class="externalLink">$name</a>
+  #else
+    <a href="$href">$name</a>
+  #end
+#end
+
+#macro ( banner $banner $id )
+  #if ( $banner )
+    #if( $banner.href )
+      <a href="$banner.href" id="$id" #if( $banner.alt ) title="$banner.alt" #end >
     #else
-        <span id="$id">
+        <div id="$id">
     #end
 
-    #if($banner.src)
-        #set ($src = $banner.src)
-        #if (! ($src.toLowerCase().startsWith("http") || $src.toLowerCase().startsWith("https")))
-            #set ($src = $PathTool.calculateLink($src, $relativePath))
-            #set ($src = $src.replaceAll("\\", "/"))
+    #if( $banner.src )
+        #set ( $src = $banner.src )
+        #if ( ! ( $src.toLowerCase().startsWith("http") || $src.toLowerCase().startsWith("https") ) )
+            #set ( $src = $PathTool.calculateLink( $src, $relativePath ) )
+            #set ( $src = $src.replaceAll( "\\", "/" ) )
         #end
         #if ($banner.alt)
             #set ($alt = $banner.alt)
         #else
-            #set ($alt = "")
+            #set ( $alt = $banner.name )
         #end
         <img src="$src" alt="$alt"/>
     #else
@@ -51,289 +59,320 @@
     #if($banner.href)
         </a>
     #else
-        </span>
+        </div>
     #end
   #end
 #end
-##
-#macro (links $links)
-    #set ($counter = 0)
-    #foreach($item in $links)
-        #set ($counter = $counter + 1)
-        #set ($currentItemHref = $PathTool.calculateLink($item.href, $relativePath))
-        #set ($currentItemHref = $currentItemHref.replaceAll("\\", "/"))
-        <a href="$currentItemHref">$item.name</a>
-        #if ($links.size() > $counter)
-            |
-        #end
+
+#macro ( links $links )
+  #set ( $counter = 0 )
+  #foreach( $item in $links )
+    #set ( $counter = $counter + 1 )
+    #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
+    #set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) )
+    #link( $currentItemHref $item.name )
+    #if ( $links.size() > $counter )
+      |
     #end
+  #end
 #end
-##
-#macro (breadcrumbs $breadcrumbs)
-    #set ($counter = 0)
-    #foreach($item in $breadcrumbs)
-        #set ($counter = $counter + 1)
-        #set ($currentItemHref = $PathTool.calculateLink($item.href, $relativePath))
-        #set ($currentItemHref = $currentItemHref.replaceAll("\\", "/"))
-        
-        #if ($currentItemHref == $alignedFileName || $currentItemHref == "")
-            $item.name
-        #else
-            <a href="$currentItemHref">$item.name</a>
-        #end
-        #if ($breadcrumbs.size() > $counter)
-            &gt;
-        #end
+
+#macro ( breadcrumbs $breadcrumbs )
+  #set ( $counter = 0 )
+  #foreach( $item in $breadcrumbs )
+    #set ( $counter = $counter + 1 )
+    #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
+    #set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) )
+
+    #if ( $currentItemHref == $alignedFileName || $currentItemHref == "" )
+      $item.name
+    #else
+      #link( $currentItemHref $item.name )
+    #end
+    #if ( $breadcrumbs.size() > $counter )
+      &gt;
     #end
+  #end
 #end
-##
-#macro (displayTree $display $item)
-    #if ($item && $item.items && $item.items.size() > 0)
-        #foreach($subitem in $item.items)
-            #set ($subitemHref = $PathTool.calculateLink($subitem.href, $relativePath))
-            #set ($subitemHref = $subitemHref.replaceAll("\\", "/"))
-            
-            #if ($alignedFileName == $subitemHref)
-                #set ($display = true)
-            #end
-            
-            #displayTree($display $subitem)
-        #end
+
+#macro ( displayTree $display $item )
+  #if ( $item && $item.items && $item.items.size() > 0 )
+    #foreach( $subitem in $item.items )
+      #set ( $subitemHref = $PathTool.calculateLink( $subitem.href, $relativePath ) )
+      #set ( $subitemHref = $subitemHref.replaceAll( "\\", "/" ) )
+      #set ( $display = false )
+      #if ( $alignedFileName == $subitemHref )
+        #set ( $display = true )
+      #end
+
+      #displayTree( $display $subitem )
     #end
+  #end
 #end
-##
-#macro (menuItem $item)
-    #set ($collapse = "none")
-    #set ($currentItemHref = $PathTool.calculateLink($item.href, $relativePath))
-    #set ($currentItemHref = $currentItemHref.replaceAll("\\", "/"))
-    
-    #if ($item && $item.items && $item.items.size() > 0)
-        #if ($item.collapse == false)
-            #set ($collapse = "expanded")
-        #else
-            ## By default collapsed
-            #set ($collapse = "collapsed")
-        #end
-            
-        #set ($display = false)
-        #displayTree($display $item)
+
+#macro ( menuItem $item )
+  #set ( $collapse = "none" )
+  #set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
+  #set ( $currentItemHref = $currentItemHref.replaceAll( "\\", "/" ) )
+
+  #if ( $item && $item.items && $item.items.size() > 0 )
+    #if ( $item.collapse == false )
+      #set ( $collapse = "expanded" )
+    #else
+      ## By default collapsed
+      #set ( $collapse = "collapsed" )
+    #end
+
+    #set ( $display = false )
+    #displayTree( $display $item )
         
-        #if ($alignedFileName == $currentItemHref || $display)
-            #set ($collapse = "expanded")
-        #end
+    #if ( $alignedFileName == $currentItemHref || $display )
+      #set ( $collapse = "expanded" )
     #end
-    
-    <li class="$collapse">
-        #if ($item.img)
-            #if (! ($item.img.toLowerCase().startsWith("http") || $item.img.toLowerCase().startsWith("https")))
-                #set ($src = $PathTool.calculateLink($item.img, $relativePath))
-                #set ($src = $item.img.replaceAll("\\", "/"))
-                <img src="$src"/>
-            #else
-                <img src="$item.img" align="absbottom" style="border-width: 0"/>
-            #end
-        #end
-        #if ($alignedFileName == $currentItemHref)
-            <strong>$item.name</strong>
-        #else
-            <a href="$currentItemHref">$item.name</a>
-        #end
-        #if ($item && $item.items && $item.items.size() > 0)
-            #if ($collapse == "expanded")
-                <ul>
-                    #foreach($subitem in $item.items)
-                        #menuItem($subitem)
-                    #end
-                </ul>
-            #end
-        #end
-    </li>
-#end
-##
-#macro (mainMenu $menus)
-    #foreach($menu in $menus)
-        #if ($menu.name)
-            <h5>$menu.name</h5>
+  #end
+  <li class="$collapse">
+    #if ( $item.img )
+      #if ( ! ( $item.img.toLowerCase().startsWith("http") || $item.img.toLowerCase().startsWith("https") ) )
+        #set ( $src = $PathTool.calculateLink( $item.img, $relativePath ) )
+        #set ( $src = $src.replaceAll( "\\", "/" ) )
+        <img src="$src"/>
+      #else
+        <img src="$item.img" align="absbottom" style="border-width: 0"/>
+      #end
+    #end
+    #if ( $alignedFileName == $currentItemHref )
+      <strong>$item.name</strong>
+    #else
+      #link( $currentItemHref $item.name )
+    #end
+  #if ( $item && $item.items && $item.items.size() > 0 )
+    #if ( $collapse == "expanded" )
+      <ul>
+        #foreach( $subitem in $item.items )
+          #menuItem( $subitem )
         #end
-        <ul>
-            #foreach($item in $menu.items)
-                #menuItem($item)
-            #end
-        </ul>
+      </ul>
     #end
+  #end
+  </li>
 #end
-##
-#macro (copyright)
-    #if ($project)
-        #set ($currentYear = ${currentDate.year} + 1900)
-        
-        #if (${project.inceptionYear} && (${project.inceptionYear} != ${currentYear.toString()}))
-            ${project.inceptionYear}-${currentYear}
-        #else
-            ${currentYear}
-        #end
-            
-        #if (${project.organization} && ${project.organization.name})
-            ${project.organization.name}
-        #end
+
+#macro ( mainMenu $menus )
+  #foreach( $menu in $menus )
+    #if ( $menu.name )
+    <h5>$menu.name</h5>
+    #end
+    #if ( $menu.items && $menu.items.size() > 0 )
+    <ul>
+      #foreach( $item in $menu.items )
+        #menuItem( $item )
+      #end
+    </ul>
     #end
+  #end
 #end
-##
-#macro (publishDate $position $publishDate $version)
-    #if ($publishDate && $publishDate.format)
-        #set ($format = $publishDate.format)
+
+#macro ( copyright )
+  #if ( $project )
+    #set ( $currentYear = ${currentDate.year} + 1900 )
+
+    #if ( ${project.inceptionYear} && ( ${project.inceptionYear} != ${currentYear.toString()} ) )
+      ${project.inceptionYear}-${currentYear}
     #else
-        #set ($format = "MM/dd/yyyy")
+      ${currentYear}
     #end
-    
-    $dateFormat.applyPattern($format)
-    
-    #set ($dateToday = $dateFormat.format($currentDate))
-    
-    #if ($publishDate && $publishDate.position)
-        #set ($datePosition = $publishDate.position)
-    #else
-        #set ($datePosition = "left")
+
+    #if ( ${project.organization} && ${project.organization.name} )
+      ${project.organization.name}
     #end
-    
-    #if ($version)
-        #if ($version.position)
-            #set ($versionPosition = $version.position)
-        #else
-            #set ($versionPosition = "left")
-        #end
+  #end
+#end
+
+#macro ( publishDate $position $publishDate $version )
+  #if ( $publishDate && $publishDate.format )
+    #set ( $format = $publishDate.format )
+  #else
+    #set ( $format = "yyyy-MM-dd" )
+  #end
+
+  $dateFormat.applyPattern( $format )
+
+  #set ( $dateToday = $dateFormat.format( $currentDate ) )
+
+  #if ( $publishDate && $publishDate.position )
+    #set ( $datePosition = $publishDate.position )
+  #else
+    #set ( $datePosition = "left" )
+  #end
+
+  #if ( $version )
+    #if ( $version.position )
+      #set ( $versionPosition = $version.position )
+    #else
+      #set ( $versionPosition = "left" )
     #end
-    
-    #set ($breadcrumbs = $decoration.body.breadcrumbs)
-    
-    #if ($datePosition.equalsIgnoreCase($position))
-        #if (($datePosition.equalsIgnoreCase("right")) || ($datePosition.equalsIgnoreCase("bottom")))
-            &nbsp;| $i18n.getString("site-renderer", $locale, "template.lastpublished"): $dateToday
-            #if ($versionPosition.equalsIgnoreCase($position))
-                &nbsp;| $i18n.getString("site-renderer", $locale, "template.version"): ${project.version}
-            #end
-        #elseif (($datePosition.equalsIgnoreCase("navigation-bottom")) || ($datePosition.equalsIgnoreCase("navigation-top")))
-            <div id="lastPublished">
-                $i18n.getString("site-renderer", $locale, "template.lastpublished"): $dateToday
-                #if ($versionPosition.equalsIgnoreCase($position))
-                    &nbsp;| $i18n.getString("site-renderer", $locale, "template.version"): ${project.version}
-                #end
-            </div>
-        #elseif ($datePosition.equalsIgnoreCase("left"))
-            <div class="xleft">
-                $i18n.getString("site-renderer", $locale, "template.lastpublished"): $dateToday
-                #if ($versionPosition.equalsIgnoreCase($position))
-                    &nbsp;| $i18n.getString("site-renderer", $locale, "template.version"): ${project.version}
-                #end
-                #if ($breadcrumbs && $breadcrumbs.size() > 0)
-                    | #breadcrumbs($breadcrumbs)
-                #end
-            </div>
-        #end
-    #elseif ($versionPosition.equalsIgnoreCase($position))
-        #if (($versionPosition.equalsIgnoreCase("right")) || ($versionPosition.equalsIgnoreCase("bottom")))
-            &nbsp;| $i18n.getString("site-renderer", $locale, "template.version"): ${project.version}
-        #elseif (($versionPosition.equalsIgnoreCase("navigation-bottom")) || ($versionPosition.equalsIgnoreCase("navigation-top")))
-            <div id="lastPublished">
-                $i18n.getString("site-renderer", $locale, "template.version"): ${project.version}
-            </div>
-        #elseif ($versionPosition.equalsIgnoreCase("left"))
-            <div class="xleft">
-                $i18n.getString("site-renderer", $locale, "template.version"): ${project.version}
-                #if ($breadcrumbs && $breadcrumbs.size() > 0)
-                    | #breadcrumbs($breadcrumbs)
-                #end
-            </div>
-        #end
-    #elseif ($position.equalsIgnoreCase("left"))
-        #if ($breadcrumbs && $breadcrumbs.size() > 0)
-            <div class="xleft">
-                #breadcrumbs($breadcrumbs)
-            </div>
-        #end
+  #else
+    #set ( $version = "" )
+    #set ( $versionPosition = "left" )
+  #end
+
+  #set ( $breadcrumbs = $decoration.body.breadcrumbs )
+  #set ( $links = $decoration.body.links )
+
+  #if ( $datePosition.equalsIgnoreCase( "right" ) && $links && $links.size() > 0 )
+    #set ( $prefix = "&nbsp;|" )
+  #else
+    #set ( $prefix = "" )
+  #end
+
+  #if ( $datePosition.equalsIgnoreCase( $position ) )
+    #if ( ( $datePosition.equalsIgnoreCase( "right" ) ) || ( $datePosition.equalsIgnoreCase( "bottom" ) ) )
+      $prefix $i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateToday
+      #if ( $versionPosition.equalsIgnoreCase( $position ) )
+        &nbsp;| $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
+      #end
+    #elseif ( ( $datePosition.equalsIgnoreCase( "navigation-bottom" ) ) || ( $datePosition.equalsIgnoreCase( "navigation-top" ) ) )
+      <div id="lastPublished">
+        $i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateToday
+        #if ( $versionPosition.equalsIgnoreCase( $position ) )
+          &nbsp;| $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
+        #end
+      </div>
+    #elseif ( $datePosition.equalsIgnoreCase("left") )
+      <div class="xleft">
+        $i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateToday
+        #if ( $versionPosition.equalsIgnoreCase( $position ) )
+          &nbsp;| $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
+        #end
+        #if ( $breadcrumbs && $breadcrumbs.size() > 0 )
+          | #breadcrumbs( $breadcrumbs )
+        #end
+      </div>
+    #end
+  #elseif ( $versionPosition.equalsIgnoreCase( $position ) )
+    #if ( ( $versionPosition.equalsIgnoreCase( "right" ) ) || ( $versionPosition.equalsIgnoreCase( "bottom" ) ) )
+      $prefix $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
+    #elseif ( ( $versionPosition.equalsIgnoreCase( "navigation-bottom" ) ) || ( $versionPosition.equalsIgnoreCase( "navigation-top" ) ) )
+      <div id="lastPublished">
+        $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
+      </div>
+    #elseif ( $versionPosition.equalsIgnoreCase("left") )
+      <div class="xleft">
+        $i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}
+        #if ( $breadcrumbs && $breadcrumbs.size() > 0 )
+          | #breadcrumbs( $breadcrumbs )
+        #end
+      </div>
+    #end
+  #elseif ( $position.equalsIgnoreCase( "left" ) )
+    #if ( $breadcrumbs && $breadcrumbs.size() > 0 )
+      <div class="xleft">
+        #breadcrumbs( $breadcrumbs )
+      </div>
     #end
+  #end
 #end
-##
+
 #macro (poweredByLogo $poweredBy)
     #if($poweredBy)
         #foreach ($item in $poweredBy)
-            #if($item.href)
-                #set ($href = $PathTool.calculateLink($item.href, $relativePath))
-                #set ($href = $href.replaceAll("\\", "/"))
+            #if( $item.href )
+                #set ( $href = $PathTool.calculateLink( $item.href, $relativePath ) )
+                #set ( $href = $href.replaceAll( "\\", "/" ) )
             #else
-                #set ($href="http://maven.apache.org/")
+                #set ( $href="http://maven.apache.org/" )
             #end
 
             #if($item.name)
                 #set ($name = $item.name)
             #else
-                #set ($name = $i18n.getString("site-renderer", $locale, "template.builtby") )
-                #set ($name = "${name} Maven" )
+                #set ( $name = $i18n.getString( "site-renderer", $locale, "template.builtby" )  )
+                #set ( $name = "${name} Maven"  )
             #end
 
             #if($item.img)
                 #set ($img = $item.img)
             #else
-                #set ($img = "images/logos/maven-feather.png")
+                #set ( $img = "images/logos/maven-feather.png" )
             #end
 
-            <a href="$href" title="$name" id="poweredBy">
-                #set ($img = $PathTool.calculateLink($img, $relativePath))
-                #set ($img = $img.replaceAll("\\", "/"))
-                <img alt="$name" src="$img"/>
+            <a href="$href" title="$name" class="poweredBy">
+              #set ( $img = $PathTool.calculateLink( $img, $relativePath ) )
+              #set ( $img = $img.replaceAll( "\\", "/" ) )
+              <img  class="poweredBy"  
+                    alt="$name" 
+                    src="$img" 
+                    width="90"
+                    height="30"
+              />
             </a>
         #end
-        #if($poweredBy.isEmpty())
-            <a href="http://maven.apache.org/" title="$i18n.getString("site-renderer", $locale, "template.builtby") Maven" id="poweredBy">
-                <img alt="$i18n.getString("site-renderer", $locale, "template.builtby") Maven" src="$relativePath/images/maven-feather.png"></img>
-            </a>
+        #if( $poweredBy.isEmpty() )
+          <a href="http://maven.apache.org/" title="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" class="poweredBy">
+            <img class="poweredBy" 
+                 alt="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" 
+                 src="$relativePath/images/logos/maven-feather.png" 
+                 width="90"
+                 height="30"
+                 border="1" />
+          </a>
         #end
     #else
-        <a href="http://maven.apache.org/" title="$i18n.getString("site-renderer", $locale, "template.builtby") Maven" id="poweredBy">
-            <img alt="$i18n.getString("site-renderer", $locale, "template.builtby") Maven" src="$relativePath/images/maven-feather.png"></img>
+        <a href="http://maven.apache.org/" title="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" class="poweredBy">
+          <img class="poweredBy" 
+               alt="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" 
+               src="$relativePath/images/logos/maven-feather.png" 
+               width="90"
+               height="30"
+               border="1"
+               />
         </a>
     #end
 #end
-##
-<html>
-    <head>
-        <title>$title</title>
-        <style type="text/css" media="all">
-            @import url("$relativePath/css/maven-base.css");
-            @import url("$relativePath/css/maven-theme.css");
-            @import url("$relativePath/css/site.css");
-        </style>
-        <link rel="stylesheet" href="$relativePath/css/print.css" type="text/css" media="print"/>
-        #foreach($author in $authors)
-            <meta name="author" content="$author"/>
-        #end
-        <meta http-equiv="Content-Type" content="text/html; charset=${outputEncoding}"/>
-        #if ($decoration.body.head)
-            #foreach($item in $decoration.body.head.getChildren())
-                #if ($item.name == "script")
-                    $item.toUnescapedString()
-                #else
-                    $item.toString()
-                #end
-            #end
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>$title</title>
+    <style type="text/css" media="all">
+      @import url("$relativePath/css/maven-base.css");
+      @import url("$relativePath/css/maven-theme.css");
+      @import url("$relativePath/css/site.css");
+    </style>
+    <link rel="stylesheet" href="$relativePath/css/print.css" type="text/css" media="print" />
+    #foreach( $author in $authors )
+      <meta name="author" content="$author" />
+    #end
+    <meta http-equiv="Content-Type" content="text/html; charset=${outputEncoding}" />
+    #if ( $decoration.body.head )
+      #foreach( $item in $decoration.body.head.getChildren() )
+        ## Workaround for DOXIA-150 due to a non-desired behaviour in p-u
+        ## @see org.codehaus.plexus.util.xml.Xpp3Dom#toString()
+        ## @see org.codehaus.plexus.util.xml.Xpp3Dom#toUnescapedString()
+        #set ( $documentHeader = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" )
+        #set ( $documentHeader = $documentHeader.replaceAll( "\\", "" ) )
+        #if ( $item.name == "script" )
+          $StringUtils.replace( $item.toUnescapedString(), $documentHeader, "" )
+        #else
+          $StringUtils.replace( $item.toString(), $documentHeader, "" )
         #end
-    </head>
-    <body class="composite">
-        <div id="banner">
-            #banner($decoration.bannerLeft "bannerLeft")
-            #banner($decoration.bannerRight "bannerRight")
-            <div class="clear">
-                <hr/>
-            </div>
-        </div>
-        
-        <div id="breadcrumbs">
-            #publishDate("left" $decoration.publishDate $decoration.version)
-            <div class="xright">#links($decoration.body.links)#publishDate("right" $decoration.publishDate $decoration.version)</div>
-            <div class="clear">
-                <hr/>
-            </div>
-        </div>
+      #end
+    #end
+  </head>
+  <body class="composite">
+    <div id="banner">
+      #banner( $decoration.bannerLeft "bannerLeft" )
+      #banner( $decoration.bannerRight "bannerRight" )
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+      #publishDate( "left" $decoration.publishDate $decoration.version )
+      <div class="xright">#links( $decoration.body.links )#publishDate( "right" $decoration.publishDate $decoration.version )</div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
         
         <table bgcolor="#FFFFFF">
             <tr>
@@ -360,15 +399,14 @@
             </tr>
         </table>
         
-        <div class="clear">
-          <hr/>
-        </div>
-        
-        <div id="footer">
-            <div class="xright">&#169;#copyright()#publishDate("bottom" $decoration.publishDate $decoration.version)</div>
-            <div class="clear">
-                <hr/>
-            </div>
-        </div>
-    </body>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">&#169;#copyright()#publishDate( "bottom" $decoration.publishDate $decoration.version )</div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
 </html>

Modified: geronimo/genesis/trunk/config/project-config/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/config/project-config/pom.xml?rev=635376&r1=635375&r2=635376&view=diff
==============================================================================
--- geronimo/genesis/trunk/config/project-config/pom.xml (original)
+++ geronimo/genesis/trunk/config/project-config/pom.xml Sun Mar  9 14:57:58 2008
@@ -40,8 +40,6 @@
         by all Apache Geronimo projects.
     </description>
     
-    <url>http://geronimo.apache.org</url>
-    
     <organization>
         <name>Apache Software Foundation</name>
         <url>http://www.apache.org</url>

Modified: geronimo/genesis/trunk/config/project-config/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/config/project-config/src/site/site.xml?rev=635376&r1=635375&r2=635376&view=diff
==============================================================================
--- geronimo/genesis/trunk/config/project-config/src/site/site.xml (original)
+++ geronimo/genesis/trunk/config/project-config/src/site/site.xml Sun Mar  9 14:57:58 2008
@@ -21,12 +21,14 @@
 <!-- $Rev$ $Date$ -->
 
 <project name="${project.name}">
+<!--
     <skin>
         <groupId>org.apache.geronimo.genesis.config</groupId>
         <artifactId>geronimo-skin</artifactId>
         <version>1.4-SNAPSHOT</version>
     </skin>
-    
+-->
+
     <publishDate format="dd MMM yyyy"/>
     
     <bannerLeft>
@@ -36,9 +38,7 @@
     
     <body>
         
-        ${parentProject}
-        
-        ${modules}
+        <menu ref="parent" />
         
         ${reports}
         

Modified: geronimo/genesis/trunk/config/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/config/src/site/site.xml?rev=635376&r1=635375&r2=635376&view=diff
==============================================================================
--- geronimo/genesis/trunk/config/src/site/site.xml (original)
+++ geronimo/genesis/trunk/config/src/site/site.xml Sun Mar  9 14:57:58 2008
@@ -23,11 +23,9 @@
 <project name="${project.name}">
     
     <body>
-        
-        ${parentProject}
-        
-        ${modules}
-        
+        <menu ref="parent" />
+        <menu ref="modules" />
+
         ${reports}
         
     </body>

Modified: geronimo/genesis/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/pom.xml?rev=635376&r1=635375&r2=635376&view=diff
==============================================================================
--- geronimo/genesis/trunk/pom.xml (original)
+++ geronimo/genesis/trunk/pom.xml Sun Mar  9 14:57:58 2008
@@ -43,7 +43,7 @@
         and common plugins.
     </description>
 
-    <url>http://geronimo.apache.org</url>
+    <url>http://geronimo.apache.org/maven/${siteId}/${version}</url>
 
     <scm>
         <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/genesis/trunk</connection>
@@ -115,6 +115,12 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-idea-plugin</artifactId>
                     <version>2.1</version>
+                </plugin>
+
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-site-plugin</artifactId>
+                    <version>2.0-beta-6</version>
                 </plugin>
             </plugins>
         </pluginManagement>

Modified: geronimo/genesis/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/geronimo/genesis/trunk/src/site/site.xml?rev=635376&r1=635375&r2=635376&view=diff
==============================================================================
--- geronimo/genesis/trunk/src/site/site.xml (original)
+++ geronimo/genesis/trunk/src/site/site.xml Sun Mar  9 14:57:58 2008
@@ -24,9 +24,9 @@
     <skin>
         <groupId>org.apache.geronimo.genesis.config</groupId>
         <artifactId>geronimo-skin</artifactId>
-        <version>1.2-SNAPSHOT</version>
+        <version>1.4-SNAPSHOT</version>
     </skin>
-    
+
     <publishDate format="dd MMM yyyy"/>
     
     <bannerLeft>