You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2018/09/03 06:10:49 UTC
svn commit: r1839907 [1/4] - in /karaf/site/production/manual/latest: ./
commands/
Author: jbonofre
Date: Mon Sep 3 06:10:48 2018
New Revision: 1839907
URL: http://svn.apache.org/viewvc?rev=1839907&view=rev
Log:
[scm-publish] Updating main site with Karaf documentation
Added:
karaf/site/production/manual/latest/commands/feature-refresh.adoc
karaf/site/production/manual/latest/commands/http-proxies.adoc
karaf/site/production/manual/latest/commands/http-proxy-add.adoc
karaf/site/production/manual/latest/commands/http-proxy-remove.adoc
karaf/site/production/manual/latest/commands/scheduler-reschedule.adoc
karaf/site/production/manual/latest/docker.html
Removed:
karaf/site/production/manual/latest/blueprint.html
karaf/site/production/manual/latest/dev-cdi.html
karaf/site/production/manual/latest/ds.html
karaf/site/production/manual/latest/services.html
Modified:
karaf/site/production/manual/latest/archetypes.html
karaf/site/production/manual/latest/branding.html
karaf/site/production/manual/latest/cdi.html
karaf/site/production/manual/latest/commands/bundle-capabilities.adoc
karaf/site/production/manual/latest/commands/bundle-classes.adoc
karaf/site/production/manual/latest/commands/bundle-diag.adoc
karaf/site/production/manual/latest/commands/bundle-headers.adoc
karaf/site/production/manual/latest/commands/bundle-info.adoc
karaf/site/production/manual/latest/commands/bundle-list.adoc
karaf/site/production/manual/latest/commands/bundle-load-test.adoc
karaf/site/production/manual/latest/commands/bundle-refresh.adoc
karaf/site/production/manual/latest/commands/bundle-requirements.adoc
karaf/site/production/manual/latest/commands/bundle-resolve.adoc
karaf/site/production/manual/latest/commands/bundle-restart.adoc
karaf/site/production/manual/latest/commands/bundle-services.adoc
karaf/site/production/manual/latest/commands/bundle-start.adoc
karaf/site/production/manual/latest/commands/bundle-stop.adoc
karaf/site/production/manual/latest/commands/bundle-uninstall.adoc
karaf/site/production/manual/latest/commands/bundle-update.adoc
karaf/site/production/manual/latest/commands/bundle-watch.adoc
karaf/site/production/manual/latest/commands/commands.adoc
karaf/site/production/manual/latest/commands/config-list.adoc
karaf/site/production/manual/latest/commands/config-meta.adoc
karaf/site/production/manual/latest/commands/dev-dump-create.adoc
karaf/site/production/manual/latest/commands/feature-export-bundles.adoc
karaf/site/production/manual/latest/commands/feature-info.adoc
karaf/site/production/manual/latest/commands/feature-install.adoc
karaf/site/production/manual/latest/commands/feature-list.adoc
karaf/site/production/manual/latest/commands/feature-regions.adoc
karaf/site/production/manual/latest/commands/feature-repo-add.adoc
karaf/site/production/manual/latest/commands/feature-repo-list.adoc
karaf/site/production/manual/latest/commands/feature-requirement-add.adoc
karaf/site/production/manual/latest/commands/feature-requirement-remove.adoc
karaf/site/production/manual/latest/commands/feature-uninstall.adoc
karaf/site/production/manual/latest/commands/instance-clone.adoc
karaf/site/production/manual/latest/commands/instance-connect.adoc
karaf/site/production/manual/latest/commands/instance-create.adoc
karaf/site/production/manual/latest/commands/instance-start.adoc
karaf/site/production/manual/latest/commands/jaas-group-create.adoc
karaf/site/production/manual/latest/commands/jaas-realm-manage.adoc
karaf/site/production/manual/latest/commands/jaas-sudo.adoc
karaf/site/production/manual/latest/commands/jaas-whoami.adoc
karaf/site/production/manual/latest/commands/jdbc-ds-create.adoc
karaf/site/production/manual/latest/commands/jms-browse.adoc
karaf/site/production/manual/latest/commands/jms-consume.adoc
karaf/site/production/manual/latest/commands/jms-count.adoc
karaf/site/production/manual/latest/commands/jms-create.adoc
karaf/site/production/manual/latest/commands/jms-info.adoc
karaf/site/production/manual/latest/commands/jms-move.adoc
karaf/site/production/manual/latest/commands/jms-queues.adoc
karaf/site/production/manual/latest/commands/jms-send.adoc
karaf/site/production/manual/latest/commands/jms-topics.adoc
karaf/site/production/manual/latest/commands/kar-install.adoc
karaf/site/production/manual/latest/commands/log-display.adoc
karaf/site/production/manual/latest/commands/log-load-test.adoc
karaf/site/production/manual/latest/commands/log-tail.adoc
karaf/site/production/manual/latest/commands/maven-http-proxy-list.adoc
karaf/site/production/manual/latest/commands/maven-http-proxy.adoc
karaf/site/production/manual/latest/commands/maven-repository-add.adoc
karaf/site/production/manual/latest/commands/maven-repository-change.adoc
karaf/site/production/manual/latest/commands/maven-repository-list.adoc
karaf/site/production/manual/latest/commands/maven-repository-remove.adoc
karaf/site/production/manual/latest/commands/maven-summary.adoc
karaf/site/production/manual/latest/commands/obr-deploy.adoc
karaf/site/production/manual/latest/commands/obr-resolve.adoc
karaf/site/production/manual/latest/commands/package-exports.adoc
karaf/site/production/manual/latest/commands/package-imports.adoc
karaf/site/production/manual/latest/commands/profile-copy.adoc
karaf/site/production/manual/latest/commands/profile-edit.adoc
karaf/site/production/manual/latest/commands/scheduler-schedule.adoc
karaf/site/production/manual/latest/commands/service-wait.adoc
karaf/site/production/manual/latest/commands/shell-info.adoc
karaf/site/production/manual/latest/commands/shell-java.adoc
karaf/site/production/manual/latest/commands/shell-threads.adoc
karaf/site/production/manual/latest/commands/ssh-ssh.adoc
karaf/site/production/manual/latest/commands/system-property.adoc
karaf/site/production/manual/latest/commands/system-shutdown.adoc
karaf/site/production/manual/latest/commands/wrapper-install.adoc
karaf/site/production/manual/latest/configuration.html
karaf/site/production/manual/latest/connect.html
karaf/site/production/manual/latest/console.html
karaf/site/production/manual/latest/creating-bundles.html
karaf/site/production/manual/latest/custom-distribution.html
karaf/site/production/manual/latest/debugging.html
karaf/site/production/manual/latest/deployers.html
karaf/site/production/manual/latest/developer-commands.html
karaf/site/production/manual/latest/directory-structure.html
karaf/site/production/manual/latest/ejb.html
karaf/site/production/manual/latest/extending.html
karaf/site/production/manual/latest/failover.html
karaf/site/production/manual/latest/github-contributions.html
karaf/site/production/manual/latest/http.html
karaf/site/production/manual/latest/index.html
karaf/site/production/manual/latest/installation.html
karaf/site/production/manual/latest/instances.html
karaf/site/production/manual/latest/jdbc.html
karaf/site/production/manual/latest/jms.html
karaf/site/production/manual/latest/jndi.html
karaf/site/production/manual/latest/jpa.html
karaf/site/production/manual/latest/jta.html
karaf/site/production/manual/latest/kar.html
karaf/site/production/manual/latest/karaf-maven-plugin.html
karaf/site/production/manual/latest/log.html
karaf/site/production/manual/latest/monitoring.html
karaf/site/production/manual/latest/obr.html
karaf/site/production/manual/latest/os-integration.html
karaf/site/production/manual/latest/overview.html
karaf/site/production/manual/latest/provisioning.html
karaf/site/production/manual/latest/quick-start.html
karaf/site/production/manual/latest/remote.html
karaf/site/production/manual/latest/scheduler.html
karaf/site/production/manual/latest/scripting.html
karaf/site/production/manual/latest/security-framework.html
karaf/site/production/manual/latest/security.html
karaf/site/production/manual/latest/start-stop.html
karaf/site/production/manual/latest/tuning.html
karaf/site/production/manual/latest/update-notes.html
karaf/site/production/manual/latest/urls.html
karaf/site/production/manual/latest/webconsole.html
karaf/site/production/manual/latest/webcontainer.html
karaf/site/production/manual/latest/writing-tests.html
Modified: karaf/site/production/manual/latest/archetypes.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/archetypes.html?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/archetypes.html (original)
+++ karaf/site/production/manual/latest/archetypes.html Mon Sep 3 06:10:48 2018
@@ -927,7 +927,7 @@ package: com.mycompany.package
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2017-07-26 16:36:29 +02:00
+Last updated 2018-06-17 17:18:28 +02:00
</div>
</div>
</body>
Modified: karaf/site/production/manual/latest/branding.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/branding.html?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/branding.html (original)
+++ karaf/site/production/manual/latest/branding.html Mon Sep 3 06:10:48 2018
@@ -506,6 +506,7 @@ table.CodeRay td.code>pre{padding:0}
<div id="toctitle">Table of Contents</div>
<ul class="sectlevel2">
<li><a href="#_branding">Branding</a></li>
+<li><a href="#_adding_a_branding_ssh_properties_file_to_etc">Adding a branding-ssh.properties file to etc</a></li>
</ul>
</div>
</div>
@@ -571,152 +572,18 @@ prompt = \u001B[1m${USER}@${APPLICATION}
<p>Start Karaf and you will see your branded Karaf console.</p>
</div>
</div>
-<div class="sect3">
-<h4 id="_branding_bundle">Branding bundle</h4>
-<div class="paragraph">
-<p>At startup, Apache Karaf is looking for a bundle which exports the <code>org.apache.karaf.branding</code> package, containing
-a <code>branding.properties</code> file.</p>
-</div>
-<div class="paragraph">
-<p>Basically, a branding bundle is a very simple bundle, just containing a <code>org/apache/karaf/branding/branding.properties</code>
-file.</p>
-</div>
-<div class="paragraph">
-<p>It’s easy to create such branding bundle using Apache Maven.</p>
-</div>
-<div class="paragraph">
-<p>The following <code>pom.xml</code> creates a branding bundle:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre><?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>your.group.id</groupId>
- <artifactId>your.branding.artifact.id</artifactId>
- <version>1.0-SNAPSHOT</version>
- <packaging>bundle</packaging>
- <name>Your Branding Bundle Name</name>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.4.0</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${project.artifactId}</bundle-SymbolicName>
- <Import-Package>*</Import-Package>
- <Private-Package>!*</Private-Package>
- <Export-Package>
- org.apache.karaf.branding
- </Export-Package>
- <Spring-Context>*;public-context:=false</Spring-Context>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>You can put your <code>branding.properties</code> file in the project resources (<code>src/main/resources/org/apache/karaf/branding/branding.properties</code>):</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre>welcome = This is my Karaf brand\r\n
-prompt = Hey ${USER}></pre>
-</div>
-</div>
-<div class="paragraph">
-<p>For instance, the default Apache Karaf branding properties file contains:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre>welcome = \
-\u001B[36m __ __ ____ \u001B[0m\r\n\
-\u001B[36m / //_/____ __________ _/ __/ \u001B[0m\r\n\
-\u001B[36m / ,< / __ `/ ___/ __ `/ /_ \u001B[0m\r\n\
-\u001B[36m / /| |/ /_/ / / / /_/ / __/ \u001B[0m\r\n\
-\u001B[36m /_/ |_|\\__,_/_/ \\__,_/_/ \u001B[0m\r\n\
-\r\n\
-\u001B[1m Apache Karaf\u001B[0m (${project.version})\r\n\
-\r\n\
-Hit '\u001B[1m<tab>\u001B[0m' for a list of available commands\r\n\
- and '\u001B[1m[cmd] --help\u001B[0m' for help on a specific command.\r\n\
-Hit '\u001B[1m<ctrl-d>\u001B[0m' or type '\u001B[1msystem:shutdown\u001B[0m' or '\u001B[1mlogout\u001B[0m' to shutdown Karaf.\r\n</pre>
-</div>
-</div>
-<div class="paragraph">
-<p>As you can see, the <code>branding.properties</code> contains two properties:</p>
-</div>
-<div class="ulist">
-<ul>
-<li>
-<p>welcome is the welcome message displayed when you start Apache Karaf console.</p>
-</li>
-<li>
-<p>prompt is the string used to display the console prompt. This string supports variables:</p>
-<div class="ulist">
-<ul>
-<li>
-<p>${USER` defines the user name of the prompt. Caveat — the user name is presently static and hardcoded to "karaf",
-however you can override here with your own static user name.</p>
-</li>
-<li>
-<p>$<code>APPLICATION</code> defines the Karaf instance name.</p>
-</li>
-</ul>
-</div>
-</li>
-</ul>
-</div>
-<div class="paragraph">
-<p>As you can see, both strings support ASCII escaped format. For instance \u001B[1m switches the foreground in bold
-and \u001B[0m switch back to normal.</p>
</div>
+<div class="sect2">
+<h3 id="_adding_a_branding_ssh_properties_file_to_etc">Adding a branding-ssh.properties file to etc</h3>
<div class="paragraph">
-<p>Some examples of customized prompt examples follow:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre># Define a user with fancy colors
-prompt = \u001B[36mmy-karaf-user\u001B[0m\u001B[1m@\u001B[0m\u001B[34m${APPLICATION}\u001B[0m></pre>
-</div>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre># Static sober prompt
-prompt = my-user@my-karaf></pre>
-</div>
-</div>
+<p>In a similar way, a <code>etc/branding-ssh.properties</code> file can be added. It should contain the same
+<code>welcome</code> and <code>prompt</code> entries but those will be used for external clients connecting through ssh.
+The values default to the ones in <code>etc/branding.properties</code> if this file is not defined.</p>
</div>
<div class="sect3">
-<h4 id="_installing_the_branding_bundle">Installing the branding bundle</h4>
-<div class="paragraph">
-<p>Thanks to the <code>pom.xml</code>, we can use <code>mvn</code> to build the branding bundle:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre>mvn install</pre>
-</div>
-</div>
-<div class="paragraph">
-<p>You just have to drop the file in the <code>lib</code> directory:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre>cp branding.jar /opt/apache-karaf-4.0.0/lib/karaf-branding.jar</pre>
-</div>
-</div>
+<h4 id="_branding_bundle">Branding bundle</h4>
<div class="paragraph">
-<p>You can now start Apache Karaf to see your branded console.</p>
+<p>See [<a href="https://github.com/apache/karaf/examples/karaf-branding-example/README.md" class="bare">https://github.com/apache/karaf/examples/karaf-branding-example/README.md</a>].</p>
</div>
</div>
<div class="sect3">
@@ -808,7 +675,7 @@ webconsole.stylesheet = /res/karaf/ui/we
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2017-07-26 16:36:29 +02:00
+Last updated 2018-08-17 21:42:57 +02:00
</div>
</div>
</body>
Modified: karaf/site/production/manual/latest/cdi.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/cdi.html?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/cdi.html (original)
+++ karaf/site/production/manual/latest/cdi.html Mon Sep 3 06:10:48 2018
@@ -593,7 +593,7 @@ karaf@root()> feature:install pax-cdi
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2017-07-26 16:36:29 +02:00
+Last updated 2018-05-18 16:02:21 +02:00
</div>
</div>
</body>
Modified: karaf/site/production/manual/latest/commands/bundle-capabilities.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/bundle-capabilities.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-capabilities.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-capabilities.adoc Mon Sep 3 06:10:48 2018
@@ -25,11 +25,11 @@ bundle:capabilities [options] [ids]
|--namespace
|
-|--context, -c
-|Use the given bundle context
-
|--help
|Display this help message
+
+|--context, -c
+|Use the given bundle context
|===
Modified: karaf/site/production/manual/latest/commands/bundle-classes.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/bundle-classes.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-classes.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-classes.adoc Mon Sep 3 06:10:48 2018
@@ -25,11 +25,11 @@ bundle:classes [options] [ids]
|-a, --display-all-files
|List all classes and files in the bundle
-|--context, -c
-|Use the given bundle context
-
|--help
|Display this help message
+
+|--context, -c
+|Use the given bundle context
|===
Modified: karaf/site/production/manual/latest/commands/bundle-diag.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/bundle-diag.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-diag.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-diag.adoc Mon Sep 3 06:10:48 2018
@@ -22,11 +22,11 @@ bundle:diag [options] [ids]
|===
|Name |Description
-|--context, -c
-|Use the given bundle context
-
|--help
|Display this help message
+
+|--context, -c
+|Use the given bundle context
|===
Modified: karaf/site/production/manual/latest/commands/bundle-headers.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/bundle-headers.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-headers.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-headers.adoc Mon Sep 3 06:10:48 2018
@@ -28,11 +28,11 @@ bundle:headers [options] [ids]
|--indent
|Indentation method
-|--context, -c
-|Use the given bundle context
-
|--help
|Display this help message
+
+|--context, -c
+|Use the given bundle context
|===
Modified: karaf/site/production/manual/latest/commands/bundle-info.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/bundle-info.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-info.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-info.adoc Mon Sep 3 06:10:48 2018
@@ -22,11 +22,11 @@ bundle:info [options] [ids]
|===
|Name |Description
-|--context, -c
-|Use the given bundle context
-
|--help
|Display this help message
+
+|--context, -c
+|Use the given bundle context
|===
Modified: karaf/site/production/manual/latest/commands/bundle-list.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/bundle-list.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-list.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-list.adoc Mon Sep 3 06:10:48 2018
@@ -31,6 +31,9 @@ bundle:list [options] [ids]
|-r
|Shows the bundle revisions
+|--help
+|Display this help message
+
|--no-ellipsis
|
@@ -46,9 +49,6 @@ bundle:list [options] [ids]
|-t
|Specifies the bundle threshold; bundles with a start-level less than this value will not get printed out.
-|--help
-|Display this help message
-
|--no-format
|Disable table rendered output
|===
Modified: karaf/site/production/manual/latest/commands/bundle-load-test.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/bundle-load-test.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-load-test.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-load-test.adoc Mon Sep 3 06:10:48 2018
@@ -19,15 +19,15 @@ bundle:load-test [options]
|--excludes
|List of bundles (ids or symbolic names) to exclude
+|--help
+|Display this help message
+
|--iterations
|number of iterations per thread
|--delay
|maximum delay between actions
-|--help
-|Display this help message
-
|--threads
|number of concurrent threads
|===
Modified: karaf/site/production/manual/latest/commands/bundle-refresh.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/bundle-refresh.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-refresh.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-refresh.adoc Mon Sep 3 06:10:48 2018
@@ -22,11 +22,11 @@ bundle:refresh [options] [ids]
|===
|Name |Description
-|--context, -c
-|Use the given bundle context
-
|--help
|Display this help message
+
+|--context, -c
+|Use the given bundle context
|===
Modified: karaf/site/production/manual/latest/commands/bundle-requirements.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/bundle-requirements.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-requirements.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-requirements.adoc Mon Sep 3 06:10:48 2018
@@ -25,11 +25,11 @@ bundle:requirements [options] [ids]
|--namespace
|
-|--context, -c
-|Use the given bundle context
-
|--help
|Display this help message
+
+|--context, -c
+|Use the given bundle context
|===
Modified: karaf/site/production/manual/latest/commands/bundle-resolve.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/bundle-resolve.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-resolve.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-resolve.adoc Mon Sep 3 06:10:48 2018
@@ -22,11 +22,11 @@ bundle:resolve [options] [ids]
|===
|Name |Description
-|--context, -c
-|Use the given bundle context
-
|--help
|Display this help message
+
+|--context, -c
+|Use the given bundle context
|===
Modified: karaf/site/production/manual/latest/commands/bundle-restart.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/bundle-restart.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-restart.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-restart.adoc Mon Sep 3 06:10:48 2018
@@ -22,11 +22,11 @@ bundle:restart [options] [ids]
|===
|Name |Description
-|--context, -c
-|Use the given bundle context
-
|--help
|Display this help message
+
+|--context, -c
+|Use the given bundle context
|===
Modified: karaf/site/production/manual/latest/commands/bundle-services.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/bundle-services.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-services.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-services.adoc Mon Sep 3 06:10:48 2018
@@ -25,6 +25,9 @@ bundle:services [options] [ids]
|-p
|Shows the properties of the services
+|--help
+|Display this help message
+
|-u
|Shows the services each bundle uses. (By default the provided services are shown)
@@ -33,9 +36,6 @@ bundle:services [options] [ids]
|-a
|Shows all services. (Karaf commands and completers are hidden by default)
-
-|--help
-|Display this help message
|===
Modified: karaf/site/production/manual/latest/commands/bundle-start.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/bundle-start.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-start.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-start.adoc Mon Sep 3 06:10:48 2018
@@ -25,11 +25,11 @@ bundle:start [options] [ids]
|-t, --transient
|Keep the bundle as auto-start
-|--context, -c
-|Use the given bundle context
-
|--help
|Display this help message
+
+|--context, -c
+|Use the given bundle context
|===
Modified: karaf/site/production/manual/latest/commands/bundle-stop.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/bundle-stop.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-stop.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-stop.adoc Mon Sep 3 06:10:48 2018
@@ -25,11 +25,11 @@ bundle:stop [options] [ids]
|-t, --transient
|Keep the bundle as auto-start
-|--context, -c
-|Use the given bundle context
-
|--help
|Display this help message
+
+|--context, -c
+|Use the given bundle context
|===
Modified: karaf/site/production/manual/latest/commands/bundle-uninstall.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/bundle-uninstall.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-uninstall.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-uninstall.adoc Mon Sep 3 06:10:48 2018
@@ -22,11 +22,11 @@ bundle:uninstall [options] [ids]
|===
|Name |Description
-|--context, -c
-|Use the given bundle context
-
|--help
|Display this help message
+
+|--context, -c
+|Use the given bundle context
|===
Modified: karaf/site/production/manual/latest/commands/bundle-update.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/bundle-update.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-update.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-update.adoc Mon Sep 3 06:10:48 2018
@@ -31,11 +31,11 @@ bundle:update [options] id [location]
|--raw
|Do not update the bundles's Bundle-UpdateLocation manifest header
-|-r, --refresh
-|Perform a refresh after the bundle update
-
|--help
|Display this help message
+
+|-r, --refresh
+|Perform a refresh after the bundle update
|===
Modified: karaf/site/production/manual/latest/commands/bundle-watch.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/bundle-watch.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/bundle-watch.adoc (original)
+++ karaf/site/production/manual/latest/commands/bundle-watch.adoc Mon Sep 3 06:10:48 2018
@@ -31,14 +31,14 @@ bundle:watch [options] [urls]
|--remove
|Removes bundles from the watch list
+|--help
+|Display this help message
+
|--start
|Starts watching the selected bundles
|--list
|Displays the watch list
-
-|--help
-|Display this help message
|===
== Details
Modified: karaf/site/production/manual/latest/commands/commands.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/commands.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/commands.adoc (original)
+++ karaf/site/production/manual/latest/commands/commands.adoc Mon Sep 3 06:10:48 2018
@@ -52,6 +52,7 @@
* [feature:info|feature-info]
* [feature:install|feature-install]
* [feature:list|feature-list]
+* [feature:refresh|feature-refresh]
* [feature:regions|feature-regions]
* [feature:repo-add|feature-repo-add]
* [feature:repo-list|feature-repo-list]
@@ -68,6 +69,9 @@
== http
* [http:list|http-list]
+* [http:proxies|http-proxies]
+* [http:proxy-add|http-proxy-add]
+* [http:proxy-remove|http-proxy-remove]
== instance
@@ -206,6 +210,7 @@
== scheduler
* [scheduler:list|scheduler-list]
+* [scheduler:reschedule|scheduler-reschedule]
* [scheduler:schedule|scheduler-schedule]
* [scheduler:trigger|scheduler-trigger]
* [scheduler:unschedule|scheduler-unschedule]
Modified: karaf/site/production/manual/latest/commands/config-list.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/config-list.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/config-list.adoc (original)
+++ karaf/site/production/manual/latest/commands/config-list.adoc Mon Sep 3 06:10:48 2018
@@ -24,6 +24,9 @@ config:list [options] [query]
|--help
|Display this help message
+
+|-s, --short
+|Only list the PIDs, not the properties
|===
Modified: karaf/site/production/manual/latest/commands/config-meta.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/config-meta.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/config-meta.adoc (original)
+++ karaf/site/production/manual/latest/commands/config-meta.adoc Mon Sep 3 06:10:48 2018
@@ -22,11 +22,11 @@ config:meta [options] pid
|===
|Name |Description
-|-c
-|Create respective config from metatype defaults
-
|--help
|Display this help message
+
+|-c
+|Create respective config from metatype defaults
|===
Modified: karaf/site/production/manual/latest/commands/dev-dump-create.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/dev-dump-create.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/dev-dump-create.adoc (original)
+++ karaf/site/production/manual/latest/commands/dev-dump-create.adoc Mon Sep 3 06:10:48 2018
@@ -28,11 +28,11 @@ dev:dump-create [options] [name]
|--no-thread-dump
|Include or not the thread dump in ZIP archive
-|-d, --directory
-|Creates dump in a directory in place of a ZIP archive
-
|--help
|Display this help message
+
+|-d, --directory
+|Creates dump in a directory in place of a ZIP archive
|===
Modified: karaf/site/production/manual/latest/commands/feature-export-bundles.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/feature-export-bundles.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/feature-export-bundles.adoc (original)
+++ karaf/site/production/manual/latest/commands/feature-export-bundles.adoc Mon Sep 3 06:10:48 2018
@@ -28,11 +28,11 @@ feature:export-bundles [options] feature
|-d, --dependencies-only
|This flag indicates that only bundles marked as a dependency will be exported.
-|-v, --version
-|The version of the feature you want to export bundles for. Default is latest
-
|--help
|Display this help message
+
+|-v, --version
+|The version of the feature you want to export bundles for. Default is latest
|===
Modified: karaf/site/production/manual/latest/commands/feature-info.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/feature-info.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/feature-info.adoc (original)
+++ karaf/site/production/manual/latest/commands/feature-info.adoc Mon Sep 3 06:10:48 2018
@@ -34,6 +34,9 @@ feature:info [options] name [version]
|-t, --tree
|Display feature tree
+|--help
+|Display this help message
+
|-c, --configuration
|Display configuration info
@@ -43,9 +46,6 @@ feature:info [options] name [version]
|--conditional
|Display conditional info
-|--help
-|Display this help message
-
|--color
|Colorize output (`always', `never' or `auto')
|===
Modified: karaf/site/production/manual/latest/commands/feature-install.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/feature-install.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/feature-install.adoc (original)
+++ karaf/site/production/manual/latest/commands/feature-install.adoc Mon Sep 3 06:10:48 2018
@@ -37,6 +37,9 @@ feature:install [options] features
|--store
|Store the resolution into the given file and result for offline analysis
+|--help
+|Display this help message
+
|-u, --upgrade
|Perform an upgrade of feature if previous version are installed or install it
@@ -51,9 +54,6 @@ feature:install [options] features
|-g, --region
|Region to install to
-
-|--help
-|Display this help message
|===
Modified: karaf/site/production/manual/latest/commands/feature-list.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/feature-list.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/feature-list.adoc (original)
+++ karaf/site/production/manual/latest/commands/feature-list.adoc Mon Sep 3 06:10:48 2018
@@ -22,12 +22,15 @@ feature:list [options]
|-o, --ordered
|Display a list using alphabetical order
-|-r, --required
-|Display a list of all required features only
-
|--help
|Display this help message
+|-b, --show-blacklisted
+|Display blacklisted features
+
+|-r, --required
+|Display a list of all required features only
+
|--no-format
|Disable table rendered output
|===
Added: karaf/site/production/manual/latest/commands/feature-refresh.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/feature-refresh.adoc?rev=1839907&view=auto
==============================================================================
--- karaf/site/production/manual/latest/commands/feature-refresh.adoc (added)
+++ karaf/site/production/manual/latest/commands/feature-refresh.adoc Mon Sep 3 06:10:48 2018
@@ -0,0 +1,32 @@
+= feature:refresh
+
+== Description
+
+Reloads features processing instructions and reprovisions existing features.
+
+== Syntax
+
+feature:refresh [options]
+
+== Options
+
+|===
+|Name |Description
+
+|-t, --simulate
+|Perform a simulation only
+
+|--features-wiring
+|Print the wiring between features
+
+|-v, --verbose
+|Explain what is being done
+
+|--all-wiring
+|Print the full wiring
+
+|--help
+|Display this help message
+|===
+
+
Modified: karaf/site/production/manual/latest/commands/feature-regions.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/feature-regions.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/feature-regions.adoc (original)
+++ karaf/site/production/manual/latest/commands/feature-regions.adoc Mon Sep 3 06:10:48 2018
@@ -25,6 +25,9 @@ feature:regions [options] [regions]
|-n, --namespaces
|Show namespaces in each filter.
+|--help
+|Display this help message
+
|-f, --filters
|Show filters.
@@ -33,9 +36,6 @@ feature:regions [options] [regions]
|-b, --bundles
|Show bundles in each region.
-
-|--help
-|Display this help message
|===
Modified: karaf/site/production/manual/latest/commands/feature-repo-add.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/feature-repo-add.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/feature-repo-add.adoc (original)
+++ karaf/site/production/manual/latest/commands/feature-repo-add.adoc Mon Sep 3 06:10:48 2018
@@ -25,11 +25,11 @@ feature:repo-add [options] name/url [ver
|===
|Name |Description
-|-i, --install
-|Install all features contained in the features repository
-
|--help
|Display this help message
+
+|-i, --install
+|Install all features contained in the features repository
|===
Modified: karaf/site/production/manual/latest/commands/feature-repo-list.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/feature-repo-list.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/feature-repo-list.adoc (original)
+++ karaf/site/production/manual/latest/commands/feature-repo-list.adoc Mon Sep 3 06:10:48 2018
@@ -16,6 +16,9 @@ feature:repo-list [options]
|-r
|Reload all feature urls
+|-b, --show-blacklisted
+|Also display blacklisted repositories
+
|--help
|Display this help message
Modified: karaf/site/production/manual/latest/commands/feature-requirement-add.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/feature-requirement-add.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/feature-requirement-add.adoc (original)
+++ karaf/site/production/manual/latest/commands/feature-requirement-add.adoc Mon Sep 3 06:10:48 2018
@@ -37,6 +37,9 @@ feature:requirement-add [options] requir
|--store
|Store the resolution into the given file and result for offline analysis
+|--help
+|Display this help message
+
|-r, --no-auto-refresh
|Do not automatically refresh bundles
@@ -48,9 +51,6 @@ feature:requirement-add [options] requir
|-g, --region
|Region to install to
-
-|--help
-|Display this help message
|===
Modified: karaf/site/production/manual/latest/commands/feature-requirement-remove.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/feature-requirement-remove.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/feature-requirement-remove.adoc (original)
+++ karaf/site/production/manual/latest/commands/feature-requirement-remove.adoc Mon Sep 3 06:10:48 2018
@@ -40,6 +40,9 @@ feature:requirement-remove [options] req
|--store
|Store the resolution into the given file and result for offline analysis
+|--help
+|Display this help message
+
|-r, --no-auto-refresh
|Do not automatically refresh bundles
@@ -48,9 +51,6 @@ feature:requirement-remove [options] req
|-m, --no-auto-manage
|Do not automatically manage bundles
-
-|--help
-|Display this help message
|===
Modified: karaf/site/production/manual/latest/commands/feature-uninstall.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/feature-uninstall.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/feature-uninstall.adoc (original)
+++ karaf/site/production/manual/latest/commands/feature-uninstall.adoc Mon Sep 3 06:10:48 2018
@@ -28,14 +28,14 @@ feature:uninstall [options] features
|-v, --verbose
|Explain what is being done
+|--help
+|Display this help message
+
|-r, --no-auto-refresh
|Do not automatically refresh bundles
|-g, --region
|Region to install to
-
-|--help
-|Display this help message
|===
Added: karaf/site/production/manual/latest/commands/http-proxies.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/http-proxies.adoc?rev=1839907&view=auto
==============================================================================
--- karaf/site/production/manual/latest/commands/http-proxies.adoc (added)
+++ karaf/site/production/manual/latest/commands/http-proxies.adoc Mon Sep 3 06:10:48 2018
@@ -0,0 +1,20 @@
+= http:proxies
+
+== Description
+
+List the HTTP proxies
+
+== Syntax
+
+http:proxies [options]
+
+== Options
+
+|===
+|Name |Description
+
+|--help
+|Display this help message
+|===
+
+
Added: karaf/site/production/manual/latest/commands/http-proxy-add.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/http-proxy-add.adoc?rev=1839907&view=auto
==============================================================================
--- karaf/site/production/manual/latest/commands/http-proxy-add.adoc (added)
+++ karaf/site/production/manual/latest/commands/http-proxy-add.adoc Mon Sep 3 06:10:48 2018
@@ -0,0 +1,32 @@
+= http:proxy-add
+
+== Description
+
+Add a new HTTP proxy
+
+== Syntax
+
+http:proxy-add [options] url proxyTo
+
+== Arguments
+
+|===
+|Name |Description
+
+| url
+| HTTP proxy URL
+
+| proxyTo
+| HTTP location to proxy on the prefix
+|===
+
+== Options
+
+|===
+|Name |Description
+
+|--help
+|Display this help message
+|===
+
+
Added: karaf/site/production/manual/latest/commands/http-proxy-remove.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/http-proxy-remove.adoc?rev=1839907&view=auto
==============================================================================
--- karaf/site/production/manual/latest/commands/http-proxy-remove.adoc (added)
+++ karaf/site/production/manual/latest/commands/http-proxy-remove.adoc Mon Sep 3 06:10:48 2018
@@ -0,0 +1,29 @@
+= http:proxy-remove
+
+== Description
+
+Remove an existing HTTP proxy
+
+== Syntax
+
+http:proxy-remove [options] prefix
+
+== Arguments
+
+|===
+|Name |Description
+
+| prefix
+| The HTTP proxy prefix
+|===
+
+== Options
+
+|===
+|Name |Description
+
+|--help
+|Display this help message
+|===
+
+
Modified: karaf/site/production/manual/latest/commands/instance-clone.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/instance-clone.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/instance-clone.adoc (original)
+++ karaf/site/production/manual/latest/commands/instance-clone.adoc Mon Sep 3 06:10:48 2018
@@ -43,12 +43,12 @@ instance:clone [options] name cloneName
|-rs, --rmi-server-port
|Port number for RMI server connection
-|-o, --java-opts
-|JVM options to use when launching the cloned instance
-
|--help
|Display this help message
+|-o, --java-opts
+|JVM options to use when launching the cloned instance
+
|-br, --binary-resource
|Add a text resource to the instance
|===
Modified: karaf/site/production/manual/latest/commands/instance-connect.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/instance-connect.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/instance-connect.adoc (original)
+++ karaf/site/production/manual/latest/commands/instance-connect.adoc Mon Sep 3 06:10:48 2018
@@ -31,11 +31,11 @@ instance:connect [options] name [command
|-p, --password
|Remote password
-|-u, --username
-|Remote user name
-
|--help
|Display this help message
+
+|-u, --username
+|Remote user name
|===
Modified: karaf/site/production/manual/latest/commands/instance-create.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/instance-create.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/instance-create.adoc (original)
+++ karaf/site/production/manual/latest/commands/instance-create.adoc Mon Sep 3 06:10:48 2018
@@ -31,15 +31,15 @@ instance:create [options] name
|-rs, --rmi-server-port
|Port number for RMI server connection
+|--help
+|Display this help message
+
|-p, --profiles
|Profiles to install on the instance
|-l, --location
|Location of the new container instance in the file system
-|--help
-|Display this help message
-
|-o, --java-opts
|JVM options to use when launching the instance
Modified: karaf/site/production/manual/latest/commands/instance-start.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/instance-start.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/instance-start.adoc (original)
+++ karaf/site/production/manual/latest/commands/instance-start.adoc Mon Sep 3 06:10:48 2018
@@ -25,12 +25,12 @@ instance:start [options] name
|-o, --java-opts
|Java options when launching the instance
-|-w, --wait
-|Wait for the instance to be fully started
-
|--help
|Display this help message
+|-w, --wait
+|Wait for the instance to be fully started
+
|-d, --debug
|Start the instance in debug mode
|===
Modified: karaf/site/production/manual/latest/commands/jaas-group-create.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/jaas-group-create.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/jaas-group-create.adoc (original)
+++ karaf/site/production/manual/latest/commands/jaas-group-create.adoc Mon Sep 3 06:10:48 2018
@@ -2,7 +2,7 @@
== Description
-create a group in a realm
+Create a group in a realm
== Syntax
Modified: karaf/site/production/manual/latest/commands/jaas-realm-manage.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/jaas-realm-manage.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/jaas-realm-manage.adoc (original)
+++ karaf/site/production/manual/latest/commands/jaas-realm-manage.adoc Mon Sep 3 06:10:48 2018
@@ -22,14 +22,14 @@ jaas:realm-manage [options]
|-f, --force
|Force the management of this realm, even if another one was under management
+|--help
+|Display this help message
+
|--index
|Realm Index
|--module
|JAAS Login Module Class Name
-
-|--help
-|Display this help message
|===
Modified: karaf/site/production/manual/latest/commands/jaas-sudo.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/jaas-sudo.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/jaas-sudo.adoc (original)
+++ karaf/site/production/manual/latest/commands/jaas-sudo.adoc Mon Sep 3 06:10:48 2018
@@ -25,11 +25,11 @@ jaas:sudo [options] [command]
|--realm
|
-|--user
-|
-
|--help
|Display this help message
+
+|--user
+|
|===
Modified: karaf/site/production/manual/latest/commands/jaas-whoami.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/jaas-whoami.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/jaas-whoami.adoc (original)
+++ karaf/site/production/manual/latest/commands/jaas-whoami.adoc Mon Sep 3 06:10:48 2018
@@ -19,14 +19,14 @@ jaas:whoami [options]
|-g, --groups
|Show groups instead of user.
+|--help
+|Display this help message
+
|-a, --all
|Show all JAAS principals regardless of type.
|-r, --roles
|Show roles instead of user.
-
-|--help
-|Display this help message
|===
Modified: karaf/site/production/manual/latest/commands/jdbc-ds-create.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/jdbc-ds-create.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/jdbc-ds-create.adoc (original)
+++ karaf/site/production/manual/latest/commands/jdbc-ds-create.adoc Mon Sep 3 06:10:48 2018
@@ -34,15 +34,15 @@ jdbc:ds-create [options] name
|-dn, --driverName
|org.osgi.driver.name property of the DataSourceFactory
+|--help
+|Display this help message
+
|-url
|The JDBC URL to use
|-dc, --driverClass
|org.osgi.driver.class property of the DataSourceFactory
-|--help
-|Display this help message
-
|-u, --username
|The database username
|===
Modified: karaf/site/production/manual/latest/commands/jms-browse.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/jms-browse.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/jms-browse.adoc (original)
+++ karaf/site/production/manual/latest/commands/jms-browse.adoc Mon Sep 3 06:10:48 2018
@@ -28,6 +28,9 @@ jms:browse [options] connectionFactory q
|-v, --verbose
|Display JMS properties
+|--help
+|Display this help message
+
|-s, --selector
|The selector to select the messages to browse
@@ -36,9 +39,6 @@ jms:browse [options] connectionFactory q
|-u, --username
|Username to connect to the JMS broker
-
-|--help
-|Display this help message
|===
Modified: karaf/site/production/manual/latest/commands/jms-consume.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/jms-consume.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/jms-consume.adoc (original)
+++ karaf/site/production/manual/latest/commands/jms-consume.adoc Mon Sep 3 06:10:48 2018
@@ -28,14 +28,14 @@ jms:consume [options] connectionFactory
|-s, --selector
|The selector to use to select the messages to consume
+|--help
+|Display this help message
+
|-p, --password
|Password to connect to the JMS broker
|-u, --username
|Username to connect to the JMS broker
-
-|--help
-|Display this help message
|===
Modified: karaf/site/production/manual/latest/commands/jms-count.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/jms-count.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/jms-count.adoc (original)
+++ karaf/site/production/manual/latest/commands/jms-count.adoc Mon Sep 3 06:10:48 2018
@@ -25,14 +25,14 @@ jms:count [options] connectionFactory qu
|===
|Name |Description
+|--help
+|Display this help message
+
|-p, --password
|Password to connect to the JMS broker
|-u, --username
|Username to connect to the JMS broker
-
-|--help
-|Display this help message
|===
Modified: karaf/site/production/manual/latest/commands/jms-create.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/jms-create.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/jms-create.adoc (original)
+++ karaf/site/production/manual/latest/commands/jms-create.adoc Mon Sep 3 06:10:48 2018
@@ -25,6 +25,12 @@ jms:create [options] name
|-t, --type
|The JMS connection factory type (ActiveMQ, Artemis or WebsphereMQ)
+|--pool
+|The pool mechanism to use for this connection factory
+
+|--help
+|Display this help message
+
|--url
|URL of the JMS broker. For WebsphereMQ type, the URL is hostname/port/queuemanager/channel
@@ -33,9 +39,6 @@ jms:create [options] name
|-u, --username
|Username to connect to the JMS broker
-
-|--help
-|Display this help message
|===
Modified: karaf/site/production/manual/latest/commands/jms-info.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/jms-info.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/jms-info.adoc (original)
+++ karaf/site/production/manual/latest/commands/jms-info.adoc Mon Sep 3 06:10:48 2018
@@ -22,14 +22,14 @@ jms:info [options] connectionFactory
|===
|Name |Description
+|--help
+|Display this help message
+
|-p, --password
|Password to connect to the JMS broker
|-u, --username
|Username to connect to the JMS broker
-
-|--help
-|Display this help message
|===
Modified: karaf/site/production/manual/latest/commands/jms-move.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/jms-move.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/jms-move.adoc (original)
+++ karaf/site/production/manual/latest/commands/jms-move.adoc Mon Sep 3 06:10:48 2018
@@ -31,14 +31,14 @@ jms:move [options] connectionFactory sou
|-s, --selector
|Selector to move only some messages
+|--help
+|Display this help message
+
|-p, --password
|Password to connect to the JMS broker
|-u, --username
|Username to connect to the JMS broker
-
-|--help
-|Display this help message
|===
Modified: karaf/site/production/manual/latest/commands/jms-queues.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/jms-queues.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/jms-queues.adoc (original)
+++ karaf/site/production/manual/latest/commands/jms-queues.adoc Mon Sep 3 06:10:48 2018
@@ -22,14 +22,14 @@ jms:queues [options] connectionFactory
|===
|Name |Description
+|--help
+|Display this help message
+
|-p, --password
|Password to connect to the JMS broker
|-u, --username
|Username to connect to the JMS broker
-
-|--help
-|Display this help message
|===
Modified: karaf/site/production/manual/latest/commands/jms-send.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/jms-send.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/jms-send.adoc (original)
+++ karaf/site/production/manual/latest/commands/jms-send.adoc Mon Sep 3 06:10:48 2018
@@ -28,6 +28,9 @@ jms:send [options] connectionFactory que
|===
|Name |Description
+|--help
+|Display this help message
+
|-r, --replyTo
|Set the message ReplyTo
@@ -36,9 +39,6 @@ jms:send [options] connectionFactory que
|-u, --username
|Username to connect to the JMS broker
-
-|--help
-|Display this help message
|===
Modified: karaf/site/production/manual/latest/commands/jms-topics.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/jms-topics.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/jms-topics.adoc (original)
+++ karaf/site/production/manual/latest/commands/jms-topics.adoc Mon Sep 3 06:10:48 2018
@@ -22,14 +22,14 @@ jms:topics [options] connectionFactory
|===
|Name |Description
+|--help
+|Display this help message
+
|-p, --password
|Password to connect to the JMS broker
|-u, --username
|Username to connect to the JMS broker
-
-|--help
-|Display this help message
|===
Modified: karaf/site/production/manual/latest/commands/kar-install.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/kar-install.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/kar-install.adoc (original)
+++ karaf/site/production/manual/latest/commands/kar-install.adoc Mon Sep 3 06:10:48 2018
@@ -22,11 +22,11 @@ kar:install [options] url
|===
|Name |Description
-|--no-start
-|Do not start the bundles automatically
-
|--help
|Display this help message
+
+|--no-start
+|Do not start the bundles automatically
|===
Modified: karaf/site/production/manual/latest/commands/log-display.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/log-display.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/log-display.adoc (original)
+++ karaf/site/production/manual/latest/commands/log-display.adoc Mon Sep 3 06:10:48 2018
@@ -31,11 +31,11 @@ log:display [options] [logger]
|-n
|Number of entries to display
-|-l, --level
-|The minimal log level to display
-
|--help
|Display this help message
+
+|-l, --level
+|The minimal log level to display
|===
Modified: karaf/site/production/manual/latest/commands/log-load-test.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/log-load-test.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/log-load-test.adoc (original)
+++ karaf/site/production/manual/latest/commands/log-load-test.adoc Mon Sep 3 06:10:48 2018
@@ -13,14 +13,14 @@ log:load-test [options]
|===
|Name |Description
+|--help
+|Display this help message
+
|--messaged
|
|--threads
|
-
-|--help
-|Display this help message
|===
Modified: karaf/site/production/manual/latest/commands/log-tail.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/log-tail.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/log-tail.adoc (original)
+++ karaf/site/production/manual/latest/commands/log-tail.adoc Mon Sep 3 06:10:48 2018
@@ -31,11 +31,11 @@ log:tail [options] [logger]
|-n
|Number of entries to display
-|-l, --level
-|The minimal log level to display
-
|--help
|Display this help message
+
+|-l, --level
+|The minimal log level to display
|===
Modified: karaf/site/production/manual/latest/commands/maven-http-proxy-list.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/maven-http-proxy-list.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/maven-http-proxy-list.adoc (original)
+++ karaf/site/production/manual/latest/commands/maven-http-proxy-list.adoc Mon Sep 3 06:10:48 2018
@@ -13,11 +13,11 @@ maven:http-proxy-list [options]
|===
|Name |Description
-|-x, --show-passwords
-|Do not hide passwords related to Maven encryption
-
|--help
|Display this help message
+
+|-x, --show-passwords
+|Do not hide passwords related to Maven encryption
|===
Modified: karaf/site/production/manual/latest/commands/maven-http-proxy.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/maven-http-proxy.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/maven-http-proxy.adoc (original)
+++ karaf/site/production/manual/latest/commands/maven-http-proxy.adoc Mon Sep 3 06:10:48 2018
@@ -34,6 +34,9 @@ maven:http-proxy [options] [hostPort]
|--change
|Changes HTTP proxy configuration in Maven settings
+|--help
+|Display this help message
+
|-n, --non-proxy-hosts
|Non-proxied hosts (in the format '192.168.*|localhost|...')
@@ -48,9 +51,6 @@ maven:http-proxy [options] [hostPort]
|-x, --show-passwords
|Do not hide passwords related to Maven encryption
-
-|--help
-|Display this help message
|===
Modified: karaf/site/production/manual/latest/commands/maven-repository-add.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/maven-repository-add.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/maven-repository-add.adoc (original)
+++ karaf/site/production/manual/latest/commands/maven-repository-add.adoc Mon Sep 3 06:10:48 2018
@@ -46,15 +46,15 @@ maven:repository-add [options] [uri]
|-cp, --checksum-policy
|Checksum policy for repository (ignore, warn (default), fail)
+|--help
+|Display this help message
+
|-u, --username
|Username for remote repository
|-x, --show-passwords
|Do not hide passwords related to Maven encryption
-|--help
-|Display this help message
-
|-up, --update-policy
|Update policy for repository (never, daily (default), interval:N, always)
|===
Modified: karaf/site/production/manual/latest/commands/maven-repository-change.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/maven-repository-change.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/maven-repository-change.adoc (original)
+++ karaf/site/production/manual/latest/commands/maven-repository-change.adoc Mon Sep 3 06:10:48 2018
@@ -43,15 +43,15 @@ maven:repository-change [options] [uri]
|-cp, --checksum-policy
|Checksum policy for repository (ignore, warn (default), fail)
+|--help
+|Display this help message
+
|-u, --username
|Username for remote repository
|-x, --show-passwords
|Do not hide passwords related to Maven encryption
-|--help
-|Display this help message
-
|-up, --update-policy
|Update policy for repository (never, daily (default), interval:N, always)
|===
Modified: karaf/site/production/manual/latest/commands/maven-repository-list.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/maven-repository-list.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/maven-repository-list.adoc (original)
+++ karaf/site/production/manual/latest/commands/maven-repository-list.adoc Mon Sep 3 06:10:48 2018
@@ -16,11 +16,11 @@ maven:repository-list [options]
|-v, --verbose
|Show additional information (policies, source)
-|-x, --show-passwords
-|Do not hide passwords related to Maven encryption
-
|--help
|Display this help message
+
+|-x, --show-passwords
+|Do not hide passwords related to Maven encryption
|===
Modified: karaf/site/production/manual/latest/commands/maven-repository-remove.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/maven-repository-remove.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/maven-repository-remove.adoc (original)
+++ karaf/site/production/manual/latest/commands/maven-repository-remove.adoc Mon Sep 3 06:10:48 2018
@@ -22,11 +22,11 @@ maven:repository-remove [options]
|-d, --default
|Edit default repository instead of remote one
-|-x, --show-passwords
-|Do not hide passwords related to Maven encryption
-
|--help
|Display this help message
+
+|-x, --show-passwords
+|Do not hide passwords related to Maven encryption
|===
Modified: karaf/site/production/manual/latest/commands/maven-summary.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/maven-summary.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/maven-summary.adoc (original)
+++ karaf/site/production/manual/latest/commands/maven-summary.adoc Mon Sep 3 06:10:48 2018
@@ -22,11 +22,11 @@ maven:summary [options]
|-d, --description
|Adds description of Maven configuration options
-|-x, --show-passwords
-|Do not hide passwords related to Maven encryption
-
|--help
|Display this help message
+
+|-x, --show-passwords
+|Do not hide passwords related to Maven encryption
|===
Modified: karaf/site/production/manual/latest/commands/obr-deploy.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/obr-deploy.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/obr-deploy.adoc (original)
+++ karaf/site/production/manual/latest/commands/obr-deploy.adoc Mon Sep 3 06:10:48 2018
@@ -25,11 +25,11 @@ obr:deploy [options] bundles
|-d, --deployOptional
|Deploy optional bundles
-|-s, --start
-|Start the deployed bundles
-
|--help
|Display this help message
+
+|-s, --start
+|Start the deployed bundles
|===
Modified: karaf/site/production/manual/latest/commands/obr-resolve.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/obr-resolve.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/obr-resolve.adoc (original)
+++ karaf/site/production/manual/latest/commands/obr-resolve.adoc Mon Sep 3 06:10:48 2018
@@ -37,11 +37,11 @@ obr:resolve [options] requirements
|--optional
|Resolve optional dependencies
-|--start
-|Deploy and start the selected bundles
-
|--help
|Display this help message
+
+|--start
+|Deploy and start the selected bundles
|===
Modified: karaf/site/production/manual/latest/commands/package-exports.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/package-exports.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/package-exports.adoc (original)
+++ karaf/site/production/manual/latest/commands/package-exports.adoc Mon Sep 3 06:10:48 2018
@@ -19,15 +19,15 @@ package:exports [options]
|-d
|Only show packages that are exported by more than one bundle
+|--help
+|Display this help message
+
|--show-name-only
|Show only package name
|-p
|Only show package starting with given name
-|--help
-|Display this help message
-
|--no-format
|Disable table rendered output
|===
Modified: karaf/site/production/manual/latest/commands/package-imports.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/package-imports.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/package-imports.adoc (original)
+++ karaf/site/production/manual/latest/commands/package-imports.adoc Mon Sep 3 06:10:48 2018
@@ -16,6 +16,9 @@ package:imports [options]
|-b
|Only show imports of the given bundle id
+|--help
+|Display this help message
+
|--show-name-only
|Show only package name
@@ -25,9 +28,6 @@ package:imports [options]
|-p
|Only show package starting with given name
-|--help
-|Display this help message
-
|--no-format
|Disable table rendered output
|===
Modified: karaf/site/production/manual/latest/commands/profile-copy.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/profile-copy.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/profile-copy.adoc (original)
+++ karaf/site/production/manual/latest/commands/profile-copy.adoc Mon Sep 3 06:10:48 2018
@@ -25,11 +25,11 @@ profile:copy [options] source profile ta
|===
|Name |Description
-|-f, --force
-|Flag to allow overwriting the target profile (if exists).
-
|--help
|Display this help message
+
+|-f, --force
+|Flag to allow overwriting the target profile (if exists).
|===
Modified: karaf/site/production/manual/latest/commands/profile-edit.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/profile-edit.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/profile-edit.adoc (original)
+++ karaf/site/production/manual/latest/commands/profile-edit.adoc Mon Sep 3 06:10:48 2018
@@ -46,15 +46,15 @@ profile:edit [options] profile
|--resource
|Selects a resource under the profile to edit. This option should only be used alone.
+|--help
+|Display this help message
+
|--set
|Set or create values (selected by default).
|-i, --import-pid
|Imports the pids that are edited, from local OSGi config admin
-|--help
-|Display this help message
-
|-f, --features
|Edit features. To specify multiple features, specify this flag multiple times. For example, --features foo --features bar.
Added: karaf/site/production/manual/latest/commands/scheduler-reschedule.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/scheduler-reschedule.adoc?rev=1839907&view=auto
==============================================================================
--- karaf/site/production/manual/latest/commands/scheduler-reschedule.adoc (added)
+++ karaf/site/production/manual/latest/commands/scheduler-reschedule.adoc Mon Sep 3 06:10:48 2018
@@ -0,0 +1,44 @@
+= scheduler:reschedule
+
+== Description
+
+Update scheduling of an existing job
+
+== Syntax
+
+scheduler:reschedule [options] name
+
+== Arguments
+
+|===
+|Name |Description
+
+| name
+| The job name
+|===
+
+== Options
+
+|===
+|Name |Description
+
+|--period
+|Time during executions (in seconds)
+
+|--at
+|Absolute date in ISO format (ex: 2014-05-13T13:56:45)
+
+|--times
+|Number of times this job should be executed
+
+|--help
+|Display this help message
+
+|--concurrent
+|Should jobs run concurrently or not (defaults to false)
+
+|--cron
+|The cron expression
+|===
+
+
Modified: karaf/site/production/manual/latest/commands/scheduler-schedule.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/scheduler-schedule.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/scheduler-schedule.adoc (original)
+++ karaf/site/production/manual/latest/commands/scheduler-schedule.adoc Mon Sep 3 06:10:48 2018
@@ -31,6 +31,9 @@ scheduler:schedule [options] script
|--times
|Number of times this job should be executed
+|--help
+|Display this help message
+
|--name
|Name of this job
@@ -39,9 +42,6 @@ scheduler:schedule [options] script
|--cron
|The cron expression
-
-|--help
-|Display this help message
|===
Modified: karaf/site/production/manual/latest/commands/service-wait.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/service-wait.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/service-wait.adoc (original)
+++ karaf/site/production/manual/latest/commands/service-wait.adoc Mon Sep 3 06:10:48 2018
@@ -25,11 +25,11 @@ service:wait [options] service
|-t, --timeout
|timeout to wait for the service (in milliseconds, negative to not wait at all, zero to wait forever)
-|-e, --exception
-|throw an exception if the service is not found after the timeout
-
|--help
|Display this help message
+
+|-e, --exception
+|throw an exception if the service is not found after the timeout
|===
Modified: karaf/site/production/manual/latest/commands/shell-info.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/shell-info.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/shell-info.adoc (original)
+++ karaf/site/production/manual/latest/commands/shell-info.adoc Mon Sep 3 06:10:48 2018
@@ -13,6 +13,9 @@ shell:info [options]
|===
|Name |Description
+|--memory-pools, -mp
+|Includes detailed information about memory pools
+
|--help
|Display this help message
|===
Modified: karaf/site/production/manual/latest/commands/shell-java.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/shell-java.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/shell-java.adoc (original)
+++ karaf/site/production/manual/latest/commands/shell-java.adoc Mon Sep 3 06:10:48 2018
@@ -25,11 +25,11 @@ shell:java [options] className [argument
|===
|Name |Description
-|-m, --method
-|Invoke a named method
-
|--help
|Display this help message
+
+|-m, --method
+|Invoke a named method
|===
Modified: karaf/site/production/manual/latest/commands/shell-threads.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/shell-threads.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/shell-threads.adoc (original)
+++ karaf/site/production/manual/latest/commands/shell-threads.adoc Mon Sep 3 06:10:48 2018
@@ -37,15 +37,15 @@ shell:threads [options] [id]
|--monitors
|Display monitors
+|--help
+|Display this help message
+
|-t, --threshold
|Minimal number of interesting stack trace line to display a thread
|--locks
|Display locks
-|--help
-|Display this help message
-
|--no-format
|Disable table rendered output
|===
Modified: karaf/site/production/manual/latest/commands/ssh-ssh.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/ssh-ssh.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/ssh-ssh.adoc (original)
+++ karaf/site/production/manual/latest/commands/ssh-ssh.adoc Mon Sep 3 06:10:48 2018
@@ -34,6 +34,9 @@ ssh:ssh [options] hostname [command]
|-q
|Quiet Mode. Do not ask for confirmations
+|--help
+|Display this help message
+
|-r, --retries
|retry connection establishment (up to attempts times)
@@ -42,9 +45,6 @@ ssh:ssh [options] hostname [command]
|-k, --keyfile
|The private keyFile location when using key login, need have BouncyCastle registered as security provider using this flag
-
-|--help
-|Display this help message
|===
Modified: karaf/site/production/manual/latest/commands/system-property.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/system-property.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/system-property.adoc (original)
+++ karaf/site/production/manual/latest/commands/system-property.adoc Mon Sep 3 06:10:48 2018
@@ -31,11 +31,11 @@ system:property [options] [key] [value]
|-p, --persistent
|Persist the new value to the etc/system.properties file
-|-u, --unset
-|Show unset know properties with value unset
-
|--help
|Display this help message
+
+|-u, --unset
+|Show unset know properties with value unset
|===
Modified: karaf/site/production/manual/latest/commands/system-shutdown.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/system-shutdown.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/system-shutdown.adoc (original)
+++ karaf/site/production/manual/latest/commands/system-shutdown.adoc Mon Sep 3 06:10:48 2018
@@ -25,15 +25,15 @@ system:shutdown [options] [time]
|-c, --clean, --clean-all, -ca
|Force a clean restart by deleting the data directory
+|--help
+|Display this help message
+
|-h, --halt
|Halt the Karaf container.
|-cc, --clean-cache, -cc
|Force a clean restart by deleting the cache directory
-|--help
-|Display this help message
-
|-f, --force
|Force the shutdown without confirmation message.
Modified: karaf/site/production/manual/latest/commands/wrapper-install.adoc
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/commands/wrapper-install.adoc?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/commands/wrapper-install.adoc (original)
+++ karaf/site/production/manual/latest/commands/wrapper-install.adoc Mon Sep 3 06:10:48 2018
@@ -22,6 +22,9 @@ wrapper:install [options]
|-s, --start-type
|Mode in which the service is installed. AUTO_START or DEMAND_START (Default: AUTO_START)
+|--help
+|Display this help message
+
|-e, --env
|Specify environment variable and values. To specify multiple environment variable and values, specify this flag multiple times.
@@ -30,9 +33,6 @@ wrapper:install [options]
|-d, --display
|The display name of the service.
-
-|--help
-|Display this help message
|===
Modified: karaf/site/production/manual/latest/configuration.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/configuration.html?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/configuration.html (original)
+++ karaf/site/production/manual/latest/configuration.html Mon Sep 3 06:10:48 2018
@@ -1036,7 +1036,7 @@ pattern | Pattern | String | %d{ABSOLUTE
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2017-11-15 16:55:26 +01:00
+Last updated 2018-07-31 07:02:52 +02:00
</div>
</div>
</body>
Modified: karaf/site/production/manual/latest/connect.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/connect.html?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/connect.html (original)
+++ karaf/site/production/manual/latest/connect.html Mon Sep 3 06:10:48 2018
@@ -609,7 +609,7 @@ public class Main {
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2017-07-26 16:36:29 +02:00
+Last updated 2018-05-18 16:02:21 +02:00
</div>
</div>
</body>
Modified: karaf/site/production/manual/latest/console.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/console.html?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/console.html (original)
+++ karaf/site/production/manual/latest/console.html Mon Sep 3 06:10:48 2018
@@ -1190,7 +1190,7 @@ some commands, or limit the values allow
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2017-07-26 16:36:29 +02:00
+Last updated 2018-05-18 16:02:21 +02:00
</div>
</div>
</body>
Modified: karaf/site/production/manual/latest/creating-bundles.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/creating-bundles.html?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/creating-bundles.html (original)
+++ karaf/site/production/manual/latest/creating-bundles.html Mon Sep 3 06:10:48 2018
@@ -5,7 +5,7 @@
<!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge"><![endif]-->
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="generator" content="Asciidoctor 1.5.2">
-<title>Basic bundle creation using the Felix maven-bundle-plugin</title>
+<title>Creating Bundles</title>
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400">
<style>
/* Asciidoctor default stylesheet | MIT License | http://asciidoctor.org */
@@ -505,60 +505,29 @@ table.CodeRay td.code>pre{padding:0}
<div id="toc" class="toc">
<div id="toctitle">Table of Contents</div>
<ul class="sectlevel2">
-<li><a href="#_basic_bundle_creation_using_the_felix_maven_bundle_plugin">Basic bundle creation using the Felix maven-bundle-plugin</a></li>
+<li><a href="#_creating_bundles">Creating Bundles</a></li>
<li><a href="#_creating_bundles_for_non_osgi_third_party_dependencies">Creating bundles for non OSGi third party dependencies</a></li>
</ul>
</div>
</div>
<div id="content">
<div class="sect2">
-<h3 id="_basic_bundle_creation_using_the_felix_maven_bundle_plugin">Basic bundle creation using the Felix maven-bundle-plugin</h3>
+<h3 id="_creating_bundles">Creating Bundles</h3>
<div class="paragraph">
-<p>Create a bundle instead of a normal jar by using a Maven POM file like this:</p>
-</div>
-<div class="listingblock">
-<div class="content">
-<pre><?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>my.groupId</groupId>
- <artifactId>my.bundle</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>My Bundle</name>
- <description>My bundle short description</description>
-
- <build>
- <resources>
- <resource>
- <directory>${project.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.4.0</version>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- ...
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project></pre>
+<p>The examples provides different kind of bundles and services definition:</p>
</div>
+<div class="ulist">
+<ul>
+<li>
+<p><a href="https://github.com/apache/karaf/examples/karaf-bundle-example/README.md" class="bare">https://github.com/apache/karaf/examples/karaf-bundle-example/README.md</a></p>
+</li>
+<li>
+<p><a href="https://github.com/apache/karaf/examples/karaf-blueprint-example/README.md" class="bare">https://github.com/apache/karaf/examples/karaf-blueprint-example/README.md</a></p>
+</li>
+<li>
+<p><a href="https://github.com/apache/karaf/examples/karaf-scr-example/README.md" class="bare">https://github.com/apache/karaf/examples/karaf-scr-example/README.md</a></p>
+</li>
+</ul>
</div>
<div class="sect3">
<h4 id="_add_extended_information_to_bundles">Add extended information to bundles</h4>
@@ -775,7 +744,7 @@ This bundle is simply a Maven POM that s
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2017-07-26 16:36:29 +02:00
+Last updated 2018-08-17 21:42:57 +02:00
</div>
</div>
</body>
Modified: karaf/site/production/manual/latest/custom-distribution.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/custom-distribution.html?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/custom-distribution.html (original)
+++ karaf/site/production/manual/latest/custom-distribution.html Mon Sep 3 06:10:48 2018
@@ -543,6 +543,9 @@ table.CodeRay td.code>pre{padding:0}
</li>
</ul>
</div>
+<div class="paragraph">
+<p>See [example/karaf-maven-example/karaf-maven-example-assembly] for a custom distribution example.</p>
+</div>
<div class="sect3">
<h4 id="_maven_assembly">Maven assembly</h4>
<div class="paragraph">
@@ -1168,7 +1171,6 @@ assembly descriptor, configured in POM a
<directory>target/dependencies/apache-karaf-${karaf.version}</directory>
<outputDirectory>/</outputDirectory>
<excludes>
- <exclude>**/demos/**</exclude>
<exclude>bin/**</exclude>
<exclude>etc/system.properties</exclude>
<exclude>etc/users.properties</exclude>
@@ -1176,8 +1178,8 @@ assembly descriptor, configured in POM a
<exclude>etc/org.ops4j.pax.logging.cfg</exclude>
<exclude>LICENSE</exclude>
<exclude>NOTICE</exclude>
- <exclude>README</exclude>
- <exclude>RELEASE-NOTES</exclude>
+ <exclude>README.md</exclude>
+ <exclude>RELEASE-NOTES.md</exclude>
<exclude>karaf-manual*.html</exclude>
<exclude>karaf-manual*.pdf</exclude>
</excludes>
@@ -1260,7 +1262,7 @@ assembly descriptor, configured in POM a
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2017-08-09 13:23:59 +02:00
+Last updated 2018-08-17 21:42:57 +02:00
</div>
</div>
</body>
Modified: karaf/site/production/manual/latest/debugging.html
URL: http://svn.apache.org/viewvc/karaf/site/production/manual/latest/debugging.html?rev=1839907&r1=1839906&r2=1839907&view=diff
==============================================================================
--- karaf/site/production/manual/latest/debugging.html (original)
+++ karaf/site/production/manual/latest/debugging.html Mon Sep 3 06:10:48 2018
@@ -809,7 +809,7 @@ allowing you to create, rename, destroy,
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2017-07-26 16:36:29 +02:00
+Last updated 2018-05-18 16:02:21 +02:00
</div>
</div>
</body>