[sling-site] branch master updated: SLING-8948 Documentation for the feature model case

[gh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ghenzler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-site.git


The following commit(s) were added to refs/heads/master by this push:
     new a3fdbd5  SLING-8948 Documentation for the feature model case
a3fdbd5 is described below

commit a3fdbd584a6f369b298b6960da281e1f5d8feac8
Author: georg.henzler <ge...@netcentric.biz>
AuthorDate: Sat Dec 21 10:22:35 2019 +0100

    SLING-8948 Documentation for the feature model case
---
 .../content/documentation/bundles/installer-provider-installhook.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/jbake/content/documentation/bundles/installer-provider-installhook.md b/src/main/jbake/content/documentation/bundles/installer-provider-installhook.md
index 6baa8c8..a143631 100644
--- a/src/main/jbake/content/documentation/bundles/installer-provider-installhook.md
+++ b/src/main/jbake/content/documentation/bundles/installer-provider-installhook.md
@@ -8,6 +8,8 @@ tags=installer
 
 The Installer Vault Package Install Hook allows to install bundles and configurations synchronously during vault package installation by feeding them directly to the [OSGI installer core](/documentation/bundles/osgi-installer.html). That way [vault package dependencies](http://jackrabbit.apache.org/filevault/properties.html) can be used to not only depend on content of a package, but also on configurations and bundles contained in a package (the installer install hook has to be added to  [...]
 
+NOTE: When using with a package that should be usable in both the [Feature Model](https://sling.apache.org/documentation/development/feature-model.html) and [Provisioning Model](https://sling.apache.org/documentation/development/slingstart.html) (and the [OSGi installer](https://sling.apache.org/documentation/bundles/osgi-installer.html), ensure you use version 1.1.0 of this hook that will auto-detect its environment and only become active when the OSGi installer is present (see [SLING-8 [...]
+
 ## Installation Process
 
 The Installer Vault Package Install Hook scans through the contained files and installs bundles (extension `jar`) and OSGi configurations with extension `config` (`conf` and node configurations are not supported). Runmode folders (e.g. `install.publish` or `config.author`) are supported. To perform the installation, the hook registers the installable resources to the OSGi installer core with the exact same digest as the JCR installer would do (hence the JCR installer that will also proce [...]
@@ -31,7 +33,7 @@ To include the install hook into a content package, use the following code:
                         <artifactItem>
                             <groupId>org.apache.sling</groupId>
                             <artifactId>org.apache.sling.installer.provider.installhook</artifactId>
-                            <version>1.0.4</version>
+                            <version>1.1.0</version>
                         </artifactItem>
                     </artifactItems>
                     <outputDirectory>${project.build.directory}/vault-work/META-INF/vault/hooks</outputDirectory>
@@ -49,4 +51,4 @@ The following package properties are supported (only `installPathRegex` is requi
 | `maxWaitForOsgiInstallerInSec ` | defaults to 60 sec | Maximum wait time until installation is successful |
 | `waitForOsgiEventsQuietInSec ` | defaults to 1 sec | Time to wait for OSGi events to go quiet. Default normally works well for bundles, for certain configurations that trigger restart of bundles this can be increased. |
 | `osgiInstallerPriority ` | defaults to 2000 | Priority, by default higher than the standard installation priority of the JCR installer to ensure bundles/configs from this mechanism take higher priority  |
-| `installhook.installer.class` | `org.apache.sling.installer.provider.installhook.OsgiInstallerHook` | Alternative to including the hook in package, however then the bundle `org.apache.sling.installer.provider.installhook` needs to be installed as prerequisite | 
+| `installhook.installer.class` | `org.apache.sling.installer.provider.installhook.OsgiInstallerHookOsgiInstallerHookEntry` | Alternative to including the hook in package, however then the bundle `org.apache.sling.installer.provider.installhook` needs to be installed as prerequisite |