Index: src/site/site.xml
===================================================================
--- src/site/site.xml	(revision 598418)
+++ src/site/site.xml	(working copy)
@@ -16,17 +16,6 @@
    limitations under the License.
   -->
 <project name="Apache Jackrabbit">
-  <publishDate position="none"/>
-  <bannerLeft>
-    <name>Apache Jackrabbit</name>
-    <src>/images/logos/jackrabbitlogo.gif</src>
-    <href>/</href>
-  </bannerLeft>
-  <bannerRight>
-    <name>Apache Software Foundation</name>
-    <src>http://www.apache.org/images/asf_logo.gif</src>
-    <href>http://www.apache.org</href>
-  </bannerRight>
   <body>
     <menu name="Apache Jackrabbit">
       <item name="Home"                       href="/index.html" />
@@ -73,14 +62,13 @@
          <item name="Compact Notation"        href="/doc/nodetype/cnd.html" />
          <item name="Visualization"           href="/doc/nodetype/visualization.html" />
       </item>
-      <item name="Thanks">
-        <item name="Sponsorship"
-              href="http://www.apache.org/foundation/sponsorship.html"/>
-        <item name="Apache Sponsors"
-              href="http://www.apache.org/foundation/thanks.html"/>
-        <item name="Attribution"              href="/thanks.html"/>
-      </item>
     </menu>
-    ${reports}
+    <menu name="Thanks">
+      <item name="Sponsorship"
+            href="http://www.apache.org/foundation/sponsorship.html"/>
+      <item name="Apache Sponsors"
+            href="http://www.apache.org/foundation/thanks.html"/>
+      <item name="Attribution"                href="/thanks.html"/>
+    </menu>
   </body>
 </project>
Index: src/site/resources/images/logos/asf-logo.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: src\site\resources\images\logos\asf-logo.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Index: src/site/resources/images/logos/jlogo.gif
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: src\site\resources\images\logos\jlogo.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Index: src/site/resources/css/print.css
===================================================================
--- src/site/resources/css/print.css	(revision 598418)
+++ src/site/resources/css/print.css	(working copy)
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#banner, #footer, #leftcol, #breadcrumbs, .docs #toc, .docs .courtesylinks, #leftColumn, #navColumn {
-	display: none;
-}
-#bodyColumn, body.docs div.docs {
-	margin: 0 !important;
-	border: none !important
-}
Index: src/site/resources/css/site.css
===================================================================
--- src/site/resources/css/site.css	(revision 598418)
+++ src/site/resources/css/site.css	(working copy)
@@ -15,418 +15,74 @@
  * limitations under the License.
  */
 
-:link,:visited,:hover,:active
-    {
-    text-decoration:none
-    }
+body        { font-family: Verdana, Helvetica, Arial, sans-serif;
+              font-size: small;
+              background-color: #e0e0e0;
+              margin: 1em 100px 1em 100px;
+              padding: 0; }
 
-dl
-    {
-    padding: 0;
-    border: 0;
-    background-color: transparent;
-    }
+#page       { background-color: white; }
 
-dd,dt
-    {
-    list-style:none
-    }
+a:link      { color: #667C00; }
+a:visited   { color: #7C7C7C; }
 
-dd
-    {
-    padding: 0px;
-    margin-left: 0px;
-    }
+img         { border: 0; }
 
-h1,h2,h3,h4,h5,h6,pre,code
-    {
-    font-size:1em;
-    }
+/* BANNER */
 
-li,h1,h2,h3,h4,h5,h6,pre,form,body,html,p,blockquote,fieldset,input,table,thead,tbody,tfoot,caption,th,tr,td,a,textarea,#breadcrumbs
-    {
-    margin:0;
-    padding:0;
-    background: transparent;
-    }
+#banner     { padding: 0 0 113px 0;
+              border-top: 6px solid black;
+              border-bottom: 2px solid black; }
+#banner p   { margin: 0; }
+#jcr        { float: left; }
+#asf        { float: right; }
+#banner img { margin: 0;
+              padding: 10px 0 0 0; }
+#banner a   { text-decoration: none; }
 
-a img,:link img,:visited img
-    {
-    border:none
-    }
+/* NAVIGATION */
 
-/*  ------------------------------------------------------------------------*/
+#navigation { padding: 18px 0;
+              width: 180px;
+              float: left;
+              font-size: x-small; }
 
-body
-    {
-    background-color: #fff;
-    margin: 0 0 0 0;
-    padding: 30px 0 0 10%;
-    }
+#navigation ul
+            { margin: 0;
+              padding: 1ex 0 1ex 1em;
+              list-style: none;
+              font-weight: bold; }
 
-body, td, select, input, li
-    {
-    background-color: #;
-    font-family: Verdana, Helvetica, Arial, sans-serif;
-    font-size: small;
-    }
+#navigation ul ul
+            { font-weight: normal; }
 
-.composite
-  {
-  }
+#navigation a
+            { text-decoration: none; }
 
-#banner
-    {
-    border: 10px solid #ccc;
-    background: ;
-    width: 90%;
-    padding: 5px;
-    }
+a.external  { font-style: italic; }
 
-#breadcrumbs
-    {
-    position: absolute;
-    top: 0;
-    left: 0;
-    border: 0;
-    background-color: #fff;
-    width: 0;
-    height: 0;
-    visibility: hidden;
-    }
+/* CONTENT */
 
-#leftColumn
-    {
-    margin: 20px 0 0 -6px;
-    padding: 0 0 0 0;
-    border: 0px solid #999;
-    background-color: #fff;
-    width: 15%;
-    float: left;
-    }
+#content    { margin: 1em 1em 1em 180px; }
 
-#poweredBy
-    {
-    text-align: left;
-    margin: 0;
-    padding: 0;
-    border: 0;
-    }
+#content p  { line-height: 1.3em; }
 
-#bodyColumn
-    {
-    margin: 3px 0 0 18%;
-    padding: 3px 0 0 0;
-     border: 0px solid #999;
-    background: transparent;
-    width: 73.5%;
-    }
+h1, h2, h3  { color: #869900; }
 
-#footer
-    {
-    border-top: 1px solid #999;
-    width: 73.5%;
-    margin: 20px 0 30px 18%;
-    font-size: x-small;
-    }
+pre         { background: #E0E0E0;
+              margin-left: 2em;
+              margin-right: 2em;
+              padding: 1em;
+              border: 1px dotted black; }
 
-img
-    {
-    border:none;
-    }
 
+/* FOOTER */
 
-a:link
-    {
-    color:#546600;
-    }
+#footer     { clear: both;
+              border-top: 1px solid #999;
+              font-size: x-small; }
 
-a:visited
-    {
-    color: #7C7C7C;
-    }
+#footer p   { margin: 0;
+              text-align: center; }
 
-a:active, a:hover
-    {
-    color:#fff;
-    background-color: #869900;
-    }
-
-a.externalLink, a.externalLink:link, a.externalLink:visited, a.externalLink:active, a.externalLink:hover
-    {
-    background: url(../images/external.png) right no-repeat;
-    padding-right: 18px;
-    }
-
-a.newWindow, a.newWindow:link, a.newWindow:visited, a.newWindow:active, a.newWindow:hover
-    {
-    background: url(../images/newwindow.png) right center no-repeat;
-    padding-right: 18px;
-    }
-
-a.externalLink:hover
-    {
-    color:#fff;
-    background-color: #869900;
-    }
-
-div.clear
-    {
-    visibility: hidden;
-    }
-
-/*------- BANNER and LOGOS -------------------------------------------------------*/
-
-#banner img
-    {
-    margin: 0px 0px 0px 0px;
-    }
-
-#projectLogo
-    {
-    font-size: xx-large;
-    font-weight: bold;
-    }
-
-#organizationLogo img, #projectLogo img, #projectLogo span
-    {
-    margin: 10px 20px 10px 20px;
-    }
-
-#projectLogo span
-    {
-    border: 0px solid;
-    padding: 0px 0px 0px 0px;
-    background-color: #ffffff;
-    cursor: pointer;
-    }
-
-.xleft, #organizationLogo img
-    {
-    float:right;
-    }
-
-.xright, #projectLogo img, #projectLogo span
-    {
-    float:left;
-    text-shadow: none;
-    }
-
-/*---- LEFTCOLUMN / NAVCOLUMN ----------------------------------------------------*/
-
-#navcolumn
-    {
-    padding: 0 0 0 0;
-    }
-
-#navcolumn h5, #navcolumn ul
-    {
-    margin: 0;
-    padding: 0;
-    font-size: small;
-    }
-
-#navcolumn h5
-    {
-    font-size: smaller;
-    border-bottom: 0px dotted #999;
-    padding: 10px 0 0 10px;
-    margin-bottom: 3px;
-    }
-
-#navcolumn li
-    {
-    list-style-type: none;
-    background-repeat: no-repeat;
-    background-position: 0 4px;
-    padding-left: 10px;
-    list-style-position: outside;
-    line-height: 1.2em;
-    font-size: smaller;
-    margin-bottom: 3px;
-    }
-
-#navcolumn ul
-    {
-    margin-top: 3px;
-    }
-
-#navcolumn li.expanded
-    {
-    background-image: url(../images/expanded.gif);
-    color: #000000;
-    padding-bottom: 3px;
-    }
-
-#navcolumn li.collapsed
-    {
-    background-image: url(../images/collapsed.gif);
-    margin-bottom: 3px;
-    }
-
-#poweredBy
-    {
-    text-align: left;
-    }
-
-#navcolumn img
-    {
-    margin-top: 10px;
-    margin-bottom: 10px;
-    border: 0;
-    }
-
-#poweredBy img
-    {
-    display:block;
-    margin: 10px 0 0 11px;
-    border: 0;
-    width: auto;
-    height: auto;
-    }
-
-#navcolumn a
-    {
-    text-decoration: none;
-    }
-
-#navcolumn a:link
-    {
-    color:#4A5A00;
-    }
-
-#navcolumn a:visited
-    {
-    color: #4A5A00;
-    }
-
-#navcolumn a:active, #navcolumn a:hover
-    {
-    color:#fff;
-    background-color: #869900;
-    }
-
-/*------ TEXT --------------------------------------------------------------------*/
-
-h2, h3
-    {
-    padding: 20px 4px 4px 0px;
-    border: 0px solid #999;
-    border-bottom: 1px dotted #999;
-    color: #869900;
-    font-weight:900;
-    font-size: large;
-    }
-
-h3
-    {
-    font-size: medium;
-    }
-
-#bodyColumn p
-    {
-    line-height: 1.3em;
-    font-size: small;
-    margin: 10px 0 5px 0;
-    }
-
-#bodyColumn li, ol
-    {
-    line-height: 1.3em;
-    font-size: small;
-    margin: 0 0 5px 0;
-    }
-
-#bodyColumn table li
-    {
-    line-height: 1.3em;
-    font-size: x-small;
-    margin: 0 0 1.3em 0;
-    vertical-align: top;
-    }
-
-#bodyColumn table
-    {
-    margin: 10px 0 10px 0;
-    width: 100%;
-    }
-
-#bodyColumn dt
-    {
-    font-weight: bold;
-    margin: 25px 0 0 0;
-    }
-
-table,.bodyTable, tr, tr.b
-    {
-    font-size: x-small;
-    background: #ccc;
-    vertical-align: top;
-    }
-
-th, thead, td
-    {
-    padding: 5px;
-    }
-
-td
-    {
-    background: #F5F9EF;
-    }
-
-th, thead, tr, td, ul, li
-    {
-    font-size: x-small;
-    }
-
-table.bodyTable th
-    {
-    color: #fff;
-    background-color: #869900;
-    text-align: left;
-    font-weight: bold;
-    font-size: x-small;
-    }
-
-subsection
-    {
-    margin: 0;
-    padding: 0;
-    text-indent: 0;
-    }
-
-/*------ SOURCE CODE  ------------------------------------------------------------*/
-
-.source
-    {
-    padding: 12px;
-    margin: 20px 0 20px 0;
-    border: 0px solid #999;
-    background: #E0E0E0;
-    }
-
-.source pre
-    {
-    margin: 0px;
-    padding: 0px;
-    }
-
-
-#bodyColumn code
-    {
-    color: #000000;
-    background: #E0E0E0;
-    border: 1px solid #E0E0E0;
-    border-left: 4px;
-    border-right: 4px;
-    }
-
-#bodyColumn a
-    {
-    text-decoration: underline;
-    }
-
-#bodyColumn a:hover
-    {
-    text-decoration: none;
-    }
+#footer a   { text-decoration: none; }
Index: src/site/templates/maven-site.vm
===================================================================
--- src/site/templates/maven-site.vm	(revision 0)
+++ src/site/templates/maven-site.vm	(revision 0)
@@ -0,0 +1,102 @@
+#set($year = ${currentDate.year} + 1900)
+#set ($alignedFileName = $alignedFileName.replaceAll("\\", "/"))
+
+#macro (link $href $name)
+  #set ($lower = $href.toLowerCase())
+  #if ($lower.startsWith("http") || $lower.startsWith("https"))
+    <a href="$href" class="external">$name</a>
+  #else
+    <a href="$href">$name</a>
+  #end
+#end
+
+#macro (expand $item $expand)
+  #set ($href = $PathTool.calculateLink($item.href, $relativePath))
+  #set ($href = $href.replaceAll("\\", "/"))
+  #if ($alignedFileName == $href)
+    #set ($expand = true)
+  #else
+    #if ($item.items)
+      #foreach ($subitem in $item.items)
+        #expand($subitem $expand)
+      #end
+    #end
+  #end
+#end 
+
+#macro (display $item)
+  #set ($href = $PathTool.calculateLink($item.href, $relativePath))
+  #set ($href = $href.replaceAll("\\", "/"))
+    #if ($alignedFileName == $href)
+  <li><strong>#link($href $item.name)</strong>
+    #else
+  <li>#link($href $item.name)
+    #end
+    #set ($expand = false)
+    #expand($item $expand)
+    #if ($expand == true && $item.items.size() > 0)
+    <ul>
+      #foreach ($subitem in $item.items)
+        #display($subitem)
+      #end
+    </ul>
+    #end
+  </li>
+#end
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+  <head>
+    <meta http-equiv="Content-Type"
+          content="text/html; charset=${outputEncoding}"/>
+    <title>$title</title>
+    <link rel="stylesheet" href="$relativePath/css/site.css" type="text/css"/>
+  </head>
+  <body>
+    <div id="page">
+
+      <div id="banner">
+        <p id="jcr">
+          <a href="http://jackrabbit.apache.org/">
+            <img src="$relativePath/images/logos/jlogo.gif"
+                 alt="Apache Jackrabbit" height="100" width="336"/>
+          </a>
+        </p>
+        <p id="asf">
+          <a href="http://www.apache.org/">
+            <img src="$relativePath/images/logos/asf-logo.gif"
+                 alt="Apache Software Foundation" height="100" width="387"/>
+          </a>
+        </p>
+      </div>
+
+      <div id="navigation">
+        <ul>
+#foreach($menu in $decoration.body.menus)
+          <li>$menu.name
+            <ul>
+#foreach($item in $menu.items)
+#display($item)
+#end
+            </ul>
+          </li>
+#end
+        </ul>
+      </div>
+
+      <div id="content">
+$bodyContent
+      </div>
+
+      <div id="footer">
+        <p>
+          &copy; 2004-$year
+          <a href="http://www.apache.org/">Apache Software Foundation</a>,
+          site built by <a href="http://maven.apache.org/">Maven</a>
+        </p>
+      </div>
+
+    </div>
+  </body>
+</html>

Property changes on: src\site\templates\maven-site.vm
___________________________________________________________________
Name: svn:eol-style
   + native

Index: pom.xml
===================================================================
--- pom.xml	(revision 598418)
+++ pom.xml	(working copy)
@@ -35,4 +35,16 @@
   <name>Jackrabbit web site</name>
   <description>Jackrabbit web site</description>
 
+  <build>
+    <plugins>
+      <plugin>
+       <artifactId>maven-site-plugin</artifactId>
+       <configuration>
+         <templateDirectory>${basedir}/src/site/templates</templateDirectory>
+         <template>maven-site.vm</template>
+       </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
 </project>
