karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject karaf git commit: Update manual
Date Tue, 30 Jun 2015 15:35:21 GMT
Repository: karaf
Updated Branches:
  refs/heads/master f97e31741 -> ce9ffff7a


Update manual


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/ce9ffff7
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/ce9ffff7
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/ce9ffff7

Branch: refs/heads/master
Commit: ce9ffff7a3ea1ee998ab6a5f4eb180008d368133
Parents: f97e317
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Tue Jun 30 17:35:09 2015 +0200
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Tue Jun 30 17:35:09 2015 +0200

----------------------------------------------------------------------
 .../src/main/webapp/users-guide/deployers.conf  | 57 ++-----------------
 .../webapp/users-guide/directory-structure.conf |  7 ++-
 .../src/main/webapp/users-guide/features.conf   |  4 +-
 manual/src/main/webapp/users-guide/http.conf    | 12 ++--
 .../main/webapp/users-guide/installation.conf   | 19 +++----
 .../src/main/webapp/users-guide/instances.conf  | 14 ++---
 manual/src/main/webapp/users-guide/jta.conf     |  6 +-
 manual/src/main/webapp/users-guide/kar.conf     | 44 +++++++-------
 manual/src/main/webapp/users-guide/log.conf     | 48 ++++++++--------
 .../src/main/webapp/users-guide/migration.conf  | 52 -----------------
 manual/src/main/webapp/users-guide/obr.conf     | 60 ++++++++++----------
 11 files changed, 109 insertions(+), 214 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/ce9ffff7/manual/src/main/webapp/users-guide/deployers.conf
----------------------------------------------------------------------
diff --git a/manual/src/main/webapp/users-guide/deployers.conf b/manual/src/main/webapp/users-guide/deployers.conf
index a6757cb..f8972f3 100644
--- a/manual/src/main/webapp/users-guide/deployers.conf
+++ b/manual/src/main/webapp/users-guide/deployers.conf
@@ -34,6 +34,7 @@ felix.fileinstall.tmpdir        = ${karaf.data}/generated-bundles
 felix.fileinstall.poll          = 1000
 felix.fileinstall.start.level   = 80
 felix.fileinstall.active.level  = 80
+felix.fileinstall.log.level     = 3
 {code}
 
 * {{felix.fileinstall.dir}} defines the location of the {{deploy}} folder. Default value
is {{KARAF_BASE/deploy}}.
@@ -126,57 +127,7 @@ you can deploy WAB (WebApplication Bundle) or pure WAR (WebApplication
aRchive).
 You can install the war feature with:
 
 {code}
-karaf@root()> feature:install -v war
-Installing feature war 3.0.0
-Installing feature pax-war 3.0.5
-Installing feature pax-http-whiteboard 3.0.5
-Installing feature pax-http 3.0.5
-Installing feature pax-jetty 8.1.14.v20131031
-Found installed bundle: org.apache.servicemix.specs.activation-api-1.1 [81]
-Found installed bundle: org.apache.geronimo.specs.geronimo-servlet_3.0_spec [82]
-Found installed bundle: javax.mail [83]
-Found installed bundle: org.apache.geronimo.specs.geronimo-jta_1.1_spec [84]
-Found installed bundle: org.apache.geronimo.specs.geronimo-annotation_1.1_spec [85]
-Found installed bundle: org.apache.geronimo.specs.geronimo-jaspic_1.0_spec [86]
-Found installed bundle: org.apache.servicemix.bundles.asm [87]
-Found installed bundle: org.eclipse.jetty.aggregate.jetty-all-server [88]
-Checking configuration file mvn:org.ops4j.pax.web/pax-web-features/3.0.5/xml/jettyconfig
-Installing bundle mvn:org.ops4j.base/ops4j-base-lang/1.4.0
-Found installed bundle: org.ops4j.pax.swissbox.core [89]
-Found installed bundle: org.ops4j.pax.swissbox.optional.jcl [90]
-Found installed bundle: org.apache.xbean.bundleutils [91]
-Found installed bundle: org.apache.xbean.asm-shaded [92]
-Found installed bundle: org.apache.xbean.reflect [93]
-Found installed bundle: org.apache.xbean.finder-shaded [94]
-Found installed bundle: org.ops4j.pax.web.pax-web-api [95]
-Found installed bundle: org.ops4j.pax.web.pax-web-spi [96]
-Found installed bundle: org.ops4j.pax.web.pax-web-runtime [97]
-Found installed bundle: org.ops4j.pax.web.pax-web-jetty [98]
-Found installed bundle: org.ops4j.pax.web.pax-web-jsp [99]
-Found installed bundle: org.ops4j.pax.web.pax-web-extender-whiteboard [100]
-Installing bundle mvn:org.ops4j.pax.web/pax-web-jsp/3.0.5
-Found installed bundle: org.ops4j.pax.web.pax-web-extender-war [101]
-Installing bundle mvn:org.ops4j.pax.web/pax-web-extender-whiteboard/3.0.5
-Found installed bundle: org.ops4j.pax.web.pax-web-deployer [102]
-Found installed bundle: org.ops4j.pax.url.war [103]
-Found installed bundle: org.ops4j.pax.url.commons [104]
-Found installed bundle: org.ops4j.pax.swissbox.pax-swissbox-bnd [105]
-Found installed bundle: org.ops4j.pax.swissbox.property [106]
-Installing bundle mvn:org.ops4j.base/ops4j-base-net/1.4.0
-Installing bundle mvn:org.ops4j.base/ops4j-base-lang/1.4.0
-Installing bundle mvn:org.ops4j.base/ops4j-base-monitors/1.4.0
-Installing bundle mvn:org.ops4j.base/ops4j-base-util-property/1.4.0
-Found installed bundle: biz.aQute.bndlib [107]
-Found installed bundle: org.apache.karaf.web.core [108]
-Found installed bundle: org.apache.karaf.web.command [109]
-{code}
-
-We can note that the Pax Web deployer (WAR deployer) has been started:
-
-{code}
-...
-Found installed bundle: org.ops4j.pax.web.pax-web-deployer [102]
-...
+karaf@root()> feature:install war
 {code}
 
 The WAR deployer supports:
@@ -221,7 +172,7 @@ Tool = Bnd-2.1.0.20130426-122213
 Specification-Version = 2.3
 Specification-Vendor = Apache Software Foundation
 Implementation-Version = 2.3
-Generated-By-Ops4j-Pax-From = wrap:file:/opt/apache-karaf-3.0.0/deploy/commons-lang-2.3.jar$Bundle-SymbolicName=commons-lang&Bundle-Version=2.3
+Generated-By-Ops4j-Pax-From = wrap:file:/opt/apache-karaf-4.0.0/deploy/commons-lang-2.3.jar$Bundle-SymbolicName=commons-lang&Bundle-Version=2.3
 Implementation-Vendor-Id = org.apache
 Created-By = 1.7.0_21 (Oracle Corporation)
 Implementation-Title = Commons Lang
@@ -269,4 +220,4 @@ When defined in a features.xml file, it's necessary to escape any ampersands
and
 
 {code:lang=xml}
 <bundle>wrap:mvn:jboss/jbossall-client/4.3.2.GA/$Bundle-SymbolicName=jbossall-client&amp;Bundle-Version=4.3.2.GA&amp;Export-Package=org.jboss.remoting;version=&quot;4.3.2.GA&quot;,!*</bundle>
-{code}
\ No newline at end of file
+{code}

http://git-wip-us.apache.org/repos/asf/karaf/blob/ce9ffff7/manual/src/main/webapp/users-guide/directory-structure.conf
----------------------------------------------------------------------
diff --git a/manual/src/main/webapp/users-guide/directory-structure.conf b/manual/src/main/webapp/users-guide/directory-structure.conf
index 9b1c057..3e624dc 100644
--- a/manual/src/main/webapp/users-guide/directory-structure.conf
+++ b/manual/src/main/webapp/users-guide/directory-structure.conf
@@ -2,6 +2,7 @@ h1. Directory structure
 
 The directory layout of a Karaf installation is as follows:
 * {{/bin}}: control scripts to start, stop, login, ...
+* {{/demos}}: contains some simple Karaf samples
 * {{/etc}}: configuration files
 * {{/data}}: working directory 
 ** {{/cache}}: OSGi framework bundle cache
@@ -9,10 +10,10 @@ The directory layout of a Karaf installation is as follows:
 ** {{/log}}: log files
 * {{/deploy}}: hot deploy directory
 * {{/instances}}: directory containing [instances|instances]
-* {{/lib}}: contains additional libraries
-** {{/lib/ext}}: directory for JRE extensions
+* {{/lib}}: contains libraries
+** {{/lib/boot}}: contains the systeù libraries used at Karaf bootstrap
 ** {{/lib/endorsed}}: directory for endorsed libraries
-** {{/lib/boot}}: contains the system libraries
+** {{/lib/ext}}: directory for JRE extensions
 * {{/system}}: OSGi bundles repository, laid out as a Maven 2 repository
 
 {tip}

http://git-wip-us.apache.org/repos/asf/karaf/blob/ce9ffff7/manual/src/main/webapp/users-guide/features.conf
----------------------------------------------------------------------
diff --git a/manual/src/main/webapp/users-guide/features.conf b/manual/src/main/webapp/users-guide/features.conf
index c7fe92c..6dc83de 100644
--- a/manual/src/main/webapp/users-guide/features.conf
+++ b/manual/src/main/webapp/users-guide/features.conf
@@ -33,7 +33,9 @@ h2. Enterprise features
 * Persistence (JPA)
 * EJB
 * CDI
-* HA/failover and cluster
+* HA/failover and cluster (Apache Karaf Cellar)
+* Monitoring (Apache Karaf Decanter)
+* Artifacts repository and OSGi bundle repository (Apache Karaf Cave)
 
 h2. External Features
 

http://git-wip-us.apache.org/repos/asf/karaf/blob/ce9ffff7/manual/src/main/webapp/users-guide/http.conf
----------------------------------------------------------------------
diff --git a/manual/src/main/webapp/users-guide/http.conf b/manual/src/main/webapp/users-guide/http.conf
index 8ec92ad..fa45219 100644
--- a/manual/src/main/webapp/users-guide/http.conf
+++ b/manual/src/main/webapp/users-guide/http.conf
@@ -5,22 +5,22 @@ The Karaf http feature enables the Pax Web implementation of the OSGi HTTPServic
 h2. Installing the HTTP feature
 
 {code}
-root@karaf> feature:install http
+root@karaf()> feature:install http
 {code}
 
-Test the HTTP service is up by pointing your browser to [http://localhost:8080/].
+Test the HTTP service is up by pointing your browser to [http://localhost:8181/].
 
 h2. Configuring the HTTPService
 
 By default the HTTPService listens on port 8181 you can change the port by creating a file
{{etc/org.ops4j.pax.web.cfg}} with the following content:
 
 {code}
-org.osgi.service.http.port=8080
+org.osgi.service.http.port=8181
 {code}
 
 or by typing:
 {code}
-root@karaf> config:property-set -p org.ops4j.pax.web org.osgi.service.http.port 8080
+root@karaf> config:property-set -p org.ops4j.pax.web org.osgi.service.http.port 8181
 {code}
 
 If the http feature is already installed the change will take effect immediately.
@@ -53,8 +53,8 @@ So it is much more convenient than registering with the HttpService directly.
 </blueprint>
 {code}
 
-The above snippet publishes the Servlet MyServlet on http://localhost:8080/myServlet.
+The above snippet publishes the Servlet MyServlet on http://localhost:8181/myServlet.
 
 Please keep in mind that the Whiteboard pattern for Servlets is not standardized and only
works with Pax Web.
 
-For commands take a look at the command section in the [webcontainer|webcontainer] chapter.
\ No newline at end of file
+For commands take a look at the command section in the [webcontainer|webcontainer] chapter.

http://git-wip-us.apache.org/repos/asf/karaf/blob/ce9ffff7/manual/src/main/webapp/users-guide/installation.conf
----------------------------------------------------------------------
diff --git a/manual/src/main/webapp/users-guide/installation.conf b/manual/src/main/webapp/users-guide/installation.conf
index cceea79..3b840c5 100644
--- a/manual/src/main/webapp/users-guide/installation.conf
+++ b/manual/src/main/webapp/users-guide/installation.conf
@@ -19,7 +19,6 @@ h2. Using Apache Karaf binary distributions
 
 Apache Karaf is available in two distributions, both as a tar.gz and zip archives.
 
-
 The "default" distribution is a "ready to use" distribution.
 The "default" distribution provides the following features enabled.
 
@@ -34,7 +33,7 @@ h3. Installation on Windows platform
 NB: the JAVA_HOME environment variable has to be correctly defined. To accomplish that, press
Windows key and Break key together, switch to "Advanced" tab and click on "Environment Variables".
 
 # From a browser, navigate to [http://karaf.apache.org/index/community/download.html].
-# Download Apache Karaf binary distribution in the zip format: {{apache-karaf-3.0.0.zip}}.
+# Download Apache Karaf binary distribution in the zip format: {{apache-karaf-4.0.0.zip}}.
 # Extract the files from the zip file into a directory of your choice (it's the {{KARAF_HOME}}.
 NB: remember the restrictions concerning illegal characters in Java paths, e.g. \!, % etc.
 # Apache Karaf is now installed.
@@ -59,11 +58,11 @@ export JAVA_HOME=....
 {code}
 
 # From a browser, navigate to [http://karaf.apache.org/index/community/download.html].
-# Download Apache Karaf binary distribution in the tar.gz format: {{apache-karaf-3.0.0.tar.gz}}.
+# Download Apache Karaf binary distribution in the tar.gz format: {{apache-karaf-4.0.0.tar.gz}}.
 # Extract the files from the tar.gz file into a directory of your choice (it's the {{KARAF_HOME}}).
For example:
 {code}
-gunzip apache-karaf-3.0.0.tar.gz
-tar xvf apache-karaf-3.0.0.tar
+gunzip apache-karaf-4.0.0.tar.gz
+tar xvf apache-karaf-4.0.0.tar
 {code}
 NB: remember the restrictions concerning illegal characters in Java paths, e.g. \!, % etc.
 # Apache Karaf is now installed.
@@ -90,12 +89,12 @@ If you intend to build Apache Karaf from the sources, the requirements
are a bit
 
 *Environment:*
 * Java SE Development Kit 1.7.x or greater ([http://www.oracle.com/technetwork/java/javase/]).
-* Apache Maven 3.0.4 ([http://maven.apache.org/download.html]).
+* Apache Maven 3.0.4 or greater ([http://maven.apache.org/download.html]).
 
 h3. Building on Windows platform
 
 # You can get the Apache Karaf sources from:
-* the sources distribution {{apache-karaf-3.0.0-src.zip}} available at [http://karaf.apache.org/index/community/download.html].
Extract the files in the directory of your choice.
+* the sources distribution {{apache-karaf-4.0.0-src.zip}} available at [http://karaf.apache.org/index/community/download.html].
Extract the files in the directory of your choice.
 * by checkout of the git repository:
 {code}
 git clone https://git-wip-us.apache.org/repos/asf/karaf.git karaf
@@ -108,12 +107,12 @@ NB: you can speed up the build by bypassing the unit tests:
 {code}
 mvn clean install -DskipTests
 {code}
-# You can find the built binary distribution in {{assemblies\apache-karaf\target\apache-karaf-3.0.0.zip}}.
You can install and use it as explained in the "Using Apache Karaf binary distributions" section.
+# You can find the built binary distribution in {{assemblies\apache-karaf\target\apache-karaf-4.0.0.zip}}.
You can install and use it as explained in the "Using Apache Karaf binary distributions" section.
 
 h3. Building on Unix platforms
 
 # You can get the Apache Karaf sources from:
-* the sources distribution {{apache-karaf-3.0.0-src.tar.gz}} available at [http://karaf.apache.org/index/community/download.html].
Extract the files in the directory of your choice.
+* the sources distribution {{apache-karaf-4.0.0-src.tar.gz}} available at [http://karaf.apache.org/index/community/download.html].
Extract the files in the directory of your choice.
 * by checkout of the git repository:
 {code}
 git clone https://git-wip-us.apache.org/repos/asf/karaf.git karaf
@@ -126,4 +125,4 @@ NB: you can speed up the build by bypassing the unit tests:
 {code}
 mvn clean install -DskipTests
 {code}
-# You can find the built binary distribution in {{assemblies/apache-karaf/target/apache-karaf-3.0.0.tar.gz}}.
You can install and use it as explained in the "Using Apache Karaf binary distributions" section.
+# You can find the built binary distribution in {{assemblies/apache-karaf/target/apache-karaf-4.0.0.tar.gz}}.
You can install and use it as explained in the "Using Apache Karaf binary distributions" section.

http://git-wip-us.apache.org/repos/asf/karaf/blob/ce9ffff7/manual/src/main/webapp/users-guide/instances.conf
----------------------------------------------------------------------
diff --git a/manual/src/main/webapp/users-guide/instances.conf b/manual/src/main/webapp/users-guide/instances.conf
index 6dcef91..1d792e6 100644
--- a/manual/src/main/webapp/users-guide/instances.conf
+++ b/manual/src/main/webapp/users-guide/instances.conf
@@ -215,13 +215,13 @@ The {{instance:connect}} command accepts shell commands as argument.
It allows y
 karaf@root()> instance:connect test feature:list
 Name                          | Version         | Installed | Repository                |
Description
 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-standard                      | 3.0.0           | x         | standard-3.0.0            |
Karaf standard feature
-aries-annotation              | 3.0.0           |           | standard-3.0.0            |
Aries Annotations
-wrapper                       | 3.0.0           |           | standard-3.0.0            |
Provide OS integration
-service-wrapper               | 3.0.0           |           | standard-3.0.0            |
Provide OS integration (alias to wrapper feature)
-obr                           | 3.0.0           |           | standard-3.0.0            |
Provide OSGi Bundle Repository (OBR) support
-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
+standard                      | 4.0.0           | x         | standard-4.0.0            |
Karaf standard feature
+aries-annotation              | 4.0.0           |           | standard-4.0.0            |
Aries Annotations
+wrapper                       | 4.0.0           |           | standard-4.0.0            |
Provide OS integration
+service-wrapper               | 4.0.0           |           | standard-4.0.0            |
Provide OS integration (alias to wrapper feature)
+obr                           | 4.0.0           |           | standard-4.0.0            |
Provide OSGi Bundle Repository (OBR) support
+config                        | 4.0.0           | x         | standard-4.0.0            |
Provide OSGi ConfigAdmin support
+region                        | 4.0.0           | x         | standard-4.0.0            |
Provide Region Support
 ...
 {code}
 

http://git-wip-us.apache.org/repos/asf/karaf/blob/ce9ffff7/manual/src/main/webapp/users-guide/jta.conf
----------------------------------------------------------------------
diff --git a/manual/src/main/webapp/users-guide/jta.conf b/manual/src/main/webapp/users-guide/jta.conf
index 3a21b5d..9857465 100644
--- a/manual/src/main/webapp/users-guide/jta.conf
+++ b/manual/src/main/webapp/users-guide/jta.conf
@@ -45,7 +45,7 @@ Properties:
    org.apache.karaf.features.configKey = org.apache.aries.transaction
    aries.transaction.howl.maxBlocksPerFile = 512
    aries.transaction.howl.maxLogFiles = 2
-   aries.transaction.howl.logFileDir = /opt/apache-karaf-3.0.0/data/txlog
+   aries.transaction.howl.logFileDir = /opt/apache-karaf-4.0.0/data/txlog
    aries.transaction.howl.bufferSizeKBytes = 4
 {code}
 
@@ -83,7 +83,7 @@ Properties:
    org.apache.karaf.features.configKey = org.apache.aries.transaction
    aries.transaction.howl.maxBlocksPerFile = 512
    aries.transaction.howl.maxLogFiles = 2
-   aries.transaction.howl.logFileDir = /opt/apache-karaf-3.0.0/data/txlog
+   aries.transaction.howl.logFileDir = /opt/apache-karaf-4.0.0/data/txlog
    aries.transaction.howl.bufferSizeKBytes = 4
 {code}
 
@@ -99,7 +99,7 @@ aries.transaction.recoverable = true
 aries.transaction.timeout = 1200
 aries.transaction.howl.maxBlocksPerFile = 512
 aries.transaction.howl.maxLogFiles = 2
-aries.transaction.howl.logFileDir = /opt/apache-karaf-3.0.0/data/txlog
+aries.transaction.howl.logFileDir = /opt/apache-karaf-4.0.0/data/txlog
 aries.transaction.howl.bufferSizeKBytes = 4
 {code}
 {warning}

http://git-wip-us.apache.org/repos/asf/karaf/blob/ce9ffff7/manual/src/main/webapp/users-guide/kar.conf
----------------------------------------------------------------------
diff --git a/manual/src/main/webapp/users-guide/kar.conf b/manual/src/main/webapp/users-guide/kar.conf
index 7690373..11ffb21 100644
--- a/manual/src/main/webapp/users-guide/kar.conf
+++ b/manual/src/main/webapp/users-guide/kar.conf
@@ -107,25 +107,15 @@ For instance, you can use the following POM to create a kar:
     <groupId>my.groupId</groupId>
     <artifactId>my-kar</artifactId>
     <version>1.0</version>
-    <packaging>pom</packaging>
+    <packaging>kar</packaging>
 
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.karaf.tooling</groupId>
                 <artifactId>karaf-maven-plugin</artifactId>
-                <version>3.0.0</version>
-                <executions>
-                    <execution>
-                        <id>kar</id>
-                        <goals>
-                            <goal>kar</goal>
-                        </goals>
-                        <configuration>
-                            <featuresFile>src/main/resources/features.xml</featuresFile>
-                        </configuration>
-                    </execution>
-                </executions>
+                <version>4.0.0</version>
+                <extensions>true</extensions>
             </plugin>
         </plugins>
     </build>
@@ -172,22 +162,26 @@ The {{feature:repo-list}} command gives you the list of registered features
repo
 karaf@root()> feature:repo-list
 Repository                       | URL
 -------------------------------------------------------------------------------------------------------
-standard-3.0.0                   | mvn:org.apache.karaf.features/standard/3.0.0/xml/features
-enterprise-3.0.0                 | mvn:org.apache.karaf.features/enterprise/3.0.0/xml/features
-spring-3.0.0                     | mvn:org.apache.karaf.features/spring/3.0.0/xml/features
-org.ops4j.pax.web-3.0.5          | mvn:org.ops4j.pax.web/pax-web-features/3.0.5/xml/features
+standard-4.0.0                   | mvn:org.apache.karaf.features/standard/4.0.0/xml/features
+enterprise-4.0.0                 | mvn:org.apache.karaf.features/enterprise/4.0.0/xml/features
+spring-4.0.0                     | mvn:org.apache.karaf.features/spring/4.0.0/xml/features
+org.ops4j.pax.web-4.1.4          | mvn:org.ops4j.pax.web/pax-web-features/4.1.4/xml/features
 {code}
 
 You can use one of these features repositories to create the kar file:
 
 {code}
-karaf@root()> kar:create org.ops4j.pax.web-3.0.5
-Adding feature pax-war
-Adding feature pax-http-whiteboard
+karaf@root()> kar:create org.ops4j.pax.web-4.1.4
 Adding feature pax-jetty
-Adding feature pax-tomcat
+Adding feature pax-http-whiteboard
+Adding feature pax-war
+Adding feature pax-http-tomcat
+Adding feature pax-war-tomcat
 Adding feature pax-http
-Kar file created : /opt/apache-karaf-3.0.0/data/kar/org.ops4j.pax.web-3.0.5.kar
+Adding feature pax-http-jetty
+Adding feature pax-jsf-support
+Adding feature pax-jetty-spdy
+Kar file created : /home/jbonofre/Downloads/apache-karaf-4.0.0/data/kar/org.ops4j.pax.web-4.1.4.kar
 {code}
 
 You can see that the KAR file has been created in the {{KARAF_DATA/kar}} folder.
@@ -197,10 +191,10 @@ By default, the {{kar:create}} command creates a KAR file, packaging
all feature
 You can provide the list of features that you want to package into the KAR file:
 
 {code}
-karaf@root()> kar:create org.ops4j.pax.web-3.0.5 pax-jetty pax-tomcat
+karaf@root()> kar:create org.ops4j.pax.web-4.1.4 pax-jetty pax-tomcat
 Adding feature pax-jetty
 Adding feature pax-tomcat
-Kar file created : /opt/apache-karaf-3.0.0/data/kar/org.ops4j.pax.web-3.0.5.kar
+Kar file created : /opt/apache-karaf-4.1.4/data/kar/org.ops4j.pax.web-4.1.4.kar
 {code}
 
 h3. {{kar:install}}
@@ -287,4 +281,4 @@ h3. Operations
 * {{install(url)}} installs the KAR file at the given {{url}}.
 * {{create(repository, features)}} creates a KAR file using the given features {{repository}}
name, and optionally the
 list of {{features}} to include in the KAR file.
-* {{uninstall(name)}} uninstalls a KAR file with the given {{name}}.
\ No newline at end of file
+* {{uninstall(name)}} uninstalls a KAR file with the given {{name}}.

http://git-wip-us.apache.org/repos/asf/karaf/blob/ce9ffff7/manual/src/main/webapp/users-guide/log.conf
----------------------------------------------------------------------
diff --git a/manual/src/main/webapp/users-guide/log.conf b/manual/src/main/webapp/users-guide/log.conf
index aeaec13..86166b6 100644
--- a/manual/src/main/webapp/users-guide/log.conf
+++ b/manual/src/main/webapp/users-guide/log.conf
@@ -121,15 +121,15 @@ By default, it displays the log entries of the {{rootLogger}}:
 
 {code}
 karaf@root()> log:display
-2013-11-29 19:12:46,208 | INFO  | FelixStartLevel  | SecurityUtils                    | 16
- org.apache.sshd.core - 0.9.0 | BouncyCastle not registered, using the default JCE provider
-2013-11-29 19:12:47,368 | INFO  | FelixStartLevel  | core                             | 68
- org.apache.aries.jmx.core - 1.1.1 | Starting JMX OSGi agent
+2015-07-01 19:12:46,208 | INFO  | FelixStartLevel  | SecurityUtils                    | 16
- org.apache.sshd.core - 0.12.0 | BouncyCastle not registered, using the default JCE provider
+2015-07-01 19:12:47,368 | INFO  | FelixStartLevel  | core                             | 68
- org.apache.aries.jmx.core - 1.1.1 | Starting JMX OSGi agent
 {code}
 
 You can also display the log entries from a specific logger, using the {{logger}} argument:
 
 {code}
 karaf@root()> log:display ssh
-2013-11-29 19:12:46,208 | INFO  | FelixStartLevel  | SecurityUtils                    | 16
- org.apache.sshd.core - 0.9.0 | BouncyCastle not registered, using the default JCE provider
+2015-07-01 19:12:46,208 | INFO  | FelixStartLevel  | SecurityUtils                    | 16
- org.apache.sshd.core - 0.12.0 | BouncyCastle not registered, using the default JCE provider
 {code}
 
 By default, all log entries will be displayed. It could be very long if your Apache Karaf
container is running since a long time.
@@ -137,11 +137,11 @@ You can limit the number of entries to display using the {{-n}} option:
 
 {code}
 karaf@root()> log:display -n 5
-2013-11-30 06:53:24,143 | INFO  | JMX OSGi Agent   | core                             | 68
- org.apache.aries.jmx.core - 1.1.1 | Registering org.osgi.jmx.framework.BundleStateMBean
to MBeanServer com.sun.jmx.mbeanserver.JmxMBeanServer@27cc75cb with name osgi.core:type=bundleState,version=1.7,framework=org.apache.felix.framework,uuid=5335370f-9dee-449f-9b1c-cabe74432ed1
-2013-11-30 06:53:24,150 | INFO  | JMX OSGi Agent   | core                             | 68
- org.apache.aries.jmx.core - 1.1.1 | Registering org.osgi.jmx.framework.PackageStateMBean
to MBeanServer com.sun.jmx.mbeanserver.JmxMBeanServer@27cc75cb with name osgi.core:type=packageState,version=1.5,framework=org.apache.felix.framework,uuid=5335370f-9dee-449f-9b1c-cabe74432ed1
-2013-11-30 06:53:24,150 | INFO  | JMX OSGi Agent   | core                             | 68
- org.apache.aries.jmx.core - 1.1.1 | Registering org.osgi.jmx.framework.ServiceStateMBean
to MBeanServer com.sun.jmx.mbeanserver.JmxMBeanServer@27cc75cb with name osgi.core:type=serviceState,version=1.7,framework=org.apache.felix.framework,uuid=5335370f-9dee-449f-9b1c-cabe74432ed1
-2013-11-30 06:53:24,152 | INFO  | JMX OSGi Agent   | core                             | 68
- org.apache.aries.jmx.core - 1.1.1 | Registering org.osgi.jmx.framework.wiring.BundleWiringStateMBean
to MBeanServer com.sun.jmx.mbeanserver.JmxMBeanServer@27cc75cb with name osgi.core:type=wiringState,version=1.1,framework=org.apache.felix.framework,uuid=5335370f-9dee-449f-9b1c-cabe74432ed1
-2013-11-30 06:53:24,530 | INFO  | FelixStartLevel  | RegionsPersistenceImpl           | 78
- org.apache.karaf.region.persist - 3.0.0 | Loading region digraph persistence
+2015-07-01 06:53:24,143 | INFO  | JMX OSGi Agent   | core                             | 68
- org.apache.aries.jmx.core - 1.1.1 | Registering org.osgi.jmx.framework.BundleStateMBean
to MBeanServer com.sun.jmx.mbeanserver.JmxMBeanServer@27cc75cb with name osgi.core:type=bundleState,version=1.7,framework=org.apache.felix.framework,uuid=5335370f-9dee-449f-9b1c-cabe74432ed1
+2015-07-01 06:53:24,150 | INFO  | JMX OSGi Agent   | core                             | 68
- org.apache.aries.jmx.core - 1.1.1 | Registering org.osgi.jmx.framework.PackageStateMBean
to MBeanServer com.sun.jmx.mbeanserver.JmxMBeanServer@27cc75cb with name osgi.core:type=packageState,version=1.5,framework=org.apache.felix.framework,uuid=5335370f-9dee-449f-9b1c-cabe74432ed1
+2015-07-01 06:53:24,150 | INFO  | JMX OSGi Agent   | core                             | 68
- org.apache.aries.jmx.core - 1.1.1 | Registering org.osgi.jmx.framework.ServiceStateMBean
to MBeanServer com.sun.jmx.mbeanserver.JmxMBeanServer@27cc75cb with name osgi.core:type=serviceState,version=1.7,framework=org.apache.felix.framework,uuid=5335370f-9dee-449f-9b1c-cabe74432ed1
+2015-07-01 06:53:24,152 | INFO  | JMX OSGi Agent   | core                             | 68
- org.apache.aries.jmx.core - 1.1.1 | Registering org.osgi.jmx.framework.wiring.BundleWiringStateMBean
to MBeanServer com.sun.jmx.mbeanserver.JmxMBeanServer@27cc75cb with name osgi.core:type=wiringState,version=1.1,framework=org.apache.felix.framework,uuid=5335370f-9dee-449f-9b1c-cabe74432ed1
+2015-07-01 06:53:24,501 | INFO  | FelixStartLevel  | RegionsPersistenceImpl           | 78
- org.apache.karaf.region.persist - 4.0.0 | Loading region digraph persistence
 {code}
 
 You can also limit the number of entries stored and retain using the {{size}} property in
{{etc/org.apache.karaf.log.cfg}} file:
@@ -173,10 +173,10 @@ You can also change the pattern dynamically (for one execution) using
the {{-p}}
 
 {code}
 karaf@root()> log:display -p "%d - %c - %m%n"
-2013-11-30 07:01:58,007 - org.apache.sshd.common.util.SecurityUtils - BouncyCastle not registered,
using the default JCE provider
-2013-11-30 07:01:58,725 - org.apache.aries.jmx.core - Starting JMX OSGi agent
-2013-11-30 07:01:58,744 - org.apache.aries.jmx.core - Registering MBean with ObjectName [osgi.compendium:service=cm,version=1.3,framework=org.apache.felix.framework,uuid=6361fc65-8df4-4886-b0a6-479df2d61c83]
for service with service.id [13]
-2013-11-30 07:01:58,747 - org.apache.aries.jmx.core - Registering org.osgi.jmx.service.cm.ConfigurationAdminMBean
to MBeanServer com.sun.jmx.mbeanserver.JmxMBeanServer@27cc75cb with name osgi.compendium:service=cm,version=1.3,framework=org.apache.felix.framework,uuid=6361fc65-8df4-4886-b0a6-479df2d61c83
+2015-07-01 07:01:58,007 - org.apache.sshd.common.util.SecurityUtils - BouncyCastle not registered,
using the default JCE provider
+2015-07-01 07:01:58,725 - org.apache.aries.jmx.core - Starting JMX OSGi agent
+2015-07-01 07:01:58,744 - org.apache.aries.jmx.core - Registering MBean with ObjectName [osgi.compendium:service=cm,version=1.3,framework=org.apache.felix.framework,uuid=6361fc65-8df4-4886-b0a6-479df2d61c83]
for service with service.id [13]
+2015-07-01 07:01:58,747 - org.apache.aries.jmx.core - Registering org.osgi.jmx.service.cm.ConfigurationAdminMBean
to MBeanServer com.sun.jmx.mbeanserver.JmxMBeanServer@27cc75cb with name osgi.compendium:service=cm,version=1.3,framework=org.apache.felix.framework,uuid=6361fc65-8df4-4886-b0a6-479df2d61c83
 {code}
 
 The pattern is a regular Log4j pattern where you can use keywords like %d for the date, %c
for the class, %m for the log
@@ -239,7 +239,7 @@ scripts:
 {code}
 karaf@root()> log:log "Hello World"
 karaf@root()> log:display
-2013-11-30 07:20:16,544 | INFO  | Local user karaf | command                          | 59
- org.apache.karaf.log.command - 3.0.0 | Hello World
+2015-07-01 07:20:16,544 | INFO  | Local user karaf | command                          | 59
- org.apache.karaf.log.command - 4.0.0 | Hello World
 {code}
 
 By default, the log level is INFO, but you can specify a different log level using the {{-l}}
option:
@@ -247,7 +247,7 @@ By default, the log level is INFO, but you can specify a different log
level usi
 {code}
 karaf@root()> log:log -l ERROR "Hello World"
 karaf@root()> log:display
-2013-11-30 07:21:38,902 | ERROR | Local user karaf | command                          | 59
- org.apache.karaf.log.command - 3.0.0 | Hello World
+2015-07-01 07:21:38,902 | ERROR | Local user karaf | command                          | 59
- org.apache.karaf.log.command - 4.0.0 | Hello World
 {code}
 
 h3. {{log:set}}
@@ -348,10 +348,10 @@ By default, it displays the entries from the {{rootLogger}}:
 
 {code}
 karaf@root()> log:tail
-2013-11-30 07:40:28,152 | INFO  | FelixStartLevel  | SecurityUtils                    | 16
- org.apache.sshd.core - 0.9.0 | BouncyCastle not registered, using the default JCE provider
-2013-11-30 07:40:28,909 | INFO  | FelixStartLevel  | core                             | 68
- org.apache.aries.jmx.core - 1.1.1 | Starting JMX OSGi agent
-2013-11-30 07:40:28,928 | INFO  | FelixStartLevel  | core                             | 68
- org.apache.aries.jmx.core - 1.1.1 | Registering MBean with ObjectName [osgi.compendium:service=cm,version=1.3,framework=org.apache.felix.framework,uuid=b44a44b7-41cd-498f-936d-3b12d7aafa7b]
for service with service.id [13]
-2013-11-30 07:40:28,936 | INFO  | JMX OSGi Agent   | core                             | 68
- org.apache.aries.jmx.core - 1.1.1 | Registering org.osgi.jmx.service.cm.ConfigurationAdminMBean
to MBeanServer com.sun.jmx.mbeanserver.JmxMBeanServer@27cc75cb with name osgi.compendium:service=cm,version=1.3,framework=org.apache.felix.framework,uuid=b44a44b7-41cd-498f-936d-3b12d7aafa7b
+2015-07-01 07:40:28,152 | INFO  | FelixStartLevel  | SecurityUtils                    | 16
- org.apache.sshd.core - 0.9.0 | BouncyCastle not registered, using the default JCE provider
+2015-07-01 07:40:28,909 | INFO  | FelixStartLevel  | core                             | 68
- org.apache.aries.jmx.core - 1.1.1 | Starting JMX OSGi agent
+2015-07-01 07:40:28,928 | INFO  | FelixStartLevel  | core                             | 68
- org.apache.aries.jmx.core - 1.1.1 | Registering MBean with ObjectName [osgi.compendium:service=cm,version=1.3,framework=org.apache.felix.framework,uuid=b44a44b7-41cd-498f-936d-3b12d7aafa7b]
for service with service.id [13]
+2015-07-01 07:40:28,936 | INFO  | JMX OSGi Agent   | core                             | 68
- org.apache.aries.jmx.core - 1.1.1 | Registering org.osgi.jmx.service.cm.ConfigurationAdminMBean
to MBeanServer com.sun.jmx.mbeanserver.JmxMBeanServer@27cc75cb with name osgi.compendium:service=cm,version=1.3,framework=org.apache.felix.framework,uuid=b44a44b7-41cd-498f-936d-3b12d7aafa7b
 {code}
 
 To exit from the {{log:tail}} command, just type CTRL-C.
@@ -510,12 +510,12 @@ For instance, in the following IllegalArgumentException stack trace,
we can see
 
 {code}
 java.lang.IllegalArgumentException: Command not found:  *:foo
-	at org.apache.felix.gogo.runtime.shell.Closure.execute(Closure.java:225)[21:org.apache.karaf.shell.console:3.0.0]
-	at org.apache.felix.gogo.runtime.shell.Closure.executeStatement(Closure.java:162)[21:org.apache.karaf.shell.console:3.0.0]
-	at org.apache.felix.gogo.runtime.shell.Pipe.run(Pipe.java:101)[21:org.apache.karaf.shell.console:3.0.0]
-	at org.apache.felix.gogo.runtime.shell.Closure.execute(Closure.java:79)[21:org.apache.karaf.shell.console:3.0.0]
-	at org.apache.felix.gogo.runtime.shell.CommandSessionImpl.execute(CommandSessionImpl.java:71)[21:org.apache.karaf.shell.console:3.0.0]
-	at org.apache.karaf.shell.console.jline.Console.run(Console.java:169)[21:org.apache.karaf.shell.console:3.0.0]
+	at org.apache.felix.gogo.runtime.shell.Closure.execute(Closure.java:225)[21:org.apache.karaf.shell.console:4.0.0]
+	at org.apache.felix.gogo.runtime.shell.Closure.executeStatement(Closure.java:162)[21:org.apache.karaf.shell.console:4.0.0]
+	at org.apache.felix.gogo.runtime.shell.Pipe.run(Pipe.java:101)[21:org.apache.karaf.shell.console:4.0.0]
+	at org.apache.felix.gogo.runtime.shell.Closure.execute(Closure.java:79)[21:org.apache.karaf.shell.console:4.0.0]
+	at org.apache.felix.gogo.runtime.shell.CommandSessionImpl.execute(CommandSessionImpl.java:71)[21:org.apache.karaf.shell.console:4.0.0]
+	at org.apache.karaf.shell.console.jline.Console.run(Console.java:169)[21:org.apache.karaf.shell.console:4.0.0]
 	at java.lang.Thread.run(Thread.java:637)[:1.7.0_21]
 {code}
 

http://git-wip-us.apache.org/repos/asf/karaf/blob/ce9ffff7/manual/src/main/webapp/users-guide/migration.conf
----------------------------------------------------------------------
diff --git a/manual/src/main/webapp/users-guide/migration.conf b/manual/src/main/webapp/users-guide/migration.conf
deleted file mode 100644
index 9b88d88..0000000
--- a/manual/src/main/webapp/users-guide/migration.conf
+++ /dev/null
@@ -1,52 +0,0 @@
-h1. Migration from Karaf 2.x to 3.x
-
-This section shows the necessary changes you have to consider when upgrading karaf.
-
-h2. Updating an existing instance
-
-There is no simple upgrade path for an existing instance. The simplest way of upgraing is
to redeploy your application to the new karaf instance and copy over the changed configurations.

-
-h2. Changes in command names
-
-In general the command names now have the scheme <object in singular>:<command on
object>.
-For cases when one scope cares for more than one object type like feature:* that cares for
features and feature repositories the sheme is partly: <scope>:<object-command>.
-The following table shows side by side the old and new command names.
-
-|| Name 2.x || Name 3.x ||
-| features:add-url | feature:repo-add |
-| features:chooseurl | feature:repo-add |
-| features:chooseurl | feature:repo-add |
-| features:listrepositories | feature:repo-list |
-| features:listurl | feature:repo-list |
-| features:listversions | feature:version-list |
-| features:refreshurl | feature:repo-add |
-| features:removerepository | feature:repo-remove |
-| features:removeurl | feature:repo-remove |
-| features:* | feature:* |
-| osgi:* | bundle:* |
-| dev:dynamic-import | bundle:dynamic-import |
-| dev:framework | system:framework |
-| dev:print-stack-traces | shell:print-stack-traces |
-| dev:restart | system:shutdown -r |
-| dev:show-tree | bundle:tree-show |
-| dev:watch | bundle:watch |
-| admin:* | instance:* |
-| config: | config: |
-| jaas: | jaas: |
-
-h2. Changes in MBeans
-
-For Karaf 3 we did a major refactoring of the module and package structure of Karaf. So almost
all mbean interfaces moved to a new package. So if you use the Java interface to access an
mbean you will most likely have to change that.
-
-Like the commands the bean types have bean renamed to the singular form:
-
-|| Type Karaf 2.x || Type Karaf 3.x ||
-| admin | instance |
-| bundles | bundle |
-| features | feature |
-| packages | package |
-| services | service |
-
-Besides the type in the objectname a lot of the operations / attributes changed. 
-
-

http://git-wip-us.apache.org/repos/asf/karaf/blob/ce9ffff7/manual/src/main/webapp/users-guide/obr.conf
----------------------------------------------------------------------
diff --git a/manual/src/main/webapp/users-guide/obr.conf b/manual/src/main/webapp/users-guide/obr.conf
index 788189d..3e48180 100644
--- a/manual/src/main/webapp/users-guide/obr.conf
+++ b/manual/src/main/webapp/users-guide/obr.conf
@@ -121,10 +121,10 @@ The {{obr:list}} command lists all bundles available on the registered
OBR repos
 karaf@root()> obr:list|more
 Name                                                                         | Symbolic Name
                                                            | Version
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-activemq-blueprint                                                           | org.apache.activemq.activemq-blueprint
                                   | 5.10.0.SNAPSHOT
-activemq-camel                                                               | org.apache.activemq.activemq-camel
                                       | 5.10.0.SNAPSHOT
-activemq-karaf                                                               | activemq-karaf
                                                           | 5.10.0.SNAPSHOT
-activemq-osgi                                                                | org.apache.activemq.activemq-osgi
                                        | 5.10.0.SNAPSHOT
+activemq-blueprint                                                           | org.apache.activemq.activemq-blueprint
                                   | 5.12.0.SNAPSHOT
+activemq-camel                                                               | org.apache.activemq.activemq-camel
                                       | 5.12.0.SNAPSHOT
+activemq-karaf                                                               | activemq-karaf
                                                           | 5.12.0.SNAPSHOT
+activemq-osgi                                                                | org.apache.activemq.activemq-osgi
                                        | 5.12.0.SNAPSHOT
 Apache Aries Application API                                                 | org.apache.aries.application.api
                                         | 1.0.1.SNAPSHOT
 ...
 {code}
@@ -141,15 +141,15 @@ karaf@root()> obr:info org.apache.karaf.wrapper.core
 -------------------------------
 Apache Karaf :: Wrapper :: Core
 -------------------------------
-id: org.apache.karaf.wrapper.core/3.0.0
+id: org.apache.karaf.wrapper.core/4.0.0
 description: Core implementation and integration of the Java Service Wrapper.        It provides
a complete integration of Karaf with your Operating System.
 documentation: http://www.apache.org/
 symbolicname: org.apache.karaf.wrapper.core
 presentationname: Apache Karaf :: Wrapper :: Core
 license: http://www.apache.org/licenses/LICENSE-2.0.txt
-uri: file:/user/.m2/repository/org/apache/karaf/wrapper/org.apache.karaf.wrapper.core/3.0.0/org.apache.karaf.wrapper.core-3.0.0.jar
+uri: file:/user/.m2/repository/org/apache/karaf/wrapper/org.apache.karaf.wrapper.core/4.0.0/org.apache.karaf.wrapper.core-4.0.0.jar
 size: 1281352
-version: 3.0.0
+version: 4.0.0
 Requires:
    service:(&(service=org.apache.aries.blueprint.NamespaceHandler)(osgi.service.blueprint.namespace=http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0))
    package:(&(package=javax.management))
@@ -162,24 +162,24 @@ Requires:
    package:(&(package=org.osgi.service.blueprint)(version>=1.0.0)(!(version>=2.0.0)))
    package:(&(package=org.slf4j)(version>=1.7.0)(!(version>=2.0.0)))
 Capabilities:
-   bundle:{manifestversion=2, symbolicname=org.apache.karaf.wrapper.core, presentationname=Apache
Karaf :: Wrapper :: Core, version=3.0.0}
+   bundle:{manifestversion=2, symbolicname=org.apache.karaf.wrapper.core, presentationname=Apache
Karaf :: Wrapper :: Core, version=4.0.0}
    service:{service=org.apache.karaf.wrapper.WrapperService}
-   package:{package=org.apache.karaf.wrapper, version=3.0.0}
-   package:{package=org.apache.karaf.wrapper.management, uses:=javax.management, version=3.0.0}
+   package:{package=org.apache.karaf.wrapper, version=4.0.0}
+   package:{package=org.apache.karaf.wrapper.management, uses:=javax.management, version=4.0.0}
 {code}
 
 The {{obr:info}} command uses the following syntax to identify the bundles: {{symbolic_name,version}}
where {{version}} is optional.
-It means that you have to use the following command to see the info about the wrapper core
bundle with version 3.0.0:
+It means that you have to use the following command to see the info about the wrapper core
bundle with version 4.0.0:
 
 {code}
-karaf@root()> obr:info org.apache.karaf.wrapper.core,3.0.0
+karaf@root()> obr:info org.apache.karaf.wrapper.core,4.0.0
 ...
 {code}
 
 You can specific multiple bundles separated by space:
 
 {code}
-karaf@root()> obr:info org.apache.karaf.wrapper.core,3.0.0 org.apache.karaf.wrapper.command,3.0.0
+karaf@root()> obr:info org.apache.karaf.wrapper.core,4.0.0 org.apache.karaf.wrapper.command,4.0.0
 ...
 {code}
 
@@ -194,16 +194,16 @@ karaf@root()> obr:source /tmp org.apache.karaf.wrapper.core
 {code}
 
 The {{obr:source}} command uses the following syntax to identify the bundles: {{symbolic_name,version}}
where {{version}} is optional.
-It means that you have to use the following command to download the source of wrapper core
bundle with version 3.0.0:
+It means that you have to use the following command to download the source of wrapper core
bundle with version 4.0.0:
 
 {code}
-karaf@root()> obr:source /tmp org.apache.karaf.wrapper.core,3.0.0
+karaf@root()> obr:source /tmp org.apache.karaf.wrapper.core,4.0.0
 {code}
 
 You can specify multiple bundles separated by space:
 
 {code}
-karaf@root()> obr:source /tmp org.apache.karaf.wrapper.core,3.0.0 org.apache.karaf.wrapper.command,3.0.0
+karaf@root()> obr:source /tmp org.apache.karaf.wrapper.core,4.0.0 org.apache.karaf.wrapper.command,4.0.0
 ...
 {code}
 
@@ -220,7 +220,7 @@ For instance, to know the OBR bundle resolving the {{org.apache.karaf.wrapper}}
 karaf@root()> obr:resolve package=org.apache.karaf.wrapper
 Required resource(s):
 ---------------------
-   Apache Karaf :: Wrapper :: Core (3.0.0)
+   Apache Karaf :: Wrapper :: Core (4.0.0)
 {code}
 
 h3. {{obr:find}}
@@ -234,15 +234,15 @@ karaf@root()> obr:find package=org.apache.karaf.wrapper
 -------------------------------
 Apache Karaf :: Wrapper :: Core
 -------------------------------
-id: org.apache.karaf.wrapper.core/3.0.0
+id: org.apache.karaf.wrapper.core/4.0.0
 description: Core implementation and integration of the Java Service Wrapper.        It provides
a complete integration of Karaf with your Operating System.
 documentation: http://www.apache.org/
 symbolicname: org.apache.karaf.wrapper.core
 presentationname: Apache Karaf :: Wrapper :: Core
 license: http://www.apache.org/licenses/LICENSE-2.0.txt
-uri: file:/user/.m2/repository/org/apache/karaf/wrapper/org.apache.karaf.wrapper.core/3.0.0/org.apache.karaf.wrapper.core-3.0.0.jar
+uri: file:/user/.m2/repository/org/apache/karaf/wrapper/org.apache.karaf.wrapper.core/4.0.0/org.apache.karaf.wrapper.core-4.0.0.jar
 size: 1281352
-version: 3.0.0
+version: 4.0.0
 Requirements:
    service:(&(service=org.apache.aries.blueprint.NamespaceHandler)(osgi.service.blueprint.namespace=http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0))
    package:(&(package=javax.management))
@@ -255,10 +255,10 @@ Requirements:
    package:(&(package=org.osgi.service.blueprint)(version>=1.0.0)(!(version>=2.0.0)))
    package:(&(package=org.slf4j)(version>=1.7.0)(!(version>=2.0.0)))
 Capabilities:
-   bundle:{manifestversion=2, symbolicname=org.apache.karaf.wrapper.core, presentationname=Apache
Karaf :: Wrapper :: Core, version=3.0.0}
+   bundle:{manifestversion=2, symbolicname=org.apache.karaf.wrapper.core, presentationname=Apache
Karaf :: Wrapper :: Core, version=4.0.0}
    service:{service=org.apache.karaf.wrapper.WrapperService}
-   package:{package=org.apache.karaf.wrapper, version=3.0.0}
-   package:{package=org.apache.karaf.wrapper.management, uses:=javax.management, version=3.0.0}
+   package:{package=org.apache.karaf.wrapper, version=4.0.0}
+   package:{package=org.apache.karaf.wrapper.management, uses:=javax.management, version=4.0.0}
 {code}
 
 h3. {{obr:deploy}}
@@ -282,16 +282,16 @@ Deploying...done.
 By default, the bundles are just installed, not started. You can use the {{-s}} option to
start the bundles.
 
 The {{obr:deploy}} command uses the following syntax to identify the bundles: {{symbolic_name,version}}
where {{version}} is optional.
-It means that you have to use the following command to deploy the wrapper core bundle with
version 3.0.0:
+It means that you have to use the following command to deploy the wrapper core bundle with
version 4.0.0:
 
 {code}
-karaf@root()> obr:deploy org.apache.karaf.wrapper.core,3.0.0
+karaf@root()> obr:deploy org.apache.karaf.wrapper.core,4.0.0
 {code}
 
 You can specify multiple bundles separated by space:
 
 {code}
-karaf@root()> obr:deploy org.apache.karaf.wrapper.core,3.0.0 org.apache.karaf.wrapper.command,3.0.0
+karaf@root()> obr:deploy org.apache.karaf.wrapper.core,4.0.0 org.apache.karaf.wrapper.command,4.0.0
 ...
 {code}
 
@@ -315,16 +315,16 @@ Deploying...done.
 {code}
 
 The {{obr:start}} command uses the following syntax to identify the bundles: {{symbolic_name,version}}
where {{version}} is optional.
-It means that you have to use the following command to deploy and start the wrapper core
bundle with version 3.0.0:
+It means that you have to use the following command to deploy and start the wrapper core
bundle with version 4.0.0:
 
 {code}
-karaf@root()> obr:start org.apache.karaf.wrapper.core,3.0.0
+karaf@root()> obr:start org.apache.karaf.wrapper.core,4.0.0
 {code}
 
 You can specify multiple bundles separated by space:
 
 {code}
-karaf@root()> obr:start org.apache.karaf.wrapper.core,3.0.0 org.apache.karaf.wrapper.command,3.0.0
+karaf@root()> obr:start org.apache.karaf.wrapper.core,4.0.0 org.apache.karaf.wrapper.command,4.0.0
 ...
 {code}
 
@@ -356,4 +356,4 @@ h2. Apache Karaf Cave
 
 In addition of being an OBR client, Apache Karaf can act as an OBR repositories server, thanks
to Apache Karaf Cave.
 
-See the [Apache Karaf Cave sub-project|http://karaf.apache.org/index/subprojects/cave.html]
for details.
\ No newline at end of file
+See the [Apache Karaf Cave sub-project|http://karaf.apache.org/index/subprojects/cave.html]
for details.


Mime
View raw message