svn commit: r911238 - in /websites/staging/sling/trunk/content: ./ documentation/bundles/osgi-installer.html site/.htaccess

[bu...@apache.org]

Author: buildbot
Date: Wed Jun  4 05:31:50 2014
New Revision: 911238

Log:
Staging update by buildbot for sling

Modified:
    websites/staging/sling/trunk/content/   (props changed)
    websites/staging/sling/trunk/content/documentation/bundles/osgi-installer.html
    websites/staging/sling/trunk/content/site/.htaccess

Propchange: websites/staging/sling/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Jun  4 05:31:50 2014
@@ -1 +1 @@
-1599523
+1599909

Modified: websites/staging/sling/trunk/content/documentation/bundles/osgi-installer.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/bundles/osgi-installer.html (original)
+++ websites/staging/sling/trunk/content/documentation/bundles/osgi-installer.html Wed Jun  4 05:31:50 2014
@@ -87,16 +87,11 @@
       </div>
 
       
-      <div class="tip">
-           This page is a translated version of <a href="/site/osgi-installer.html" target="sling_cwiki">/site/osgi-installer.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
       
       <h1>OSGi Installer</h1>
       <h1 id="overview">Overview</h1>
 <p>The OSGi installer is a central service for handling installs, updates and uninstall of "artifacts". By default, the installer supports bundles and has an extension for handling configurations for the OSGi configuration admin.</p>
-<p>!Slide14.jpg|border=1!</p>
+<p><img alt="Apache Sling OSGI Installer Diagram" src="/documentation/bundles/Slide14.jpg" /></p>
 <p>The OSGi installer itself is "just" the central service managing the tasks and states of the artifacts. The artifacts can be provided through various providers, e.g. through a file system provider reading artifacts from configured directories or the jcr provider reading artifacts from a JCR repository.</p>
 <p>A provider is just scanning for artifacts and their removal. It informs the OSGi installer about new artifacts and removed artifacts. The provider itself has usually no knowledge about the contents of an artifact. It does not know about bundles, configurations etc.</p>
 <p>As the OSGi installer itself is not performing the actual install, update or removal of an artifact, its possible to install transformers and installer factories. A transformer inspects the artifacts and tries to detect its type. By default, detecting of bundles and configurations is supported. The final service is an installer factory creating the actual task, like install this bundle, update that bundle etc.</p>
@@ -118,9 +113,9 @@ If an installed bundle is managed via an
 <p>The OSGi installer asumes that a symbolic name and version (not a snapshot version) uniquely identifies a bundle. Obviously this is a common development requirement that a released version of an artifact never changes over time. Therefore, once a bundle with a specific version is installed, it will not be reinstalled if the corresponding artifact changes. For example, if  bundle A with version 1.0 is put into the JCR repository, it gets installed. If now this jar in the repository is overwritten either with the same contents or with a different one, and this new artifact has again A as the symbolic name and version set to 1.0, nothing will happen as this exact bundle is already installed.</p>
 <p>During development, SNAPSHOT versions should be used, like 1.0.0-SNAPSHOT (using the Maven convention). If a bundle with a snapshot version is changed, it gets updated by the OSGI installer.</p>
 <h2 id="configuration-handling">Configuration Handling</h2>
-<p>In general the OSGi installer installs the configuration with the highes priority. For example in combination with the JCR installer provider, a configuration from <em>/apps</em> is preferred over a configuration for the same service from <em>/libs</em>.</p>
+<p>In general the OSGi installer installs the configuration with the highest priority. For example in combination with the JCR installer provider, a configuration from <em>/apps</em> is preferred over a configuration for the same service from <em>/libs</em>.</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1499238 by fmeschbe on Wed, 3 Jul 2013 07:39:54 +0000
+        Rev. 1599909 by dklco on Wed, 4 Jun 2014 05:31:41 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project

Modified: websites/staging/sling/trunk/content/site/.htaccess
==============================================================================
--- websites/staging/sling/trunk/content/site/.htaccess (original)
+++ websites/staging/sling/trunk/content/site/.htaccess Wed Jun  4 05:31:50 2014
@@ -76,3 +76,4 @@ Redirect Permanent /site/release-managem
 Redirect Permanent /site/scheduler-service-commons-scheduler.htm /documentation/bundles/scheduler-service-commons-scheduler.html
 Redirect Permanent /site/dependency-management.html /documentation/development/dependency-management.html
 Redirect Permanent /site/issue-tracker.html /documentation/development/issue-tracker.html
+Redirect Permanent /site/osgi-installer.html /documentation/bundles/osgi-installer.html
\ No newline at end of file