svn commit: r1535294 - in /karaf/trunk/manual/src/main/webapp/users-guide: provisioning.conf wrapper.conf

[cs...@apache.org]

Author: cschneider
Date: Thu Oct 24 07:32:21 2013
New Revision: 1535294

URL: http://svn.apache.org/r1535294
Log:
KARAF-1186 Fixes and additions to manual

Modified:
    karaf/trunk/manual/src/main/webapp/users-guide/provisioning.conf
    karaf/trunk/manual/src/main/webapp/users-guide/wrapper.conf

Modified: karaf/trunk/manual/src/main/webapp/users-guide/provisioning.conf
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/users-guide/provisioning.conf?rev=1535294&r1=1535293&r2=1535294&view=diff
==============================================================================
--- karaf/trunk/manual/src/main/webapp/users-guide/provisioning.conf (original)
+++ karaf/trunk/manual/src/main/webapp/users-guide/provisioning.conf Thu Oct 24 07:32:21 2013
@@ -10,8 +10,8 @@ h3. Repository management
 The following commands can be used to manage the list of descriptors known by Karaf.  They use URLs pointing to features descriptors.  These URLs can use any protocol known to the Apache Karaf, the most common ones being http, file and mvn.
 
 || Command || Description ||
-| feature:repo-add | Add a list of repository URLs to the features service |
-| feature:repo-remove | Remove a list of repository URLs from the features service |
+| feature:repo-add | Add repository identified by URL or shortcut name and version to the features service |
+| feature:repo-remove | Remove a repository identified by URL or shortcut name from the features service |
 | feature:repo-list | Display the repository URLs currently associated with the features service |
 
 Karaf maintains a persistent list of these repositories so that if you add one URL and restart Karaf, the features will still be available.
@@ -19,12 +19,23 @@ Karaf maintains a persistent list of the
 h3. Features management
 
 || Command || Description ||
-| feature:install | Install a named feature |
-| feature:uninstall | Uninstall a named feature |
-| feature:list | List installed or all fatures |
+| feature:install | Install named features |
+| feature:uninstall | Uninstall named features |
+| feature:list | List installed or all features |
+
+h3. Shortcut management
+
+The most popular feature repositories like camel and cxf are available as shortcuts. So it is not necessary to remember the exact url. The mapping from shortcut name to URI is administered in the file etc/org.apache.karaf.features.repos.cfg.
+Type feature:repo-add <tab> to see the list of available shortcuts.
 
 h3. Examples
 
+1. Install features using shortcut
+{code}
+feature:repo-add cxf 2.7.7
+feature:install cxf-jaxws
+{code}
+
 1. Install features using mvn handler
 {code}
 feature:repo-add mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/1.0.0-m2/xml/features

Modified: karaf/trunk/manual/src/main/webapp/users-guide/wrapper.conf
URL: http://svn.apache.org/viewvc/karaf/trunk/manual/src/main/webapp/users-guide/wrapper.conf?rev=1535294&r1=1535293&r2=1535294&view=diff
==============================================================================
--- karaf/trunk/manual/src/main/webapp/users-guide/wrapper.conf (original)
+++ karaf/trunk/manual/src/main/webapp/users-guide/wrapper.conf Thu Oct 24 07:32:21 2013
@@ -23,7 +23,7 @@ h2. Installation
 Karaf Wrapper is an optional feature. To install it, simply type:
 
 {code}
-karaf@root> features:install wrapper
+karaf@root> feature:install wrapper
 {code}
 
 Once installed, wrapper feature will provide {{wrapper:install}} new command in the Karaf shell: