ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r883132 [1/4] - in /websites/staging/ace/trunk/content: ./ dev-doc/ dev-doc/analysis/ dev-doc/design/ dev-doc/requirements/ dev-doc/requirements/use-cases/ get-involved/ user-doc/
Date Fri, 18 Oct 2013 12:50:20 GMT
Author: buildbot
Date: Fri Oct 18 12:50:18 2013
New Revision: 883132

Log:
Staging update by buildbot for ace

Added:
    websites/staging/ace/trunk/content/dev-doc/adding-custom-artifact-types.html
Modified:
    websites/staging/ace/trunk/content/   (props changed)
    websites/staging/ace/trunk/content/dev-doc/analysis/auditlog-analysis.html
    websites/staging/ace/trunk/content/dev-doc/analysis/bundlerepository-analysis.html
    websites/staging/ace/trunk/content/dev-doc/analysis/index.html
    websites/staging/ace/trunk/content/dev-doc/analysis/security-analysis.html
    websites/staging/ace/trunk/content/dev-doc/analysis/template-mechanism.html
    websites/staging/ace/trunk/content/dev-doc/architecture.html
    websites/staging/ace/trunk/content/dev-doc/coding-standards.html
    websites/staging/ace/trunk/content/dev-doc/design/ace-authentication.html
    websites/staging/ace/trunk/content/dev-doc/design/ace-deployment-strategies.html
    websites/staging/ace/trunk/content/dev-doc/design/auditlog-protocol.html
    websites/staging/ace/trunk/content/dev-doc/design/index.html
    websites/staging/ace/trunk/content/dev-doc/design/remote-interfaces.html
    websites/staging/ace/trunk/content/dev-doc/design/test-script.html
    websites/staging/ace/trunk/content/dev-doc/design/using-client-certificates.html
    websites/staging/ace/trunk/content/dev-doc/getting-started.html
    websites/staging/ace/trunk/content/dev-doc/release-guide.html
    websites/staging/ace/trunk/content/dev-doc/requirements/index.html
    websites/staging/ace/trunk/content/dev-doc/requirements/roles.html
    websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/index.html
    websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-01.html
    websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-02.html
    websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-03.html
    websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-04.html
    websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-05.html
    websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-06.html
    websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-07.html
    websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-08.html
    websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-09.html
    websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-10.html
    websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-11.html
    websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-12.html
    websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-13.html
    websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-14.html
    websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-15.html
    websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-16.html
    websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-17.html
    websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-18.html
    websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-19.html
    websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-20.html
    websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-21.html
    websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-22.html
    websites/staging/ace/trunk/content/dev-doc/requirements/use-cases/uc-23.html
    websites/staging/ace/trunk/content/dev-doc/writing-tests.html
    websites/staging/ace/trunk/content/downloads.html
    websites/staging/ace/trunk/content/get-involved/continuous-integration.html
    websites/staging/ace/trunk/content/get-involved/issue-tracking.html
    websites/staging/ace/trunk/content/get-involved/mailing-lists.html
    websites/staging/ace/trunk/content/get-involved/project-team.html
    websites/staging/ace/trunk/content/get-involved/source-code.html
    websites/staging/ace/trunk/content/index.html
    websites/staging/ace/trunk/content/news.html
    websites/staging/ace/trunk/content/on-the-web.html
    websites/staging/ace/trunk/content/sitemap.html
    websites/staging/ace/trunk/content/user-doc/faq.html
    websites/staging/ace/trunk/content/user-doc/features.html
    websites/staging/ace/trunk/content/user-doc/getting-started.html
    websites/staging/ace/trunk/content/user-doc/introduction.html
    websites/staging/ace/trunk/content/user-doc/restapi.html
    websites/staging/ace/trunk/content/user-doc/support.html
    websites/staging/ace/trunk/content/user-doc/user-guide.html
    websites/staging/ace/trunk/content/user-doc/useradmin-ui.html

Propchange: websites/staging/ace/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Oct 18 12:50:18 2013
@@ -1 +1 @@
-1533407
+1533428

Added: websites/staging/ace/trunk/content/dev-doc/adding-custom-artifact-types.html
==============================================================================
--- websites/staging/ace/trunk/content/dev-doc/adding-custom-artifact-types.html (added)
+++ websites/staging/ace/trunk/content/dev-doc/adding-custom-artifact-types.html Fri Oct 18 12:50:18 2013
@@ -0,0 +1,361 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html lang="en">
+  <head>
+    <title>Adding custom artifact types</title>
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
+    <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
+    <link href="/css/prettify.css" rel="stylesheet" media="screen">
+    <link href="/css/code.css" rel="stylesheet" media="screen">
+    <script src="http://code.jquery.com/jquery.js"></script>
+    <script src="/js/bootstrap.min.js"></script>    
+    <script src="/js/prettify.js"></script>
+    
+    
+    
+    <script>
+    $(function () { prettyPrint() })
+    $().dropdown()
+    </script>
+  </head>
+  <body style="padding-top: 50px;">
+    <div class="navbar navbar-fixed-top">
+      <div class="navbar-inner">
+        <div class="container">
+          <a class="brand" href="/index.html">Apache ACE&trade;</a>
+          <ul class="nav">
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">News <b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li>
+        <a href="/news.html">News</a>
+      </li>
+      <li>
+        <a href="/on-the-web.html">On the web</a>
+      </li>
+    </ul>
+  </li>
+  <li>
+    <a href="/downloads.html">Downloads</a>
+  </li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Users <b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li>
+        <a href="/user-doc/introduction.html">Introduction</a>
+      </li>
+      <li>
+        <a href="/user-doc/getting-started.html">Getting Started</a>
+      </li>
+      <li>
+        <a href="/user-doc/user-guide.html">User Guide</a>
+      </li>
+      <li>
+        <a href="/user-doc/features.html">Features</a>
+      </li>
+	    <li>
+        <a href="/user-doc/restapi.html">Client REST API</a>
+      </li>
+      <li>
+        <a href="/user-doc/useradmin-ui.html">User Management Guide</a>
+      </li>
+      <li>
+        <a href="/user-doc/faq.html">FAQ</a>
+      </li>
+      <li>
+        <a href="/user-doc/support.html">Support</a>
+      </li>
+    </ul>
+  </li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developers <b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li>
+        <a href="/dev-doc/getting-started.html">Getting Started</a>
+      </li>
+      <li>
+        <a href="/dev-doc/requirements/">Requirements</a>
+      </li>
+      <li>
+        <a href="/dev-doc/architecture.html">Architecture</a>
+      </li>
+      <li>
+        <a href="/dev-doc/analysis/">Analysis</a>
+      </li>
+      <li>
+        <a href="/dev-doc/design/">Design</a>
+      </li>
+      <li>
+        <a href="/dev-doc/coding-standards.html">Coding Standards</a>
+      </li>
+      <li>
+        <a href="/dev-doc/release-guide.html">Release Guide</a>
+      </li>
+      <li>
+        <a href="/dev-doc/writing-tests.html">Writing unit/integration tests</a>
+      </li>
+      <li>
+        <a href="/dev-doc/adding-custom-artifact-types.html">Adding custom artifact types</a>
+      </li>
+    </ul>
+  </li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Get Involved <b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li>
+        <a href="/get-involved/mailing-lists.html">Mailing Lists</a>
+      </li>
+      <li>
+        <a href="/get-involved/issue-tracking.html">Issue Tracking</a>
+      </li>
+      <li>
+        <a href="/get-involved/continuous-integration.html">Continuous Integration</a>
+      </li>
+      <li>
+        <a href="/get-involved/source-code.html">Source Code</a>
+      </li>
+      <li>
+        <a href="/get-involved/project-team.html">Project Team</a>
+      </li>
+    </ul>
+  </li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Wiki <b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li>
+        <a href="https://cwiki.apache.org/confluence/display/ACE/Board+Reports">Board Reports <i class="icon-share-alt"></i></a>
+      </li>
+      <li>
+        <a href="https://cwiki.apache.org/confluence/display/ACE/Index">Homepage <i class="icon-share-alt"></i></a>
+      </li>
+    </ul>
+  </li>
+  <li class="dropdown">
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Apache <b class="caret"></b></a>
+    <ul class="dropdown-menu">
+      <li>
+        <a href="http://www.apache.org/">Apache Homepage <i class="icon-share-alt"></i></a>
+      </li>
+      <li>
+        <a href="http://www.apache.org/licenses/">Licenses <i class="icon-share-alt"></i></a>
+      </li>
+      <li>
+        <a href="http://www.apache.org/security/">Security <i class="icon-share-alt"></i></a>
+      </li>
+      <li>
+        <a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship <i class="icon-share-alt"></i></a>
+      </li>
+      <li>
+        <a href="http://www.apache.org/foundation/thanks.html">Thanks <i class="icon-share-alt"></i></a>
+      </li>
+    </ul>
+  </li>
+</ul>
+
+        </div>
+      </div>
+    </div>
+    <div class="container">
+      <p><a href="/"><i class='icon-home'></i> Home</a>&nbsp;&raquo&nbsp;<a href="/dev-doc/">Dev-doc</a></p>
+      <h1>Adding custom artifact types</h1>
+      <div class="clear"></div>
+      <div id="content"><p>Out of the box, ACE comes with support for bundles and configuration files that follow the Auto Configuration specification. However, it is possible to extend ACE with support for new types of artifacts. Doing so requires you to do three things:</p>
+<ol>
+<li>Write a resource processor, according to the Deployment Admin specification.</li>
+<li>Write an ArtifactRecognizer service implementation.</li>
+<li>Write an ArtifactHelper service implementation.</li>
+</ol>
+<p>This document explains how to write each of these, and how to subsequently deploy them appropriately.</p>
+<h1 id="writing-a-resource-processor">Writing a resource processor</h1>
+<p>A resource processor implements the ResourceProcessor interface as defined in the Deployment Admin specification (OSGi Compendium 114.10). It describes in detail the contract that needs to be implemented and also contains an example. If you want to get started quickly, you can use the following code:</p>
+<div class="codehilite"><pre><span class="kd">public</span> <span class="kd">class</span> <span class="nc">Processor</span> <span class="kd">implements</span> <span class="n">ResourceProcessor</span> <span class="o">{</span>
+    <span class="kd">private</span> <span class="kd">volatile</span> <span class="n">DeploymentSession</span> <span class="n">m_session</span><span class="o">;</span>
+    <span class="kd">private</span> <span class="n">String</span> <span class="n">m_deploymentPackageName</span><span class="o">;</span>
+    <span class="kd">private</span> <span class="n">List</span><span class="o">&lt;</span><span class="n">String</span><span class="o">&gt;</span> <span class="n">m_toInstall</span><span class="o">;</span>
+    <span class="kd">private</span> <span class="n">List</span><span class="o">&lt;</span><span class="n">String</span><span class="o">&gt;</span> <span class="n">m_toRemove</span><span class="o">;</span>
+
+    <span class="cm">/**</span>
+<span class="cm">     * Sets up the necessary environment for a deployment session.</span>
+<span class="cm">     */</span>
+    <span class="kd">private</span> <span class="kt">void</span> <span class="nf">startSession</span><span class="o">(</span><span class="n">DeploymentSession</span> <span class="n">session</span><span class="o">)</span> <span class="o">{</span>
+        <span class="k">if</span> <span class="o">(</span><span class="n">m_session</span> <span class="o">!=</span> <span class="kc">null</span><span class="o">)</span> <span class="o">{</span>
+            <span class="k">throw</span> <span class="k">new</span> <span class="nf">IllegalArgumentException</span><span class="o">(</span><span class="s">&quot;This resource processor is currently processing another deployment session, installing deploymentpackage&quot;</span> <span class="o">+</span> <span class="n">m_session</span><span class="o">.</span><span class="na">getTargetDeploymentPackage</span><span class="o">().</span><span class="na">getName</span><span class="o">());</span>
+        <span class="o">}</span>
+        <span class="n">m_session</span> <span class="o">=</span> <span class="n">session</span><span class="o">;</span>
+        <span class="n">m_toInstall</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ArrayList</span><span class="o">&lt;</span><span class="n">String</span><span class="o">&gt;();</span>
+        <span class="n">m_toRemove</span> <span class="o">=</span> <span class="k">new</span> <span class="n">ArrayList</span><span class="o">&lt;</span><span class="n">String</span><span class="o">&gt;();</span>
+        <span class="n">String</span> <span class="n">fromSource</span> <span class="o">=</span> <span class="n">session</span><span class="o">.</span><span class="na">getSourceDeploymentPackage</span><span class="o">().</span><span class="na">getName</span><span class="o">();</span>
+        <span class="n">String</span> <span class="n">fromTarget</span> <span class="o">=</span> <span class="n">session</span><span class="o">.</span><span class="na">getTargetDeploymentPackage</span><span class="o">().</span><span class="na">getName</span><span class="o">();</span>
+        <span class="k">if</span> <span class="o">(</span><span class="n">fromSource</span><span class="o">.</span><span class="na">equals</span><span class="o">(</span><span class="s">&quot;&quot;</span><span class="o">))</span> <span class="o">{</span>
+            <span class="n">m_deploymentPackageName</span> <span class="o">=</span> <span class="n">fromTarget</span><span class="o">;</span>
+        <span class="o">}</span>
+        <span class="k">else</span> <span class="o">{</span>
+            <span class="n">m_deploymentPackageName</span> <span class="o">=</span> <span class="n">fromSource</span><span class="o">;</span>
+        <span class="o">}</span>
+    <span class="o">}</span>
+
+    <span class="cm">/**</span>
+<span class="cm">     * Ends a deployment session.</span>
+<span class="cm">     */</span>
+    <span class="kd">private</span> <span class="kt">void</span> <span class="nf">endSession</span><span class="o">()</span> <span class="o">{</span>
+        <span class="n">m_session</span> <span class="o">=</span> <span class="kc">null</span><span class="o">;</span>
+        <span class="n">m_deploymentPackageName</span> <span class="o">=</span> <span class="kc">null</span><span class="o">;</span>
+        <span class="n">m_toInstall</span> <span class="o">=</span> <span class="kc">null</span><span class="o">;</span>
+        <span class="n">m_toRemove</span> <span class="o">=</span> <span class="kc">null</span><span class="o">;</span>
+    <span class="o">}</span>
+
+    <span class="kd">private</span> <span class="kt">void</span> <span class="nf">ensureSession</span><span class="o">()</span>  <span class="o">{</span>
+        <span class="k">if</span> <span class="o">(</span><span class="n">m_session</span> <span class="o">==</span> <span class="kc">null</span><span class="o">)</span> <span class="o">{</span>
+            <span class="k">throw</span> <span class="k">new</span> <span class="nf">IllegalStateException</span><span class="o">(</span><span class="s">&quot;This resource processor is currently not part of a deployment session.&quot;</span><span class="o">);</span>
+        <span class="o">}</span>
+    <span class="o">}</span>
+
+    <span class="kd">public</span> <span class="kt">void</span> <span class="nf">begin</span><span class="o">(</span><span class="n">DeploymentSession</span> <span class="n">session</span><span class="o">)</span> <span class="o">{</span>
+        <span class="n">startSession</span><span class="o">(</span><span class="n">session</span><span class="o">);</span>
+    <span class="o">}</span>
+
+    <span class="kd">public</span> <span class="kt">void</span> <span class="nf">process</span><span class="o">(</span><span class="n">String</span> <span class="n">name</span><span class="o">,</span> <span class="n">InputStream</span> <span class="n">stream</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">ResourceProcessorException</span> <span class="o">{</span>
+        <span class="n">ensureSession</span><span class="o">();</span>
+        <span class="n">m_toInstall</span><span class="o">.</span><span class="na">add</span><span class="o">(</span><span class="n">name</span><span class="o">);</span>
+    <span class="o">}</span>
+
+    <span class="kd">public</span> <span class="kt">void</span> <span class="nf">dropped</span><span class="o">(</span><span class="n">String</span> <span class="n">resource</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">ResourceProcessorException</span> <span class="o">{</span>
+        <span class="n">ensureSession</span><span class="o">();</span>
+        <span class="n">m_toRemove</span><span class="o">.</span><span class="na">add</span><span class="o">(</span><span class="n">resource</span><span class="o">);</span>
+    <span class="o">}</span>
+
+    <span class="kd">public</span> <span class="kt">void</span> <span class="nf">dropAllResources</span><span class="o">()</span> <span class="kd">throws</span> <span class="n">ResourceProcessorException</span> <span class="o">{</span>
+        <span class="n">ensureSession</span><span class="o">();</span>
+        <span class="n">m_toRemove</span><span class="o">.</span><span class="na">addAll</span><span class="o">(</span><span class="n">Collections</span><span class="o">.</span><span class="na">EMPTY_LIST</span> <span class="cm">/* should be a list of all current resources */</span><span class="o">);</span>
+    <span class="o">}</span>
+
+    <span class="kd">public</span> <span class="kt">void</span> <span class="nf">prepare</span><span class="o">()</span> <span class="kd">throws</span> <span class="n">ResourceProcessorException</span> <span class="o">{</span>
+        <span class="n">ensureSession</span><span class="o">();</span>
+    <span class="o">}</span>
+
+    <span class="kd">public</span> <span class="kt">void</span> <span class="nf">commit</span><span class="o">()</span> <span class="o">{</span>
+        <span class="n">ensureSession</span><span class="o">();</span>
+        <span class="k">while</span> <span class="o">(!</span><span class="n">m_toInstall</span><span class="o">.</span><span class="na">isEmpty</span><span class="o">())</span> <span class="o">{</span>
+            <span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="s">&quot;installing: &quot;</span> <span class="o">+</span> <span class="n">m_toInstall</span><span class="o">.</span><span class="na">remove</span><span class="o">(</span><span class="mi">0</span><span class="o">));</span>
+        <span class="o">}</span>
+        <span class="k">while</span> <span class="o">(!</span><span class="n">m_toRemove</span><span class="o">.</span><span class="na">isEmpty</span><span class="o">())</span> <span class="o">{</span>
+            <span class="n">System</span><span class="o">.</span><span class="na">out</span><span class="o">.</span><span class="na">println</span><span class="o">(</span><span class="s">&quot;removing: &quot;</span> <span class="o">+</span> <span class="n">m_toRemove</span><span class="o">.</span><span class="na">remove</span><span class="o">(</span><span class="mi">0</span><span class="o">));</span>
+        <span class="o">}</span>
+        <span class="n">endSession</span><span class="o">();</span>
+    <span class="o">}</span>
+
+    <span class="kd">public</span> <span class="kt">void</span> <span class="nf">rollback</span><span class="o">()</span> <span class="o">{</span>
+        <span class="c1">// nothing special to do.</span>
+        <span class="n">ensureSession</span><span class="o">();</span>
+        <span class="n">endSession</span><span class="o">();</span>
+    <span class="o">}</span>
+
+    <span class="kd">public</span> <span class="kt">void</span> <span class="nf">cancel</span><span class="o">()</span> <span class="o">{</span>
+        <span class="n">ensureSession</span><span class="o">();</span>
+        <span class="c1">// Nothing to do: we have no long-running operation, we only read the stream.</span>
+    <span class="o">}</span>
+<span class="o">}</span>
+</pre></div>
+
+
+<p>This should be enough to get you started, but the code takes a few shortcuts so please do take some time to read the specification and implement each method correctly.</p>
+<p>The next step then is to publish this processor as an OSGi service. Don't forget to add the SERVICE_PID property and set its value, because that is how the processor is later recognized. Package everything up in an OSGi bundle and make sure to include these two headers in its manifest:</p>
+<div class="codehilite"><pre><span class="n">Deployment</span><span class="o">-</span><span class="n">ProvidesResourceProcessor</span><span class="p">:</span> <span class="n">org</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">ace</span><span class="p">.</span><span class="n">resourceprocessor</span><span class="p">.</span><span class="n">custom</span>
+<span class="n">DeploymentPackage</span><span class="o">-</span><span class="n">Customizer</span><span class="p">:</span> <span class="n">true</span>
+</pre></div>
+
+
+<p>The first one should match the PID you used earlier.</p>
+<h1 id="writing-an-artifacthelper-and-artifactrecognizer">Writing an ArtifactHelper and ArtifactRecognizer</h1>
+<p>These services can usually just be implemented by the same class. The artifact recognizer is used to identify an artifact as being of this specific type. How it does that is up to the implementation. It might do something as simple as look at the file extension, but a lot of recognizers will also inspect (part of) the actual file. The artifact helper then contains all kinds of methods to help ACE deal with this specific type of artifact. The API documentation of these two interfaces explains the methods in detail. Again, let's get started with an implementation of both for a very simple artifact: a file with a specific extension:</p>
+<div class="codehilite"><pre><span class="kd">public</span> <span class="kd">class</span> <span class="nc">CustomArtifactHelper</span> <span class="kd">implements</span> <span class="n">ArtifactRecognizer</span><span class="o">,</span> <span class="n">ArtifactHelper</span> <span class="o">{</span>
+    <span class="kd">public</span> <span class="kd">static</span> <span class="kd">final</span> <span class="n">String</span> <span class="n">KEY_FILENAME</span> <span class="o">=</span> <span class="s">&quot;filename&quot;</span><span class="o">;</span>
+    <span class="kd">public</span> <span class="kd">static</span> <span class="kd">final</span> <span class="n">String</span> <span class="n">MIMETYPE</span> <span class="o">=</span> <span class="s">&quot;application/vnd.apache.ace.custom&quot;</span><span class="o">;</span>
+    <span class="kd">public</span> <span class="kd">static</span> <span class="kd">final</span> <span class="n">String</span> <span class="n">PROCESSOR</span> <span class="o">=</span> <span class="s">&quot;org.apache.ace.resourceprocessor.custom&quot;</span><span class="o">;</span>
+
+    <span class="nd">@Override</span>
+    <span class="kd">public</span> <span class="kt">boolean</span> <span class="nf">canUse</span><span class="o">(</span><span class="n">ArtifactObject</span> <span class="n">object</span><span class="o">)</span> <span class="o">{</span>
+        <span class="k">return</span> <span class="o">(</span><span class="n">object</span> <span class="o">==</span> <span class="kc">null</span><span class="o">)</span> <span class="o">?</span> <span class="kc">false</span> <span class="o">:</span> <span class="n">MIMETYPE</span><span class="o">.</span><span class="na">equals</span><span class="o">(</span><span class="n">object</span><span class="o">.</span><span class="na">getMimetype</span><span class="o">());</span>
+    <span class="o">}</span>
+
+    <span class="nd">@Override</span>
+    <span class="kd">public</span> <span class="n">ArtifactPreprocessor</span> <span class="nf">getPreprocessor</span><span class="o">()</span> <span class="o">{</span>
+        <span class="k">return</span> <span class="kc">null</span><span class="o">;</span>
+    <span class="o">}</span>
+
+    <span class="nd">@Override</span>
+    <span class="kd">public</span> <span class="o">&lt;</span><span class="n">TYPE</span> <span class="kd">extends</span> <span class="n">ArtifactObject</span><span class="o">&gt;</span> <span class="n">String</span> <span class="n">getAssociationFilter</span><span class="o">(</span><span class="n">TYPE</span> <span class="n">obj</span><span class="o">,</span> <span class="n">Map</span><span class="o">&lt;</span><span class="n">String</span><span class="o">,</span> <span class="n">String</span><span class="o">&gt;</span> <span class="n">properties</span><span class="o">)</span> <span class="o">{</span>
+        <span class="k">return</span> <span class="s">&quot;(&quot;</span> <span class="o">+</span> <span class="n">ArtifactObject</span><span class="o">.</span><span class="na">KEY_ARTIFACT_NAME</span> <span class="o">+</span> <span class="s">&quot;=&quot;</span> <span class="o">+</span> <span class="n">obj</span><span class="o">.</span><span class="na">getAttribute</span><span class="o">(</span><span class="n">ArtifactObject</span><span class="o">.</span><span class="na">KEY_ARTIFACT_NAME</span><span class="o">)</span> <span class="o">+</span> <span class="s">&quot;)&quot;</span><span class="o">;</span>
+    <span class="o">}</span>
+
+    <span class="nd">@Override</span>
+    <span class="kd">public</span> <span class="o">&lt;</span><span class="n">TYPE</span> <span class="kd">extends</span> <span class="n">ArtifactObject</span><span class="o">&gt;</span> <span class="kt">int</span> <span class="n">getCardinality</span><span class="o">(</span><span class="n">TYPE</span> <span class="n">obj</span><span class="o">,</span> <span class="n">Map</span><span class="o">&lt;</span><span class="n">String</span><span class="o">,</span> <span class="n">String</span><span class="o">&gt;</span> <span class="n">properties</span><span class="o">)</span> <span class="o">{</span>
+        <span class="k">return</span> <span class="n">Integer</span><span class="o">.</span><span class="na">MAX_VALUE</span><span class="o">;</span>
+    <span class="o">}</span>
+
+    <span class="nd">@Override</span>
+    <span class="kd">public</span> <span class="n">Comparator</span><span class="o">&lt;</span><span class="n">ArtifactObject</span><span class="o">&gt;</span> <span class="n">getComparator</span><span class="o">()</span> <span class="o">{</span>
+        <span class="k">return</span> <span class="kc">null</span><span class="o">;</span>
+    <span class="o">}</span>
+
+    <span class="nd">@Override</span>
+    <span class="kd">public</span> <span class="n">Map</span><span class="o">&lt;</span><span class="n">String</span><span class="o">,</span> <span class="n">String</span><span class="o">&gt;</span> <span class="n">checkAttributes</span><span class="o">(</span><span class="n">Map</span><span class="o">&lt;</span><span class="n">String</span><span class="o">,</span> <span class="n">String</span><span class="o">&gt;</span> <span class="n">attributes</span><span class="o">)</span> <span class="o">{</span>
+        <span class="k">return</span> <span class="n">attributes</span><span class="o">;</span>
+    <span class="o">}</span>
+
+    <span class="kd">public</span> <span class="n">String</span><span class="o">[]</span> <span class="nf">getDefiningKeys</span><span class="o">()</span> <span class="o">{</span>
+        <span class="k">return</span> <span class="k">new</span> <span class="n">String</span><span class="o">[]</span> <span class="o">{</span><span class="n">ArtifactObject</span><span class="o">.</span><span class="na">KEY_ARTIFACT_NAME</span><span class="o">};</span>
+    <span class="o">}</span>
+
+    <span class="kd">public</span> <span class="n">String</span><span class="o">[]</span> <span class="nf">getMandatoryAttributes</span><span class="o">()</span> <span class="o">{</span>
+        <span class="k">return</span> <span class="k">new</span> <span class="n">String</span><span class="o">[]</span> <span class="o">{</span><span class="n">ArtifactObject</span><span class="o">.</span><span class="na">KEY_ARTIFACT_NAME</span><span class="o">};</span>
+    <span class="o">}</span>
+
+    <span class="nd">@Override</span>
+    <span class="kd">public</span> <span class="n">String</span> <span class="nf">recognize</span><span class="o">(</span><span class="n">ArtifactResource</span> <span class="n">artifact</span><span class="o">)</span> <span class="o">{</span>
+        <span class="c1">// here we can examine the stream to check the contents of the artifact</span>
+        <span class="c1">// for this demo, our check is just for the extension of the URL, which is</span>
+        <span class="c1">// a bit simplistic</span>
+        <span class="k">if</span> <span class="o">(</span><span class="n">artifact</span><span class="o">.</span><span class="na">getURL</span><span class="o">().</span><span class="na">toExternalForm</span><span class="o">().</span><span class="na">endsWith</span><span class="o">(</span><span class="s">&quot;.custom&quot;</span><span class="o">))</span> <span class="o">{</span>
+            <span class="k">return</span> <span class="n">MIMETYPE</span><span class="o">;</span>
+        <span class="o">}</span>
+        <span class="k">return</span> <span class="kc">null</span><span class="o">;</span>
+    <span class="o">}</span>
+
+    <span class="nd">@Override</span>
+    <span class="kd">public</span> <span class="n">Map</span><span class="o">&lt;</span><span class="n">String</span><span class="o">,</span> <span class="n">String</span><span class="o">&gt;</span> <span class="n">extractMetaData</span><span class="o">(</span><span class="n">ArtifactResource</span> <span class="n">artifact</span><span class="o">)</span> <span class="kd">throws</span> <span class="n">IllegalArgumentException</span> <span class="o">{</span>
+        <span class="n">Map</span><span class="o">&lt;</span><span class="n">String</span><span class="o">,</span> <span class="n">String</span><span class="o">&gt;</span> <span class="n">result</span> <span class="o">=</span> <span class="k">new</span> <span class="n">HashMap</span><span class="o">&lt;</span><span class="n">String</span><span class="o">,</span> <span class="n">String</span><span class="o">&gt;();</span>
+        <span class="n">result</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="n">ArtifactObject</span><span class="o">.</span><span class="na">KEY_PROCESSOR_PID</span><span class="o">,</span> <span class="n">PROCESSOR</span><span class="o">);</span>
+        <span class="n">result</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="n">ArtifactObject</span><span class="o">.</span><span class="na">KEY_MIMETYPE</span><span class="o">,</span> <span class="n">MIMETYPE</span><span class="o">);</span>
+        <span class="n">String</span> <span class="n">name</span> <span class="o">=</span> <span class="k">new</span> <span class="n">File</span><span class="o">(</span><span class="n">artifact</span><span class="o">.</span><span class="na">getURL</span><span class="o">().</span><span class="na">getFile</span><span class="o">()).</span><span class="na">getName</span><span class="o">();</span>
+        <span class="n">result</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="n">ArtifactObject</span><span class="o">.</span><span class="na">KEY_ARTIFACT_NAME</span><span class="o">,</span> <span class="n">name</span><span class="o">);</span>
+        <span class="n">result</span><span class="o">.</span><span class="na">put</span><span class="o">(</span><span class="n">KEY_FILENAME</span><span class="o">,</span> <span class="n">name</span><span class="o">);</span>
+        <span class="k">return</span> <span class="n">result</span><span class="o">;</span>
+    <span class="o">}</span>
+
+    <span class="nd">@Override</span>
+    <span class="kd">public</span> <span class="kt">boolean</span> <span class="nf">canHandle</span><span class="o">(</span><span class="n">String</span> <span class="n">mimetype</span><span class="o">)</span> <span class="o">{</span>
+        <span class="k">return</span> <span class="n">MIMETYPE</span><span class="o">.</span><span class="na">equals</span><span class="o">(</span><span class="n">mimetype</span><span class="o">);</span>
+    <span class="o">}</span>
+
+    <span class="nd">@Override</span>
+    <span class="kd">public</span> <span class="n">String</span> <span class="nf">getExtension</span><span class="o">(</span><span class="n">ArtifactResource</span> <span class="n">artifact</span><span class="o">)</span> <span class="o">{</span>
+        <span class="k">return</span> <span class="s">&quot;.custom&quot;</span><span class="o">;</span>
+    <span class="o">}</span>
+<span class="o">}</span>
+</pre></div>
+
+
+<p>Again, this is no production code, but it should get you started quickly. This code will recognize artifacts that have the ".custom" file extension. No effort is done here to look at the contents of the file, to keep the example simple. Publish this instance as both an ArtifactHelper and an ArtifactRecognizer and make sure to add a service property for the mime type: ArtifactObject.KEY_MIMETYPE, CustomArtifactHelper.MIMETYPE</p>
+<p>Wrap it up in a bundle, and you're ready to use your custom artifact in ACE.</p>
+<h1 id="installing-everything-in-ace">Installing everything in ACE</h1>
+<p>To add the new artifact type to ACE, you first have to take the bundle that contained the ArtifactHelper and ArtifactRecognizer service and add that to ACE. The bundle should be part of the ACE client. If you use the "all in one" server, add it to that.</p>
+<p>The second step is to upload the resource processor to ACE. You can do that like you upload any other bundle. Just add it to the artifact column. After adding it, it will not show up in the column, but ACE will send it to a target if that target needs an artifact of this type.</p>
+<p>Should you ever discover that you made a mistake in your resource processor, you can simply upload a newer one. Just make sure you bump the version and ACE will ensure that everybody gets this latest version.</p></div>
+      <hr>
+      <footer>
+        <p>Copyright &#169; 2012-2013 <a href="http://www.apache.org/">The Apache Software Foundation</a>, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache ACE, the Apache ACE logo, Apache and the Apache feather logo are trademarks of The Apache Software Foundation. All other marks mentioned may be trademarks or registered trademarks of their respective owners.</p>
+      </footer>
+    </div>
+  </body>
+</html>

Modified: websites/staging/ace/trunk/content/dev-doc/analysis/auditlog-analysis.html
==============================================================================
--- websites/staging/ace/trunk/content/dev-doc/analysis/auditlog-analysis.html (original)
+++ websites/staging/ace/trunk/content/dev-doc/analysis/auditlog-analysis.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Audit Log Analysis</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-  <!--
-    <link rel="stylesheet/less" type="text/css" href="/lib/bootstrap.less">
-    <link href="/css/prettify.css" rel="stylesheet" media="screen">
-    <link href="/css/code.css" rel="stylesheet" media="screen">
-
-    <script src="/js/less-1.2.1.min.js" type="text/javascript"></script>
-    <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
-    <script src="/js/prettify.js"></script>
-    
-    <script src="/js/bootstrap-alert.js"></script>
-    <script src="/js/bootstrap-dropdown.js"></script>
-    <script src="/js/bootstrap-tooltip.js"></script>
-    <script src="/js/bootstrap-alerts.js"></script>
-    <script src="/js/bootstrap-modal.js"></script>
-    <script src="/js/bootstrap-transition.js"></script>
-    <script src="/js/bootstrap-button.js"></script>
-    <script src="/js/bootstrap-popover.js"></script>
-    <script src="/js/bootstrap-twipsy.js"></script>
-    <script src="/js/bootstrap-buttons.js"></script>
-    <script src="/js/bootstrap-scrollspy.js"></script>
-    <script src="/js/bootstrap-typeahead.js"></script>
-    <script src="/js/bootstrap-carousel.js"></script>
-    <script src="/js/bootstrap-tab.js"></script>
-    <script src="/js/bootstrap-collapse.js"></script>
-    <script src="/js/bootstrap-tabs.js"></script>
-  -->
-
     <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
     <link href="/css/prettify.css" rel="stylesheet" media="screen">
     <link href="/css/code.css" rel="stylesheet" media="screen">
     <script src="http://code.jquery.com/jquery.js"></script>
     <script src="/js/bootstrap.min.js"></script>    
     <script src="/js/prettify.js"></script>
-
     
     
     
@@ -48,7 +18,6 @@
     $().dropdown()
     </script>
   </head>
-
   <body style="padding-top: 50px;">
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
@@ -70,7 +39,7 @@
     <a href="/downloads.html">Downloads</a>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">User Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Users <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/user-doc/introduction.html">Introduction</a>
@@ -79,6 +48,9 @@
         <a href="/user-doc/getting-started.html">Getting Started</a>
       </li>
       <li>
+        <a href="/user-doc/user-guide.html">User Guide</a>
+      </li>
+      <li>
         <a href="/user-doc/features.html">Features</a>
       </li>
 	    <li>
@@ -96,7 +68,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developer Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developers <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/dev-doc/getting-started.html">Getting Started</a>
@@ -122,6 +94,9 @@
       <li>
         <a href="/dev-doc/writing-tests.html">Writing unit/integration tests</a>
       </li>
+      <li>
+        <a href="/dev-doc/adding-custom-artifact-types.html">Adding custom artifact types</a>
+      </li>
     </ul>
   </li>
   <li class="dropdown">

Modified: websites/staging/ace/trunk/content/dev-doc/analysis/bundlerepository-analysis.html
==============================================================================
--- websites/staging/ace/trunk/content/dev-doc/analysis/bundlerepository-analysis.html (original)
+++ websites/staging/ace/trunk/content/dev-doc/analysis/bundlerepository-analysis.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Bundle Repository Analysis</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-  <!--
-    <link rel="stylesheet/less" type="text/css" href="/lib/bootstrap.less">
-    <link href="/css/prettify.css" rel="stylesheet" media="screen">
-    <link href="/css/code.css" rel="stylesheet" media="screen">
-
-    <script src="/js/less-1.2.1.min.js" type="text/javascript"></script>
-    <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
-    <script src="/js/prettify.js"></script>
-    
-    <script src="/js/bootstrap-alert.js"></script>
-    <script src="/js/bootstrap-dropdown.js"></script>
-    <script src="/js/bootstrap-tooltip.js"></script>
-    <script src="/js/bootstrap-alerts.js"></script>
-    <script src="/js/bootstrap-modal.js"></script>
-    <script src="/js/bootstrap-transition.js"></script>
-    <script src="/js/bootstrap-button.js"></script>
-    <script src="/js/bootstrap-popover.js"></script>
-    <script src="/js/bootstrap-twipsy.js"></script>
-    <script src="/js/bootstrap-buttons.js"></script>
-    <script src="/js/bootstrap-scrollspy.js"></script>
-    <script src="/js/bootstrap-typeahead.js"></script>
-    <script src="/js/bootstrap-carousel.js"></script>
-    <script src="/js/bootstrap-tab.js"></script>
-    <script src="/js/bootstrap-collapse.js"></script>
-    <script src="/js/bootstrap-tabs.js"></script>
-  -->
-
     <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
     <link href="/css/prettify.css" rel="stylesheet" media="screen">
     <link href="/css/code.css" rel="stylesheet" media="screen">
     <script src="http://code.jquery.com/jquery.js"></script>
     <script src="/js/bootstrap.min.js"></script>    
     <script src="/js/prettify.js"></script>
-
     
     
     
@@ -48,7 +18,6 @@
     $().dropdown()
     </script>
   </head>
-
   <body style="padding-top: 50px;">
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
@@ -70,7 +39,7 @@
     <a href="/downloads.html">Downloads</a>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">User Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Users <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/user-doc/introduction.html">Introduction</a>
@@ -79,6 +48,9 @@
         <a href="/user-doc/getting-started.html">Getting Started</a>
       </li>
       <li>
+        <a href="/user-doc/user-guide.html">User Guide</a>
+      </li>
+      <li>
         <a href="/user-doc/features.html">Features</a>
       </li>
 	    <li>
@@ -96,7 +68,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developer Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developers <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/dev-doc/getting-started.html">Getting Started</a>
@@ -122,6 +94,9 @@
       <li>
         <a href="/dev-doc/writing-tests.html">Writing unit/integration tests</a>
       </li>
+      <li>
+        <a href="/dev-doc/adding-custom-artifact-types.html">Adding custom artifact types</a>
+      </li>
     </ul>
   </li>
   <li class="dropdown">

Modified: websites/staging/ace/trunk/content/dev-doc/analysis/index.html
==============================================================================
--- websites/staging/ace/trunk/content/dev-doc/analysis/index.html (original)
+++ websites/staging/ace/trunk/content/dev-doc/analysis/index.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Analysis</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-  <!--
-    <link rel="stylesheet/less" type="text/css" href="/lib/bootstrap.less">
-    <link href="/css/prettify.css" rel="stylesheet" media="screen">
-    <link href="/css/code.css" rel="stylesheet" media="screen">
-
-    <script src="/js/less-1.2.1.min.js" type="text/javascript"></script>
-    <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
-    <script src="/js/prettify.js"></script>
-    
-    <script src="/js/bootstrap-alert.js"></script>
-    <script src="/js/bootstrap-dropdown.js"></script>
-    <script src="/js/bootstrap-tooltip.js"></script>
-    <script src="/js/bootstrap-alerts.js"></script>
-    <script src="/js/bootstrap-modal.js"></script>
-    <script src="/js/bootstrap-transition.js"></script>
-    <script src="/js/bootstrap-button.js"></script>
-    <script src="/js/bootstrap-popover.js"></script>
-    <script src="/js/bootstrap-twipsy.js"></script>
-    <script src="/js/bootstrap-buttons.js"></script>
-    <script src="/js/bootstrap-scrollspy.js"></script>
-    <script src="/js/bootstrap-typeahead.js"></script>
-    <script src="/js/bootstrap-carousel.js"></script>
-    <script src="/js/bootstrap-tab.js"></script>
-    <script src="/js/bootstrap-collapse.js"></script>
-    <script src="/js/bootstrap-tabs.js"></script>
-  -->
-
     <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
     <link href="/css/prettify.css" rel="stylesheet" media="screen">
     <link href="/css/code.css" rel="stylesheet" media="screen">
     <script src="http://code.jquery.com/jquery.js"></script>
     <script src="/js/bootstrap.min.js"></script>    
     <script src="/js/prettify.js"></script>
-
     
     
     
@@ -48,7 +18,6 @@
     $().dropdown()
     </script>
   </head>
-
   <body style="padding-top: 50px;">
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
@@ -70,7 +39,7 @@
     <a href="/downloads.html">Downloads</a>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">User Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Users <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/user-doc/introduction.html">Introduction</a>
@@ -79,6 +48,9 @@
         <a href="/user-doc/getting-started.html">Getting Started</a>
       </li>
       <li>
+        <a href="/user-doc/user-guide.html">User Guide</a>
+      </li>
+      <li>
         <a href="/user-doc/features.html">Features</a>
       </li>
 	    <li>
@@ -96,7 +68,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developer Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developers <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/dev-doc/getting-started.html">Getting Started</a>
@@ -122,6 +94,9 @@
       <li>
         <a href="/dev-doc/writing-tests.html">Writing unit/integration tests</a>
       </li>
+      <li>
+        <a href="/dev-doc/adding-custom-artifact-types.html">Adding custom artifact types</a>
+      </li>
     </ul>
   </li>
   <li class="dropdown">

Modified: websites/staging/ace/trunk/content/dev-doc/analysis/security-analysis.html
==============================================================================
--- websites/staging/ace/trunk/content/dev-doc/analysis/security-analysis.html (original)
+++ websites/staging/ace/trunk/content/dev-doc/analysis/security-analysis.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Security Analysis</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-  <!--
-    <link rel="stylesheet/less" type="text/css" href="/lib/bootstrap.less">
-    <link href="/css/prettify.css" rel="stylesheet" media="screen">
-    <link href="/css/code.css" rel="stylesheet" media="screen">
-
-    <script src="/js/less-1.2.1.min.js" type="text/javascript"></script>
-    <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
-    <script src="/js/prettify.js"></script>
-    
-    <script src="/js/bootstrap-alert.js"></script>
-    <script src="/js/bootstrap-dropdown.js"></script>
-    <script src="/js/bootstrap-tooltip.js"></script>
-    <script src="/js/bootstrap-alerts.js"></script>
-    <script src="/js/bootstrap-modal.js"></script>
-    <script src="/js/bootstrap-transition.js"></script>
-    <script src="/js/bootstrap-button.js"></script>
-    <script src="/js/bootstrap-popover.js"></script>
-    <script src="/js/bootstrap-twipsy.js"></script>
-    <script src="/js/bootstrap-buttons.js"></script>
-    <script src="/js/bootstrap-scrollspy.js"></script>
-    <script src="/js/bootstrap-typeahead.js"></script>
-    <script src="/js/bootstrap-carousel.js"></script>
-    <script src="/js/bootstrap-tab.js"></script>
-    <script src="/js/bootstrap-collapse.js"></script>
-    <script src="/js/bootstrap-tabs.js"></script>
-  -->
-
     <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
     <link href="/css/prettify.css" rel="stylesheet" media="screen">
     <link href="/css/code.css" rel="stylesheet" media="screen">
     <script src="http://code.jquery.com/jquery.js"></script>
     <script src="/js/bootstrap.min.js"></script>    
     <script src="/js/prettify.js"></script>
-
     
     
     
@@ -48,7 +18,6 @@
     $().dropdown()
     </script>
   </head>
-
   <body style="padding-top: 50px;">
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
@@ -70,7 +39,7 @@
     <a href="/downloads.html">Downloads</a>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">User Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Users <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/user-doc/introduction.html">Introduction</a>
@@ -79,6 +48,9 @@
         <a href="/user-doc/getting-started.html">Getting Started</a>
       </li>
       <li>
+        <a href="/user-doc/user-guide.html">User Guide</a>
+      </li>
+      <li>
         <a href="/user-doc/features.html">Features</a>
       </li>
 	    <li>
@@ -96,7 +68,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developer Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developers <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/dev-doc/getting-started.html">Getting Started</a>
@@ -122,6 +94,9 @@
       <li>
         <a href="/dev-doc/writing-tests.html">Writing unit/integration tests</a>
       </li>
+      <li>
+        <a href="/dev-doc/adding-custom-artifact-types.html">Adding custom artifact types</a>
+      </li>
     </ul>
   </li>
   <li class="dropdown">

Modified: websites/staging/ace/trunk/content/dev-doc/analysis/template-mechanism.html
==============================================================================
--- websites/staging/ace/trunk/content/dev-doc/analysis/template-mechanism.html (original)
+++ websites/staging/ace/trunk/content/dev-doc/analysis/template-mechanism.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Template Mechanism</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-  <!--
-    <link rel="stylesheet/less" type="text/css" href="/lib/bootstrap.less">
-    <link href="/css/prettify.css" rel="stylesheet" media="screen">
-    <link href="/css/code.css" rel="stylesheet" media="screen">
-
-    <script src="/js/less-1.2.1.min.js" type="text/javascript"></script>
-    <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
-    <script src="/js/prettify.js"></script>
-    
-    <script src="/js/bootstrap-alert.js"></script>
-    <script src="/js/bootstrap-dropdown.js"></script>
-    <script src="/js/bootstrap-tooltip.js"></script>
-    <script src="/js/bootstrap-alerts.js"></script>
-    <script src="/js/bootstrap-modal.js"></script>
-    <script src="/js/bootstrap-transition.js"></script>
-    <script src="/js/bootstrap-button.js"></script>
-    <script src="/js/bootstrap-popover.js"></script>
-    <script src="/js/bootstrap-twipsy.js"></script>
-    <script src="/js/bootstrap-buttons.js"></script>
-    <script src="/js/bootstrap-scrollspy.js"></script>
-    <script src="/js/bootstrap-typeahead.js"></script>
-    <script src="/js/bootstrap-carousel.js"></script>
-    <script src="/js/bootstrap-tab.js"></script>
-    <script src="/js/bootstrap-collapse.js"></script>
-    <script src="/js/bootstrap-tabs.js"></script>
-  -->
-
     <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
     <link href="/css/prettify.css" rel="stylesheet" media="screen">
     <link href="/css/code.css" rel="stylesheet" media="screen">
     <script src="http://code.jquery.com/jquery.js"></script>
     <script src="/js/bootstrap.min.js"></script>    
     <script src="/js/prettify.js"></script>
-
     
     
     
@@ -48,7 +18,6 @@
     $().dropdown()
     </script>
   </head>
-
   <body style="padding-top: 50px;">
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
@@ -70,7 +39,7 @@
     <a href="/downloads.html">Downloads</a>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">User Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Users <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/user-doc/introduction.html">Introduction</a>
@@ -79,6 +48,9 @@
         <a href="/user-doc/getting-started.html">Getting Started</a>
       </li>
       <li>
+        <a href="/user-doc/user-guide.html">User Guide</a>
+      </li>
+      <li>
         <a href="/user-doc/features.html">Features</a>
       </li>
 	    <li>
@@ -96,7 +68,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developer Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developers <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/dev-doc/getting-started.html">Getting Started</a>
@@ -122,6 +94,9 @@
       <li>
         <a href="/dev-doc/writing-tests.html">Writing unit/integration tests</a>
       </li>
+      <li>
+        <a href="/dev-doc/adding-custom-artifact-types.html">Adding custom artifact types</a>
+      </li>
     </ul>
   </li>
   <li class="dropdown">

Modified: websites/staging/ace/trunk/content/dev-doc/architecture.html
==============================================================================
--- websites/staging/ace/trunk/content/dev-doc/architecture.html (original)
+++ websites/staging/ace/trunk/content/dev-doc/architecture.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Architecture</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-  <!--
-    <link rel="stylesheet/less" type="text/css" href="/lib/bootstrap.less">
-    <link href="/css/prettify.css" rel="stylesheet" media="screen">
-    <link href="/css/code.css" rel="stylesheet" media="screen">
-
-    <script src="/js/less-1.2.1.min.js" type="text/javascript"></script>
-    <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
-    <script src="/js/prettify.js"></script>
-    
-    <script src="/js/bootstrap-alert.js"></script>
-    <script src="/js/bootstrap-dropdown.js"></script>
-    <script src="/js/bootstrap-tooltip.js"></script>
-    <script src="/js/bootstrap-alerts.js"></script>
-    <script src="/js/bootstrap-modal.js"></script>
-    <script src="/js/bootstrap-transition.js"></script>
-    <script src="/js/bootstrap-button.js"></script>
-    <script src="/js/bootstrap-popover.js"></script>
-    <script src="/js/bootstrap-twipsy.js"></script>
-    <script src="/js/bootstrap-buttons.js"></script>
-    <script src="/js/bootstrap-scrollspy.js"></script>
-    <script src="/js/bootstrap-typeahead.js"></script>
-    <script src="/js/bootstrap-carousel.js"></script>
-    <script src="/js/bootstrap-tab.js"></script>
-    <script src="/js/bootstrap-collapse.js"></script>
-    <script src="/js/bootstrap-tabs.js"></script>
-  -->
-
     <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
     <link href="/css/prettify.css" rel="stylesheet" media="screen">
     <link href="/css/code.css" rel="stylesheet" media="screen">
     <script src="http://code.jquery.com/jquery.js"></script>
     <script src="/js/bootstrap.min.js"></script>    
     <script src="/js/prettify.js"></script>
-
     
     
     
@@ -48,7 +18,6 @@
     $().dropdown()
     </script>
   </head>
-
   <body style="padding-top: 50px;">
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
@@ -70,7 +39,7 @@
     <a href="/downloads.html">Downloads</a>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">User Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Users <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/user-doc/introduction.html">Introduction</a>
@@ -79,6 +48,9 @@
         <a href="/user-doc/getting-started.html">Getting Started</a>
       </li>
       <li>
+        <a href="/user-doc/user-guide.html">User Guide</a>
+      </li>
+      <li>
         <a href="/user-doc/features.html">Features</a>
       </li>
 	    <li>
@@ -96,7 +68,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developer Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developers <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/dev-doc/getting-started.html">Getting Started</a>
@@ -122,6 +94,9 @@
       <li>
         <a href="/dev-doc/writing-tests.html">Writing unit/integration tests</a>
       </li>
+      <li>
+        <a href="/dev-doc/adding-custom-artifact-types.html">Adding custom artifact types</a>
+      </li>
     </ul>
   </li>
   <li class="dropdown">

Modified: websites/staging/ace/trunk/content/dev-doc/coding-standards.html
==============================================================================
--- websites/staging/ace/trunk/content/dev-doc/coding-standards.html (original)
+++ websites/staging/ace/trunk/content/dev-doc/coding-standards.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Coding Standards</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-  <!--
-    <link rel="stylesheet/less" type="text/css" href="/lib/bootstrap.less">
-    <link href="/css/prettify.css" rel="stylesheet" media="screen">
-    <link href="/css/code.css" rel="stylesheet" media="screen">
-
-    <script src="/js/less-1.2.1.min.js" type="text/javascript"></script>
-    <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
-    <script src="/js/prettify.js"></script>
-    
-    <script src="/js/bootstrap-alert.js"></script>
-    <script src="/js/bootstrap-dropdown.js"></script>
-    <script src="/js/bootstrap-tooltip.js"></script>
-    <script src="/js/bootstrap-alerts.js"></script>
-    <script src="/js/bootstrap-modal.js"></script>
-    <script src="/js/bootstrap-transition.js"></script>
-    <script src="/js/bootstrap-button.js"></script>
-    <script src="/js/bootstrap-popover.js"></script>
-    <script src="/js/bootstrap-twipsy.js"></script>
-    <script src="/js/bootstrap-buttons.js"></script>
-    <script src="/js/bootstrap-scrollspy.js"></script>
-    <script src="/js/bootstrap-typeahead.js"></script>
-    <script src="/js/bootstrap-carousel.js"></script>
-    <script src="/js/bootstrap-tab.js"></script>
-    <script src="/js/bootstrap-collapse.js"></script>
-    <script src="/js/bootstrap-tabs.js"></script>
-  -->
-
     <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
     <link href="/css/prettify.css" rel="stylesheet" media="screen">
     <link href="/css/code.css" rel="stylesheet" media="screen">
     <script src="http://code.jquery.com/jquery.js"></script>
     <script src="/js/bootstrap.min.js"></script>    
     <script src="/js/prettify.js"></script>
-
     
     
     
@@ -48,7 +18,6 @@
     $().dropdown()
     </script>
   </head>
-
   <body style="padding-top: 50px;">
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
@@ -70,7 +39,7 @@
     <a href="/downloads.html">Downloads</a>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">User Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Users <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/user-doc/introduction.html">Introduction</a>
@@ -79,6 +48,9 @@
         <a href="/user-doc/getting-started.html">Getting Started</a>
       </li>
       <li>
+        <a href="/user-doc/user-guide.html">User Guide</a>
+      </li>
+      <li>
         <a href="/user-doc/features.html">Features</a>
       </li>
 	    <li>
@@ -96,7 +68,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developer Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developers <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/dev-doc/getting-started.html">Getting Started</a>
@@ -122,6 +94,9 @@
       <li>
         <a href="/dev-doc/writing-tests.html">Writing unit/integration tests</a>
       </li>
+      <li>
+        <a href="/dev-doc/adding-custom-artifact-types.html">Adding custom artifact types</a>
+      </li>
     </ul>
   </li>
   <li class="dropdown">

Modified: websites/staging/ace/trunk/content/dev-doc/design/ace-authentication.html
==============================================================================
--- websites/staging/ace/trunk/content/dev-doc/design/ace-authentication.html (original)
+++ websites/staging/ace/trunk/content/dev-doc/design/ace-authentication.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>ACE Authentication</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-  <!--
-    <link rel="stylesheet/less" type="text/css" href="/lib/bootstrap.less">
-    <link href="/css/prettify.css" rel="stylesheet" media="screen">
-    <link href="/css/code.css" rel="stylesheet" media="screen">
-
-    <script src="/js/less-1.2.1.min.js" type="text/javascript"></script>
-    <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
-    <script src="/js/prettify.js"></script>
-    
-    <script src="/js/bootstrap-alert.js"></script>
-    <script src="/js/bootstrap-dropdown.js"></script>
-    <script src="/js/bootstrap-tooltip.js"></script>
-    <script src="/js/bootstrap-alerts.js"></script>
-    <script src="/js/bootstrap-modal.js"></script>
-    <script src="/js/bootstrap-transition.js"></script>
-    <script src="/js/bootstrap-button.js"></script>
-    <script src="/js/bootstrap-popover.js"></script>
-    <script src="/js/bootstrap-twipsy.js"></script>
-    <script src="/js/bootstrap-buttons.js"></script>
-    <script src="/js/bootstrap-scrollspy.js"></script>
-    <script src="/js/bootstrap-typeahead.js"></script>
-    <script src="/js/bootstrap-carousel.js"></script>
-    <script src="/js/bootstrap-tab.js"></script>
-    <script src="/js/bootstrap-collapse.js"></script>
-    <script src="/js/bootstrap-tabs.js"></script>
-  -->
-
     <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
     <link href="/css/prettify.css" rel="stylesheet" media="screen">
     <link href="/css/code.css" rel="stylesheet" media="screen">
     <script src="http://code.jquery.com/jquery.js"></script>
     <script src="/js/bootstrap.min.js"></script>    
     <script src="/js/prettify.js"></script>
-
     
     
     
@@ -48,7 +18,6 @@
     $().dropdown()
     </script>
   </head>
-
   <body style="padding-top: 50px;">
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
@@ -70,7 +39,7 @@
     <a href="/downloads.html">Downloads</a>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">User Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Users <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/user-doc/introduction.html">Introduction</a>
@@ -79,6 +48,9 @@
         <a href="/user-doc/getting-started.html">Getting Started</a>
       </li>
       <li>
+        <a href="/user-doc/user-guide.html">User Guide</a>
+      </li>
+      <li>
         <a href="/user-doc/features.html">Features</a>
       </li>
 	    <li>
@@ -96,7 +68,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developer Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developers <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/dev-doc/getting-started.html">Getting Started</a>
@@ -122,6 +94,9 @@
       <li>
         <a href="/dev-doc/writing-tests.html">Writing unit/integration tests</a>
       </li>
+      <li>
+        <a href="/dev-doc/adding-custom-artifact-types.html">Adding custom artifact types</a>
+      </li>
     </ul>
   </li>
   <li class="dropdown">

Modified: websites/staging/ace/trunk/content/dev-doc/design/ace-deployment-strategies.html
==============================================================================
--- websites/staging/ace/trunk/content/dev-doc/design/ace-deployment-strategies.html (original)
+++ websites/staging/ace/trunk/content/dev-doc/design/ace-deployment-strategies.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Deployment Strategies</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-  <!--
-    <link rel="stylesheet/less" type="text/css" href="/lib/bootstrap.less">
-    <link href="/css/prettify.css" rel="stylesheet" media="screen">
-    <link href="/css/code.css" rel="stylesheet" media="screen">
-
-    <script src="/js/less-1.2.1.min.js" type="text/javascript"></script>
-    <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
-    <script src="/js/prettify.js"></script>
-    
-    <script src="/js/bootstrap-alert.js"></script>
-    <script src="/js/bootstrap-dropdown.js"></script>
-    <script src="/js/bootstrap-tooltip.js"></script>
-    <script src="/js/bootstrap-alerts.js"></script>
-    <script src="/js/bootstrap-modal.js"></script>
-    <script src="/js/bootstrap-transition.js"></script>
-    <script src="/js/bootstrap-button.js"></script>
-    <script src="/js/bootstrap-popover.js"></script>
-    <script src="/js/bootstrap-twipsy.js"></script>
-    <script src="/js/bootstrap-buttons.js"></script>
-    <script src="/js/bootstrap-scrollspy.js"></script>
-    <script src="/js/bootstrap-typeahead.js"></script>
-    <script src="/js/bootstrap-carousel.js"></script>
-    <script src="/js/bootstrap-tab.js"></script>
-    <script src="/js/bootstrap-collapse.js"></script>
-    <script src="/js/bootstrap-tabs.js"></script>
-  -->
-
     <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
     <link href="/css/prettify.css" rel="stylesheet" media="screen">
     <link href="/css/code.css" rel="stylesheet" media="screen">
     <script src="http://code.jquery.com/jquery.js"></script>
     <script src="/js/bootstrap.min.js"></script>    
     <script src="/js/prettify.js"></script>
-
     
     
     
@@ -48,7 +18,6 @@
     $().dropdown()
     </script>
   </head>
-
   <body style="padding-top: 50px;">
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
@@ -70,7 +39,7 @@
     <a href="/downloads.html">Downloads</a>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">User Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Users <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/user-doc/introduction.html">Introduction</a>
@@ -79,6 +48,9 @@
         <a href="/user-doc/getting-started.html">Getting Started</a>
       </li>
       <li>
+        <a href="/user-doc/user-guide.html">User Guide</a>
+      </li>
+      <li>
         <a href="/user-doc/features.html">Features</a>
       </li>
 	    <li>
@@ -96,7 +68,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developer Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developers <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/dev-doc/getting-started.html">Getting Started</a>
@@ -122,6 +94,9 @@
       <li>
         <a href="/dev-doc/writing-tests.html">Writing unit/integration tests</a>
       </li>
+      <li>
+        <a href="/dev-doc/adding-custom-artifact-types.html">Adding custom artifact types</a>
+      </li>
     </ul>
   </li>
   <li class="dropdown">

Modified: websites/staging/ace/trunk/content/dev-doc/design/auditlog-protocol.html
==============================================================================
--- websites/staging/ace/trunk/content/dev-doc/design/auditlog-protocol.html (original)
+++ websites/staging/ace/trunk/content/dev-doc/design/auditlog-protocol.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Audit Log Protocol</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-  <!--
-    <link rel="stylesheet/less" type="text/css" href="/lib/bootstrap.less">
-    <link href="/css/prettify.css" rel="stylesheet" media="screen">
-    <link href="/css/code.css" rel="stylesheet" media="screen">
-
-    <script src="/js/less-1.2.1.min.js" type="text/javascript"></script>
-    <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
-    <script src="/js/prettify.js"></script>
-    
-    <script src="/js/bootstrap-alert.js"></script>
-    <script src="/js/bootstrap-dropdown.js"></script>
-    <script src="/js/bootstrap-tooltip.js"></script>
-    <script src="/js/bootstrap-alerts.js"></script>
-    <script src="/js/bootstrap-modal.js"></script>
-    <script src="/js/bootstrap-transition.js"></script>
-    <script src="/js/bootstrap-button.js"></script>
-    <script src="/js/bootstrap-popover.js"></script>
-    <script src="/js/bootstrap-twipsy.js"></script>
-    <script src="/js/bootstrap-buttons.js"></script>
-    <script src="/js/bootstrap-scrollspy.js"></script>
-    <script src="/js/bootstrap-typeahead.js"></script>
-    <script src="/js/bootstrap-carousel.js"></script>
-    <script src="/js/bootstrap-tab.js"></script>
-    <script src="/js/bootstrap-collapse.js"></script>
-    <script src="/js/bootstrap-tabs.js"></script>
-  -->
-
     <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
     <link href="/css/prettify.css" rel="stylesheet" media="screen">
     <link href="/css/code.css" rel="stylesheet" media="screen">
     <script src="http://code.jquery.com/jquery.js"></script>
     <script src="/js/bootstrap.min.js"></script>    
     <script src="/js/prettify.js"></script>
-
     
     
     
@@ -48,7 +18,6 @@
     $().dropdown()
     </script>
   </head>
-
   <body style="padding-top: 50px;">
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
@@ -70,7 +39,7 @@
     <a href="/downloads.html">Downloads</a>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">User Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Users <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/user-doc/introduction.html">Introduction</a>
@@ -79,6 +48,9 @@
         <a href="/user-doc/getting-started.html">Getting Started</a>
       </li>
       <li>
+        <a href="/user-doc/user-guide.html">User Guide</a>
+      </li>
+      <li>
         <a href="/user-doc/features.html">Features</a>
       </li>
 	    <li>
@@ -96,7 +68,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developer Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developers <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/dev-doc/getting-started.html">Getting Started</a>
@@ -122,6 +94,9 @@
       <li>
         <a href="/dev-doc/writing-tests.html">Writing unit/integration tests</a>
       </li>
+      <li>
+        <a href="/dev-doc/adding-custom-artifact-types.html">Adding custom artifact types</a>
+      </li>
     </ul>
   </li>
   <li class="dropdown">

Modified: websites/staging/ace/trunk/content/dev-doc/design/index.html
==============================================================================
--- websites/staging/ace/trunk/content/dev-doc/design/index.html (original)
+++ websites/staging/ace/trunk/content/dev-doc/design/index.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Design</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-  <!--
-    <link rel="stylesheet/less" type="text/css" href="/lib/bootstrap.less">
-    <link href="/css/prettify.css" rel="stylesheet" media="screen">
-    <link href="/css/code.css" rel="stylesheet" media="screen">
-
-    <script src="/js/less-1.2.1.min.js" type="text/javascript"></script>
-    <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
-    <script src="/js/prettify.js"></script>
-    
-    <script src="/js/bootstrap-alert.js"></script>
-    <script src="/js/bootstrap-dropdown.js"></script>
-    <script src="/js/bootstrap-tooltip.js"></script>
-    <script src="/js/bootstrap-alerts.js"></script>
-    <script src="/js/bootstrap-modal.js"></script>
-    <script src="/js/bootstrap-transition.js"></script>
-    <script src="/js/bootstrap-button.js"></script>
-    <script src="/js/bootstrap-popover.js"></script>
-    <script src="/js/bootstrap-twipsy.js"></script>
-    <script src="/js/bootstrap-buttons.js"></script>
-    <script src="/js/bootstrap-scrollspy.js"></script>
-    <script src="/js/bootstrap-typeahead.js"></script>
-    <script src="/js/bootstrap-carousel.js"></script>
-    <script src="/js/bootstrap-tab.js"></script>
-    <script src="/js/bootstrap-collapse.js"></script>
-    <script src="/js/bootstrap-tabs.js"></script>
-  -->
-
     <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
     <link href="/css/prettify.css" rel="stylesheet" media="screen">
     <link href="/css/code.css" rel="stylesheet" media="screen">
     <script src="http://code.jquery.com/jquery.js"></script>
     <script src="/js/bootstrap.min.js"></script>    
     <script src="/js/prettify.js"></script>
-
     
     
     
@@ -48,7 +18,6 @@
     $().dropdown()
     </script>
   </head>
-
   <body style="padding-top: 50px;">
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
@@ -70,7 +39,7 @@
     <a href="/downloads.html">Downloads</a>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">User Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Users <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/user-doc/introduction.html">Introduction</a>
@@ -79,6 +48,9 @@
         <a href="/user-doc/getting-started.html">Getting Started</a>
       </li>
       <li>
+        <a href="/user-doc/user-guide.html">User Guide</a>
+      </li>
+      <li>
         <a href="/user-doc/features.html">Features</a>
       </li>
 	    <li>
@@ -96,7 +68,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developer Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developers <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/dev-doc/getting-started.html">Getting Started</a>
@@ -122,6 +94,9 @@
       <li>
         <a href="/dev-doc/writing-tests.html">Writing unit/integration tests</a>
       </li>
+      <li>
+        <a href="/dev-doc/adding-custom-artifact-types.html">Adding custom artifact types</a>
+      </li>
     </ul>
   </li>
   <li class="dropdown">

Modified: websites/staging/ace/trunk/content/dev-doc/design/remote-interfaces.html
==============================================================================
--- websites/staging/ace/trunk/content/dev-doc/design/remote-interfaces.html (original)
+++ websites/staging/ace/trunk/content/dev-doc/design/remote-interfaces.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Remote Interfaces Design</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-  <!--
-    <link rel="stylesheet/less" type="text/css" href="/lib/bootstrap.less">
-    <link href="/css/prettify.css" rel="stylesheet" media="screen">
-    <link href="/css/code.css" rel="stylesheet" media="screen">
-
-    <script src="/js/less-1.2.1.min.js" type="text/javascript"></script>
-    <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
-    <script src="/js/prettify.js"></script>
-    
-    <script src="/js/bootstrap-alert.js"></script>
-    <script src="/js/bootstrap-dropdown.js"></script>
-    <script src="/js/bootstrap-tooltip.js"></script>
-    <script src="/js/bootstrap-alerts.js"></script>
-    <script src="/js/bootstrap-modal.js"></script>
-    <script src="/js/bootstrap-transition.js"></script>
-    <script src="/js/bootstrap-button.js"></script>
-    <script src="/js/bootstrap-popover.js"></script>
-    <script src="/js/bootstrap-twipsy.js"></script>
-    <script src="/js/bootstrap-buttons.js"></script>
-    <script src="/js/bootstrap-scrollspy.js"></script>
-    <script src="/js/bootstrap-typeahead.js"></script>
-    <script src="/js/bootstrap-carousel.js"></script>
-    <script src="/js/bootstrap-tab.js"></script>
-    <script src="/js/bootstrap-collapse.js"></script>
-    <script src="/js/bootstrap-tabs.js"></script>
-  -->
-
     <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
     <link href="/css/prettify.css" rel="stylesheet" media="screen">
     <link href="/css/code.css" rel="stylesheet" media="screen">
     <script src="http://code.jquery.com/jquery.js"></script>
     <script src="/js/bootstrap.min.js"></script>    
     <script src="/js/prettify.js"></script>
-
     
     
     
@@ -48,7 +18,6 @@
     $().dropdown()
     </script>
   </head>
-
   <body style="padding-top: 50px;">
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
@@ -70,7 +39,7 @@
     <a href="/downloads.html">Downloads</a>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">User Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Users <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/user-doc/introduction.html">Introduction</a>
@@ -79,6 +48,9 @@
         <a href="/user-doc/getting-started.html">Getting Started</a>
       </li>
       <li>
+        <a href="/user-doc/user-guide.html">User Guide</a>
+      </li>
+      <li>
         <a href="/user-doc/features.html">Features</a>
       </li>
 	    <li>
@@ -96,7 +68,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developer Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developers <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/dev-doc/getting-started.html">Getting Started</a>
@@ -122,6 +94,9 @@
       <li>
         <a href="/dev-doc/writing-tests.html">Writing unit/integration tests</a>
       </li>
+      <li>
+        <a href="/dev-doc/adding-custom-artifact-types.html">Adding custom artifact types</a>
+      </li>
     </ul>
   </li>
   <li class="dropdown">

Modified: websites/staging/ace/trunk/content/dev-doc/design/test-script.html
==============================================================================
--- websites/staging/ace/trunk/content/dev-doc/design/test-script.html (original)
+++ websites/staging/ace/trunk/content/dev-doc/design/test-script.html Fri Oct 18 12:50:18 2013
@@ -2,44 +2,14 @@
 <html lang="en">
   <head>
     <title>Test Script</title>
-
     <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
     <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-  <!--
-    <link rel="stylesheet/less" type="text/css" href="/lib/bootstrap.less">
-    <link href="/css/prettify.css" rel="stylesheet" media="screen">
-    <link href="/css/code.css" rel="stylesheet" media="screen">
-
-    <script src="/js/less-1.2.1.min.js" type="text/javascript"></script>
-    <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
-    <script src="/js/prettify.js"></script>
-    
-    <script src="/js/bootstrap-alert.js"></script>
-    <script src="/js/bootstrap-dropdown.js"></script>
-    <script src="/js/bootstrap-tooltip.js"></script>
-    <script src="/js/bootstrap-alerts.js"></script>
-    <script src="/js/bootstrap-modal.js"></script>
-    <script src="/js/bootstrap-transition.js"></script>
-    <script src="/js/bootstrap-button.js"></script>
-    <script src="/js/bootstrap-popover.js"></script>
-    <script src="/js/bootstrap-twipsy.js"></script>
-    <script src="/js/bootstrap-buttons.js"></script>
-    <script src="/js/bootstrap-scrollspy.js"></script>
-    <script src="/js/bootstrap-typeahead.js"></script>
-    <script src="/js/bootstrap-carousel.js"></script>
-    <script src="/js/bootstrap-tab.js"></script>
-    <script src="/js/bootstrap-collapse.js"></script>
-    <script src="/js/bootstrap-tabs.js"></script>
-  -->
-
     <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen">
     <link href="/css/prettify.css" rel="stylesheet" media="screen">
     <link href="/css/code.css" rel="stylesheet" media="screen">
     <script src="http://code.jquery.com/jquery.js"></script>
     <script src="/js/bootstrap.min.js"></script>    
     <script src="/js/prettify.js"></script>
-
     
     
     
@@ -48,7 +18,6 @@
     $().dropdown()
     </script>
   </head>
-
   <body style="padding-top: 50px;">
     <div class="navbar navbar-fixed-top">
       <div class="navbar-inner">
@@ -70,7 +39,7 @@
     <a href="/downloads.html">Downloads</a>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">User Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Users <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/user-doc/introduction.html">Introduction</a>
@@ -79,6 +48,9 @@
         <a href="/user-doc/getting-started.html">Getting Started</a>
       </li>
       <li>
+        <a href="/user-doc/user-guide.html">User Guide</a>
+      </li>
+      <li>
         <a href="/user-doc/features.html">Features</a>
       </li>
 	    <li>
@@ -96,7 +68,7 @@
     </ul>
   </li>
   <li class="dropdown">
-    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developer Documentation <b class="caret"></b></a>
+    <a href="#" class="dropdown-toggle" data-toggle="dropdown">Developers <b class="caret"></b></a>
     <ul class="dropdown-menu">
       <li>
         <a href="/dev-doc/getting-started.html">Getting Started</a>
@@ -122,6 +94,9 @@
       <li>
         <a href="/dev-doc/writing-tests.html">Writing unit/integration tests</a>
       </li>
+      <li>
+        <a href="/dev-doc/adding-custom-artifact-types.html">Adding custom artifact types</a>
+      </li>
     </ul>
   </li>
   <li class="dropdown">



Mime
View raw message