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 the user guide
Date Wed, 01 Jul 2015 14:42:54 GMT
Repository: karaf
Updated Branches:
  refs/heads/master ce9ffff7a -> 457b9b741


Update the user guide


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

Branch: refs/heads/master
Commit: 457b9b74148e034c4e6b5d077c57371609899240
Parents: ce9ffff
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Wed Jul 1 16:42:41 2015 +0200
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Wed Jul 1 16:42:41 2015 +0200

----------------------------------------------------------------------
 .../main/webapp/users-guide/configuration.conf  |  12 +-
 manual/src/main/webapp/users-guide/kar.conf     |  12 +-
 .../webapp/users-guide/provisioning-schema.conf |  18 +-
 .../main/webapp/users-guide/provisioning.conf   | 283 ++++++++++++-------
 manual/src/main/webapp/users-guide/remote.conf  |   6 +-
 .../src/main/webapp/users-guide/start-stop.conf |  12 +-
 manual/src/main/webapp/users-guide/tuning.conf  |   2 +-
 manual/src/main/webapp/users-guide/update.conf  |   4 +-
 .../main/webapp/users-guide/webcontainer.conf   |   4 +-
 manual/src/main/webapp/users-guide/wrapper.conf |  27 +-
 10 files changed, 235 insertions(+), 145 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/457b9b74/manual/src/main/webapp/users-guide/configuration.conf
----------------------------------------------------------------------
diff --git a/manual/src/main/webapp/users-guide/configuration.conf b/manual/src/main/webapp/users-guide/configuration.conf
index d9d5801..e5f312e 100644
--- a/manual/src/main/webapp/users-guide/configuration.conf
+++ b/manual/src/main/webapp/users-guide/configuration.conf
@@ -76,7 +76,7 @@ properties defined in the configuration:
 karaf@root()> config:list
 ----------------------------------------------------------------
 Pid:            org.apache.karaf.service.acl.command.system.start-level
-BundleLocation: mvn:org.apache.karaf.shell/org.apache.karaf.shell.console/3.0.0
+BundleLocation: mvn:org.apache.karaf.shell/org.apache.karaf.shell.console/4.0.0
 Properties:
    service.guard = (&(osgi.command.scope=system)(osgi.command.function=start-level))
    * = *
@@ -89,7 +89,7 @@ Properties:
    execute[/.*/,/.*[0-9][0-9][0-9]+.*/] = manager # manager can set startlevels above 100
 ----------------------------------------------------------------
 Pid:            org.apache.karaf.log
-BundleLocation: mvn:org.apache.karaf.log/org.apache.karaf.log.core/3.0.0
+BundleLocation: mvn:org.apache.karaf.log/org.apache.karaf.log.core/4.0.0
 Properties:
    service.pid = org.apache.karaf.log
    size = 500
@@ -174,7 +174,7 @@ karaf@root()> config:property-set -p org.apache.karaf.log size 1000
 karaf@root()> config:list "(service.pid=org.apache.karaf.log)"
 ----------------------------------------------------------------
 Pid:            org.apache.karaf.log
-BundleLocation: mvn:org.apache.karaf.log/org.apache.karaf.log.core/3.0.0
+BundleLocation: mvn:org.apache.karaf.log/org.apache.karaf.log.core/4.0.0
 Properties:
    service.pid = org.apache.karaf.log
    size = 1000
@@ -213,7 +213,7 @@ karaf@root()> config:property-append -p org.apache.karaf.log size 1
 karaf@root()> config:list "(service.pid=org.apache.karaf.log)"
 ----------------------------------------------------------------
 Pid:            org.apache.karaf.log
-BundleLocation: mvn:org.apache.karaf.log/org.apache.karaf.log.core/3.0.0
+BundleLocation: mvn:org.apache.karaf.log/org.apache.karaf.log.core/4.0.0
 Properties:
    service.pid = org.apache.karaf.log
    size = 5001
@@ -272,7 +272,7 @@ karaf@root()> config:update
 karaf@root()> config:list "(service.pid=org.apache.karaf.log)"
 ----------------------------------------------------------------
 Pid:            org.apache.karaf.log
-BundleLocation: mvn:org.apache.karaf.log/org.apache.karaf.log.core/3.0.0
+BundleLocation: mvn:org.apache.karaf.log/org.apache.karaf.log.core/4.0.0
 Properties:
    service.pid = org.apache.karaf.log
    size = 500
@@ -294,7 +294,7 @@ karaf@root()> config:cancel
 karaf@root()> config:list "(service.pid=org.apache.karaf.log)"
 ----------------------------------------------------------------
 Pid:            org.apache.karaf.log
-BundleLocation: mvn:org.apache.karaf.log/org.apache.karaf.log.core/3.0.0
+BundleLocation: mvn:org.apache.karaf.log/org.apache.karaf.log.core/4.0.0
 Properties:
    service.pid = org.apache.karaf.log
    size = 500

http://git-wip-us.apache.org/repos/asf/karaf/blob/457b9b74/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 11ffb21..50229f3 100644
--- a/manual/src/main/webapp/users-guide/kar.conf
+++ b/manual/src/main/webapp/users-guide/kar.conf
@@ -19,15 +19,15 @@ A KAR file contains a {{repository}} folder containing:
 * a set of features XML files
 * the artifacts following the Maven directory structure ({{groupId/artifactId/version/artifactId-version.type}}).
 
-For instance, the {{spring-3.0.0.kar}} contains:
+For instance, the {{spring-4.0.0.kar}} contains:
 
 {code}
-~$ unzip -l spring-3.0.0.kar
-Archive:  spring-3.0.0.kar
+~$ unzip -l spring-4.0.0.kar
+Archive:  spring-4.0.0.kar
   Length      Date    Time    Name
 ---------  ---------- -----   ----
       143  2013-12-06 10:52   META-INF/MANIFEST.MF
-    12186  2013-12-06 10:52   repository/org/apache/karaf/features/spring/3.0.0/spring-3.0.0-features.xml
+    12186  2013-12-06 10:52   repository/org/apache/karaf/features/spring/4.0.0/spring-4.0.0-features.xml
    575389  2013-12-06 10:52   repository/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar
    232019  2013-12-06 10:52   repository/commons-beanutils/commons-beanutils/1.8.3/commons-beanutils-1.8.3.jar
    673109  2013-12-06 10:52   repository/org/apache/servicemix/bundles/org.apache.servicemix.bundles.struts/1.3.10_1/org.apache.servicemix.bundles.struts-1.3.10_1.jar
@@ -41,7 +41,7 @@ Archive:  spring-3.0.0.kar
    340841  2013-12-06 10:52   repository/org/springframework/org.springframework.aop/3.2.4.RELEASE/org.springframework.aop-3.2.4.RELEASE.jar
    877369  2013-12-06 10:52   repository/org/springframework/org.springframework.context/3.2.4.RELEASE/org.springframework.context-3.2.4.RELEASE.jar
    130224  2013-12-06 10:52   repository/org/springframework/org.springframework.context.support/3.2.4.RELEASE/org.springframework.context.support-3.2.4.RELEASE.jar
-    30640  2013-12-06 10:52   repository/org/apache/karaf/deployer/org.apache.karaf.deployer.spring/3.0.0/org.apache.karaf.deployer.spring-3.0.0.jar
+    30640  2013-12-06 10:52   repository/org/apache/karaf/deployer/org.apache.karaf.deployer.spring/4.0.0/org.apache.karaf.deployer.spring-4.0.0.jar
     51951  2013-12-06 10:52   repository/org/springframework/org.springframework.aspects/3.2.4.RELEASE/org.springframework.aspects-3.2.4.RELEASE.jar
    411175  2013-12-06 10:52   repository/org/springframework/org.springframework.jdbc/3.2.4.RELEASE/org.springframework.jdbc-3.2.4.RELEASE.jar
     48049  2013-12-06 10:52   repository/javax/portlet/portlet-api/2.0/portlet-api-2.0.jar
@@ -60,7 +60,7 @@ Archive:  spring-3.0.0.kar
    362889  2013-12-06 10:52   repository/org/springframework/osgi/spring-osgi-core/1.2.1/spring-osgi-core-1.2.1.jar
    120822  2013-12-06 10:52   repository/org/springframework/osgi/spring-osgi-extender/1.2.1/spring-osgi-extender-1.2.1.jar
     24231  2013-12-06 10:52   repository/org/springframework/osgi/spring-osgi-annotation/1.2.1/spring-osgi-annotation-1.2.1.jar
-    12597  2013-12-06 10:52   repository/org/apache/karaf/bundle/org.apache.karaf.bundle.springstate/3.0.0/org.apache.karaf.bundle.springstate-3.0.0.jar
+    12597  2013-12-06 10:52   repository/org/apache/karaf/bundle/org.apache.karaf.bundle.springstate/4.0.0/org.apache.karaf.bundle.springstate-4.0.0.jar
     31903  2013-12-06 10:52   repository/org/eclipse/gemini/blueprint/gemini-blueprint-io/1.0.0.RELEASE/gemini-blueprint-io-1.0.0.RELEASE.jar
    578205  2013-12-06 10:52   repository/org/eclipse/gemini/blueprint/gemini-blueprint-core/1.0.0.RELEASE/gemini-blueprint-core-1.0.0.RELEASE.jar
    178525  2013-12-06 10:52   repository/org/eclipse/gemini/blueprint/gemini-blueprint-extender/1.0.0.RELEASE/gemini-blueprint-extender-1.0.0.RELEASE.jar

http://git-wip-us.apache.org/repos/asf/karaf/blob/457b9b74/manual/src/main/webapp/users-guide/provisioning-schema.conf
----------------------------------------------------------------------
diff --git a/manual/src/main/webapp/users-guide/provisioning-schema.conf b/manual/src/main/webapp/users-guide/provisioning-schema.conf
index 4293465..b57dcaa 100644
--- a/manual/src/main/webapp/users-guide/provisioning-schema.conf
+++ b/manual/src/main/webapp/users-guide/provisioning-schema.conf
@@ -1,10 +1,12 @@
 h1. Features XML Schemas (provisioning)
 
-Apache Karaf 3.0.0 supports different versions of the features XML schemas.
+Apache Karaf 4.0.0 supports different versions of the features XML schemas.
 
 The features XML schema can be found directly in the Apache Karaf sources, in the {{features/core}}
module:
 
 {code}
+features/core/src/main/resources/org/apache/karaf/features/karaf-features-1.3.0.xsd
+features/core/src/main/resources/org/apache/karaf/features/karaf-features-1.2.1.xsd
 features/core/src/main/resources/org/apache/karaf/features/karaf-features-1.2.0.xsd
 features/core/src/main/resources/org/apache/karaf/features/karaf-features-1.1.0.xsd
 features/core/src/main/resources/org/apache/karaf/features/karaf-features-1.0.0.xsd
@@ -12,10 +14,22 @@ features/core/src/main/resources/org/apache/karaf/features/karaf-features-1.0.0.
 
 These schemas are also available on the Apache Karaf website:
 
+* [http://karaf.apache.org/xmlns/features/v1.3.0]
+* [http://karaf.apache.org/xmlns/features/v1.2.1]
 * [http://karaf.apache.org/xmlns/features/v1.2.0]
 * [http://karaf.apache.org/xmlns/features/v1.1.0]
 * [http://karaf.apache.org/xmlns/features/v1.0.0]
 
+h2. karaf-features-1.3.0.xsd
+
+{snippet:url=../features/core/src/main/resources/org/apache/karaf/features/karaf-features-1.3.0.xsd|lang=xml|pygmentize=true}
+{snippet}
+
+h2. karaf-features-1.2.1.xsd
+
+{snippet:url=../features/core/src/main/resources/org/apache/karaf/features/karaf-features-1.2.1.xsd|lang=xml|pygmentize=true}
+{snippet}
+
 h2. karaf-features-1.2.0.xsd
 
 {snippet:url=../features/core/src/main/resources/org/apache/karaf/features/karaf-features-1.2.0.xsd|lang=xml|pygmentize=true}
@@ -29,4 +43,4 @@ h2. karaf-features-1.1.0.xsd
 h2. karaf-features-1.0.0.xsd
 
 {snippet:url=../features/core/src/main/resources/org/apache/karaf/features/karaf-features-1.0.0.xsd|lang=xml|pygmentize=true}
-{snippet}
\ No newline at end of file
+{snippet}

http://git-wip-us.apache.org/repos/asf/karaf/blob/457b9b74/manual/src/main/webapp/users-guide/provisioning.conf
----------------------------------------------------------------------
diff --git a/manual/src/main/webapp/users-guide/provisioning.conf b/manual/src/main/webapp/users-guide/provisioning.conf
index a0a7f8d..409624c 100644
--- a/manual/src/main/webapp/users-guide/provisioning.conf
+++ b/manual/src/main/webapp/users-guide/provisioning.conf
@@ -1,6 +1,12 @@
 h1. Provisioning
 
-Apache Karaf is OSGi powered container.
+Apache Karaf supports the provisioning of applications and modules using the concept of Karaf
Features.
+
+h2. Application
+
+By provisioning application, it means install all modules, configuration, and transitive
applications.
+
+h2. OSGi
 
 It natively supports the deployment of OSGi applications.
 
@@ -16,10 +22,10 @@ More over, typically, an application requires configuration (see the [Configurat
 So, before being able to start your application, in addition of the dependency bundles, you
have to create or deploy the
 configuration.
 
-Deploying all the requirements (bundles and configurations) of an application into a container
is called the "provisioning".
-
 As we can see, the provisioning of an application can be very long and fastidious.
 
+h2. Feature and resolver
+
 Apache Karaf provides a simple and flexible way to provision applications.
 
 In Apache Karaf, the application provisioning is an Apache Karaf "feature".
@@ -36,6 +42,26 @@ A feature describes an application as:
 When you install a feature, Apache Karaf installs all resources described in the feature.
It means that it will
 automatically resolves and installs all bundles, configurations, and dependency features
described in the feature.
 
+The feature resolver checks the service requirements, and install the bundles providing the
services matching the requirements.
+The default mode enables this behavior only for "new style" features repositories (basically,
the features repositories XML with
+schema equal or greater to 1.3.0). It doesn't apply for "old style" features repositories
(coming from Karaf 2 or 3).
+
+You can change the service requirements enforcement mode in {{etc/org.apache.karaf.features.cfg}}
file, using the {{serviceRequirements}} property.
+
+{code}
+serviceRequirements=default
+{code}
+
+The possible values are:
+* disable: service requirements are completely ignored, for both "old style" and "new style"
features repositories
+* default: service requirements are ignored for "old style" features repositories, and enabled
for "new style" features repositories.
+* enforce: service requirements are always verified, for "old style" and "new style" features
repositories.
+
+Additionally, a feature can also define requirements. In that case, Karaf can automatically
additional bundles or features
+providing the capabilities to satisfy the requirements.
+
+A feature has a complete lifecycle: install, start, stop, update, uninstall.
+
 h2. Features repositories
 
 The features are described in a features XML descriptor. This XML file contains the description
of a set of features.
@@ -46,7 +72,7 @@ the features repository that provides the feature (using {{feature:repo-add}}
co
 For instance, the following XML file (or "features repository") describes the {{feature1}}
and {{feature2}} features:
 
 {code:lang=xml}
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.3.0">
   <feature name="feature1" version="1.0.0">
     <bundle>...</bundle>
     <bundle>...</bundle>
@@ -94,12 +120,11 @@ This configuration file contains the two properties to use to define
boot featur
 
 h2. Features upgrade
 
-Right now, Apache Karaf doesn't provide complete upgrade cycle for features.
+You can update a release by installing the same feature (with the same SNAPSHOT version or
a different version).
 
-Basically, a feature upgrade means:
+Thanks to the features lifecycle, you can control the status of the feature (started, stopped,
etc).
 
-* Uninstall the features first (eventually providing the feature version to uninstall), and
the features repository.
-* Register the new version of the features repository and install the features with the target
version.
+You can also use a simulation to see what the update will do.
 
 h2. Feature bundles
 
@@ -122,7 +147,9 @@ The start-level attribute insure that the {{myproject-dao}} bundle is
started be
 Instead of using start-level, a better solution is to simply let the OSGi framework know
what your dependencies are by
 defining the packages or services you need. It is more robust than setting start levels.
 
-h3. Start and stop
+h3. Simulate, Start and stop
+
+You can simulate the installation of a feature using the {{-t}} option to {{feature:install}}
command.
 
 You can install a bundle without starting it. By default, the bundles in a feature are automatically
started.
 
@@ -136,15 +163,6 @@ To do so, a feature can specify the {{start}} attribute to false in the
{{<bundl
   </feature>
 {code}
 
-{warning}
-Before Apache Karaf 3.0.0 the start-level was not considered during the feature startup,
but only the order in which bundles
-are defined in your feature.xml.
-Starting with Apache Karaf 3.0.0, the start-level is considered correctly.
-If you need to use the old behavior you can uncomment and set the {{respectStartLvlDuringFeatureStartup}}
property to false in
-{{etc/org.apache.karaf.features.xml}} configuration file.
-Note that it will be removed in 4.0 and should therefore be used only temporarily.
-{warning}
-
 h3. Dependency
 
 A bundle can be flagged as being a dependency, using the {{dependency}} attribute set to
true on the {{<bundle/>}} element.
@@ -212,24 +230,20 @@ contain customization. This behaviour can be overriden by {{override}}
set to tr
 
 The file URL is any URL supported by Apache Karaf (see the [Artifacts repositories and URLs|urls]
of the user guide for details).
 
-h2. Feature resolver
+h3. Requirements
+
+A feature can also specify expected requirements. The feature resolver will try to satisfy
the requirements. For that, it checks
+the features and bundles capabilities and will automatically install the bundles to satisfy
the requirements.
 
-A feature accepts a {{resolver}} attribute:
+For instance, a feature can contain:
 
 {code:lang=xml}
-<feature name="my-project" version="1.0.0" resolver="(obr)">
-...
-</feature>
+<requirement>osgi.ee;filter:=&quot;(&amp;(osgi.ee=JavaSE)(!(version&gt;=1.8)))&quot;</requirement>
 {code}
 
-This {{resolver}} attribute forces the usage of a specific resolver, instead of the default
resolution process.
+The requirement specifies that the feature will work by only if the JDK version is not 1.8
(so basically 1.7).
 
-A resolver is used to obtain the list of bundles to install, when installing the feature.
-
-The default resolver simply returns the list of bundles as described by the {{<bundle/>}}
elements in a feature.
-
-You can install a OBR (OSGi Bundle Repository) resolver instead of the default one.
-The OBR resolver use the OBR service to get the list of bundles to install (see the [OBR
section|obr] of the user guide for details).
+The features resolver is also able to refresh the bundles when an optional dependency is
satisfy, rewiring the optional import.
 
 h2. Commands
 
@@ -239,12 +253,13 @@ The {{feature:repo-list}} command lists all registered features repository:
 
 {code}
 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
-org.ops4j.pax.web-3.0.5   | mvn:org.ops4j.pax.web/pax-web-features/3.0.5/xml/features
-spring-3.0.0              | mvn:org.apache.karaf.features/spring/3.0.0/xml/features
+Repository               | URL
+--------------------------------------------------------------------------------------
+org.ops4j.pax.cdi-0.12.0 | mvn:org.ops4j.pax.cdi/pax-cdi-features/0.12.0/xml/features
+org.ops4j.pax.web-4.1.4  | mvn:org.ops4j.pax.web/pax-web-features/4.1.4/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
 {code}
 
 Each repository has a name and the URL to the features XML.
@@ -257,12 +272,13 @@ so update the features definition), you can use the {{-r}} option:
 karaf@root()> feature:repo-list -r
 Reloading all repositories from their urls
 
-Repository                | URL
-------------------------------------------------------------------------------------------------
-standard-3.0.0            | mvn:org.apache.karaf.features/standard/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
-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
+Repository               | URL
+--------------------------------------------------------------------------------------
+org.ops4j.pax.cdi-0.12.0 | mvn:org.ops4j.pax.cdi/pax-cdi-features/0.12.0/xml/features
+org.ops4j.pax.web-4.1.4  | mvn:org.ops4j.pax.web/pax-web-features/4.1.4/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
 {code}
 
 h3. {{feature:repo-add}}
@@ -302,17 +318,27 @@ The {{etc/org.apache.karaf.features.repos.cfg}} defines a list of "pre-installed
 # This file describes the features repository URL
 # It could be directly installed using feature:repo-add command
 #
-
-cellar       = org.apache.karaf.cellar:apache-karaf-cellar:xml:features:(0,]
-camel        = org.apache.camel.karaf:apache-camel:xml:features:(0,]
-camel-extras = org.apache-extras.camel-extra.karaf:camel-extra:xml:features:(0,]
-cxf          = org.apache.cxf.karaf:apache-cxf:xml:features:(0,]
-cxf-dosgi    = org.apache.cxf.dosgi:cxf-dosgi:xml:features:(0,]
-activemq     = org.apache.activemq:activemq-karaf:xml:features:(0,]
-jclouds      = org.jclouds.karaf:jclouds-karaf:xml:features:(0,]
-openejb      = org.apache.openejb:openejb-feature:xml:features:(0,]
-wicket       = org.ops4j.pax.wicket:features:xml:features:(0,]
-hawtio       = io.hawt:hawtio-karaf:xml:features:(0,]
+enterprise=mvn:org.apache.karaf.features/enterprise/LATEST/xml/features
+spring=mvn:org.apache.karaf.features/spring/LATEST/xml/features
+cellar=mvn:org.apache.karaf.cellar/apache-karaf-cellar/LATEST/xml/features
+cave=mvn:org.apache.karaf.cave/apache-karaf-cave/LATEST/xml/features
+camel=mvn:org.apache.camel.karaf/apache-camel/LATEST/xml/features
+camel-extras=mvn:org.apache-extras.camel-extra.karaf/camel-extra/LATEST/xml/features
+cxf=mvn:org.apache.cxf.karaf/apache-cxf/LATEST/xml/features
+cxf-dosgi=mvn:org.apache.cxf.dosgi/cxf-dosgi/LATEST/xml/features
+cxf-xkms=mvn:org.apache.cxf.services.xkms/cxf-services-xkms-features/LATEST/xml
+activemq=mvn:org.apache.activemq/activemq-karaf/LATEST/xml/features
+jclouds=mvn:org.apache.jclouds.karaf/jclouds-karaf/LATEST/xml/features
+openejb=mvn:org.apache.openejb/openejb-feature/LATEST/xml/features
+wicket=mvn:org.ops4j.pax.wicket/features/LATEST/xml/features
+hawtio=mvn:io.hawt/hawtio-karaf/LATEST/xml/features
+pax-cdi=mvn:org.ops4j.pax.cdi/pax-cdi-features/LATEST/xml/features
+pax-jdbc=mvn:org.ops4j.pax.jdbc/pax-jdbc-features/LATEST/xml/features
+pax-jpa=mvn:org.ops4j.pax.jpa/pax-jpa-features/LATEST/xml/features
+pax-web=mvn:org.ops4j.pax.web/pax-web-features/LATEST/xml/features
+pax-wicket=mvn:org.ops4j.pax.wicket/pax-wicket-features/LATEST/xml/features
+ecf=http://download.eclipse.org/rt/ecf/latest/site.p2/karaf-features.xml
+decanter=mvn:org.apache.karaf.decanter/apache-karaf-decanter/LATEST/xml/features
 {code}
 
 You can directly provide a features repository name to the {{feature:repo-add}} command.
For install, to install Apache Karaf Cellar, you can do:
@@ -326,16 +352,16 @@ When you don't provide the optional {{version}} argument, Apache Karaf
installs
 You can specify a target version with the {{version}} argument:
 
 {code}
-karaf@root()> feature:repo-add cellar 2.3.1
-Adding feature url mvn:org.apache.karaf.cellar/apache-karaf-cellar/2.3.1/xml/features
+karaf@root()> feature:repo-add cellar 4.0.0.RC1
+Adding feature url mvn:org.apache.karaf.cellar/apache-karaf-cellar/4.0.0.RC1/xml/features
 {code}
 
 Instead of providing a features repository name defined in the {{etc/org.apache.karaf.features.repos.cfg}}
configuration file,
 you can directly provide the features repository URL to the {{feature:repo-add}} command:
 
 {code}
-karaf@root()> feature:repo-add mvn:org.apache.karaf.cellar/apache-karaf-cellar/2.3.1/xml/features
-Adding feature url mvn:org.apache.karaf.cellar/apache-karaf-cellar/2.3.1/xml/features
+karaf@root()> feature:repo-add mvn:org.apache.karaf.cellar/apache-karaf-cellar/4.0.0.RC1/xml/features
+Adding feature url mvn:org.apache.karaf.cellar/apache-karaf-cellar/4.0.0.RC1/xml/features
 {code}
 
 By default, the {{feature:repo-add}} command just registers the features repository, it doesn't
install any feature.
@@ -357,18 +383,19 @@ Without argument, the command refreshes all features repository:
 
 {code}
 karaf@root()> feature:repo-refresh
-Refreshing feature url mvn:org.apache.karaf.features/standard/3.0.0/xml/features
-Refreshing feature url mvn:org.apache.karaf.features/enterprise/3.0.0/xml/features
-Refreshing feature url mvn:org.ops4j.pax.web/pax-web-features/3.0.4/xml/features
-Refreshing feature url mvn:org.apache.karaf.features/spring/3.0.0/xml/features
+Refreshing feature url mvn:org.ops4j.pax.cdi/pax-cdi-features/0.12.0/xml/features
+Refreshing feature url mvn:org.ops4j.pax.web/pax-web-features/4.1.4/xml/features
+Refreshing feature url mvn:org.apache.karaf.features/standard/4.0.0/xml/features
+Refreshing feature url mvn:org.apache.karaf.features/enterprise/4.0.0/xml/features
+Refreshing feature url mvn:org.apache.karaf.features/spring/4.0.0/xml/features
 {code}
 
 Instead of refreshing all features repositories, you can specify the features repository
to refresh, by providing the URL
 or the features repository name (and optionally version):
 
 {code}
-karaf@root()> feature:repo-refresh mvn:org.apache.karaf.features/standard/3.0.0-SNAPSHOT/xml/features
-Refreshing feature url mvn:org.apache.karaf.features/standard/3.0.0-SNAPSHOT/xml/features
+karaf@root()> feature:repo-refresh mvn:org.apache.karaf.features/standard/4.0.0/xml/features
+Refreshing feature url mvn:org.apache.karaf.features/standard/4.0.0/xml/features
 {code}
 
 {code}
@@ -386,7 +413,7 @@ The {{feature:repo-remove}} command requires a argument:
 * the features repository URL (as displayed in the URL column of the {{feature:repo-list}}
command output)
 
 {code}
-karaf@root()> feature:repo-remove karaf-cellar-3.0.0
+karaf@root()> feature:repo-remove karaf-cellar-4.0.0.RC1
 {code}
 
 {code}
@@ -399,7 +426,7 @@ uninstall the features provided by the features repository.
 If you use {{-u}} option, the {{feature:repo-remove}} command uninstalls all features described
by the features repository:
 
 {code}
-karaf@root()> feature:repo-remove -u karaf-cellar-3.0.0
+karaf@root()> feature:repo-remove -u karaf-cellar-4.0.0.RC1
 {code}
 
 h3. {{feature:list}}
@@ -407,16 +434,17 @@ h3. {{feature:list}}
 The {{feature:list}} command lists all available features (provided by the different registered
features repositories):
 
 {code}
-karaf@root()> 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
+Name                          | Version                          | Required | State     
 | Repository               | Description
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+pax-cdi                       | 0.12.0                           |          | Uninstalled
| org.ops4j.pax.cdi-0.12.0 | Provide CDI support
+pax-cdi-1.1                   | 0.12.0                           |          | Uninstalled
| org.ops4j.pax.cdi-0.12.0 | Provide CDI 1.1 support
+pax-cdi-1.2                   | 0.12.0                           |          | Uninstalled
| org.ops4j.pax.cdi-0.12.0 | Provide CDI 1.2 support
+pax-cdi-weld                  | 0.12.0                           |          | Uninstalled
| org.ops4j.pax.cdi-0.12.0 | Weld CDI support
+pax-cdi-1.1-weld              | 0.12.0                           |          | Uninstalled
| org.ops4j.pax.cdi-0.12.0 | Weld CDI 1.1 support
+pax-cdi-1.2-weld              | 0.12.0                           |          | Uninstalled
| org.ops4j.pax.cdi-0.12.0 | Weld CDI 1.2 support
+pax-cdi-openwebbeans          | 0.12.0                           |          | Uninstalled
| org.ops4j.pax.cdi-0.12.0 | OpenWebBeans CDI support
+pax-cdi-web                   | 0.12.0                           |          | Uninstalled
| org.ops4j.pax.cdi-0.12.0 | Web CDI support
+pax-cdi-1.1-web               | 0.12.0                           |          | Uninstalled
| org.ops4j.pax.cdi-0.12.0 | Web CDI 1.1 support
 ...
 {code}
 
@@ -424,14 +452,18 @@ If you want to order the features by alphabetical name, you can use
the {{-o}} o
 
 {code}
 karaf@root()> feature:list -o
-Name                          | Version         | Installed | Repository                |
Description
---------------------------------------------------------------------------------------------------------------------------------------------
-aries-annotation              | 3.0.0-SNAPSHOT  |           | standard-3.0.0-SNAPSHOT   |
Aries Annotations
-blueprint-web                 | 3.0.0-SNAPSHOT  |           | standard-3.0.0-SNAPSHOT   |
Provides an OSGI-aware Servlet ContextListener for
-config                        | 3.0.0-SNAPSHOT  | x         | standard-3.0.0-SNAPSHOT   |
Provide OSGi ConfigAdmin support
-eventadmin                    | 3.0.0-SNAPSHOT  |           | standard-3.0.0-SNAPSHOT   |
OSGi Event Admin service specification for event-b
-http                          | 3.0.0-SNAPSHOT  |           | standard-3.0.0-SNAPSHOT   |
Implementation of the OSGI HTTP Service
-http-whiteboard               | 3.0.0-SNAPSHOT  |           | standard-3.0.0-SNAPSHOT   |
Provide HTTP Whiteboard pattern support
+Name                          | Version                          | Required | State     
 | Repository               | Description
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+deltaspike-core               | 1.2.1                            |          | Uninstalled
| org.ops4j.pax.cdi-0.12.0 | Apache Deltaspike core support
+deltaspike-data               | 1.2.1                            |          | Uninstalled
| org.ops4j.pax.cdi-0.12.0 | Apache Deltaspike data support
+deltaspike-jpa                | 1.2.1                            |          | Uninstalled
| org.ops4j.pax.cdi-0.12.0 | Apache Deltaspike jpa support
+deltaspike-partial-bean       | 1.2.1                            |          | Uninstalled
| org.ops4j.pax.cdi-0.12.0 | Apache Deltaspike partial bean support
+pax-cdi                       | 0.12.0                           |          | Uninstalled
| org.ops4j.pax.cdi-0.12.0 | Provide CDI support
+pax-cdi-1.1                   | 0.12.0                           |          | Uninstalled
| org.ops4j.pax.cdi-0.12.0 | Provide CDI 1.1 support
+pax-cdi-1.1-web               | 0.12.0                           |          | Uninstalled
| org.ops4j.pax.cdi-0.12.0 | Web CDI 1.1 support
+pax-cdi-1.1-web-weld          | 0.12.0                           |          | Uninstalled
| org.ops4j.pax.cdi-0.12.0 | Weld Web CDI 1.1 support
+pax-cdi-1.1-weld              | 0.12.0                           |          | Uninstalled
| org.ops4j.pax.cdi-0.12.0 | Weld CDI 1.1 support
+pax-cdi-1.2                   | 0.12.0                           |          | Uninstalled
| org.ops4j.pax.cdi-0.12.0 | Provide CDI 1.2 support
 ...
 {code}
 
@@ -441,15 +473,27 @@ Using the {{-i}} option displays only installed features:
 
 {code}
 karaf@root()> feature:list -i
-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
+-------------------------------------------------------------------------------------------------------------------
+aries-proxy     | 4.0.0   |          | Started | standard-4.0.0 | Aries Proxy
+aries-blueprint | 4.0.0   | x        | Started | standard-4.0.0 | Aries Blueprint
+feature         | 4.0.0   | x        | Started | standard-4.0.0 | Features Support
+shell           | 4.0.0   | x        | Started | standard-4.0.0 | Karaf Shell
+shell-compat    | 4.0.0   | x        | Started | standard-4.0.0 | Karaf Shell Compatibility
+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
+wrap            | 0.0.0   | x        | Started | standard-4.0.0 | Wrap URL handler
 {code}
 
 h3. {{feature:install}}
@@ -463,8 +507,20 @@ If only the name of the feature is provided (not the version), the latest
versio
 karaf@root()> feature:install eventadmin
 {code}
 
+We can simulate an installation using {{-t}} or {{--simulate}} option: it just displays what
it would do, but it doesn't do it:
+
 {code}
-karaf@root()> feature:install eventadmin/3.0.0
+karaf@root()> feature:install -t -v eventadmin
+Adding features: eventadmin/[4.0.0,4.0.0]
+No deployment change.
+  Managing bundle:
+    org.apache.felix.metatype / 1.0.12
+{code}
+
+You can specify a feature version to install:
+
+{code}
+karaf@root()> feature:install eventadmin/4.0.0
 {code}
 
 By default, the {{feature:install}} command is not verbose. If you want to have some details
about actions performed by the {{feature:install}}
@@ -472,8 +528,9 @@ command, you can use the {{-v}} option:
 
 {code}
 karaf@root()> feature:install -v eventadmin
-Installing feature eventadmin 3.0.0
-Found installed bundle: org.apache.felix.eventadmin [80]
+Adding features: eventadmin/[4.0.0,4.0.0]
+No deployment change.
+Done.
 {code}
 
 If a feature contains a bundle which is already installed, by default, Apache Karaf will
refresh this bundle.
@@ -482,15 +539,30 @@ bundles, you can use the {{-r}} option:
 
 {code}
 karaf@root()> feature:install -v -r eventadmin
-Installing feature eventadmin 3.0.0
-Installing bundle mvn:org.apache.felix/org.apache.felix.eventadmin/1.3.2
+Adding features: eventadmin/[4.0.0,4.0.0]
+No deployment change.
+Done.
 {code}
 
-If the installation of a failure fails (for any reason), by default, Apache Karaf will uninstall
all bundles installed by the feature.
-It will go back in the state before the installation of the feature.
+You can decide to not start the bundles installed by a feature using the {{-s}} or {{--no-auto-start}}
option:
 
-If you want to keep the bundles in the feature successfully installed, you can use the {{-c}}
option. Even if the complete feature
-installation fails, the feature successfully installed bundles remain installed.
+{code}
+karaf@root()> feature:install -s eventadmin
+{code}
+
+h3. {{feature:start}}
+
+By default, when you install a feature, it's automatically installed. However, you can specify
the {{-s}} option to the {{feature:install}} command.
+
+As soon as you install a feature (started or not), all packages provided by the bundles defined
in the feature will be available, and can be used for
+the wiring in other bundles.
+
+When starting a feature, all bundles are started, and so, the feature also exposes the services.
+
+h3. {{feature:stop}}
+
+You can also stop a feature: it means that all services provided by the feature will be stop
and removed from the service registry. However, the packages
+are still available for the wiring (the bundles are in resolved state).
 
 h3. {{feature:uninstall}}
 
@@ -502,6 +574,9 @@ If only the name of the feature is provided (not the version), the latest
versio
 karaf@root()> feature:uninstall eventadmin
 {code}
 
+The features resolver is involved during feature uninstallation: transitive features installed
by the uninstalled feature can be uninstalled
+themselves if not used by other feature.
+
 h2. Deployer
 
 You can "hot deploy" a features XML by dropping the file directly in the {{deploy}} folder.
@@ -517,8 +592,8 @@ feature3 won't be installed:
 
 {code:lang=xml}
 <?xml version="1.0" encoding="UTF-8"?>
-<features name="my-features" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
+<features name="my-features" xmlns="http://karaf.apache.org/xmlns/features/v1.3.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.3.0 http://karaf.apache.org/xmlns/features/v1.3.0">
 
     <feature name="feature1" version="1.0" install="auto">
         ...
@@ -582,4 +657,4 @@ h3. Notifications
 The FeatureMBean sends two kind of notifications (on which you can subscribe and react):
 
 * When a feature repository changes (added or removed).
-* When a feature changes (installed or uninstalled).
\ No newline at end of file
+* When a feature changes (installed or uninstalled).

http://git-wip-us.apache.org/repos/asf/karaf/blob/457b9b74/manual/src/main/webapp/users-guide/remote.conf
----------------------------------------------------------------------
diff --git a/manual/src/main/webapp/users-guide/remote.conf b/manual/src/main/webapp/users-guide/remote.conf
index fceda30..ddce509 100644
--- a/manual/src/main/webapp/users-guide/remote.conf
+++ b/manual/src/main/webapp/users-guide/remote.conf
@@ -150,7 +150,7 @@ Password:
      / /| |/ /_/ / /  / /_/ / __/
     /_/ |_|\__,_/_/   \__,_/_/
 
-  Apache Karaf (3.0.0)
+  Apache Karaf (4.0.0)
 
 Hit '<tab>' for a list of available commands
 and '[cmd] --help' for help on a specific command.
@@ -213,7 +213,7 @@ Connected
      / /| |/ /_/ / /  / /_/ / __/
     /_/ |_|\__,_/_/   \__,_/_/
 
-  Apache Karaf (3.0.0)
+  Apache Karaf (4.0.0)
 
 Hit '<tab>' for a list of available commands
 and '[cmd] --help' for help on a specific command.
@@ -283,7 +283,7 @@ Logging in as karaf
      / /| |/ /_/ / /  / /_/ / __/
     /_/ |_|\__,_/_/   \__,_/_/
 
-  Apache Karaf (3.0.0)
+  Apache Karaf (4.0.0)
 
 Hit '<tab>' for a list of available commands
 and '[cmd] --help' for help on a specific command.

http://git-wip-us.apache.org/repos/asf/karaf/blob/457b9b74/manual/src/main/webapp/users-guide/start-stop.conf
----------------------------------------------------------------------
diff --git a/manual/src/main/webapp/users-guide/start-stop.conf b/manual/src/main/webapp/users-guide/start-stop.conf
index f40b0da..0fdf8b9 100644
--- a/manual/src/main/webapp/users-guide/start-stop.conf
+++ b/manual/src/main/webapp/users-guide/start-stop.conf
@@ -26,7 +26,7 @@ bin/karaf
      / /| |/ /_/ / /  / /_/ / __/
     /_/ |_|\__,_/_/   \__,_/_/
 
-  Apache Karaf (3.0.0)
+  Apache Karaf (4.0.0)
 
 Hit '<tab>' for a list of available commands
 and '[cmd] --help' for help on a specific command.
@@ -45,7 +45,7 @@ bin\karaf.bat
      / /| |/ /_/ / /  / /_/ / __/
     /_/ |_|\__,_/_/   \__,_/_/
 
-  Apache Karaf (3.0.0)
+  Apache Karaf (4.0.0)
 
 Hit '<tab>' for a list of available commands
 and '[cmd] --help' for help on a specific command.
@@ -186,7 +186,7 @@ Logging in as karaf
      / /| |/ /_/ / /  / /_/ / __/
     /_/ |_|\__,_/_/   \__,_/_/
 
-  Apache Karaf (3.0.0)
+  Apache Karaf (4.0.0)
 
 Hit '<tab>' for a list of available commands
 and '[cmd] --help' for help on a specific command.
@@ -208,7 +208,7 @@ Logging in as karaf
      / /| |/ /_/ / /  / /_/ / __/
     /_/ |_|\__,_/_/   \__,_/_/
 
-  Apache Karaf (3.0.0-SNAPSHOT)
+  Apache Karaf (4.0.0-SNAPSHOT)
 
 Hit '<tab>' for a list of available commands
 and '[cmd] --help' for help on a specific command.
@@ -275,7 +275,7 @@ Password:
      / /| |/ /_/ / /  / /_/ / __/
     /_/ |_|\__,_/_/   \__,_/_/
 
-  Apache Karaf (3.0.0-SNAPSHOT)
+  Apache Karaf (4.0.0-SNAPSHOT)
 
 Hit '<tab>' for a list of available commands
 and '[cmd] --help' for help on a specific command.
@@ -416,4 +416,4 @@ The SystemMBean provides different attributes and operations, especially
operati
 * {{rebootCleanCache(time)}} reboots Apache Karaf at a given time, including the cleanup
of the cache.
 * {{rebootCleanAll(time)}} reboots Apache Karaf at a given time, including the cleanup of
the whole data folder.
 * {{halt()}} shutdown Apache Karaf now.
-* {{halt(time)}} shutdown Apache Karaf at a given time. The time format is the same as the
time argument of the {{shutdown}} command.
\ No newline at end of file
+* {{halt(time)}} shutdown Apache Karaf at a given time. The time format is the same as the
time argument of the {{shutdown}} command.

http://git-wip-us.apache.org/repos/asf/karaf/blob/457b9b74/manual/src/main/webapp/users-guide/tuning.conf
----------------------------------------------------------------------
diff --git a/manual/src/main/webapp/users-guide/tuning.conf b/manual/src/main/webapp/users-guide/tuning.conf
index 62095cb..452d9ba 100644
--- a/manual/src/main/webapp/users-guide/tuning.conf
+++ b/manual/src/main/webapp/users-guide/tuning.conf
@@ -16,7 +16,7 @@ By default, Apache Karaf uses:
 * {{-XX:+UnsyncloadClass}}
 
 On Sun/Oracle JVM:
-* the Perm size is the JVM default
+* the Perm size is the JVM default (for Java 7)
 
 On IBM JVM and AIX system:
 * {{-Xverify:none}}

http://git-wip-us.apache.org/repos/asf/karaf/blob/457b9b74/manual/src/main/webapp/users-guide/update.conf
----------------------------------------------------------------------
diff --git a/manual/src/main/webapp/users-guide/update.conf b/manual/src/main/webapp/users-guide/update.conf
index d7ee64f..c5216eb 100644
--- a/manual/src/main/webapp/users-guide/update.conf
+++ b/manual/src/main/webapp/users-guide/update.conf
@@ -1,5 +1,5 @@
 h1. Update procedure
 
-h2. From Karaf 3.0.x to Karaf 3.0.x
+h2. From Karaf 4.0.x to Karaf 4.0.x
 
-h2. From Karaf 2.2.x to Karaf 3.0.x
+h2. From Karaf 3.0.x to Karaf 4.0.x

http://git-wip-us.apache.org/repos/asf/karaf/blob/457b9b74/manual/src/main/webapp/users-guide/webcontainer.conf
----------------------------------------------------------------------
diff --git a/manual/src/main/webapp/users-guide/webcontainer.conf b/manual/src/main/webapp/users-guide/webcontainer.conf
index 64f8f6c..1368e9e 100644
--- a/manual/src/main/webapp/users-guide/webcontainer.conf
+++ b/manual/src/main/webapp/users-guide/webcontainer.conf
@@ -158,7 +158,7 @@ WAB can be deployed directly in Apache Karaf, for instance, by dropping
the arch
 For instance, the Apache Karaf manual (documentation) is available as a WAB that you can
deploy directly in a running instance:
 
 {code}
-karaf@root()> bundle:install -s mvn:org.apache.karaf/manual/3.0.0/war
+karaf@root()> bundle:install -s mvn:org.apache.karaf/manual/4.0.0/war
 {code}
 
 h3. WAR (WebApplication aRchive)
@@ -208,7 +208,7 @@ For instance, if you installed the Apache Karaf manual WAR file as described
pre
 karaf@root()> web:list
 ID  | State       | Web-State   | Level | Web-ContextPath | Name
 ---------------------------------------------------------------------------------------------------
-111 | Active      | Deployed    | 80    | /karaf-doc      | Apache Karaf :: Manual (3.0.0)
+111 | Active      | Deployed    | 80    | /karaf-doc      | Apache Karaf :: Manual (4.0.0)
 {code}
 
 h3. {{web:stop}}

http://git-wip-us.apache.org/repos/asf/karaf/blob/457b9b74/manual/src/main/webapp/users-guide/wrapper.conf
----------------------------------------------------------------------
diff --git a/manual/src/main/webapp/users-guide/wrapper.conf b/manual/src/main/webapp/users-guide/wrapper.conf
index b9fb8e2..e7497bd 100644
--- a/manual/src/main/webapp/users-guide/wrapper.conf
+++ b/manual/src/main/webapp/users-guide/wrapper.conf
@@ -107,21 +107,22 @@ For instance, on a Ubuntu/Debian Linux system:
 
 {code}
 karaf@root()> wrapper:install
-Creating file: /opt/apache-karaf-3.0.0/bin/karaf-wrapper
-Creating file: /opt/apache-karaf-3.0.0/bin/karaf-service
-Creating file: /opt/apache-karaf-3.0.0/etc/karaf-wrapper.conf
-Creating file: /opt/apache-karaf-3.0.0/lib/libwrapper.so
-Creating file: /opt/apache-karaf-3.0.0/lib/karaf-wrapper.jar
-Creating file: /opt/apache-karaf-3.0.0/lib/karaf-wrapper-main.jar
+Creating file: /opt/apache-karaf-4.0.0/bin/karaf-wrapper
+Creating file: /opt/apache-karaf-4.0.0/bin/karaf-service
+Creating file: /opt/apache-karaf-4.0.0/etc/karaf-wrapper.conf
+Creating missing directory: /opt/apache-karaf-4.0.0/lib/wrapper
+Creating file: /opt/apache-karaf-4.0.0/lib/wrapper/libwrapper.so
+Creating file: /opt/apache-karaf-4.0.0/lib/wrapper/karaf-wrapper.jar
+Creating file: /opt/apache-karaf-4.0.0/lib/wrapper/karaf-wrapper-main.jar
 
 Setup complete.  You may wish to tweak the JVM properties in the wrapper configuration file:
-        /opt/apache-karaf-3.0.0/etc/karaf-wrapper.conf
+        /opt/apache-karaf-4.0.0/etc/karaf-wrapper.conf
 before installing and starting the service.
 
 
 Ubuntu/Debian Linux system detected:
   To install the service:
-    $ ln -s /opt/apache-karaf-3.0.0/bin/karaf-service /etc/init.d/
+    $ ln -s /opt/apache-karaf-4.0.0/bin/karaf-service /etc/init.d/
 
   To start the service when the machine is rebooted:
     $ update-rc.d karaf-service defaults
@@ -145,7 +146,7 @@ You can note that {{wrapper:install}} command detected the running operating
sys
 You have a complete explanation and list of system commands to perform to integrate Apache
Karaf in your system:
 
 {code}
-ln -s /opt/apache-karaf-3.0.0/bin/karaf-service /etc/init.d/
+ln -s /opt/apache-karaf-4.0.0/bin/karaf-service /etc/init.d/
 update-rc.d karaf-service defaults
 {code}
 
@@ -259,10 +260,10 @@ This is a example of generated {{etc/karaf-wrapper.conf}} file:
 # Wrapper Properties
 #********************************************************************
 set.default.JAVA_HOME=/opt/jdk/1.7.0_21
-set.default.KARAF_HOME=/home/jbonofre/workspace/karaf/karaf/assemblies/apache-karaf/target/apache-karaf-3.0.0-SNAPSHOT
-set.default.KARAF_BASE=/home/jbonofre/workspace/karaf/karaf/assemblies/apache-karaf/target/apache-karaf-3.0.0-SNAPSHOT
-set.default.KARAF_DATA=/home/jbonofre/workspace/karaf/karaf/assemblies/apache-karaf/target/apache-karaf-3.0.0-SNAPSHOT/data
-set.default.KARAF_ETC=/home/jbonofre/workspace/karaf/karaf/assemblies/apache-karaf/target/apache-karaf-3.0.0-SNAPSHOT/etc
+set.default.KARAF_HOME=/opt/apache-karaf-4.0.0
+set.default.KARAF_BASE=/opt/apache-karaf-4.0.0
+set.default.KARAF_DATA=/opt/apache-karaf-4.0.0/data
+set.default.KARAF_ETC=/opt/apache-karaf-4.0.0/etc
 
 # Java Application
 wrapper.working.dir=%KARAF_BASE%


Mime
View raw message