ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r930358 [6/10] - in /websites/staging/ace/trunk/content: ./ dev-doc/ docs/ docs/analysis/ docs/analysis/src/ docs/design/ docs/design/src/ docs/use-cases/ user-doc/
Date Mon, 24 Nov 2014 22:42:14 GMT
Added: websites/staging/ace/trunk/content/docs/setup-dev-environment.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/setup-dev-environment.html (added)
+++ websites/staging/ace/trunk/content/docs/setup-dev-environment.html Mon Nov 24 22:42:13 2014
@@ -0,0 +1,394 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html lang="en">
+  <head>
+    <title>Setting up a development environment</title>
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    <meta property="og:image" content="//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="//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 navbar-inverse">
+      <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/shellapi.html">Client Shell API</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>
+      <li>
+        <a href="/dev-doc/configuring-relay-servers.html">Configuring and using relay servers</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="/docs/">Docs</a></p>
+      <h1>Setting up a development environment</h1>
+      <div class="clear"></div>
+      <div id="content"><p>Everything you need to know to start developing Apache ACE can be found here.</p>
+<h2 id="obtaining-the-sources">Obtaining the sources</h2>
+<p>There are two ways to obtain a copy of the source code. You can either download one of the
+source releases, or checkout the code from subversion.</p>
+<h3 id="download-the-sources">Download the sources</h3>
+<p>Point your browser to: http://ace.apache.org/download.html</p>
+<p>On that page you will find, amongst others, a link to the latest released sources, plus an
+archive containing all binary third-party dependencies. The page will automatically select
+a download mirror close to you. Download both the source and dependencies archive and then
+type:</p>
+<div class="codehilite"><pre><span class="nv">$ </span>unzip apache-ace-1.0.0-src.zip
+<span class="nv">$ </span>unzip apache-ace-1.0.0-deps.zip
+</pre></div>
+
+
+<p>Note that when unzipping the second archive, you will get some warnings about overlapping
+files. Those are the required NOTICE and LICENSE files, which are in the same location in
+both archives. Just overwriting them is fine.</p>
+<h3 id="checkout-from-subversion">Checkout from subversion</h3>
+<div class="codehilite"><pre><span class="nv">$ </span>svn co http://svn.apache.org/repos/asf/ace/trunk apache-ace
+</pre></div>
+
+
+<p>In both cases you end up with a copy of the source code.</p>
+<h2 id="building-the-sources">Building the sources</h2>
+<p>There are two ways to build the sources. You can either run a command line build or use
+Eclipse with Bndtools to build everything. If you want to actively start developing, we
+strongly recommend you use Eclipse with Bndtools as this is by far the most convenient way
+to build and run Apache ACE within a development environment.</p>
+<h3 id="eclipse-with-bndtools">Eclipse with Bndtools</h3>
+<h4 id="prerequisites">Prerequisites</h4>
+<p>For developing ACE using Eclipse, you need:</p>
+<ul>
+<li>A recent Java JDK, at least <a href="http://www.oracle.com/technetwork/indexes/downloads/index.html">Java 6</a>;</li>
+<li>A recent Eclipse, for example, <a href="http://www.eclipse.org/downloads/">Eclipse Juno</a> with the following plugins:</li>
+<li><a href="http://subclipse.tigris.org/servlets/ProjectProcess?pageID=p4wYuA">Subclipse</a>;</li>
+<li><a href="http://bndtools.org/installation.html">BndTools</a>;</li>
+<li><a href="http://testng.org/doc/download.html">TestNG</a>.</li>
+</ul>
+<p>For building or exporting the compiled artifacts of ACE without Eclipse, you only need
+<a href="http://ant.apache.org/">Apache ANT</a> version 1.8+ installed.</p>
+<h4 id="eclipse-set-up">Eclipse set up</h4>
+<p>When firing up Eclipse, make sure to either create a new workspace and check out the
+sources according to the instructions below, or choose the root folder where you have
+previously checked out or extracted your copy of the sources. This is important, as
+otherwise Bndtools will not function correctly.</p>
+<h5 id="checking-out-the-latest-sources">Checking out the latest sources</h5>
+<p>If you created a new workspace above, you need to grab the latest sources from ACE's
+subversion repository. To do this, open up the "SVN Repository Exploring" perspective, and
+add the following URL as new SVN repository using the yellow add-icon in the "SVN
+Repositories" view:</p>
+<div class="codehilite"><pre><span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">svn</span><span class="p">.</span><span class="n">apache</span><span class="p">.</span><span class="n">org</span><span class="o">/</span><span class="n">repos</span><span class="o">/</span><span class="n">asf</span><span class="o">/</span><span class="n">ace</span><span class="o">/</span><span class="n">trunk</span><span class="o">/</span>
+</pre></div>
+
+
+<p>After this, expand the newly created tree node named after the SVN URL, and select all
+<strong>individual</strong> projects underneath.  <em>Note: do <strong>not</strong> (only) select the root node, as
+this won't let you properly import the individual projects.</em></p>
+<p>Right click on the selected (sub)projects, and choose "Checkout…" from the context menu.
+Leave all default settings as-is and click "finish". Now relax and wait until the checkout
+is completed, and all projects are imported into your workspace.</p>
+<p>Switching back to the "Bndtools" perspective should give you a long list of imported
+projects.</p>
+<h5 id="importing-existing-projects">Importing existing projects</h5>
+<p>If you created a workspace in a folder that already contained the sources, you need to
+import these projects into the workspace. From the main menu in Eclipse, choose: "File
+-&gt; Import..." and then select "General -&gt; Existing projects into workspace..." and
+select your workspace folder. A list of projects should show up now. Import them all, wait
+until Eclipse has built the project and you're ready to start.</p>
+<h5 id="coding-guidelines">Coding guidelines</h5>
+<p>If you want to develop for ACE, you might want to import the code templates and formatter
+rules for ACE. The formatter can be found in the <code>etc</code> folder in subversion, and you can
+import it into Eclipse as your default formatter for this workspace.</p>
+<h4 id="running-debugging">Running &amp; debugging</h4>
+<p>One of the benefits of the migration to BndTools is that we can now directly run ACE from
+Eclipse with almost zero effort. In fact, it is even possible to directly debug or profile
+ACE from Eclipse. By convention, all runnable projects start with "run-" and contain a
+".bndrun" file.</p>
+<h5 id="ace-server">ACE server</h5>
+<p>To run or debug the ACE server, you open up the "<tt>server.bndrun</tt>" file in the
+"run-server" project. This will present you with a view in which you can directly choose
+to run it (use "Run OSGi") or debug it (use "Debug OSGi"). Alternatively, you can right
+click on "server.bndrun" and choose either "Run As -&gt; Bnd OSGi Run Launcher" or "Debug
+As -&gt; Bnd OSGi Run Launcher".</p>
+<h5 id="ace-obr">ACE obr</h5>
+<p>To run or debug the ACE obr, you open up the "<tt>obr.bndrun</tt>" file in the "run-obr"
+project. This will present you with a view in which you can directly choose to run it (use
+"Run OSGi") or debug it (use "Debug OSGi"). Alternatively, you can right click on
+"obr.bndrun" and choose either "Run As -&gt; Bnd OSGi Run Launcher" or "Debug As -&gt; Bnd
+OSGi Run Launcher".</p>
+<h5 id="ace-client">ACE client</h5>
+<p>To run or debug the ACE client, you open up the "<tt>client.bndrun</tt>" file in the
+"run-client" project. This will present you with a view in which you can directly choose
+to run it (use "Run OSGi") or debug it (use "Debug OSGi"). Alternatively, you can right
+click on "client.bndrun" and choose either "Run As -&gt; Bnd OSGi Run Launcher" or "Debug
+As -&gt; Bnd OSGi Run Launcher".</p>
+<h5 id="ace-server-allinone">ACE server-allinone</h5>
+<p>To run or debug the "all in one" ACE server, you open up the
+"<tt>server-allinone.bndrun</tt>" file in the "run-server-allinone" project. This will
+present you with a view in which you can directly choose to run it (use "Run OSGi") or
+debug it (use "Debug OSGi"). Alternatively, you can right click on
+"server-allinone.bndrun" and choose either "Run As -&gt; Bnd OSGi Run Launcher" or "Debug
+As -&gt; Bnd OSGi Run Launcher".</p>
+<h5 id="ace-target">ACE target</h5>
+<p>You can also directly run a target from Eclipse. Doing this is almost equal as running the
+ones described in the previous sections. The only difference is that for running a target,
+you need to use the "<tt>target.bndrun</tt>" file from the "run-target" project.</p>
+<h5 id="unit-tests">Unit tests</h5>
+<p>ACE uses TestNG for its unit tests. To run a single test or a package of tests, use "Run
+As -&gt; TestNG Test" or "Debug As -&gt; TestNG Test". </p>
+<h5 id="integration-tests">Integration tests</h5>
+<p>The integration tests of ACE are placed in separate projects that are -by convention-
+named with a '<tt>.itest</tt>' suffix. These integration tests use BndTools to get an OSGi
+framework up and running. To run one or all integration tests, use "Run As -&gt; OSGi
+JUnit Test" or "Debug As -&gt; OSGi JUnit Test".</p>
+<h3 id="command-line-build">Command line build</h3>
+<h4 id="prerequisites_1">Prerequisites</h4>
+<p>For developing ACE using Ant, you need:</p>
+<ul>
+<li>A recent Java JDK, at least <a href="http://www.oracle.com/technetwork/indexes/downloads/index.html">Java 6</a>;</li>
+<li><a href="http://ant.apache.org/">Apache ANT</a> version 1.8+.</li>
+</ul>
+<h4 id="building">Building</h4>
+<p>The command line build for Apache ACE is based on Ant, and generated automatically when
+using the Bndtools plugin in Eclipse.</p>
+<p>The build is structured as a flat hierarchy of projects, and you can go into any of these
+projects to build just that project and its dependencies. There are two special projects:</p>
+<ol>
+<li><code>cnf</code> -- Which is collection of repositories that contain all the required dependencies
+for building and running Apache ACE;</li>
+<li><code>build</code> -- A project that depends on all other projects and is used to build
+everything.</li>
+</ol>
+<p>So, to build Apache ACE, we issue the following commands:</p>
+<div class="codehilite"><pre><span class="nv">$ </span><span class="nb">cd </span>build
+<span class="nv">$ </span>ant
+</pre></div>
+
+
+<p>In the end, this leaves us with a set of bundles (in the <tt>generated</tt> folder of each
+project).</p>
+<p>The following targets are available:</p>
+<ul>
+<li><tt>clean</tt> -- Cleans up any files in the current project that were generated during a build;</li>
+<li><tt>build</tt> -- Build the current project;</li>
+<li><tt>test</tt> -- Run the integration tests in the <em>current</em> project;</li>
+<li><tt>testng</tt> -- Run the unit tests in the <em>current</em> project;</li>
+<li><tt>deepclean</tt> -- Cleans up any files in the current project and all its dependencies;</li>
+<li><tt>deeptestng</tt> -- Runs the unit tests in the current project and all its dependencies;</li>
+<li><tt>deeptest</tt> -- Runs the integration tests in the current project and all its dependencies.</li>
+</ul>
+<p>There actually are a few more, but these are the most important ones.</p>
+<h2 id="how-to">How to...</h2>
+<h3 id="use-my-favorite-ide-not-eclipse">...use my favorite IDE (not Eclipse)?</h3>
+<p>Unfortunately, the easy answer is "no". Until somebody ports Bndtools to your favorite
+IDE, you either have to use Eclipse, or a combination of your IDE and manual builds using
+Ant (though not recommended). If you insist, please do make sure you manually generate the
+proper metadata for Eclipse.</p>
+<h3 id="build-this-thing-in-eclipse">...build this thing in Eclipse?</h3>
+<p>Normally, you don't. Seriously. If "Build Automatically" is enabled, as soon as you hit
+save after changing a line of code, BndTools will automatically build your bundle for you.
+In fact, if your server if already running, Bndtools will even redeploy all changed
+bundles to it automatically.</p>
+<h3 id="get-rid-of-all-those-red-crosses-in-eclipse">...get rid of all those red crosses in Eclipse?</h3>
+<p>If Eclipse complaints about missing test libraries, you probably forgot to install the
+TestNG plugin. If this plugin is installed, it will automatically cause your projects to
+get the required dependency to the TestNG library. Without this plugin, Eclipse won't have
+the required library and fails to compile the code correctly.<br />
+In case you are importing the projects into Eclipse for the first time, it takes a while
+and a couple of builds to get rid of all build errors. If the problem does <em>not</em> go away,
+please drop a line on the <a href="/get-involved/mailing-lists.html">mailing lists</a> to get
+additional help.</p>
+<h3 id="create-a-distributable-archive">...create a distributable archive</h3>
+<p>The next step is to create an archive for the server, so we end up with something we can
+actually run:</p>
+<div class="codehilite"><pre><span class="nv">$ </span><span class="nb">cd </span>build
+<span class="nv">$ </span>ant package-bin
+</pre></div>
+
+
+<p>Now, in the generated folder, an archive will have been created. You can unzip this
+archive, which should expose a couple of subfolders with the same names as the runnable
+projects that you can go into and run. You can start the "all in one" server like this:</p>
+<div class="codehilite"><pre><span class="nv">$ </span><span class="nb">cd </span>apache-ace-1.0.0-bin
+<span class="nv">$ </span>unzip apache-ace-1.0.0-bin/.zip
+<span class="nv">$ </span><span class="nb">cd </span>server-allinone/
+<span class="nv">$ </span>java -jar server-allinone.jar
+</pre></div>
+
+
+<p>For other projects, the steps are similar to this: just go into the correct folder and
+launch the jar file.</p>
+<h3 id="add-an-osgi-bundle">...add an OSGi bundle</h3>
+<p>The easiest way to add an OSGi bundle, is to drag it onto the "Local Repository" entry in
+the "Repositories" view, or to use the "Add files to repository" toolbar icon. Bndtools
+will analyze the files you try to add and show their metadata if they're indeed valid
+bundles.</p>
+<p>The bundles will end up in the local repository inside the <tt>cnf</tt> project.</p>
+<h3 id="add-a-java-library">...add a Java library</h3>
+<p>If you want to add a library that does not contain any OSGi metadata, you can follow the
+steps below to add it to the "Library Repository" so it can be used in all other projects
+within Apache ACE. If your library does have sensible OSGi metadata, please follow the
+"...add an OSGi bundle" instructions above.</p>
+<ol>
+<li>Copy the library to the right location. The jar file for the library should be copied
+to the following location: <tt>cnf/lib/foo/foo-1.0.0.jar</tt>. Note that the directory
+name should be equal to the basename of the added JAR file, that is, everything <em>before</em>
+the version-string of the JAR;</li>
+<li>
+<p>Update the <code>repository.xml</code>. After making changes to anything in <tt>cnf/lib/</tt> you
+need to update the index file that describes the contents of the repository. To do this
+enter the following commands:</p>
+<div class="codehilite"><pre><span class="nv">$ </span><span class="nb">cd </span>cnf
+<span class="nv">$ </span>ant build
+<span class="nv">$ </span>java -cp bin org.apache.ace.bnd.LibraryIndexer
+</pre></div>
+
+
+</li>
+</ol></div>
+      <hr>
+      <footer>
+        <p>Copyright &#169; 2012-2014 <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>

Added: websites/staging/ace/trunk/content/docs/shell-api.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/shell-api.html (added)
+++ websites/staging/ace/trunk/content/docs/shell-api.html Mon Nov 24 22:42:13 2014
@@ -0,0 +1,260 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html lang="en">
+  <head>
+    <title>Client Shell API</title>
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    <meta property="og:image" content="//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="//code.jquery.com/jquery.js"></script>
+    <script src="/js/bootstrap.min.js"></script>    
+    <script src="/js/prettify.js"></script>
+    
+    
+    <!-- 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 &quot;License&quot;); 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 &quot;AS IS&quot; 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. -->
+    <script>
+    $(function () { prettyPrint() })
+    $().dropdown()
+    </script>
+  </head>
+  <body style="padding-top: 50px;">
+    <div class="navbar navbar-fixed-top navbar-inverse">
+      <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/shellapi.html">Client Shell API</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>
+      <li>
+        <a href="/dev-doc/configuring-relay-servers.html">Configuring and using relay servers</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="/docs/">Docs</a></p>
+      <h1>Client Shell API</h1>
+      <div class="clear"></div>
+      <div id="content"><h1 id="introduction">Introduction</h1>
+<p>To script the interaction with ACE, you can use its shell based client API. Typical use cases include the tight integration of ACE into your development or automated build process, the creation of a custom user interface, or interactive use for those who prefer a shell over a GUI.</p>
+<p>The shell commands extend the standardized OSGi shell, using the GoGo implementation from Apache Felix. This page does not aim to give an overview of all commands available in that shell, so please consult the documentation of the GoGo shell itself in case you're not familiar with it.</p>
+<h1 id="overview">Overview</h1>
+<p>Before we dive into the various shell commands, let's start with an overview of how all of this works. Everything in ACE is an entity. For example, an artifact or a feature is an entity, but also the association between an artifact and a feature is. Entities have properties and tags. Properties are the "fixed" attributes that make up a specific type of entity. For example a feature has a name and a description. If you know the type of entity, its properties are also known. Tags on the other hand are attributes that a user can freely add and refer to.</p>
+<h1 id="sessions-and-workspaces">Sessions and Workspaces</h1>
+<p>The client, independent of whether you're using the WebUI, REST or shell, always works in the same way. You start out by creating a session or workspace that you can then start editing. Once you're happy with your changes, you commit them back to the server.</p>
+<p>Creating a session in the shell is done like this:</p>
+<div class="codehilite"><pre><span class="n">w</span> <span class="p">=</span> <span class="p">(</span><span class="n">cw</span><span class="p">)</span>
+</pre></div>
+
+
+<p>The "cw" (create workspace) command checks out and returns a new workspace. We assign that result to a variable, because
+all our subsequent commands operate on the workspace. Optionally, when creating the workspace, we can provide several parameters:</p>
+<div class="codehilite"><pre><span class="n">w</span> <span class="p">=</span> <span class="p">(</span><span class="n">cw</span> <span class="p">[</span><span class="n">showunregisteredtargets</span><span class="p">=</span><span class="n">false</span><span class="p">])</span>
+<span class="n">w</span> <span class="p">=</span> <span class="p">(</span><span class="n">cw</span> <span class="n">european</span> <span class="n">dutch</span> <span class="n">dutch</span><span class="p">)</span>
+<span class="n">w</span> <span class="p">=</span> <span class="p">(</span><span class="n">cw</span> <span class="n">european</span> <span class="n">dutch</span> <span class="n">dutch</span> <span class="p">[</span><span class="n">showunregisteredtargets</span><span class="p">=</span><span class="n">false</span><span class="p">])</span>
+</pre></div>
+
+
+<p>The three names (european dutch dutch) are names of repositories. ACE supports a flexible multi-tenancy mechanism that allows you to specify customer or tenant names for all the different repositories. In this example, we checkout a european store repository, and a dutch target and deployment repository. Most people will probably start out with a single workspace with default repositories.</p>
+<p>The map (maps are entered like this: [key1=val1 key2=val2 key3=val3]) contains an optional set of configuration properties for the workspace. At the moment, the only property there is is "showunregisteredtargets" which determines if the workspace will contain targets that have not been registered. It finds those by scanning all audit logs. By default, they are included but in some use cases you might not want them to be visible. In such cases, rather than filtering them out of your results, you can completely remove them, which saves quite a bit of processing time as well.</p>
+<p>When you're done with your workspace, you can clean it up like this:</p>
+<div class="codehilite"><pre><span class="n">rw</span> $<span class="n">w</span>
+</pre></div>
+
+
+<p>This will remove the workspace from memory. Note that any changes will be lost, unless you commit the workspace first:</p>
+<div class="codehilite"><pre>$<span class="n">w</span> <span class="n">commit</span>
+</pre></div>
+
+
+<p>This is actually not a shell command we explicitly created. Instead, the shell is smart enough to scan an instance (our workspace $w) for methods and tries to invoke those. It also parses arguments as we will soon see.</p>
+<p>Let's start creating some entities:</p>
+<div class="codehilite"><pre>$<span class="n">w</span> <span class="n">cf</span> <span class="n">feature</span><span class="o">-</span><span class="n">base</span>
+$<span class="n">w</span> <span class="n">cd</span> <span class="n">dist</span><span class="o">-</span><span class="n">core</span>
+$<span class="n">w</span> <span class="n">cf2d</span> &quot;<span class="p">(</span><span class="n">name</span><span class="p">=</span><span class="n">feature</span><span class="o">-</span><span class="n">base</span><span class="p">)</span>&quot; &quot;<span class="p">(</span><span class="n">name</span><span class="p">=</span><span class="n">dist</span><span class="o">-</span><span class="n">core</span><span class="p">)</span>&quot;
+</pre></div>
+
+
+<p>This gives us a feature, a distribution and the association between the two. Associations have a left and right hand side, and both are OSGi filters. This means you can create quite complex associations, but in this case we use a simple condition that matches only a single feature and distribution. If you want to see what you've created, you can list all entities of a certain type like this:</p>
+<div class="codehilite"><pre>$<span class="n">w</span> <span class="n">lf</span>
+$<span class="n">w</span> <span class="n">ld</span>
+$<span class="n">w</span> <span class="n">lf2d</span>
+</pre></div>
+
+
+<p>Lists all features, distributions and feature to distribution associations. These list commands accept a filter condition as well:</p>
+<div class="codehilite"><pre>$<span class="n">w</span> <span class="n">lf</span> &quot;<span class="p">(</span><span class="n">name</span><span class="p">=</span><span class="n">feature</span><span class="o">-*</span><span class="p">)</span>&quot;
+</pre></div>
+
+
+<p>Lists all features whose name start with "feature-". Let's proceed by adding a bundle. Bundles are a specific type of artifact and there are several ways to add them. The easiest one, most of the time, is:</p>
+<div class="codehilite"><pre>$<span class="n">w</span> <span class="n">ca</span> <span class="n">file</span><span class="p">:</span><span class="o">///</span><span class="n">path</span><span class="o">/</span><span class="n">to</span><span class="o">/</span><span class="n">some</span><span class="o">/</span><span class="n">bundle</span><span class="p">.</span><span class="n">jar</span> <span class="n">true</span>
+</pre></div>
+
+
+<p>This will create an artifact, using the URL you specified. Because the second parameter was set to true, it will upload the artifact from that URL to the OBR. It will also extract all necessary metadata from the artifact: it recognizes the type and then uses type specific extraction mechanisms.</p>
+<p>If you really want to, you can also create the bundle yourself and specify all the metadata manually:</p>
+<div class="codehilite"><pre>$<span class="n">w</span> <span class="n">ca</span> <span class="p">[</span><span class="n">mimetype</span><span class="p">=</span><span class="n">application</span><span class="o">/</span><span class="n">vnd</span><span class="p">.</span><span class="n">osgi</span><span class="p">.</span><span class="n">bundle</span> <span class="n">artifactName</span><span class="p">=</span><span class="n">org</span><span class="p">.</span><span class="n">foo</span> <span class="n">Bundle</span><span class="o">-</span><span class="n">Name</span><span class="p">=</span><span class="n">org</span><span class="p">.</span><span class="n">foo</span> <span class="n">Bundle</span><span class="o">-</span><span class="n">SymbolicName</span><span class="p">=</span><span class="n">org</span><span class="p">.</span><span class="n">foo</span> <span class="n">Bundle</span><span class="o">-</span><span class="n">Version</span><span class="p">=</span>1<span class="p">.</span>0<span cla
 ss="p">.</span>0 <span class="n">url</span><span class="p">=</span><span class="n">http</span><span class="p">:</span><span class="o">//</span><span class="n">localhost</span><span class="p">:</span>8080<span class="o">/</span><span class="n">obr</span><span class="o">/</span><span class="n">org</span><span class="o">/</span><span class="n">foo</span><span class="o">/</span><span class="n">org</span><span class="p">.</span><span class="n">foo</span><span class="o">-</span>1<span class="p">.</span>0<span class="p">.</span>0<span class="p">.</span><span class="n">jar</span> <span class="n">processorPid</span><span class="p">=]</span>
+$<span class="n">w</span> <span class="n">ca2f</span> &quot;<span class="p">(</span><span class="n">Bundle</span><span class="o">-</span><span class="n">SymbolicName</span><span class="p">=</span><span class="n">org</span><span class="p">.</span><span class="n">foo</span><span class="p">)</span>&quot; &quot;<span class="p">(</span><span class="n">name</span><span class="p">=</span><span class="n">feature</span><span class="o">-</span><span class="n">base</span><span class="p">)</span>&quot;
+</pre></div>
+
+
+<p>This creates the bundle. The "url" is an important attribute as it tells ACE where to get the bundle from. In this example we assume it can already be found in the OBR at that location. We also create an association. On the bundle side, we use a filter that only specifies the symbolic name of the bundle. So what happens if there is more than one version of such a bundle available? To understand that, we need to explain a few more things about associations.</p>
+<p>First of all, assocations have a cardinality for both sides. If you don't specify the cardinality, it defaults to "1:1". So what happens if you specify a filter that returns more than one entity? Two things. First of all, the list of entities is sorted in an order that is specific to the type of entity. Bundles are sorted by version, highest first. Finally, the cardinality is used to determine how many entities from the list to return. So in this case, from all the bundles with the same symbolic name, the bundle with the highest version is selected.</p>
+<p>You can use this to create features that automatically update to the highest version of a bundle, or if you're more specific, are fixed to a version or version range. Combined with semantic versioning this gives you a powerful way to for example create a feature where bugfixes or backward compatible changes will automatically be upgraded, but major changes require human intervention.</p>
+<p>Let's proceed to create a target:</p>
+<div class="codehilite"><pre>$<span class="n">w</span> <span class="n">ct</span> <span class="n">target</span><span class="o">-</span>1
+$<span class="n">w</span> <span class="n">cd2t</span> &quot;<span class="p">(</span><span class="n">name</span><span class="p">=</span><span class="n">dist</span><span class="o">-</span><span class="n">core</span><span class="p">)</span>&quot; &quot;<span class="p">(</span><span class="n">id</span><span class="p">=</span><span class="n">target</span><span class="o">-</span>1<span class="p">)</span>&quot;
+</pre></div>
+
+
+<p>This creates the target and associates it with the "dist-core" distribution.</p>
+<p>Deleting entities is also quite easy. You first need to get hold of the entity you want to delete though, which can be done like this:</p>
+<div class="codehilite"><pre><span class="n">targetlist</span> <span class="p">=</span> <span class="p">(</span>$<span class="n">w</span> <span class="n">lt</span> &quot;<span class="p">(</span><span class="n">id</span><span class="p">=</span><span class="n">target</span><span class="o">-</span>1<span class="p">)</span>&quot;<span class="p">)</span>
+</pre></div>
+
+
+<p>This gives you a list of targets, but since the filter is very specific, the list will only contain one entity. The shell now has a helper command to fetch the first item from the list:</p>
+<div class="codehilite"><pre><span class="n">t1</span> <span class="p">=</span> <span class="p">(</span><span class="n">first</span> $<span class="n">targetlist</span><span class="p">)</span>
+$<span class="n">w</span> <span class="n">dt</span> $<span class="n">t1</span>
+</pre></div>
+
+
+<p>Fetches the first and only target in the list and assigns it to a variable called "t1". Subsequently deletes the target from the workspace. Deleting other entities is done in a similar way.</p></div>
+      <hr>
+      <footer>
+        <p>Copyright &#169; 2012-2014 <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>

Added: websites/staging/ace/trunk/content/docs/simple-workflow.png
==============================================================================
Binary file - no diff available.

Propchange: websites/staging/ace/trunk/content/docs/simple-workflow.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: websites/staging/ace/trunk/content/docs/test-script.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/test-script.html (added)
+++ websites/staging/ace/trunk/content/docs/test-script.html Mon Nov 24 22:42:13 2014
@@ -0,0 +1,200 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html lang="en">
+  <head>
+    <title>Test Script</title>
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    <meta property="og:image" content="//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="//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 navbar-inverse">
+      <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/shellapi.html">Client Shell API</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>
+      <li>
+        <a href="/dev-doc/configuring-relay-servers.html">Configuring and using relay servers</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="/docs/">Docs</a></p>
+      <h1>Test Script</h1>
+      <div class="clear"></div>
+      <div id="content"><p>Besides all our automated tests, sometimes it is useful to run some tests by hand to get a feel for the performance of Apache ACE and tweak it for specific scenarios. To aid in setting up and running such tests, an Ant script was made that allows you to:</p>
+<ol>
+<li>Configure it to create a runnable server, a collection of targets or both.</li>
+<li>Run every configured node.</li>
+<li>Cleanup afterwards.</li>
+</ol>
+<p>Typical use cases include running a set of targets and a server on the same box, or having two or more boxes and distributing server and (groups of) targets over both. The script, which is located in the <code>ace-test</code> project folder, assumes you have a full checkout of ACE and that you have actually already built the code (<code>mvn -DskipTests=true clean install</code> or something similar). It also assumes you have a recent version of Ant on your machine.</p>
+<p>Before using the script, there are several variables that you can configure that influence its behaviour:</p>
+<ul>
+<li>with-server - when defined, will run an ACE server;</li>
+<li>with-targets - when defined, will run a number of targets;</li>
+<li>targets - a comma separated list of target names ("target-" will be used as prefix for all of them);</li>
+<li>server-host - the discovery URL for the server to use with the targets</li>
+<li>version - the ACE version to use (should match whatever version of the code you checked out).</li>
+</ul>
+<p>To run:</p>
+<ol>
+<li><code>ant unzip</code> will unzip all required code into folders under the current directory;</li>
+<li><code>ant run</code> will run all nodes (and at least on Linux and Mac OS X stop them again when you hit Ctrl-C);</li>
+<li><code>ant rm</code> will delete all folders and files created in steps 1 and 2.</li>
+</ol>
+<p>For example, to run the ACE management server with 10 targets, we should do the following:</p>
+<div class="codehilite"><pre><span class="o">[</span>localhost:~/<span class="o">]</span><span class="nv">$ </span>ant -Dtargets<span class="o">=</span>1,2,3,4,5,6,7,8,9,10 unzip run
+...<span class="o">(</span>CTRL+C<span class="o">)</span>...
+<span class="o">[</span>localhost:~/<span class="o">]</span><span class="nv">$ </span>ant -Dtargets<span class="o">=</span>1,2,3,4,5,6,7,8,9,10 rm
+</pre></div></div>
+      <hr>
+      <footer>
+        <p>Copyright &#169; 2012-2014 <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>

Added: websites/staging/ace/trunk/content/docs/use-cases/index.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/use-cases/index.html (added)
+++ websites/staging/ace/trunk/content/docs/use-cases/index.html Mon Nov 24 22:42:13 2014
@@ -0,0 +1,204 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html lang="en">
+  <head>
+    <title>Use Cases</title>
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    <meta property="og:image" content="//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="//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 navbar-inverse">
+      <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/shellapi.html">Client Shell API</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>
+      <li>
+        <a href="/dev-doc/configuring-relay-servers.html">Configuring and using relay servers</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="/docs/">Docs</a>&nbsp;&raquo&nbsp;<a href="/docs/use-cases/">Use-cases</a></p>
+      <h1>Use Cases</h1>
+      <div class="clear"></div>
+      <div id="content"><p>The view below shows all the major use cases of Apache ACE. If you scroll down
+you will also see a list of use cases, described in more detail when you click on
+a use case.</p>
+<p><object data="usecasesview.svg" type="image/svg+xml" class="span12" height="1898"></object></p>
+<h2 id="list">List</h2>
+<ul>
+<li><a href="uc-01.html">UC-01 Checkout</a></li>
+<li><a href="uc-02.html">UC-02 Commit</a></li>
+<li><a href="uc-03.html">UC-03 Resolve merge conflict</a></li>
+<li><a href="uc-04.html">UC-04 Check for update</a></li>
+<li><a href="uc-05.html">UC-05 Send audit log data</a></li>
+<li><a href="uc-06.html">UC-06 Synchronize</a></li>
+<li><a href="uc-07.html">UC-07 Add artifact</a></li>
+<li><a href="uc-08.html">UC-08 Add artifact from external location</a></li>
+<li><a href="uc-09.html">UC-09 Add artifact from managed location</a></li>
+<li><a href="uc-10.html">UC-10 Add artifact from filesystem</a></li>
+<li><a href="uc-11.html">UC-11 Add artifact from OBR</a></li>
+<li><a href="uc-12.html">UC-12 Associate</a></li>
+<li><a href="uc-13.html">UC-13 Associate artifact to distribution</a></li>
+<li><a href="uc-14.html">UC-14 Associate distribution to target</a></li>
+<li><a href="uc-15.html">UC-15 Create</a></li>
+<li><a href="uc-15.html">UC-16 Create distribution</a></li>
+<li><a href="uc-15.html">UC-17 Create target</a></li>
+<li><a href="uc-18.html">UC-18 Review audit log</a></li>
+<li><a href="uc-19.html">UC-19 Approve version</a></li>
+<li><a href="uc-20.html">UC-20 Manage users</a></li>
+<li><a href="uc-21.html">UC-21 Manage rights</a></li>
+<li><a href="uc-22.html">UC-22 Manage certificates</a></li>
+<li><a href="uc-23.html">UC-23 Manage system topology</a></li>
+</ul></div>
+      <hr>
+      <footer>
+        <p>Copyright &#169; 2012-2014 <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>

Added: websites/staging/ace/trunk/content/docs/use-cases/uc-01.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/use-cases/uc-01.html (added)
+++ websites/staging/ace/trunk/content/docs/use-cases/uc-01.html Mon Nov 24 22:42:13 2014
@@ -0,0 +1,188 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html lang="en">
+  <head>
+    <title>Use Case 01 - Checkout</title>
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    <meta property="og:image" content="//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="//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 navbar-inverse">
+      <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/shellapi.html">Client Shell API</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>
+      <li>
+        <a href="/dev-doc/configuring-relay-servers.html">Configuring and using relay servers</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="/docs/">Docs</a>&nbsp;&raquo&nbsp;<a href="/docs/use-cases/">Use-cases</a></p>
+      <h1>Use Case 01 - Checkout</h1>
+      <div class="clear"></div>
+      <div id="content"><p>Check out data from a repository.</p>
+<h2 id="flow">Flow</h2>
+<h3 id="basic-flow">Basic Flow</h3>
+<ol>
+<li>Editor asks discovery service for a location of a server for a certain repository.</li>
+<li>Editor contacts the repository to ask for a list of versions.</li>
+<li>Editor checks out the latest version of the repository.</li>
+</ol>
+<h3 id="alternative-flows">Alternative Flows</h3>
+<ul>
+<li>Server cannot be found.</li>
+<li>Repository does not exist.</li>
+<li>Latest version could not be checked out.</li>
+</ul></div>
+      <hr>
+      <footer>
+        <p>Copyright &#169; 2012-2014 <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>

Added: websites/staging/ace/trunk/content/docs/use-cases/uc-02.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/use-cases/uc-02.html (added)
+++ websites/staging/ace/trunk/content/docs/use-cases/uc-02.html Mon Nov 24 22:42:13 2014
@@ -0,0 +1,190 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html lang="en">
+  <head>
+    <title>Use Case 02 - Commit</title>
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    <meta property="og:image" content="//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="//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 navbar-inverse">
+      <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/shellapi.html">Client Shell API</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>
+      <li>
+        <a href="/dev-doc/configuring-relay-servers.html">Configuring and using relay servers</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="/docs/">Docs</a>&nbsp;&raquo&nbsp;<a href="/docs/use-cases/">Use-cases</a></p>
+      <h1>Use Case 02 - Commit</h1>
+      <div class="clear"></div>
+      <div id="content"><p>Check out data from a repository.</p>
+<h2 id="flow">Flow</h2>
+<h3 id="basic-flow">Basic Flow</h3>
+<ol>
+<li>Editor asks discovery service for a location of a server for the repository.</li>
+<li>Editor sends the modified repository the server, together with the version number this edit was based on.</li>
+<li>Server reports back that the commit was successful.</li>
+</ol>
+<h3 id="alternative-flows">Alternative Flows</h3>
+<ul>
+<li>Server cannot be found.</li>
+<li>Repository does not exist.</li>
+<li>Commit failed because of a merge conflict.</li>
+</ul>
+<h2 id="details">Details</h2>
+<p>When a commit fails because of a merge conflict, the client is expected to check out the newly added version and (with or without interaction from a user) merge all changes and then try again. This is explained in <a href="uc-03.html">UC-03 Resolve merge conflict</a>.</p></div>
+      <hr>
+      <footer>
+        <p>Copyright &#169; 2012-2014 <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>

Added: websites/staging/ace/trunk/content/docs/use-cases/uc-03.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/use-cases/uc-03.html (added)
+++ websites/staging/ace/trunk/content/docs/use-cases/uc-03.html Mon Nov 24 22:42:13 2014
@@ -0,0 +1,190 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html lang="en">
+  <head>
+    <title>Use Case 03 - Resolve merge conflict</title>
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    <meta property="og:image" content="//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="//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 navbar-inverse">
+      <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/shellapi.html">Client Shell API</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>
+      <li>
+        <a href="/dev-doc/configuring-relay-servers.html">Configuring and using relay servers</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="/docs/">Docs</a>&nbsp;&raquo&nbsp;<a href="/docs/use-cases/">Use-cases</a></p>
+      <h1>Use Case 03 - Resolve merge conflict</h1>
+      <div class="clear"></div>
+      <div id="content"><p>Resolve merge conflicts and commit an updated version to a repository.</p>
+<p>This use case extends <a href="uc-02.html">commit</a>.</p>
+<h2 id="flow">Flow</h2>
+<h3 id="basic-flow">Basic Flow</h3>
+<p>When the UC commit scenario fails because someone else committed a version while you were editing yours, the flow continues like this:</p>
+<ol>
+<li>Editor fetches the latest version and now has three versions locally: the original version he started with, the working copy he is trying to commit and this latest version.</li>
+<li>Editor reviews the three way diff and updates the working copy.</li>
+<li>Editor tries to commit the working copy again, now referencing the latest version again. This is the normal commit use case.</li>
+</ol>
+<h3 id="alternative-flows">Alternative Flows</h3>
+<ul>
+<li>None.</li>
+</ul>
+<h2 id="details">Details</h2>
+<p>This use case interacts with the commit use case and the user can go back and forward between the two as long as new merge conflicts pop up.</p></div>
+      <hr>
+      <footer>
+        <p>Copyright &#169; 2012-2014 <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>

Added: websites/staging/ace/trunk/content/docs/use-cases/uc-04.html
==============================================================================
--- websites/staging/ace/trunk/content/docs/use-cases/uc-04.html (added)
+++ websites/staging/ace/trunk/content/docs/use-cases/uc-04.html Mon Nov 24 22:42:13 2014
@@ -0,0 +1,193 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html lang="en">
+  <head>
+    <title>Use Case 04 - Check for update</title>
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    <meta property="og:image" content="//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="//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 navbar-inverse">
+      <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/shellapi.html">Client Shell API</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>
+      <li>
+        <a href="/dev-doc/configuring-relay-servers.html">Configuring and using relay servers</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="/docs/">Docs</a>&nbsp;&raquo&nbsp;<a href="/docs/use-cases/">Use-cases</a></p>
+      <h1>Use Case 04 - Check for update</h1>
+      <div class="clear"></div>
+      <div id="content"><p>Check for an updated set of artifacts for a gateway.</p>
+<h2 id="flow">Flow</h2>
+<h3 id="pre-conditions">Pre-conditions</h3>
+<p>A target with an OSGi framework and our management agent.</p>
+<h3 id="basic-flow">Basic flow</h3>
+<ol>
+<li>Target retrieves its own identity.</li>
+<li>Target asks the discovery service for the location of a server.</li>
+<li>Target polls the server for a list of versions.</li>
+<li>If there is a version that is newer than the currently installed version, poll for this update.</li>
+<li>Install the update.</li>
+<li>Report back to the server.</li>
+</ol>
+<h3 id="alternative-flows">Alternative flows</h3>
+<ul>
+<li>If no server can be found, do nothing.</li>
+<li>If there is no newer version, do nothing.</li>
+<li>If the update cannot be installed, roll back to the previous version.</li>
+</ul></div>
+      <hr>
+      <footer>
+        <p>Copyright &#169; 2012-2014 <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>



Mime
View raw message