You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by bu...@apache.org on 2012/03/01 19:57:02 UTC

svn commit: r806928 [1/8] - in /websites/staging/maventest-doxia/trunk: ./ content/ content/book/ content/css/ content/developers/ content/doxia-example-book/ content/images/ content/images/logos/ content/issues/ content/macros/ content/modules/ conten...

Author: buildbot
Date: Thu Mar  1 18:57:00 2012
New Revision: 806928

Log:
Staging update by buildbot for maventest-doxia

Added:
    websites/staging/maventest-doxia/trunk/content/
    websites/staging/maventest-doxia/trunk/content/book/
    websites/staging/maventest-doxia/trunk/content/book/index.html
    websites/staging/maventest-doxia/trunk/content/css/
    websites/staging/maventest-doxia/trunk/content/css/maven-base.css
    websites/staging/maventest-doxia/trunk/content/css/maven-theme.css
    websites/staging/maventest-doxia/trunk/content/css/print.css
    websites/staging/maventest-doxia/trunk/content/css/site.css
    websites/staging/maventest-doxia/trunk/content/developers/
    websites/staging/maventest-doxia/trunk/content/developers/index.html
    websites/staging/maventest-doxia/trunk/content/developers/macros.html
    websites/staging/maventest-doxia/trunk/content/developers/maven-integration.html
    websites/staging/maventest-doxia/trunk/content/developers/modules.html
    websites/staging/maventest-doxia/trunk/content/developers/sink.html
    websites/staging/maventest-doxia/trunk/content/downloads.html
    websites/staging/maventest-doxia/trunk/content/doxia-1.2.pdf   (with props)
    websites/staging/maventest-doxia/trunk/content/doxia-example-book/
    websites/staging/maventest-doxia/trunk/content/doxia-example-book/aegis-binding.html
    websites/staging/maventest-doxia/trunk/content/doxia-example-book/bind.html
    websites/staging/maventest-doxia/trunk/content/doxia-example-book/bindings.html
    websites/staging/maventest-doxia/trunk/content/doxia-example-book/castor.html
    websites/staging/maventest-doxia/trunk/content/doxia-example-book/doxia-example-book.pdf   (with props)
    websites/staging/maventest-doxia/trunk/content/doxia-example-book/doxia-example-book.rtf
    websites/staging/maventest-doxia/trunk/content/doxia-example-book/http-transport.html
    websites/staging/maventest-doxia/trunk/content/doxia-example-book/index.html
    websites/staging/maventest-doxia/trunk/content/doxia-example-book/jms-transport.html
    websites/staging/maventest-doxia/trunk/content/doxia-example-book/local-transport.html
    websites/staging/maventest-doxia/trunk/content/doxia-example-book/transport-and-channel-api.html
    websites/staging/maventest-doxia/trunk/content/doxia-example-book/transports.html
    websites/staging/maventest-doxia/trunk/content/extpaths.txt
    websites/staging/maventest-doxia/trunk/content/faq.html
    websites/staging/maventest-doxia/trunk/content/images/
    websites/staging/maventest-doxia/trunk/content/images/apache-maven-project-2.png   (with props)
    websites/staging/maventest-doxia/trunk/content/images/architecture.odg   (with props)
    websites/staging/maventest-doxia/trunk/content/images/architecture.png   (with props)
    websites/staging/maventest-doxia/trunk/content/images/banner.jpg   (with props)
    websites/staging/maventest-doxia/trunk/content/images/bg.jpg   (with props)
    websites/staging/maventest-doxia/trunk/content/images/breadcrumbs.jpg   (with props)
    websites/staging/maventest-doxia/trunk/content/images/collapsed.gif   (with props)
    websites/staging/maventest-doxia/trunk/content/images/doxia-logo.png   (with props)
    websites/staging/maventest-doxia/trunk/content/images/doxia-logo.svg   (with props)
    websites/staging/maventest-doxia/trunk/content/images/expanded.gif   (with props)
    websites/staging/maventest-doxia/trunk/content/images/external.png   (with props)
    websites/staging/maventest-doxia/trunk/content/images/h3.jpg   (with props)
    websites/staging/maventest-doxia/trunk/content/images/h5.jpg   (with props)
    websites/staging/maventest-doxia/trunk/content/images/icon_error_sml.gif   (with props)
    websites/staging/maventest-doxia/trunk/content/images/icon_info_sml.gif   (with props)
    websites/staging/maventest-doxia/trunk/content/images/icon_success_sml.gif   (with props)
    websites/staging/maventest-doxia/trunk/content/images/icon_warning_sml.gif   (with props)
    websites/staging/maventest-doxia/trunk/content/images/logo_apache.jpg   (with props)
    websites/staging/maventest-doxia/trunk/content/images/logo_maven.jpg   (with props)
    websites/staging/maventest-doxia/trunk/content/images/logos/
    websites/staging/maventest-doxia/trunk/content/images/logos/build-by-maven-black.png   (with props)
    websites/staging/maventest-doxia/trunk/content/images/logos/build-by-maven-white.png   (with props)
    websites/staging/maventest-doxia/trunk/content/images/logos/maven-feather.png   (with props)
    websites/staging/maventest-doxia/trunk/content/images/maven-logo-2.gif   (with props)
    websites/staging/maventest-doxia/trunk/content/images/newwindow.png   (with props)
    websites/staging/maventest-doxia/trunk/content/index.html
    websites/staging/maventest-doxia/trunk/content/issues/
    websites/staging/maventest-doxia/trunk/content/issues/index.html
    websites/staging/maventest-doxia/trunk/content/macros/
    websites/staging/maventest-doxia/trunk/content/macros/index.html
    websites/staging/maventest-doxia/trunk/content/macros/swf-macro.html
    websites/staging/maventest-doxia/trunk/content/modules/
    websites/staging/maventest-doxia/trunk/content/modules/index.html
    websites/staging/maventest-doxia/trunk/content/overview.html
    websites/staging/maventest-doxia/trunk/content/references/
    websites/staging/maventest-doxia/trunk/content/references/apt-format.html
    websites/staging/maventest-doxia/trunk/content/references/doxia-apt.html
    websites/staging/maventest-doxia/trunk/content/references/fml-format.html
    websites/staging/maventest-doxia/trunk/content/references/index.html
    websites/staging/maventest-doxia/trunk/content/references/xdoc-format.html
    websites/staging/maventest-doxia/trunk/content/resources.html
    websites/staging/maventest-doxia/trunk/content/upgrading.html
    websites/staging/maventest-doxia/trunk/content/whatsnew-1.1.html
Modified:
    websites/staging/maventest-doxia/trunk/   (props changed)

Propchange: websites/staging/maventest-doxia/trunk/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Thu Mar  1 18:57:00 2012
@@ -1 +1 @@
-1295717
+1295738

Added: websites/staging/maventest-doxia/trunk/content/book/index.html
==============================================================================
--- websites/staging/maventest-doxia/trunk/content/book/index.html (added)
+++ websites/staging/maventest-doxia/trunk/content/book/index.html Thu Mar  1 18:57:00 2012
@@ -0,0 +1,261 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- Generated by Apache Maven Doxia at Mar 1, 2012 -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>Writing Books in Doxia</title>
+    <style type="text/css" media="all">
+      @import url("../css/maven-base.css");
+      @import url("../css/maven-theme.css");
+      @import url("../css/site.css");
+    </style>
+    <link rel="stylesheet" href="../css/print.css" type="text/css" media="print" />
+        <meta name="author" content="Trygve Laugstol
+Vincent Siveton" />
+        <meta name="Date-Creation-yyyymmdd" content="20090303" />
+    <meta name="Date-Revision-yyyymmdd" content="20120301" />
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+                                                    
+<script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
+                                                        
+<script type="text/javascript">_uacct = "UA-140879-1";
+        urchinTracker();</script>
+                    </head>
+  <body class="composite">
+    <div id="banner">
+                                      <a href="../../" id="bannerLeft">
+                                                <img src="../images/apache-maven-project-2.png" alt="" />
+                </a>
+                                            <a href=".././" id="bannerRight">
+                                                <img src="../images/maven-logo-2.gif" alt="" />
+                </a>
+            <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+            
+                                <div class="xleft">
+                          <a href="http://www.apache.org/" class="externalLink">Apache</a>
+        &gt;
+                  <a href="../../index.html">Maven</a>
+        &gt;
+                  <a href="../index.html">Doxia</a>
+        &gt;
+    Writing Books in Doxia
+      </div>
+            <div class="xright">        
+                                 Last Published: 2012-03-01
+            </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+             
+                                                <h5>About Doxia</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="../index.html">What is Doxia?</a>
+            </li>
+                  <li class="none">
+                  <a href="../overview.html">Overview</a>
+            </li>
+                                                                                      <li class="collapsed">
+                  <a href="../upgrading.html">Upgrading</a>
+                  </li>
+                  <li class="none">
+                  <a href="../downloads.html">Downloads</a>
+            </li>
+                  <li class="none">
+                  <a href="../jira-report.html">Release Notes</a>
+            </li>
+                  <li class="none">
+                  <a href="../faq.html">FAQ</a>
+            </li>
+          </ul>
+                       <h5>Documentation</h5>
+                  <ul>
+                                                                                                                                <li class="collapsed">
+                  <a href="../references/index.html">Format References</a>
+                  </li>
+                  <li class="none">
+                  <a href="../modules/index.html">Doxia Modules Guide</a>
+            </li>
+                  <li class="none">
+                  <a href="../macros/index.html">Doxia Macros Guide</a>
+            </li>
+                  <li class="none">
+            <strong>Writing Books</strong>
+          </li>
+                  <li class="none">
+                  <a href="../issues/index.html">Issues &amp; Gotchas</a>
+            </li>
+                  <li class="none">
+                  <a href="../resources.html">External Resources</a>
+            </li>
+          </ul>
+                       <h5>Developer Docs</h5>
+                  <ul>
+                                                                                                        <li class="collapsed">
+                  <a href="../developers/index.html">Developer Centre</a>
+                  </li>
+                  <li class="none">
+                  <a href="../doxia/index.html">Doxia 1.1.x</a>
+            </li>
+                  <li class="none">
+                  <a href="../doxia-sitetools/index.html">Doxia Sitetools 1.1.x</a>
+            </li>
+                  <li class="none">
+                  <a href="../doxia-1.0.x/index.html">Doxia 1.0.x</a>
+            </li>
+                  <li class="none">
+                  <a href="../doxia-sitetools-1.0.x/index.html">Doxia Sitetools 1.0.x</a>
+            </li>
+                  <li class="none">
+                  <a href="../doxia-tools/index.html">Doxia Tools</a>
+            </li>
+          </ul>
+                       <h5>Maven Projects</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="../../ant-tasks/index.html">Ant Tasks</a>
+            </li>
+                  <li class="none">
+                  <a href="../../archetype/index.html">Archetype</a>
+            </li>
+                  <li class="none">
+                  <a href="../index.html">Doxia</a>
+            </li>
+                  <li class="none">
+                  <a href="../../jxr/index.html">JXR</a>
+            </li>
+                  <li class="none">
+                  <a href="../../maven-1.x/index.html">Maven 1.x</a>
+            </li>
+                  <li class="none">
+                  <a href="../../index.html">Maven 2</a>
+            </li>
+                  <li class="none">
+                  <a href="../../mercury/index.html">Mercury</a>
+            </li>
+                  <li class="none">
+                  <a href="../../plugins/index.html">Plugins</a>
+            </li>
+                  <li class="none">
+                  <a href="../../scm/index.html">SCM</a>
+            </li>
+                  <li class="none">
+                  <a href="../../shared/index.html">Shared Components</a>
+            </li>
+                  <li class="none">
+                  <a href="../../surefire/index.html">Surefire</a>
+            </li>
+                  <li class="none">
+                  <a href="../../wagon/index.html">Wagon</a>
+            </li>
+          </ul>
+                                 <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+          <img alt="Built by Maven" src="../images/logos/maven-feather.png"/>
+        </a>
+                       
+                            </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <!-- 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. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/doxia/referen
 ces/apt-format.html --><div class="section"><h2>Introduction<a name="Introduction"></a></h2><p>Doxia allows you to write books like user manuals and guides in any format supported by Doxia. Combined with the Doxia Book Maven you are able to include the manuals directly in your generated site with links to the off-line friendly formats like XDoc, PDF, RTF and LaTeX.</p><p>The Xdoc output which has been rendered into this site can be viewed <a href="../doxia-example-book/index.html">here</a>.</p><p>The generated PDF is <a href="../doxia-example-book/doxia-example-book.pdf">here</a> and the generated RTF <a href="../doxia-example-book/doxia-example-book.rtf">here</a>.</p><div class="section"><h3>How It Works<a name="How_It_Works"></a></h3><p>The only thing you need in addition to the content files itself is a simple book descriptor which is used to specify the ordering of the sections and the names for the chapters.</p><p>See <a href="../doxia/doxia-book/book.html">The Book Des
 criptor Reference</a> for a reference to the descriptor.</p></div><div class="section"><h3>Creating Book Descriptor<a name="Creating_Book_Descriptor"></a></h3><p>An XML file is used to describe the layout of the book.</p><p>A sample is given below:</p><div class="source"><pre>&lt;book xmlns=&quot;http://maven.apache.org/BOOK/1.0.0&quot;
+ xmlns:xsi=&quot;http://www.w3.org/2001/XMLSchema-instance&quot;
+ xsi:schemaLocation=&quot;http://maven.apache.org/BOOK/1.0.0 ../../../doxia/doxia-book/target/generated-site/xsd/book-1.0.0.xsd&quot;&gt;
+  &lt;id&gt;doxia-example-book&lt;/id&gt;
+  &lt;title&gt;XFire User Manual&lt;/title&gt;
+  &lt;chapters&gt;
+    &lt;chapter&gt;
+      &lt;id&gt;bind&lt;/id&gt;
+      &lt;title&gt;Bindings&lt;/title&gt;
+      &lt;sections&gt;
+        &lt;section&gt;
+          &lt;id&gt;bindings&lt;/id&gt;
+        &lt;/section&gt;
+        &lt;section&gt;
+          &lt;id&gt;aegis-binding&lt;/id&gt;
+        &lt;/section&gt;
+        &lt;section&gt;
+          &lt;id&gt;castor&lt;/id&gt;
+        &lt;/section&gt;
+      &lt;/sections&gt;
+    &lt;/chapter&gt;
+    &lt;chapter&gt;
+      &lt;id&gt;transports&lt;/id&gt;
+      &lt;title&gt;Transports&lt;/title&gt;
+      &lt;sections&gt;
+        &lt;section&gt;
+          &lt;id&gt;transport-and-channel-api&lt;/id&gt;
+        &lt;/section&gt;
+        &lt;section&gt;
+          &lt;id&gt;http-transport&lt;/id&gt;
+        &lt;/section&gt;
+        &lt;section&gt;
+          &lt;id&gt;jms-transport&lt;/id&gt;
+        &lt;/section&gt;
+        &lt;section&gt;
+          &lt;id&gt;local-transport&lt;/id&gt;
+        &lt;/section&gt;
+      &lt;/sections&gt;
+    &lt;/chapter&gt;
+  &lt;/chapters&gt;
+&lt;/book&gt;
+</pre></div></div><div class="section"><h3>Configuring Maven Doxia Plug-in<a name="Configuring_Maven_Doxia_Plug-in"></a></h3><p>This example illustrates how to configure the Doxia Maven plugin. It will render the book in three different formats. By default the output will be under <tt>target/generated-site/&lt;format&gt;/&lt;book id&gt; </tt>.</p><p>The currently supported format ids are: <tt>xdoc</tt>, <tt>pdf</tt>, <tt>latex</tt>, <tt>rtf</tt>, <tt>xhtml</tt>, <tt>doc-book</tt></p><p>A sample pom.xml is given below:</p><div class="source"><pre>&lt;plugin&gt;
+  &lt;groupId&gt;org.apache.maven.doxia&lt;/groupId&gt;
+  &lt;artifactId&gt;doxia-maven-plugin&lt;/artifactId&gt;
+  &lt;version&gt;1.3-SNAPSHOT&lt;/version&gt;
+  &lt;executions&gt;
+    &lt;execution&gt;
+      &lt;phase&gt;pre-site&lt;/phase&gt;
+      &lt;goals&gt;
+        &lt;goal&gt;render-books&lt;/goal&gt;
+      &lt;/goals&gt;
+    &lt;/execution&gt;
+  &lt;/executions&gt;
+  &lt;configuration&gt;
+    &lt;books&gt;
+      &lt;book&gt;
+        &lt;directory&gt;src/books/example-book&lt;/directory&gt;
+        &lt;descriptor&gt;src/books/example-book.xml&lt;/descriptor&gt;
+        &lt;formats&gt;
+          &lt;format&gt;
+            &lt;id&gt;latex&lt;/id&gt;
+          &lt;/format&gt;
+          &lt;format&gt;
+            &lt;id&gt;xdoc&lt;/id&gt;
+          &lt;/format&gt;
+          &lt;format&gt;
+            &lt;id&gt;pdf&lt;/id&gt;
+          &lt;/format&gt;
+          &lt;format&gt;
+            &lt;id&gt;rtf&lt;/id&gt;
+          &lt;/format&gt;
+        &lt;/formats&gt;
+      &lt;/book&gt;
+    &lt;/books&gt;
+  &lt;/configuration&gt;
+&lt;/plugin&gt;
+</pre></div></div></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">
+        &#169;            2005-2012
+              The Apache Software Foundation
+            
+                       - <a href="http://maven.apache.org/privacy-policy.html">Privacy Policy</a>.
+        Apache Maven, Maven, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation.
+      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>

Added: websites/staging/maventest-doxia/trunk/content/css/maven-base.css
==============================================================================
--- websites/staging/maventest-doxia/trunk/content/css/maven-base.css (added)
+++ websites/staging/maventest-doxia/trunk/content/css/maven-base.css Thu Mar  1 18:57:00 2012
@@ -0,0 +1,151 @@
+body {
+  margin: 0px;
+  padding: 0px;
+}
+img {
+  border:none;
+}
+table {
+  padding:0px;
+  width: 100%;
+  margin-left: -2px;
+  margin-right: -2px;
+}
+acronym {
+  cursor: help;
+  border-bottom: 1px dotted #feb;
+}
+table.bodyTable th, table.bodyTable td {
+  padding: 2px 4px 2px 4px;
+  vertical-align: top;
+}
+div.clear{
+  clear:both;
+  visibility: hidden;
+}
+div.clear hr{
+  display: none;
+}
+#bannerLeft, #bannerRight {
+  font-size: xx-large;
+  font-weight: bold;
+}
+#bannerLeft img, #bannerRight img {
+  margin: 0px;
+}
+.xleft, #bannerLeft img {
+  float:left;
+}
+.xright, #bannerRight {
+  float:right;
+}
+#banner {
+  padding: 0px;
+}
+#banner img {
+  border: none;
+}
+#breadcrumbs {
+  padding: 3px 10px 3px 10px;
+}
+#leftColumn {
+ width: 170px;
+ float:left;
+ overflow: auto;
+}
+#bodyColumn {
+  margin-right: 1.5em;
+  margin-left: 197px;
+}
+#legend {
+  padding: 8px 0 8px 0;
+}
+#navcolumn {
+  padding: 8px 4px 0 8px;
+}
+#navcolumn h5 {
+  margin: 0;
+  padding: 0;
+  font-size: small;
+}
+#navcolumn ul {
+  margin: 0;
+  padding: 0;
+  font-size: small;
+}
+#navcolumn li {
+  list-style-type: none;
+  background-image: none;
+  background-repeat: no-repeat;
+  background-position: 0 0.4em;
+  padding-left: 16px;
+  list-style-position: outside;
+  line-height: 1.2em;
+  font-size: smaller;
+}
+#navcolumn li.expanded {
+  background-image: url(../images/expanded.gif);
+}
+#navcolumn li.collapsed {
+  background-image: url(../images/collapsed.gif);
+}
+#poweredBy {
+  text-align: center;
+}
+#navcolumn img {
+  margin-top: 10px;
+  margin-bottom: 3px;
+}
+#poweredBy img {
+  display:block;
+  margin: 20px 0 20px 17px;
+}
+#search img {
+    margin: 0px;
+    display: block;
+}
+#search #q, #search #btnG {
+    border: 1px solid #999;
+    margin-bottom:10px;
+}
+#search form {
+    margin: 0px;
+}
+#lastPublished {
+  font-size: x-small;
+}
+.navSection {
+  margin-bottom: 2px;
+  padding: 8px;
+}
+.navSectionHead {
+  font-weight: bold;
+  font-size: x-small;
+}
+.section {
+  padding: 4px;
+}
+#footer {
+  padding: 3px 10px 3px 10px;
+  font-size: x-small;
+}
+#breadcrumbs {
+  font-size: x-small;
+  margin: 0pt;
+}
+.source {
+  padding: 12px;
+  margin: 1em 7px 1em 7px;
+}
+.source pre {
+  margin: 0px;
+  padding: 0px;
+}
+#navcolumn img.imageLink, .imageLink{
+  padding-left: 0px;
+  padding-bottom: 0px;
+  padding-top: 0px;
+  padding-right: 2px;
+  border: 0px;
+  margin: 0px;
+}

Added: websites/staging/maventest-doxia/trunk/content/css/maven-theme.css
==============================================================================
--- websites/staging/maventest-doxia/trunk/content/css/maven-theme.css (added)
+++ websites/staging/maventest-doxia/trunk/content/css/maven-theme.css Thu Mar  1 18:57:00 2012
@@ -0,0 +1,217 @@
+/*
+ * 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.
+ */
+
+body {
+  background-color: #fff;
+  font-family: Verdana, Helvetica, Arial, sans-serif;
+  margin-left: auto;
+  margin-right: auto;
+  background-repeat: repeat-y;
+  font-size: 13px;
+  padding: 0px;
+}
+td, select, input, li{
+  font-family: Verdana, Helvetica, Arial, sans-serif;
+  font-size: 12px;
+  color:#333333;
+}
+code{
+  font-size: 12px;
+}
+a {
+  text-decoration: none;
+}
+a:link {
+  color:#47a;
+}
+a:visited {
+  color:#68a;
+}
+a:active, a:hover {
+  color:#990000;
+}
+#legend li.externalLink {
+  background: url(../images/external.png) left top no-repeat;
+  padding-left: 18px;
+}
+a.externalLink, a.externalLink:link, a.externalLink:visited, a.externalLink:active, a.externalLink:hover {
+  background: url(../images/external.png) right center no-repeat;
+  padding-right: 18px;
+}
+#legend li.newWindow {
+  background: url(../images/newwindow.png) left top no-repeat;
+  padding-left: 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;
+}
+h2 {
+  font-size: 17px;
+  color: #333333;
+}
+h3 {
+  padding: 4px 4px 4px 24px;
+  color: #666;
+  background-color: #ccc;
+  font-weight: bold;
+  font-size: 14px;
+  background-image: url(../images/h3.jpg);
+  background-repeat: no-repeat;
+  background-position: left bottom;
+}
+p {
+  line-height: 1.3em;
+  font-size: 12px;
+  color: #000;
+}
+#breadcrumbs {
+  height: 13px;
+  background-image: url(../images/breadcrumbs.jpg);
+  padding: 5px 10px 14px 20px;
+}
+* html #breadcrumbs {
+  padding-bottom: 8px;
+}
+#leftColumn {
+  margin: 10px 0 10px 0;
+  border-top-color: #ccc;
+  border-top-style: solid;
+  border-top-width: 1px;
+  border-right-color: #ccc;
+  border-right-style: solid;
+  border-right-width: 1px;
+  border-bottom-color: #ccc;
+  border-bottom-style: solid;
+  border-bottom-width: 1px;
+  padding-right: 5px;
+  padding-left: 5px;
+}
+#navcolumn h5 {
+  font-size: smaller;
+  border-bottom: 1px solid #aaaaaa;
+  padding-top: 2px;
+  padding-left: 9px;
+  color: #49635a;
+  background-image: url(../images/h5.jpg);
+  background-repeat: no-repeat;
+  background-position: left bottom;
+}
+
+table.bodyTable th {
+  color: white;
+  background-color: #bbb;
+  text-align: left;
+  font-weight: bold;
+}
+
+table.bodyTable th, table.bodyTable td {
+  font-size: 11px;
+}
+
+table.bodyTable tr.a {
+  background-color: #ddd;
+}
+
+table.bodyTable tr.b {
+  background-color: #eee;
+}
+
+table.bodyTable tr.a:hover, table.bodyTable tr.b:hover {
+  background: #dfe3db;
+}
+
+.source {
+  border: 1px solid #999;
+  overflow:auto
+}
+dt {
+  padding: 4px 4px 4px 24px;
+  color: #333333;
+  background-color: #ccc;
+  font-weight: bold;
+  font-size: 14px;
+  background-image: url(../images/h3.jpg);
+  background-repeat: no-repeat;
+  background-position: left bottom;
+}
+.subsectionTitle {
+  font-size: 13px;
+  font-weight: bold;
+  color: #666;
+
+}
+
+table {
+  font-size: 10px;
+}
+.xright a:link, .xright a:visited, .xright a:active {
+  color: #666;
+}
+.xright a:hover {
+  color: #003300;
+}
+#banner {
+  height: 93px;
+  background: url(../images/banner.jpg);
+}
+#navcolumn ul {
+  margin: 5px 0 15px -0em;
+}
+#navcolumn ul a {
+  color: #333333;
+}
+#navcolumn ul a:hover {
+  color: red;
+}
+#intro {
+  border: solid #ccc 1px;
+  margin: 6px 0px 0px 0px;
+  padding: 10px 40px 10px 40px;
+}
+.subsection {
+  margin-left: 3px;
+  color: #333333;
+}
+
+.subsection p {
+  font-size: 12px;
+}
+#footer {
+  padding: 10px;
+  margin: 20px 0px 20px 0px;
+  border-top: solid #ccc 1px;
+  color: #333333;
+}
+
+.errormark, .warningmark, .donemark, .infomark {
+  background: url(../images/icon_error_sml.gif) no-repeat;
+}
+
+.warningmark {
+  background-image: url(../images/icon_warning_sml.gif);
+}
+
+.donemark {
+  background-image: url(../images/icon_success_sml.gif);
+}
+
+.infomark {
+  background-image: url(../images/icon_info_sml.gif);
+}

Added: websites/staging/maventest-doxia/trunk/content/css/print.css
==============================================================================
--- websites/staging/maventest-doxia/trunk/content/css/print.css (added)
+++ websites/staging/maventest-doxia/trunk/content/css/print.css Thu Mar  1 18:57:00 2012
@@ -0,0 +1,7 @@
+#banner, #footer, #leftcol, #breadcrumbs, .docs #toc, .docs .courtesylinks, #leftColumn, #navColumn {
+	display: none !important;
+}
+#bodyColumn, body.docs div.docs {
+	margin: 0 !important;
+	border: none !important
+}

Added: websites/staging/maventest-doxia/trunk/content/css/site.css
==============================================================================
--- websites/staging/maventest-doxia/trunk/content/css/site.css (added)
+++ websites/staging/maventest-doxia/trunk/content/css/site.css Thu Mar  1 18:57:00 2012
@@ -0,0 +1,38 @@
+a.externalLink, a.externalLink:link, a.externalLink:visited, a.externalLink:active, a.externalLink:hover {
+  background: none;
+  padding-right: 0;
+}
+
+body ul {
+  list-style-type: square;
+}
+
+#downloadbox {
+  float: right;
+  margin-left: 2em;
+  padding-left: 1em;
+  padding-right: 1em;
+  padding-bottom: 1em;
+  border: 1px solid #999;
+  background-color: #eee;
+  width: 17.5em;
+}
+
+#downloadbox h5 {
+  color: #000;
+  margin: 0;
+  border-bottom: 1px solid #aaaaaa;
+  font-size: smaller;
+  padding: 0;
+  margin-top: 1em;
+}
+
+#downloadbox p {
+  margin-top: 1em;
+  margin-bottom: 0;
+}
+
+#downloadbox li {
+  text-indent: inherit;
+}
+

Added: websites/staging/maventest-doxia/trunk/content/developers/index.html
==============================================================================
--- websites/staging/maventest-doxia/trunk/content/developers/index.html (added)
+++ websites/staging/maventest-doxia/trunk/content/developers/index.html Thu Mar  1 18:57:00 2012
@@ -0,0 +1,195 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- Generated by Apache Maven Doxia at Mar 1, 2012 -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>Doxia Developers Centre</title>
+    <style type="text/css" media="all">
+      @import url("../css/maven-base.css");
+      @import url("../css/maven-theme.css");
+      @import url("../css/site.css");
+    </style>
+    <link rel="stylesheet" href="../css/print.css" type="text/css" media="print" />
+        <meta name="author" content="Vincent Siveton" />
+        <meta name="Date-Creation-yyyymmdd" content="20080302" />
+    <meta name="Date-Revision-yyyymmdd" content="20120301" />
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+                                                    
+<script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
+                                                        
+<script type="text/javascript">_uacct = "UA-140879-1";
+        urchinTracker();</script>
+                    </head>
+  <body class="composite">
+    <div id="banner">
+                                      <a href="../../" id="bannerLeft">
+                                                <img src="../images/apache-maven-project-2.png" alt="" />
+                </a>
+                                            <a href=".././" id="bannerRight">
+                                                <img src="../images/maven-logo-2.gif" alt="" />
+                </a>
+            <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+            
+                                <div class="xleft">
+                          <a href="http://www.apache.org/" class="externalLink">Apache</a>
+        &gt;
+                  <a href="../../index.html">Maven</a>
+        &gt;
+                  <a href="../index.html">Doxia</a>
+        &gt;
+    Doxia Developers Centre
+      </div>
+            <div class="xright">        
+                                 Last Published: 2012-03-01
+            </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+             
+                                                <h5>About Doxia</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="../index.html">What is Doxia?</a>
+            </li>
+                  <li class="none">
+                  <a href="../overview.html">Overview</a>
+            </li>
+                                                                                      <li class="collapsed">
+                  <a href="../upgrading.html">Upgrading</a>
+                  </li>
+                  <li class="none">
+                  <a href="../downloads.html">Downloads</a>
+            </li>
+                  <li class="none">
+                  <a href="../jira-report.html">Release Notes</a>
+            </li>
+                  <li class="none">
+                  <a href="../faq.html">FAQ</a>
+            </li>
+          </ul>
+                       <h5>Documentation</h5>
+                  <ul>
+                                                                                                                                <li class="collapsed">
+                  <a href="../references/index.html">Format References</a>
+                  </li>
+                  <li class="none">
+                  <a href="../modules/index.html">Doxia Modules Guide</a>
+            </li>
+                  <li class="none">
+                  <a href="../macros/index.html">Doxia Macros Guide</a>
+            </li>
+                  <li class="none">
+                  <a href="../book/index.html">Writing Books</a>
+            </li>
+                  <li class="none">
+                  <a href="../issues/index.html">Issues &amp; Gotchas</a>
+            </li>
+                  <li class="none">
+                  <a href="../resources.html">External Resources</a>
+            </li>
+          </ul>
+                       <h5>Developer Docs</h5>
+                  <ul>
+                                                                                                            <li class="expanded">
+            <strong>Developer Centre</strong>
+                  <ul>
+                      <li class="none">
+                  <a href="../developers/modules.html">Create a Doxia Module</a>
+            </li>
+                      <li class="none">
+                  <a href="../developers/macros.html">Create a Doxia Macro</a>
+            </li>
+                      <li class="none">
+                  <a href="../developers/sink.html">Using the Sink API</a>
+            </li>
+              </ul>
+        </li>
+                  <li class="none">
+                  <a href="../doxia/index.html">Doxia 1.1.x</a>
+            </li>
+                  <li class="none">
+                  <a href="../doxia-sitetools/index.html">Doxia Sitetools 1.1.x</a>
+            </li>
+                  <li class="none">
+                  <a href="../doxia-1.0.x/index.html">Doxia 1.0.x</a>
+            </li>
+                  <li class="none">
+                  <a href="../doxia-sitetools-1.0.x/index.html">Doxia Sitetools 1.0.x</a>
+            </li>
+                  <li class="none">
+                  <a href="../doxia-tools/index.html">Doxia Tools</a>
+            </li>
+          </ul>
+                       <h5>Maven Projects</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="../../ant-tasks/index.html">Ant Tasks</a>
+            </li>
+                  <li class="none">
+                  <a href="../../archetype/index.html">Archetype</a>
+            </li>
+                  <li class="none">
+                  <a href="../index.html">Doxia</a>
+            </li>
+                  <li class="none">
+                  <a href="../../jxr/index.html">JXR</a>
+            </li>
+                  <li class="none">
+                  <a href="../../maven-1.x/index.html">Maven 1.x</a>
+            </li>
+                  <li class="none">
+                  <a href="../../index.html">Maven 2</a>
+            </li>
+                  <li class="none">
+                  <a href="../../mercury/index.html">Mercury</a>
+            </li>
+                  <li class="none">
+                  <a href="../../plugins/index.html">Plugins</a>
+            </li>
+                  <li class="none">
+                  <a href="../../scm/index.html">SCM</a>
+            </li>
+                  <li class="none">
+                  <a href="../../shared/index.html">Shared Components</a>
+            </li>
+                  <li class="none">
+                  <a href="../../surefire/index.html">Surefire</a>
+            </li>
+                  <li class="none">
+                  <a href="../../wagon/index.html">Wagon</a>
+            </li>
+          </ul>
+                                 <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+          <img alt="Built by Maven" src="../images/logos/maven-feather.png"/>
+        </a>
+                       
+                            </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <!-- 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. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/doxia/referen
 ces/apt-format.html --><div class="section"><h2>Doxia Developers Centre<a name="Doxia_Developers_Centre"></a></h2><p>This documentation centre is for those that are developing Doxia modules or macro.</p><p>Currently you can find information on the following topics:</p><ul><li><a href="./modules.html">Creating Doxia Modules</a></li><li><a href="./macros.html">Creating Doxia Macros</a></li><li><a href="./sink.html">Using the Doxia Sink API</a></li></ul></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">
+        &#169;            2005-2012
+              The Apache Software Foundation
+            
+                       - <a href="http://maven.apache.org/privacy-policy.html">Privacy Policy</a>.
+        Apache Maven, Maven, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation.
+      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>

Added: websites/staging/maventest-doxia/trunk/content/developers/macros.html
==============================================================================
--- websites/staging/maventest-doxia/trunk/content/developers/macros.html (added)
+++ websites/staging/maventest-doxia/trunk/content/developers/macros.html Thu Mar  1 18:57:00 2012
@@ -0,0 +1,234 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- Generated by Apache Maven Doxia at Mar 1, 2012 -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>Doxia Developers Centre</title>
+    <style type="text/css" media="all">
+      @import url("../css/maven-base.css");
+      @import url("../css/maven-theme.css");
+      @import url("../css/site.css");
+    </style>
+    <link rel="stylesheet" href="../css/print.css" type="text/css" media="print" />
+        <meta name="author" content="Vincent Siveton" />
+        <meta name="Date-Creation-yyyymmdd" content="20080302" />
+    <meta name="Date-Revision-yyyymmdd" content="20120301" />
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+                                                    
+<script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
+                                                        
+<script type="text/javascript">_uacct = "UA-140879-1";
+        urchinTracker();</script>
+                    </head>
+  <body class="composite">
+    <div id="banner">
+                                      <a href="../../" id="bannerLeft">
+                                                <img src="../images/apache-maven-project-2.png" alt="" />
+                </a>
+                                            <a href=".././" id="bannerRight">
+                                                <img src="../images/maven-logo-2.gif" alt="" />
+                </a>
+            <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+            
+                                <div class="xleft">
+                          <a href="http://www.apache.org/" class="externalLink">Apache</a>
+        &gt;
+                  <a href="../../index.html">Maven</a>
+        &gt;
+                  <a href="../index.html">Doxia</a>
+        &gt;
+    Doxia Developers Centre
+      </div>
+            <div class="xright">        
+                                 Last Published: 2012-03-01
+            </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+             
+                                                <h5>About Doxia</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="../index.html">What is Doxia?</a>
+            </li>
+                  <li class="none">
+                  <a href="../overview.html">Overview</a>
+            </li>
+                                                                                      <li class="collapsed">
+                  <a href="../upgrading.html">Upgrading</a>
+                  </li>
+                  <li class="none">
+                  <a href="../downloads.html">Downloads</a>
+            </li>
+                  <li class="none">
+                  <a href="../jira-report.html">Release Notes</a>
+            </li>
+                  <li class="none">
+                  <a href="../faq.html">FAQ</a>
+            </li>
+          </ul>
+                       <h5>Documentation</h5>
+                  <ul>
+                                                                                                                                <li class="collapsed">
+                  <a href="../references/index.html">Format References</a>
+                  </li>
+                  <li class="none">
+                  <a href="../modules/index.html">Doxia Modules Guide</a>
+            </li>
+                  <li class="none">
+                  <a href="../macros/index.html">Doxia Macros Guide</a>
+            </li>
+                  <li class="none">
+                  <a href="../book/index.html">Writing Books</a>
+            </li>
+                  <li class="none">
+                  <a href="../issues/index.html">Issues &amp; Gotchas</a>
+            </li>
+                  <li class="none">
+                  <a href="../resources.html">External Resources</a>
+            </li>
+          </ul>
+                       <h5>Developer Docs</h5>
+                  <ul>
+                                                                                                                  <li class="expanded">
+                  <a href="../developers/index.html">Developer Centre</a>
+                    <ul>
+                      <li class="none">
+                  <a href="../developers/modules.html">Create a Doxia Module</a>
+            </li>
+                      <li class="none">
+            <strong>Create a Doxia Macro</strong>
+          </li>
+                      <li class="none">
+                  <a href="../developers/sink.html">Using the Sink API</a>
+            </li>
+              </ul>
+        </li>
+                  <li class="none">
+                  <a href="../doxia/index.html">Doxia 1.1.x</a>
+            </li>
+                  <li class="none">
+                  <a href="../doxia-sitetools/index.html">Doxia Sitetools 1.1.x</a>
+            </li>
+                  <li class="none">
+                  <a href="../doxia-1.0.x/index.html">Doxia 1.0.x</a>
+            </li>
+                  <li class="none">
+                  <a href="../doxia-sitetools-1.0.x/index.html">Doxia Sitetools 1.0.x</a>
+            </li>
+                  <li class="none">
+                  <a href="../doxia-tools/index.html">Doxia Tools</a>
+            </li>
+          </ul>
+                       <h5>Maven Projects</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="../../ant-tasks/index.html">Ant Tasks</a>
+            </li>
+                  <li class="none">
+                  <a href="../../archetype/index.html">Archetype</a>
+            </li>
+                  <li class="none">
+                  <a href="../index.html">Doxia</a>
+            </li>
+                  <li class="none">
+                  <a href="../../jxr/index.html">JXR</a>
+            </li>
+                  <li class="none">
+                  <a href="../../maven-1.x/index.html">Maven 1.x</a>
+            </li>
+                  <li class="none">
+                  <a href="../../index.html">Maven 2</a>
+            </li>
+                  <li class="none">
+                  <a href="../../mercury/index.html">Mercury</a>
+            </li>
+                  <li class="none">
+                  <a href="../../plugins/index.html">Plugins</a>
+            </li>
+                  <li class="none">
+                  <a href="../../scm/index.html">SCM</a>
+            </li>
+                  <li class="none">
+                  <a href="../../shared/index.html">Shared Components</a>
+            </li>
+                  <li class="none">
+                  <a href="../../surefire/index.html">Surefire</a>
+            </li>
+                  <li class="none">
+                  <a href="../../wagon/index.html">Wagon</a>
+            </li>
+          </ul>
+                                 <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+          <img alt="Built by Maven" src="../images/logos/maven-feather.png"/>
+        </a>
+                       
+                            </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <!-- 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. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/doxia/referen
 ces/apt-format.html --><div class="section"><h2>Create a New Doxia Macro<a name="Create_a_New_Doxia_Macro"></a></h2><p>You need to add the following plugin configuration to generate the correct Plexus <i>component.xml</i> file for the project containing your macro:</p><div class="source"><pre>&lt;project&gt;
+  ...
+  &lt;build&gt;
+    ...
+    &lt;plugins&gt;
+      &lt;plugin&gt;
+        &lt;groupId&gt;org.codehaus.plexus&lt;/groupId&gt;
+        &lt;artifactId&gt;plexus-maven-plugin&lt;/artifactId&gt;
+        &lt;executions&gt;
+          &lt;execution&gt;
+            &lt;goals&gt;
+              &lt;goal&gt;descriptor&lt;/goal&gt;
+            &lt;/goals&gt;
+          &lt;/execution&gt;
+        &lt;/executions&gt;
+      &lt;/plugin&gt;
+      ...
+    &lt;/plugins&gt;
+  ...
+  &lt;/build&gt;
+  ...
+&lt;/project&gt;</pre></div><p>You should implement the <i>AbstractMacro</i> class:</p><div class="source"><pre>import org.apache.maven.doxia.macro.AbstractMacro;
+
+/**
+ * @plexus.component role=&quot;org.apache.maven.doxia.macro.Macro&quot; role-hint=&quot;my&quot;
+ */
+public class MyMacro
+    extends AbstractMacro
+{
+...
+    public void execute( Sink sink, MacroRequest request )
+        throws MacroExecutionException
+    {
+        String myValue = (String) request.getParameter( &quot;myParam&quot; );
+...
+    }
+...
+}</pre></div><p>To use it, you need to write the following markups:</p><ul><li>APT<div class="source"><pre>%{my|myParam=myValue} &lt;!-- my is the macro name defined by role-hint --&gt;</pre></div></li><li>XDoc<div class="source"><pre>&lt;macro name=&quot;my&quot;&gt; &lt;!-- my is the required macro name defined by role-hint --&gt;
+  &lt;param name=&quot;myParam&quot; value=&quot;myValue&quot;/&gt;
+&lt;/macro&gt;</pre></div></li></ul><div class="section"><h3><a name="References">References</a></h3><ul><li><a href="../modules/index.html">Doxia Modules Guide</a></li><li><a href="../macros/index.html">Doxia Macros Guide</a></li><li><a href="../doxia/apidocs/index.html">Doxia API Reference</a></li><li><a href="../doxia-sitetools/apidocs/index.html">Doxia Sitetools API Reference</a></li></ul></div></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">
+        &#169;            2005-2012
+              The Apache Software Foundation
+            
+                       - <a href="http://maven.apache.org/privacy-policy.html">Privacy Policy</a>.
+        Apache Maven, Maven, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation.
+      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>

Added: websites/staging/maventest-doxia/trunk/content/developers/maven-integration.html
==============================================================================
--- websites/staging/maventest-doxia/trunk/content/developers/maven-integration.html (added)
+++ websites/staging/maventest-doxia/trunk/content/developers/maven-integration.html Thu Mar  1 18:57:00 2012
@@ -0,0 +1,227 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- Generated by Apache Maven Doxia at Mar 1, 2012 -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>Integration With Maven</title>
+    <style type="text/css" media="all">
+      @import url("../css/maven-base.css");
+      @import url("../css/maven-theme.css");
+      @import url("../css/site.css");
+    </style>
+    <link rel="stylesheet" href="../css/print.css" type="text/css" media="print" />
+        <meta name="author" content="Vincent Siveton" />
+        <meta name="Date-Creation-yyyymmdd" content="20090302" />
+    <meta name="Date-Revision-yyyymmdd" content="20120301" />
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+                                                    
+<script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
+                                                        
+<script type="text/javascript">_uacct = "UA-140879-1";
+        urchinTracker();</script>
+                    </head>
+  <body class="composite">
+    <div id="banner">
+                                      <a href="../../" id="bannerLeft">
+                                                <img src="../images/apache-maven-project-2.png" alt="" />
+                </a>
+                                            <a href=".././" id="bannerRight">
+                                                <img src="../images/maven-logo-2.gif" alt="" />
+                </a>
+            <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+            
+                                <div class="xleft">
+                          <a href="http://www.apache.org/" class="externalLink">Apache</a>
+        &gt;
+                  <a href="../../index.html">Maven</a>
+        &gt;
+                  <a href="../index.html">Doxia</a>
+        &gt;
+    Integration With Maven
+      </div>
+            <div class="xright">        
+                                 Last Published: 2012-03-01
+            </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+             
+                                                <h5>About Doxia</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="../index.html">What is Doxia?</a>
+            </li>
+                  <li class="none">
+                  <a href="../overview.html">Overview</a>
+            </li>
+                                                                                                <li class="expanded">
+                  <a href="../upgrading.html">Upgrading</a>
+                    <ul>
+                      <li class="none">
+                  <a href="../whatsnew-1.1.html">What's new in 1.1?</a>
+            </li>
+                      <li class="none">
+            <strong>Maven Integration</strong>
+          </li>
+              </ul>
+        </li>
+                  <li class="none">
+                  <a href="../downloads.html">Downloads</a>
+            </li>
+                  <li class="none">
+                  <a href="../jira-report.html">Release Notes</a>
+            </li>
+                  <li class="none">
+                  <a href="../faq.html">FAQ</a>
+            </li>
+          </ul>
+                       <h5>Documentation</h5>
+                  <ul>
+                                                                                                                                <li class="collapsed">
+                  <a href="../references/index.html">Format References</a>
+                  </li>
+                  <li class="none">
+                  <a href="../modules/index.html">Doxia Modules Guide</a>
+            </li>
+                  <li class="none">
+                  <a href="../macros/index.html">Doxia Macros Guide</a>
+            </li>
+                  <li class="none">
+                  <a href="../book/index.html">Writing Books</a>
+            </li>
+                  <li class="none">
+                  <a href="../issues/index.html">Issues &amp; Gotchas</a>
+            </li>
+                  <li class="none">
+                  <a href="../resources.html">External Resources</a>
+            </li>
+          </ul>
+                       <h5>Developer Docs</h5>
+                  <ul>
+                                                                                                        <li class="collapsed">
+                  <a href="../developers/index.html">Developer Centre</a>
+                  </li>
+                  <li class="none">
+                  <a href="../doxia/index.html">Doxia 1.1.x</a>
+            </li>
+                  <li class="none">
+                  <a href="../doxia-sitetools/index.html">Doxia Sitetools 1.1.x</a>
+            </li>
+                  <li class="none">
+                  <a href="../doxia-1.0.x/index.html">Doxia 1.0.x</a>
+            </li>
+                  <li class="none">
+                  <a href="../doxia-sitetools-1.0.x/index.html">Doxia Sitetools 1.0.x</a>
+            </li>
+                  <li class="none">
+                  <a href="../doxia-tools/index.html">Doxia Tools</a>
+            </li>
+          </ul>
+                       <h5>Maven Projects</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="../../ant-tasks/index.html">Ant Tasks</a>
+            </li>
+                  <li class="none">
+                  <a href="../../archetype/index.html">Archetype</a>
+            </li>
+                  <li class="none">
+                  <a href="../index.html">Doxia</a>
+            </li>
+                  <li class="none">
+                  <a href="../../jxr/index.html">JXR</a>
+            </li>
+                  <li class="none">
+                  <a href="../../maven-1.x/index.html">Maven 1.x</a>
+            </li>
+                  <li class="none">
+                  <a href="../../index.html">Maven 2</a>
+            </li>
+                  <li class="none">
+                  <a href="../../mercury/index.html">Mercury</a>
+            </li>
+                  <li class="none">
+                  <a href="../../plugins/index.html">Plugins</a>
+            </li>
+                  <li class="none">
+                  <a href="../../scm/index.html">SCM</a>
+            </li>
+                  <li class="none">
+                  <a href="../../shared/index.html">Shared Components</a>
+            </li>
+                  <li class="none">
+                  <a href="../../surefire/index.html">Surefire</a>
+            </li>
+                  <li class="none">
+                  <a href="../../wagon/index.html">Wagon</a>
+            </li>
+          </ul>
+                                 <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+          <img alt="Built by Maven" src="../images/logos/maven-feather.png"/>
+        </a>
+                       
+                            </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <!-- 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. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/doxia/referen
 ces/apt-format.html --><div class="section"><h2>Integration With Maven<a name="Integration_With_Maven"></a></h2><p>This page presents how to use Doxia 1.1 under Maven 2.0.x and 2.1.x with a Maven reporting plugin. Its goal is to help the Maven reporting plugin developer to integrate it.</p><div class="section"><h3>Maven 2.0.x<a name="Maven_2.0.x"></a></h3><p>Doxia 1.0 API is embedded in Maven 2.0.x (see <a class="externalLink" href="http://jira.codehaus.org/browse/MNG-3402">MNG-3402</a>), so your Maven reporting plugin needs to shade Doxia 1.1 API and Logging to be backward compatible with Maven 2.0.x.</p><div class="source"><pre>&lt;project&gt;
+  ...
+  &lt;build&gt;
+    ...
+    &lt;plugins&gt;
+      &lt;plugin&gt;
+        &lt;artifactId&gt;maven-shade-plugin&lt;/artifactId&gt;
+        &lt;version&gt;1.2&lt;/version&gt;
+        &lt;executions&gt;
+          &lt;execution&gt;
+            &lt;phase&gt;package&lt;/phase&gt;
+            &lt;goals&gt;
+              &lt;goal&gt;shade&lt;/goal&gt;
+            &lt;/goals&gt;
+            &lt;configuration&gt;
+              &lt;finalName&gt;${project.build.finalName}&lt;/finalName&gt;
+              &lt;createDependencyReducedPom&gt;false&lt;/createDependencyReducedPom&gt;
+              &lt;keepDependenciesWithProvidedScope&gt;true&lt;/keepDependenciesWithProvidedScope&gt;
+              &lt;transformers&gt;
+                &lt;transformer implementation=&quot;org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer&quot; /&gt;
+              &lt;/transformers&gt;
+              &lt;artifactSet&gt;
+                &lt;includes&gt;
+                  &lt;include&gt;org.apache.maven.doxia:doxia-sink-api&lt;/include&gt;
+                  &lt;include&gt;org.apache.maven.doxia:doxia-logging-api&lt;/include&gt;
+                &lt;/includes&gt;
+              &lt;/artifactSet&gt;
+            &lt;/configuration&gt;
+          &lt;/execution&gt;
+        &lt;/executions&gt;
+      &lt;/plugin&gt;
+      ...
+    &lt;/plugins&gt;
+  &lt;/build&gt;
+  ...
+&lt;/project&gt;</pre></div></div><div class="section"><h3>Maven 2.1.x<a name="Maven_2.1.x"></a></h3><p>Doxia 1.1 API and Logging are embedded in Maven 2.1.x, your Maven reporting plugin is directly compatible with 2.1.x.</p></div></div><div class="section"><h2>Common Bugs and Pitfalls<a name="Common_Bugs_and_Pitfalls"></a></h2><p>Please read the <a href="../issues/index.html">Doxia Issues</a> page.</p></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">
+        &#169;            2005-2012
+              The Apache Software Foundation
+            
+                       - <a href="http://maven.apache.org/privacy-policy.html">Privacy Policy</a>.
+        Apache Maven, Maven, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation.
+      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>

Added: websites/staging/maventest-doxia/trunk/content/developers/modules.html
==============================================================================
--- websites/staging/maventest-doxia/trunk/content/developers/modules.html (added)
+++ websites/staging/maventest-doxia/trunk/content/developers/modules.html Thu Mar  1 18:57:00 2012
@@ -0,0 +1,245 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- Generated by Apache Maven Doxia at Mar 1, 2012 -->
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <title>Doxia Developers Centre</title>
+    <style type="text/css" media="all">
+      @import url("../css/maven-base.css");
+      @import url("../css/maven-theme.css");
+      @import url("../css/site.css");
+    </style>
+    <link rel="stylesheet" href="../css/print.css" type="text/css" media="print" />
+        <meta name="author" content="Vincent Siveton" />
+        <meta name="Date-Creation-yyyymmdd" content="20080302" />
+    <meta name="Date-Revision-yyyymmdd" content="20120301" />
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+                                                    
+<script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
+                                                        
+<script type="text/javascript">_uacct = "UA-140879-1";
+        urchinTracker();</script>
+                    </head>
+  <body class="composite">
+    <div id="banner">
+                                      <a href="../../" id="bannerLeft">
+                                                <img src="../images/apache-maven-project-2.png" alt="" />
+                </a>
+                                            <a href=".././" id="bannerRight">
+                                                <img src="../images/maven-logo-2.gif" alt="" />
+                </a>
+            <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+            
+                                <div class="xleft">
+                          <a href="http://www.apache.org/" class="externalLink">Apache</a>
+        &gt;
+                  <a href="../../index.html">Maven</a>
+        &gt;
+                  <a href="../index.html">Doxia</a>
+        &gt;
+    Doxia Developers Centre
+      </div>
+            <div class="xright">        
+                                 Last Published: 2012-03-01
+            </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+             
+                                                <h5>About Doxia</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="../index.html">What is Doxia?</a>
+            </li>
+                  <li class="none">
+                  <a href="../overview.html">Overview</a>
+            </li>
+                                                                                      <li class="collapsed">
+                  <a href="../upgrading.html">Upgrading</a>
+                  </li>
+                  <li class="none">
+                  <a href="../downloads.html">Downloads</a>
+            </li>
+                  <li class="none">
+                  <a href="../jira-report.html">Release Notes</a>
+            </li>
+                  <li class="none">
+                  <a href="../faq.html">FAQ</a>
+            </li>
+          </ul>
+                       <h5>Documentation</h5>
+                  <ul>
+                                                                                                                                <li class="collapsed">
+                  <a href="../references/index.html">Format References</a>
+                  </li>
+                  <li class="none">
+                  <a href="../modules/index.html">Doxia Modules Guide</a>
+            </li>
+                  <li class="none">
+                  <a href="../macros/index.html">Doxia Macros Guide</a>
+            </li>
+                  <li class="none">
+                  <a href="../book/index.html">Writing Books</a>
+            </li>
+                  <li class="none">
+                  <a href="../issues/index.html">Issues &amp; Gotchas</a>
+            </li>
+                  <li class="none">
+                  <a href="../resources.html">External Resources</a>
+            </li>
+          </ul>
+                       <h5>Developer Docs</h5>
+                  <ul>
+                                                                                                                  <li class="expanded">
+                  <a href="../developers/index.html">Developer Centre</a>
+                    <ul>
+                      <li class="none">
+            <strong>Create a Doxia Module</strong>
+          </li>
+                      <li class="none">
+                  <a href="../developers/macros.html">Create a Doxia Macro</a>
+            </li>
+                      <li class="none">
+                  <a href="../developers/sink.html">Using the Sink API</a>
+            </li>
+              </ul>
+        </li>
+                  <li class="none">
+                  <a href="../doxia/index.html">Doxia 1.1.x</a>
+            </li>
+                  <li class="none">
+                  <a href="../doxia-sitetools/index.html">Doxia Sitetools 1.1.x</a>
+            </li>
+                  <li class="none">
+                  <a href="../doxia-1.0.x/index.html">Doxia 1.0.x</a>
+            </li>
+                  <li class="none">
+                  <a href="../doxia-sitetools-1.0.x/index.html">Doxia Sitetools 1.0.x</a>
+            </li>
+                  <li class="none">
+                  <a href="../doxia-tools/index.html">Doxia Tools</a>
+            </li>
+          </ul>
+                       <h5>Maven Projects</h5>
+                  <ul>
+                  <li class="none">
+                  <a href="../../ant-tasks/index.html">Ant Tasks</a>
+            </li>
+                  <li class="none">
+                  <a href="../../archetype/index.html">Archetype</a>
+            </li>
+                  <li class="none">
+                  <a href="../index.html">Doxia</a>
+            </li>
+                  <li class="none">
+                  <a href="../../jxr/index.html">JXR</a>
+            </li>
+                  <li class="none">
+                  <a href="../../maven-1.x/index.html">Maven 1.x</a>
+            </li>
+                  <li class="none">
+                  <a href="../../index.html">Maven 2</a>
+            </li>
+                  <li class="none">
+                  <a href="../../mercury/index.html">Mercury</a>
+            </li>
+                  <li class="none">
+                  <a href="../../plugins/index.html">Plugins</a>
+            </li>
+                  <li class="none">
+                  <a href="../../scm/index.html">SCM</a>
+            </li>
+                  <li class="none">
+                  <a href="../../shared/index.html">Shared Components</a>
+            </li>
+                  <li class="none">
+                  <a href="../../surefire/index.html">Surefire</a>
+            </li>
+                  <li class="none">
+                  <a href="../../wagon/index.html">Wagon</a>
+            </li>
+          </ul>
+                                 <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+          <img alt="Built by Maven" src="../images/logos/maven-feather.png"/>
+        </a>
+                       
+                            </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
+        <!-- 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. --><!-- NOTE: For help with the syntax of this file, see: --><!-- http://maven.apache.org/doxia/referen
 ces/apt-format.html --><div class="section"><h2>Create a New Doxia Module<a name="Create_a_New_Doxia_Module"></a></h2><p>First, you need to create a POM with <i>doxia-modules</i> as parent:</p><div class="source"><pre>&lt;project&gt;
+  &lt;parent&gt;
+    &lt;groupId&gt;org.apache.maven.doxia&lt;/groupId&gt;
+    &lt;artifactId&gt;doxia-modules&lt;/artifactId&gt;
+    &lt;version&gt;1.0&lt;/version&gt; &lt;!-- Latest release --&gt;
+  &lt;/parent&gt;
+  &lt;modelVersion&gt;4.0.0&lt;/modelVersion&gt;
+  &lt;artifactId&gt;doxia-module-my&lt;/artifactId&gt;
+  &lt;name&gt;Doxia :: MY Module&lt;/name&gt;
+
+  ...
+&lt;/project&gt;</pre></div><p>Secondly, you should implement some Doxia classes:</p><ul><li><i>MyParser</i> class<div class="source"><pre>import org.apache.maven.doxia.parser.AbstractParser;
+
+/**
+ * @plexus.component role=&quot;org.apache.maven.doxia.parser.Parser&quot; role-hint=&quot;my&quot;
+ */
+public class MyParser
+    extends AbstractParser
+{
+...
+}</pre></div></li><li><i>MyParseException</i> class (optional)<div class="source"><pre>import org.apache.maven.doxia.parser.ParseException;
+
+public class MyParseException
+    extends ParseException
+{
+...
+}</pre></div></li><li><i>MySiteModule</i> class (optional, will be used by doxia-sitetools)<div class="source"><pre>import org.apache.maven.doxia.module.site.AbstractSiteModule;
+
+/**
+ * @plexus.component role=&quot;org.apache.maven.doxia.module.site.SiteModule&quot; role-hint=&quot;my&quot;
+ */
+public class MySiteModule
+    extends AbstractSiteModule
+{
+...
+}</pre></div></li><li><i>MySink</i> class<div class="source"><pre>import org.apache.maven.doxia.sink.SinkAdapter;
+
+public class MySink
+    extends SinkAdapter
+{
+...
+}</pre></div></li><li><i>MySinkFactory</i> class<div class="source"><pre>import org.apache.maven.doxia.sink.SinkFactory;
+
+/**
+ * @plexus.component role=&quot;org.apache.maven.doxia.sink.SinkFactory&quot; role-hint=&quot;my&quot;
+ */
+public class MySinkFactory
+    extends SinkFactory
+{
+...
+}</pre></div></li></ul><div class="section"><h3><a name="References">References</a></h3><ul><li><a href="../modules/index.html">Doxia Modules Guide</a></li><li><a href="../macros/index.html">Doxia Macros Guide</a></li><li><a href="../doxia/apidocs/index.html">Doxia API Reference</a></li><li><a href="../doxia-sitetools/apidocs/index.html">Doxia Sitetools API Reference</a></li></ul></div></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">
+        &#169;            2005-2012
+              The Apache Software Foundation
+            
+                       - <a href="http://maven.apache.org/privacy-policy.html">Privacy Policy</a>.
+        Apache Maven, Maven, Apache, the Apache feather logo, and the Apache Maven project logos are trademarks of The Apache Software Foundation.
+      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>