Modified: websites/staging/ace/trunk/content/user-doc/support.html
==============================================================================
--- websites/staging/ace/trunk/content/user-doc/support.html (original)
+++ websites/staging/ace/trunk/content/user-doc/support.html Fri Oct 18
12:50:18 2013
@@ -2,44 +2,14 @@
<html lang="en">
<head>
<title>Support</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/user-doc/user-guide.html
==============================================================================
--- websites/staging/ace/trunk/content/user-doc/user-guide.html (original)
+++ websites/staging/ace/trunk/content/user-doc/user-guide.html Fri Oct 18
12:50:18 2013
@@ -2,44 +2,14 @@
<html lang="en">
<head>
<title>ACE Users guide</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">
@@ -230,7 +205,7 @@ Even though they are smart guys that kno
<li>by using drag-and-drop: select all artifacts in an Explorer or Finder and
drag them onto the "Upload artifact" area. This way, you can upload multiple
artifacts in one go.</li>
</ol>
<p>Once artifacts are uploaded, they appear in the Artifacts column. For each
artifact, you can edit its properties by double clicking on it. In addition,
you can unlink an artifact from a feature, which will be discussed later on,
and remove an artifact. <strong>Note</strong>: removing an artifact will only
remove it from the server's metadata, <em>not</em> from the <abbr title="OSGi
Bundle Repository">OBR</abbr>. </p>
-<p>If you try to upload an artifact that is not recognized by ACE, an error is
displayed noting that that particular artifact is not uploaded. Adding support
for new types of artifacts in ACE is discussed in <a
href="/dev-doc/adding-artifact-recognizers.html">this article</a>.</p>
+<p>If you try to upload an artifact that is not recognized by ACE, an error is
displayed noting that that particular artifact is not uploaded. Adding support
for new types of artifacts in ACE is discussed in <a
href="/dev-doc/adding-custom-artifact-types.html">this article</a>.</p>
<p><strong>NOTE</strong>: All changes made through the Web UI need to be
stored explicitly by pressing the "Store" button, otherwise they will not be
visible to the ACE server. In case you want to revert all changes, you can use
the "Revert" button. This will ignore all changes and retrieve the latest state
from the server. In case there are no local changes, you can still retrieve the
latest state from the server using the "Retrieve" button.</p>
<h3 id="creating-a-new-feature-distribution-andor-target">Creating a new
feature, distribution and/or target</h3>
<p>Adding features and distributions are very similar. You either click the
"Add Featureâ¦" or "Add Distributionâ¦" buttons. In both cases, you are
presented with a dialog that allows you to enter the (mandatory) name of the
feature or distribution and an optional description.</p>
Modified: websites/staging/ace/trunk/content/user-doc/useradmin-ui.html
==============================================================================
--- websites/staging/ace/trunk/content/user-doc/useradmin-ui.html (original)
+++ websites/staging/ace/trunk/content/user-doc/useradmin-ui.html Fri Oct 18
12:50:18 2013
@@ -2,44 +2,14 @@
<html lang="en">
<head>
<title>User Management Guide</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">