Repository: karaf Updated Branches: refs/heads/master b3a2a1cba -> b1ed61d53
[manual] small improvements Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/b1ed61d5 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/b1ed61d5 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/b1ed61d5 Branch: refs/heads/master Commit: b1ed61d534406c7a54fbb9b53ebc521fe9940df6 Parents: 4aeed78 Author: Guillaume Nodet <[email protected]> Authored: Thu Apr 30 09:50:04 2015 +0200 Committer: Guillaume Nodet <[email protected]> Committed: Thu Apr 30 09:50:17 2015 +0200 ---------------------------------------------------------------------- .../developers-guide/developer-commands.conf | 2 +- .../developers-guide/security-framework.conf | 2 +- manual/src/main/webapp/users-guide/console.conf | 63 ++++++++++++-------- 3 files changed, 40 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/b1ed61d5/manual/src/main/webapp/developers-guide/developer-commands.conf ---------------------------------------------------------------------- diff --git a/manual/src/main/webapp/developers-guide/developer-commands.conf b/manual/src/main/webapp/developers-guide/developer-commands.conf index 14ae266..bc1a688 100644 --- a/manual/src/main/webapp/developers-guide/developer-commands.conf +++ b/manual/src/main/webapp/developers-guide/developer-commands.conf @@ -224,4 +224,4 @@ The following command: karaf@root> dev:watch * {code} -will monitore all bundles that have a location matching mvn:* and having '-SNAPSHOT' in their URL. +will monitor all bundles that have a location matching mvn:* and '-SNAPSHOT' in their URL. http://git-wip-us.apache.org/repos/asf/karaf/blob/b1ed61d5/manual/src/main/webapp/developers-guide/security-framework.conf ---------------------------------------------------------------------- diff --git a/manual/src/main/webapp/developers-guide/security-framework.conf b/manual/src/main/webapp/developers-guide/security-framework.conf index 1ef1b2e..d5da72b 100644 --- a/manual/src/main/webapp/developers-guide/security-framework.conf +++ b/manual/src/main/webapp/developers-guide/security-framework.conf @@ -20,7 +20,7 @@ h2. Schema To override or deploy a new realm, you can use the following XSD which is supported by a Spring namespace handler and can thus be defined in a Spring xml configuration file. Following is the XML Schema to use when defining Karaf realms: -{snippet:url=../jaas/config/src/main/resources/org/apache/karaf/jaas/config/karaf-jaas-1.1.0.xsd|lang=xml|pygmentize=true} +{snippet:url=../jaas/blueprint/config/src/main/resources/org/apache/karaf/jaas/blueprint/config/karaf-jaas-1.1.0.xsd|lang=xml|pygmentize=true} {snippet} You can find the schema at the following [location|http://karaf.apache.org/xmlns/jaas/v1.1.0]. http://git-wip-us.apache.org/repos/asf/karaf/blob/b1ed61d5/manual/src/main/webapp/users-guide/console.conf ---------------------------------------------------------------------- diff --git a/manual/src/main/webapp/users-guide/console.conf b/manual/src/main/webapp/users-guide/console.conf index d386b78..40b40e6 100644 --- a/manual/src/main/webapp/users-guide/console.conf +++ b/manual/src/main/webapp/users-guide/console.conf @@ -207,15 +207,23 @@ The {{shell:alias}} command creates a new alias. For instance, to create the {{l {code} karaf@root()> alias "list-features-installed = { feature:list -i }" karaf@root()> list-features-installed -Name | Version | Installed | Repository | Description ---------------------------------------------------------------------------------------------------------- -standard | 3.0.0 | x | standard-3.0.0 | Karaf standard feature -config | 3.0.0 | x | standard-3.0.0 | Provide OSGi ConfigAdmin support -region | 3.0.0 | x | standard-3.0.0 | Provide Region Support -package | 3.0.0 | x | standard-3.0.0 | Package commands and mbeans -kar | 3.0.0 | x | standard-3.0.0 | Provide KAR (KARaf archive) support -ssh | 3.0.0 | x | standard-3.0.0 | Provide a SSHd server on Karaf -management | 3.0.0 | x | standard-3.0.0 | Provide a JMX MBeanServer and a set of MBeans in K +Name | Version | Required | State | Repository | Description +------------------------------------------------------------------------------------------------------------------------------ +feature | 4.0.0 | x | Started | standard-4.0.0 | Features Support +shell | 4.0.0 | x | Started | standard-4.0.0 | Karaf Shell +deployer | 4.0.0 | x | Started | standard-4.0.0 | Karaf Deployer +bundle | 4.0.0 | x | Started | standard-4.0.0 | Provide Bundle support +config | 4.0.0 | x | Started | standard-4.0.0 | Provide OSGi ConfigAdmin support +diagnostic | 4.0.0 | x | Started | standard-4.0.0 | Provide Diagnostic support +instance | 4.0.0 | x | Started | standard-4.0.0 | Provide Instance support +jaas | 4.0.0 | x | Started | standard-4.0.0 | Provide JAAS support +log | 4.0.0 | x | Started | standard-4.0.0 | Provide Log support +package | 4.0.0 | x | Started | standard-4.0.0 | Package commands and mbeans +service | 4.0.0 | x | Started | standard-4.0.0 | Provide Service support +system | 4.0.0 | x | Started | standard-4.0.0 | Provide System support +kar | 4.0.0 | x | Started | standard-4.0.0 | Provide KAR (KARaf archive) support +ssh | 4.0.0 | x | Started | standard-4.0.0 | Provide a SSHd server on Karaf +management | 4.0.0 | x | Started | standard-4.0.0 | Provide a JMX MBeanServer and a set of MBeans in {code} At login, the Apache Karaf console reads the {{etc/shell.init.script}} file where you can create your aliases. @@ -262,40 +270,45 @@ You can pipe the output of one command as input to another one. It's a pipe, usi {code} karaf@root()> feature:list | grep -i war -war | 3.0.0 | | standard-3.0.0 | Turn Karaf as a full WebContainer +war | 4.0.0 | | standard-4.0.0 | Turn Karaf as a full WebContainer {code} h3. Grep, more, find, ... Karaf console provides some core commands similar to Unix environment: -* {{shell:head}} displays the first line of the input -* {{shell:source}} executes commands contained in a script * {{shell:alias}} creates an alias to an existing command -* {{shell:history}} prints the commands history * {{shell:cat}} displays the content of a file or URL -* {{shell:if}} allows you to use conditions (if, then, else blocks) in script -* {{shell:tac}} captures stdin and returns it as a string * {{shell:clear}} clears the current console display -* {{shell:info}} prints various information about the current Karaf instance -* {{shell:tail}} displays the last lines of the input * {{shell:completion}} displays or change the current completion mode -* {{shell:java}} executes a Java application -* {{shell:threads}} prints the current thread * {{shell:date}} displays the current date (optionally using a format) -* {{shell:watch}} periodically executes a command and refresh the output * {{shell:each}} executes a closure on a list of arguments +* {{shell:echo}} echoes and prints arguments to stdout +* {{shell:edit}} calls a text editor on the current file or URL * {{shell:env}} displays or sets the value of a shell session variable +* {{shell:exec}} executes a system command +* {{shell:grep}} prints lines matching the given pattern +* {{shell:head}} displays the first line of the input +* {{shell:history}} prints the commands history +* {{shell:if}} allows you to use conditions (if, then, else blocks) in script +* {{shell:info}} prints various information about the current Karaf instance +* {{shell:java}} executes a Java application +* {{shell:less}} file pager +* {{shell:logout}} disconnects shell from current session * {{shell:more}} is a file pager -* {{shell:wc}} prints newline, words, and byte counts for each file -* {{shell:echo}} echoes and prints arguments to stdout * {{shell:new}} creates a new Java object -* {{shell:edit}} calls a text editor on the current file or URL * {{shell:printf}} formats and prints arguments -* {{shell:exec}} executes a system command +* {{shell:tac}} captures stdin and returns it as a string * {{shell:sleep}} sleeps for a bit then wakes up -* {{shell:grep}} prints lines matching the given pattern * {{shell:sort}} writes sorted concatenation of all files to stdout +* {{shell:source}} executes commands contained in a script +* {{shell:stack-traces-print}} prints the full stack trace in the console when the execution of a command throws an exception +* {{shell:tac}} captures the STDIN and returns it as a string +* {{shell:tail}} displays the last lines of the input +* {{shell:threads}} prints the current thread +* {{shell:watch}} periodically executes a command and refresh the output +* {{shell:wc}} prints newline, words, and byte counts for each file +* {{shell:while}} loop while the condition is true You don't have to use the fully qualified name of the command, you can directly use the command name as long as it is unique. So you can use 'head' instead of 'shell:head'
