sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r934394 - in /websites/staging/sling/trunk/content: ./ documentation/ documentation/bundles/ site/
Date Tue, 30 Dec 2014 09:45:51 GMT
Author: buildbot
Date: Tue Dec 30 09:45:50 2014
New Revision: 934394

Log:
Staging update by buildbot for sling

Added:
    websites/staging/sling/trunk/content/documentation/bundles/configuration-installer-factory.html
    websites/staging/sling/trunk/content/documentation/bundles/file-installer-provider.html
    websites/staging/sling/trunk/content/documentation/bundles/subsystem-installer-factory.html
Removed:
    websites/staging/sling/trunk/content/site/jcr-installer-provider.html
Modified:
    websites/staging/sling/trunk/content/   (props changed)
    websites/staging/sling/trunk/content/documentation/bundles.html
    websites/staging/sling/trunk/content/documentation/bundles/jcr-installer-provider.html
    websites/staging/sling/trunk/content/documentation/bundles/osgi-installer.html
    websites/staging/sling/trunk/content/site/.htaccess
    websites/staging/sling/trunk/content/sitemap.html

Propchange: websites/staging/sling/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Dec 30 09:45:50 2014
@@ -1 +1 @@
-1648490
+1648494

Modified: websites/staging/sling/trunk/content/documentation/bundles.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/bundles.html (original)
+++ websites/staging/sling/trunk/content/documentation/bundles.html Tue Dec 30 09:45:50 2014
@@ -109,11 +109,13 @@
 <li><a href="/documentation/bundles/managing-permissions-jackrabbit-accessmanager.html">Managing permissions (jackrabbit.accessmanager)</a></li>
 <li><a href="/documentation/bundles/resource-access-security.html">Resource Access Security (resourceaccesssecurity)</a></li>
 </ul>
-<h2 id="installer">Installer</h2>
-<ul>
-<li><a href="/documentation/bundles/osgi-installer.html">OSGi Installer</a></li>
-<li><a href="/documentation/bundles/jcr-installer-provider.html">JCR Installer Provider</a></li>
-</ul>
+<h2 id="osgi-installer">OSGi Installer</h2>
+<p>The OSGi installer is a very flexible and powerful service to manage provisioning and updates of an OSGi system. It is independent of Sling and can be extended by several plugins.
+<em> <a href="/documentation/bundles/osgi-installer.html">OSGi Installer</a>
+</em> <a href="/documentation/bundles/configuration-installer-factory.html">Configuration Installer Factory</a>
+<em> <a href="/documentation/bundles/subsystem-installer-factory.html">Subsystem Installer Factory</a>
+</em> <a href="/documentation/bundles/jcr-installer-provider.html">JCR Installer Provider</a>
+* <a href="/documentation/bundles/file-installer-provider.html">File Installer Provider</a></p>
 <h2 id="development-and-utilities">Development and Utilities</h2>
 <ul>
 <li><a href="/documentation/bundles/apache-sling-commons-thread-pool.html">Commons Thread Pools</a></li>
@@ -145,7 +147,7 @@
 <li><a href="/documentation/bundles/discovery-api-and-impl.html">Discovery API and its Implementations (discovery.api, discovery.impl)</a></li>
 </ul>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1641359 by kwin on Mon, 24 Nov 2014 10:39:29 +0000
+        Rev. 1648494 by cziegeler on Tue, 30 Dec 2014 09:45:30 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project

Added: websites/staging/sling/trunk/content/documentation/bundles/configuration-installer-factory.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/bundles/configuration-installer-factory.html (added)
+++ websites/staging/sling/trunk/content/documentation/bundles/configuration-installer-factory.html Tue Dec 30 09:45:50 2014
@@ -0,0 +1,168 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+  <head>
+    <title>Apache Sling - Configuration Installer Factory</title>
+    <link rel="icon" href="/res/favicon.ico">
+    <link rel="stylesheet" href="/res/site.css" type="text/css" media="all">
+    <link rel="stylesheet" href="/res/codehilite.css" type="text/css" media="all">
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+  </head>
+  <body>
+    <div class="title">
+      <div class="logo">
+        <a href="http://sling.apache.org/">
+          <img border="0" alt="Apache Sling" src="/res/logo.png">
+        </a>
+      </div>
+      <div class="header">
+        <a href="http://www.apache.org/">
+          <img border="0" alt="Apache" src="/res/apache.png">
+        </a>
+      </div>
+    </div>
+    
+    <div class="menu"> 
+      <p><strong><a href="/documentation.html">Documentation</a></strong> <br />
+<a href="/documentation/getting-started.html">Getting Started</a> <br />
+<a href="/documentation/the-sling-engine.html">The Sling Engine</a> <br />
+<a href="/documentation/development.html">Development</a> <br />
+<a href="/documentation/bundles.html">Bundles</a> <br />
+<a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a> <br />
+<a href="/documentation/configuration.html">Configuration</a>   </p>
+<p><a href="http://s.apache.org/sling.wiki">Wiki</a> <br />
+<a href="http://s.apache.org/sling.faq">FAQ</a>   </p>
+<p><strong>API Docs</strong>  <br />
+<a href="/apidocs/sling7/index.html">Sling 7</a> <br />
+<a href="/apidocs/sling6/index.html">Sling 6</a> <br />
+<a href="/apidocs/sling5/index.html">Sling 5</a>   </p>
+<p><strong>Project info</strong> <br />
+<a href="/downloads.cgi">Downloads</a> <br />
+<a href="http://www.apache.org/licenses/">License</a> <br />
+<a href="/contributing.html">Contributing</a> <br />
+<a href="/news.html">News</a> <br />
+<a href="/links.html">Links</a> <br />
+<a href="/project-information.html">Project Information</a> <br />
+<a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a> <br />
+<a href="http://ci.apache.org/builders/sling-trunk">Build Server</a> <br />
+<a href="/project-information/security.html">Security</a>   </p>
+<p><strong>Source</strong> <br />
+<a href="http://svn.apache.org/viewvc/sling/trunk">Subversion</a> <br />
+<a href="git://git.apache.org/sling.git">Git</a> <br />
+<a href="https://github.com/apache/sling">Github Mirror</a>   </p>
+<p><strong>Sponsorship</strong> <br />
+<a href="http://www.apache.org/foundation/thanks.html">Thanks</a> <br />
+<a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a> <br />
+<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a>   </p>
+<p><strong><a href="/sitemap.html">Site Map</a></strong></p>
+<!-- no valid ads for now, we'll  reactivate this when needed
+<iframe 
+    src="http://www.apache.org/ads/button.html"
+    style="border-width:0; float: left" frameborder="0" 
+    scrolling="no"
+    width="135" 
+    height="135">
+</iframe>
+-->
+    </div>
+    
+    <div class="main">
+      <div class="breadcrump" style="font-size: 80%;">
+        <a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a href="/documentation/bundles.html">Bundles</a>
+      </div>
+
+      
+      
+      <h1>Configuration Installer Factory</h1>
+      <p>The configuration installer factory provides support for configurations to the <a href="/documentation/bundles/osgi-installer.html">OSGI installer</a>. The provisioning of artifacts is handled by installer providers like the file installer or the JCR installer.</p>
+<h2 id="configurations">Configurations</h2>
+<p>Configuration file names are related to the PID and factory PID. The structure of the file name is as follows:</p>
+<div class="codehilite"><pre><span class="n">filename</span> <span class="p">::=</span> <span class="o">&lt;</span><span class="n">pid</span><span class="o">&gt;</span> <span class="p">(</span> <span class="s">&#39;-&#39;</span> <span class="o">&lt;</span><span class="n">subname</span><span class="o">&gt;</span> <span class="p">)</span>? <span class="p">(</span><span class="s">&#39;.cfg&#39;</span><span class="o">|</span><span class="s">&#39;.config&#39;</span><span class="p">)</span>
+</pre></div>
+
+
+<p>If the form is <code>&lt;pid&gt;('.cfg'|'.config')</code>, the file contains the properties for a Managed Service. The <code>&lt;pid&gt;</code> is then the PID of the Managed Service. See the Configuration Admin service for details.</p>
+<p>When a Managed Service Factory is used, the situation is different. The <code>&lt;pid&gt;</code> part then describes the PID of the Managed Service Factory. You can pick any <code>&lt;subname&gt;</code>, the installer will then create an instance for the factory for each unique name. For example:</p>
+<div class="codehilite"><pre><span class="n">com</span><span class="p">.</span><span class="n">acme</span><span class="p">.</span><span class="n">xyz</span><span class="p">.</span><span class="n">cfg</span> <span class="o">//</span> <span class="n">configuration</span> <span class="k">for</span> <span class="n">Managed</span> <span class="n">Service</span>
+<span class="o">//</span> <span class="n">com</span><span class="p">.</span><span class="n">acme</span><span class="p">.</span><span class="n">xyz</span>
+<span class="n">com</span><span class="p">.</span><span class="n">acme</span><span class="p">.</span><span class="n">abc</span><span class="o">-</span><span class="n">default</span><span class="p">.</span><span class="n">cfg</span> <span class="o">//</span> <span class="n">Managed</span> <span class="n">Service</span> <span class="n">Factory</span><span class="p">,</span>
+<span class="o">//</span> <span class="n">creates</span> <span class="n">an</span> <span class="n">instance</span> <span class="k">for</span> <span class="n">com</span><span class="p">.</span><span class="n">acme</span><span class="p">.</span><span class="n">abc</span>
+</pre></div>
+
+
+<p>If a configuration is modified, the file installer will write the configuration back to a file to ensure peristence across restarts (if <code>sling.fileinstall.writeback</code> is enabled).</p>
+<h3 id="property-files">Property Files</h3>
+<p>Configuration files ending in '.cfg' are plain property files (<code>java.util.Property</code>). The format is simple:</p>
+<div class="codehilite"><pre><span class="n">file</span> <span class="p">::=</span> <span class="p">(</span> <span class="n">header</span> <span class="o">|</span> <span class="n">comment</span> <span class="p">)</span> <span class="o">*</span>
+<span class="n">header</span> <span class="p">::=</span> <span class="o">&lt;</span><span class="n">header</span><span class="o">&gt;</span> <span class="p">(</span> <span class="s">&#39;:&#39;</span> <span class="o">|</span> <span class="s">&#39;=&#39;</span> <span class="p">)</span> <span class="o">&lt;</span><span class="n">value</span><span class="o">&gt;</span> <span class="p">(</span> <span class="s">&#39;\&lt;nl&gt; &lt;value&gt; ) *</span>
+<span class="s">comment ::= &#39;</span>#<span class="s">&#39;</span><span class="err"> &lt;any&gt;</span>
+</pre></div>
+
+
+<p>Notice that this model only supports string properties. For example:</p>
+<div class="codehilite"><pre><span class="c"># default port</span>
+<span class="nb">ftp</span><span class="p">.</span><span class="n">port</span> <span class="p">=</span> 21
+</pre></div>
+
+
+<h3 id="configuration-files">Configuration Files</h3>
+<p>Configuration files ending in '.config' use the format of the Apache Felix ConfigAdmin implementation. It allows to specify the type and cardinality of a configuration property and is not limited to string values.</p>
+<p>The first line of such a file might start with a comment line (a line starting with a #). Comments within the file are not allowed.</p>
+<p>The format is:</p>
+<div class="codehilite"><pre><span class="n">file</span> <span class="p">::=</span> <span class="p">(</span><span class="n">comment</span><span class="p">)</span> <span class="p">(</span><span class="n">header</span><span class="p">)</span> <span class="o">*</span>
+<span class="n">comment</span> <span class="p">::=</span> <span class="s">&#39;#&#39;</span> <span class="o">&lt;</span><span class="n">any</span><span class="o">&gt;</span>
+<span class="n">header</span> <span class="p">::=</span> <span class="n">prop</span> <span class="s">&#39;=&#39;</span> <span class="n">value</span>
+<span class="n">prop</span> <span class="p">::=</span> <span class="n">symbolic</span><span class="o">-</span><span class="n">name</span> <span class="o">//</span> 1<span class="p">.</span>4<span class="p">.</span>2 <span class="n">of</span> <span class="n">OSGi</span> <span class="n">Core</span> <span class="n">Specification</span>
+<span class="n">symbolic</span><span class="o">-</span><span class="n">name</span> <span class="p">::=</span> <span class="n">token</span> <span class="p">{</span> <span class="s">&#39;.&#39;</span> <span class="n">token</span> <span class="p">}</span> 
+<span class="n">token</span> <span class="p">::=</span> <span class="p">{</span> <span class="p">[</span> 0<span class="p">..</span>9 <span class="p">]</span> <span class="o">|</span> <span class="p">[</span> <span class="n">a</span><span class="p">..</span><span class="n">z</span> <span class="p">]</span> <span class="o">|</span> <span class="p">[</span> <span class="n">A</span><span class="p">..</span><span class="n">Z</span> <span class="p">]</span> <span class="o">|</span> <span class="s">&#39;_&#39;</span> <span class="o">|</span> <span class="s">&#39;-&#39;</span> <span class="p">}</span>
+<span class="n">value</span> <span class="p">::=</span> <span class="p">[</span> <span class="n">type</span> <span class="p">]</span> <span class="p">(</span> <span class="s">&#39;[&#39;</span> <span class="n">values</span> <span class="s">&#39;]&#39;</span> <span class="o">|</span> <span class="s">&#39;(&#39;</span> <span class="n">values</span> <span class="s">&#39;)&#39;</span> <span class="o">|</span> <span class="n">simple</span> <span class="p">)</span> 
+<span class="n">values</span> <span class="p">::=</span> <span class="n">simple</span> <span class="p">{</span> <span class="s">&#39;,&#39;</span> <span class="n">simple</span> <span class="p">}</span> 
+<span class="n">simple</span> <span class="p">::=</span> <span class="s">&#39;&quot;&#39;</span> <span class="n">stringsimple</span> <span class="s">&#39;&quot;&#39;</span>
+<span class="n">type</span> <span class="p">::=</span> <span class="o">&lt;</span>1<span class="o">-</span><span class="n">char</span> <span class="n">type</span> <span class="n">code</span><span class="o">&gt;</span>
+<span class="n">stringsimple</span> <span class="p">::=</span> <span class="o">&lt;</span><span class="n">quoted</span> <span class="n">string</span> <span class="n">representation</span> <span class="n">of</span> <span class="n">the</span> <span class="n">value</span><span class="o">&gt;</span>
+</pre></div>
+
+
+<p>The 1 character type code is one of:</p>
+<ul>
+<li>'T' : simple string</li>
+<li>'I' : Integer</li>
+<li>'L' : Long</li>
+<li>'F' : Float</li>
+<li>'D' : Double</li>
+<li>'X' : Byte</li>
+<li>'S' : Short</li>
+<li>'C' : Character</li>
+<li>'B' : Boolean</li>
+</ul>
+<h1 id="project-info">Project Info</h1>
+<ul>
+<li>Configuration installer factory (<a href="http://svn.apache.org/repos/asf/sling/trunk/installer/factories/configuration">org.apache.sling.installer.factory.configuration</a>)</li>
+</ul>
+      <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
+        Rev. 1648494 by cziegeler on Tue, 30 Dec 2014 09:45:30 +0000
+      </div>
+      <div class="trademarkFooter"> 
+        Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project
+        logo are trademarks of The Apache Software Foundation. All other marks mentioned
+        may be trademarks or registered trademarks of their respective owners.
+      </div>
+    </div>
+  </body>
+</html>

Added: websites/staging/sling/trunk/content/documentation/bundles/file-installer-provider.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/bundles/file-installer-provider.html (added)
+++ websites/staging/sling/trunk/content/documentation/bundles/file-installer-provider.html Tue Dec 30 09:45:50 2014
@@ -0,0 +1,146 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+  <head>
+    <title>Apache Sling - File Installer Provider</title>
+    <link rel="icon" href="/res/favicon.ico">
+    <link rel="stylesheet" href="/res/site.css" type="text/css" media="all">
+    <link rel="stylesheet" href="/res/codehilite.css" type="text/css" media="all">
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+  </head>
+  <body>
+    <div class="title">
+      <div class="logo">
+        <a href="http://sling.apache.org/">
+          <img border="0" alt="Apache Sling" src="/res/logo.png">
+        </a>
+      </div>
+      <div class="header">
+        <a href="http://www.apache.org/">
+          <img border="0" alt="Apache" src="/res/apache.png">
+        </a>
+      </div>
+    </div>
+    
+    <div class="menu"> 
+      <p><strong><a href="/documentation.html">Documentation</a></strong> <br />
+<a href="/documentation/getting-started.html">Getting Started</a> <br />
+<a href="/documentation/the-sling-engine.html">The Sling Engine</a> <br />
+<a href="/documentation/development.html">Development</a> <br />
+<a href="/documentation/bundles.html">Bundles</a> <br />
+<a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a> <br />
+<a href="/documentation/configuration.html">Configuration</a>   </p>
+<p><a href="http://s.apache.org/sling.wiki">Wiki</a> <br />
+<a href="http://s.apache.org/sling.faq">FAQ</a>   </p>
+<p><strong>API Docs</strong>  <br />
+<a href="/apidocs/sling7/index.html">Sling 7</a> <br />
+<a href="/apidocs/sling6/index.html">Sling 6</a> <br />
+<a href="/apidocs/sling5/index.html">Sling 5</a>   </p>
+<p><strong>Project info</strong> <br />
+<a href="/downloads.cgi">Downloads</a> <br />
+<a href="http://www.apache.org/licenses/">License</a> <br />
+<a href="/contributing.html">Contributing</a> <br />
+<a href="/news.html">News</a> <br />
+<a href="/links.html">Links</a> <br />
+<a href="/project-information.html">Project Information</a> <br />
+<a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a> <br />
+<a href="http://ci.apache.org/builders/sling-trunk">Build Server</a> <br />
+<a href="/project-information/security.html">Security</a>   </p>
+<p><strong>Source</strong> <br />
+<a href="http://svn.apache.org/viewvc/sling/trunk">Subversion</a> <br />
+<a href="git://git.apache.org/sling.git">Git</a> <br />
+<a href="https://github.com/apache/sling">Github Mirror</a>   </p>
+<p><strong>Sponsorship</strong> <br />
+<a href="http://www.apache.org/foundation/thanks.html">Thanks</a> <br />
+<a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a> <br />
+<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a>   </p>
+<p><strong><a href="/sitemap.html">Site Map</a></strong></p>
+<!-- no valid ads for now, we'll  reactivate this when needed
+<iframe 
+    src="http://www.apache.org/ads/button.html"
+    style="border-width:0; float: left" frameborder="0" 
+    scrolling="no"
+    width="135" 
+    height="135">
+</iframe>
+-->
+    </div>
+    
+    <div class="main">
+      <div class="breadcrump" style="font-size: 80%;">
+        <a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a href="/documentation/bundles.html">Bundles</a>
+      </div>
+
+      
+      
+      <h1>File Installer Provider</h1>
+      <p>The file installer provider scans configured directories and provides the found artifacts (files) to the <a href="/documentation/bundles/osgi-installer.html">OSGI installer</a>. The functionality is very similar to Apache Felix FileInstall, with the major difference that this service implements just the task of scanning a file directory. All the management logic is implemented in the OSGi installer and support of various artifact types like bundles, configurations or custom formats is implemented by plugins for the OSGi installer.</p>
+<h2 id="setup">Setup</h2>
+<p>The file installer can be configured with these framework (system) properties:</p>
+<table>
+<thead>
+<tr>
+<th>Property</th>
+<th>Default</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><code>sling.fileinstall.dir</code></td>
+<td></td>
+<td>The name/path of the directories to watch. Several directories can be specified by using a comma separated list.</td>
+</tr>
+<tr>
+<td><code>sling.fileinstall.interval</code></td>
+<td>5000 ms</td>
+<td>Number of milliseconds between 2 polls of the directory</td>
+</tr>
+<tr>
+<td><code>sling.fileinstall.writeback</code></td>
+<td>true</td>
+<td>If the file provider supports writeback of changed artifacts, e.g. if a configuration is changed through Config Admin the change is written back to the file system.</td>
+</tr>
+</tbody>
+</table>
+<h2 id="bundles">Bundles</h2>
+<p>Bundles are supported by the OSGi installer. If a bundle jar is added to a scanned directory, this bundle is installed. If the file is updated/changed, the bundle is updated. If the file is removed, the bundle gets removed.
+Of course, these are the simple rules. The actual action depends by the overall state of the system and is controlled by the OSGi installer. For example if already the same bundle with a higher version is installed, when a bundle is dropped into the install folder, the OSGi installer will perform no operation.</p>
+<p>Start levels are supported as well by creating a directory with the name of the start level within the scan directory and putting the bundles within this directory. For example, if the 'install' folder is scanned, the bundle 'install/3/mybundle.jar' will be installed with start level 3. Without such a directory the default start level is used.</p>
+<h2 id="configurations">Configurations</h2>
+<p>Configurations are handled by the <a href="/documentation/bundles/configuration-installer-factory.html">Configuration Installer Factory</a>. The different formats are described there.</p>
+<h2 id="custom-artifacts">Custom Artifacts</h2>
+<p>Custom artifacts are handled by the OSGi installer depending on the installed plugins. Have a look at the OSGi installer and it's plugins for more information.</p>
+<h2 id="runmode-support">Runmode Support</h2>
+<p>The file installer supports run modes for installing artifacts. Within the scanned directory, a folder named with the run mode will only provisioning these artifacts if the respective run mode is active. If an artifact is associated with several run modes, the name of the directory contains all of them separated by a dot, for example <em>a1.dev</em>.</p>
+<h1 id="project-info">Project Info</h1>
+<ul>
+<li>File installer provider (<a href="http://svn.apache.org/repos/asf/sling/trunk/installer/providers/file">org.apache.sling.installer.provider.file</a>)</li>
+</ul>
+      <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
+        Rev. 1648494 by cziegeler on Tue, 30 Dec 2014 09:45:30 +0000
+      </div>
+      <div class="trademarkFooter"> 
+        Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project
+        logo are trademarks of The Apache Software Foundation. All other marks mentioned
+        may be trademarks or registered trademarks of their respective owners.
+      </div>
+    </div>
+  </body>
+</html>

Modified: websites/staging/sling/trunk/content/documentation/bundles/jcr-installer-provider.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/bundles/jcr-installer-provider.html (original)
+++ websites/staging/sling/trunk/content/documentation/bundles/jcr-installer-provider.html Tue Dec 30 09:45:50 2014
@@ -88,11 +88,6 @@
       </div>
 
       
-      <div class="tip">
-           This page is a translated version of <a href="/site/jcr-installer-provider.html" target="sling_cwiki">/site/jcr-installer-provider.html</a>. In case of
-           doubt you might want to refer to the old page.
-      </div>
-      
       
       <h1>JCR Installer Provider</h1>
       <p>The JCR installer provider scans the JCR repository for artifacts and provides them to the <a href="/documentation/bundles/osgi-installer.html">OSGI installer</a>.</p>
@@ -106,10 +101,10 @@
 <h1 id="example">Example</h1>
 <p>Here's a quick walkthrough of the JCR installer functionality.</p>
 <h2 id="installation">Installation</h2>
-<p>Start the Sling <a href="http://svn.apache.org/repos/asf/sling/trunk/launchpad/app">launchpad/app</a> and install and start the following additional bundles:
+<p>Start the Sling <a href="http://svn.apache.org/repos/asf/sling/trunk/launchpad/app">launchpad/app</a> and make sure that the following bundles are present and started:
 <em> <a href="/old-stuff/run-modes-org-apache-sling-runmode.html">RunMode service</a>
-</em> OSGi installer service (<a href="http://svn.apache.org/repos/asf/sling/trunk/installer/core">org.apache.sling.osgi.installer</a>)
-* JCR installer provider (<a href="http://svn.apache.org/repos/asf/sling/trunk/installer/providers/jcr">org.apache.sling.jcr.jcrinstall</a>)</p>
+</em> OSGi installer service (<a href="http://svn.apache.org/repos/asf/sling/trunk/installer/core">org.apache.sling.installer.core</a>)
+* JCR installer provider (<a href="http://svn.apache.org/repos/asf/sling/trunk/installer/providers/jcr">org.apache.sling.installer.provider.jcr</a>)</p>
 <p>To watch the logs produced by these modules, you can filter <code>sling/logs/error.log</code> using <code>egrep 'jcrinstall|osgi.installer'</code>.</p>
 <h2 id="install-and-remove-a-bundle">Install and remove a bundle</h2>
 <p>We'll use the <a href="http://www.knopflerfish.org/releases/2.0.5/jars/desktop_awt/desktop_awt_all-2.0.0.jar">Knopflerfish Desktop</a> bundle for this example, it is convenient as it displays a graphical user interface when started.</p>
@@ -201,8 +196,12 @@
 <li>JCR installer service (<a href="http://svn.apache.org/repos/asf/sling/trunk/installer/providers/jcr">org.apache.sling.installer.providers.jcr</a>)</li>
 </ul>
 <p>Many of these tests are fairly readable, and can be used to find out in more detail how these modules work.</p>
+<h1 id="project-info">Project Info</h1>
+<ul>
+<li>JCR installer provider (<a href="http://svn.apache.org/repos/asf/sling/trunk/installer/providers/jcr">org.apache.sling.installer.provider.jcr</a>)</li>
+</ul>
       <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. 1648494 by cziegeler on Tue, 30 Dec 2014 09:45:30 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project

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 Tue Dec 30 09:45:50 2014
@@ -101,7 +101,7 @@
 <p>The installer API is defined by the <code>org.apache.sling.installer.api</code> package 
 of the <a href="http://svn.apache.org/repos/asf/sling/trunk/installer/core/">org.apache.sling.installer.core</a> module. The main
 interface is the <code>OsgiInstaller</code> with which installable resources can be registered.</p>
-<p>The <a href="http://svn.apache.org/repos/asf/sling/trunk/installer/it/">installer integration tests</a> module can be useful to understand the details of how the installer works.</p>
+<p>The [installer integration tests][1] module can be useful to understand the details of how the installer works.</p>
 <h2 id="artifact-handling">Artifact Handling</h2>
 <p>Once an artifact is detected by a transformer, it gets a unique id. By default a bundle gets the symbolic name as the unique identifier and a configuration the PID.
 In addition to this id, an artifact gets a priority information from the provider. The priority is used if an artifact with the same id is provided several times from different locations. For example if a file system provider is scanning two directories and an artifact with the same id (like a configuration) is added to both directories, one should have precedence over the other. This is handled by the priority.</p>
@@ -118,10 +118,21 @@ If an installed bundle is managed via an
 <h3 id="versions-and-snapshots">Versions and Snapshots</h3>
 <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 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>
+<h2 id="plugins">Plugins</h2>
+<h3 id="factories">Factories</h3>
+<p>An installer factory provides support for a specific artifact type, like a configuration or a deployment package etc.</p>
+<ul>
+<li><a href="/documentation/bundles/configuration-installer-factory.html">Configuration Installer Factory</a></li>
+<li><a href="/documentation/bundles/subsystem-installer-factory.html">Subsystem Installer Factory</a></li>
+</ul>
+<h3 id="providers">Providers</h3>
+<p>A provider provides artifacts, e.g. by scanning a directory or a database etc.</p>
+<ul>
+<li><a href="/documentation/bundles/file-installer-provider.html">File Installer Provider</a></li>
+<li><a href="/documentation/bundles/jcr-installer-provider.html">JCR Installer Provider</a></li>
+</ul>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1615921 by bdelacretaz on Tue, 5 Aug 2014 12:57:40 +0000
+        Rev. 1648494 by cziegeler on Tue, 30 Dec 2014 09:45:30 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project

Added: websites/staging/sling/trunk/content/documentation/bundles/subsystem-installer-factory.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/bundles/subsystem-installer-factory.html (added)
+++ websites/staging/sling/trunk/content/documentation/bundles/subsystem-installer-factory.html Tue Dec 30 09:45:50 2014
@@ -0,0 +1,110 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE- 2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+  <head>
+    <title>Apache Sling - Subsystems Installer Factory</title>
+    <link rel="icon" href="/res/favicon.ico">
+    <link rel="stylesheet" href="/res/site.css" type="text/css" media="all">
+    <link rel="stylesheet" href="/res/codehilite.css" type="text/css" media="all">
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+  </head>
+  <body>
+    <div class="title">
+      <div class="logo">
+        <a href="http://sling.apache.org/">
+          <img border="0" alt="Apache Sling" src="/res/logo.png">
+        </a>
+      </div>
+      <div class="header">
+        <a href="http://www.apache.org/">
+          <img border="0" alt="Apache" src="/res/apache.png">
+        </a>
+      </div>
+    </div>
+    
+    <div class="menu"> 
+      <p><strong><a href="/documentation.html">Documentation</a></strong> <br />
+<a href="/documentation/getting-started.html">Getting Started</a> <br />
+<a href="/documentation/the-sling-engine.html">The Sling Engine</a> <br />
+<a href="/documentation/development.html">Development</a> <br />
+<a href="/documentation/bundles.html">Bundles</a> <br />
+<a href="/documentation/tutorials-how-tos.html">Tutorials &amp; How-Tos</a> <br />
+<a href="/documentation/configuration.html">Configuration</a>   </p>
+<p><a href="http://s.apache.org/sling.wiki">Wiki</a> <br />
+<a href="http://s.apache.org/sling.faq">FAQ</a>   </p>
+<p><strong>API Docs</strong>  <br />
+<a href="/apidocs/sling7/index.html">Sling 7</a> <br />
+<a href="/apidocs/sling6/index.html">Sling 6</a> <br />
+<a href="/apidocs/sling5/index.html">Sling 5</a>   </p>
+<p><strong>Project info</strong> <br />
+<a href="/downloads.cgi">Downloads</a> <br />
+<a href="http://www.apache.org/licenses/">License</a> <br />
+<a href="/contributing.html">Contributing</a> <br />
+<a href="/news.html">News</a> <br />
+<a href="/links.html">Links</a> <br />
+<a href="/project-information.html">Project Information</a> <br />
+<a href="https://issues.apache.org/jira/browse/SLING">Issue Tracker</a> <br />
+<a href="http://ci.apache.org/builders/sling-trunk">Build Server</a> <br />
+<a href="/project-information/security.html">Security</a>   </p>
+<p><strong>Source</strong> <br />
+<a href="http://svn.apache.org/viewvc/sling/trunk">Subversion</a> <br />
+<a href="git://git.apache.org/sling.git">Git</a> <br />
+<a href="https://github.com/apache/sling">Github Mirror</a>   </p>
+<p><strong>Sponsorship</strong> <br />
+<a href="http://www.apache.org/foundation/thanks.html">Thanks</a> <br />
+<a href="http://www.apache.org/foundation/sponsorship.html">Become a Sponsor</a> <br />
+<a href="http://www.apache.org/foundation/buy_stuff.html">Buy Stuff</a>   </p>
+<p><strong><a href="/sitemap.html">Site Map</a></strong></p>
+<!-- no valid ads for now, we'll  reactivate this when needed
+<iframe 
+    src="http://www.apache.org/ads/button.html"
+    style="border-width:0; float: left" frameborder="0" 
+    scrolling="no"
+    width="135" 
+    height="135">
+</iframe>
+-->
+    </div>
+    
+    <div class="main">
+      <div class="breadcrump" style="font-size: 80%;">
+        <a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/documentation.html">Documentation</a>&nbsp;&raquo&nbsp;<a href="/documentation/bundles.html">Bundles</a>
+      </div>
+
+      
+      
+      <h1>Subsystems Installer Factory</h1>
+      <p>The subsystems installer factory provides support for subsystems to the <a href="/documentation/bundles/osgi-installer.html">OSGI installer</a>. The provisioning of artifacts is handled by installer providers like the file installer or the JCR installer.</p>
+<h2 id="subsystems">Subsystems</h2>
+<p>The subsystem file must end with ".esa" and the manifest must at least contain the subsystem symbolic name "Subsystem-SymbolicName" header.</p>
+<h1 id="project-info">Project Info</h1>
+<ul>
+<li>Subsystems installer factory (<a href="http://svn.apache.org/repos/asf/sling/trunk/installer/factories/subsystems">org.apache.sling.installer.factory.subsystems</a>)</li>
+</ul>
+      <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
+        Rev. 1648494 by cziegeler on Tue, 30 Dec 2014 09:45:30 +0000
+      </div>
+      <div class="trademarkFooter"> 
+        Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project
+        logo are trademarks of The Apache Software Foundation. All other marks mentioned
+        may be trademarks or registered trademarks of their respective owners.
+      </div>
+    </div>
+  </body>
+</html>

Modified: websites/staging/sling/trunk/content/site/.htaccess
==============================================================================
--- websites/staging/sling/trunk/content/site/.htaccess (original)
+++ websites/staging/sling/trunk/content/site/.htaccess Tue Dec 30 09:45:50 2014
@@ -78,3 +78,4 @@ Redirect Permanent /site/dependency-mana
 Redirect Permanent /site/issue-tracker.html /documentation/development/issue-tracker.html
 Redirect Permanent /site/osgi-installer.html /documentation/bundles/osgi-installer.html
 Redirect Permanent /site/mime-type-support-commonsmime.html /documentation/bundles/mime-type-support-commons-mime.html
+Redirect Permanent /site/jcr-installer-provider.html documentation/bundles/jcr-installer-provider.html
\ No newline at end of file

Modified: websites/staging/sling/trunk/content/sitemap.html
==============================================================================
--- websites/staging/sling/trunk/content/sitemap.html (original)
+++ websites/staging/sling/trunk/content/sitemap.html Tue Dec 30 09:45:50 2014
@@ -100,8 +100,10 @@
 <li><a href="/documentation/bundles/bundle-resources-extensions-bundleresource.html">Bundle Resources (extensions.bundleresource)</a></li>
 <li><a href="/documentation/bundles/caching-services.html">Sling Caching Services</a></li>
 <li><a href="/documentation/bundles/commons-html-utilities.html">Commons HTML Utilities (org.apache.sling.commons.html)</a></li>
+<li><a href="/documentation/bundles/configuration-installer-factory.html">Configuration Installer Factory</a></li>
 <li><a href="/documentation/bundles/content-loading-jcr-contentloader.html">Content Loading and Nodetype Support (jcr.contentloader)</a></li>
 <li><a href="/documentation/bundles/discovery-api-and-impl.html">Discovery API and its implementations</a></li>
+<li><a href="/documentation/bundles/file-installer-provider.html">File Installer Provider</a></li>
 <li><a href="/documentation/bundles/internationalization-support-i18n.html">Internationalization Support (i18n)</a></li>
 <li><a href="/documentation/bundles/jcr-installer-provider.html">JCR Installer Provider</a></li>
 <li><a href="/documentation/bundles/managing-permissions-jackrabbit-accessmanager.html">Managing permissions (jackrabbit.accessmanager)</a></li>
@@ -123,6 +125,7 @@
 <li><a href="/documentation/bundles/sling-query.html">Sling Query</a></li>
 <li><a href="/documentation/bundles/sling-scripting-jsp-taglib.html">Sling Scripting JSP Taglib</a></li>
 <li><a href="/documentation/bundles/sling-settings-org-apache-sling-settings.html">Sling Settings (org.apache.sling.settings)</a></li>
+<li><a href="/documentation/bundles/subsystem-installer-factory.html">Subsystems Installer Factory</a></li>
 <li><a href="/documentation/bundles/validation.html">Sling Validation</a></li>
 <li><a href="/documentation/bundles/web-console-extensions.html">Web Console Extensions</a></li>
 <li><a href="/documentation/bundles/xml-support.html">XML support</a></li>



Mime
View raw message