You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bu...@apache.org on 2016/11/21 20:49:16 UTC
svn commit: r1001439 - in /websites/staging/sling/trunk/content: ./
documentation/bundles/ documentation/bundles/context-aware-configuration/
documentation/development/ documentation/tutorials-how-tos/
Author: buildbot
Date: Mon Nov 21 20:49:15 2016
New Revision: 1001439
Log:
Staging update by buildbot for sling
Modified:
websites/staging/sling/trunk/content/ (props changed)
websites/staging/sling/trunk/content/documentation/bundles/context-aware-configuration/context-aware-configuration.html
websites/staging/sling/trunk/content/documentation/bundles/models.html
websites/staging/sling/trunk/content/documentation/development/version-policy.html
websites/staging/sling/trunk/content/documentation/tutorials-how-tos/jackrabbit-persistence.html
websites/staging/sling/trunk/content/downloads.html
websites/staging/sling/trunk/content/news.html
Propchange: websites/staging/sling/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Mon Nov 21 20:49:15 2016
@@ -1 +1 @@
-1770699
+1770754
Modified: websites/staging/sling/trunk/content/documentation/bundles/context-aware-configuration/context-aware-configuration.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/bundles/context-aware-configuration/context-aware-configuration.html (original)
+++ websites/staging/sling/trunk/content/documentation/bundles/context-aware-configuration/context-aware-configuration.html Mon Nov 21 20:49:15 2016
@@ -124,7 +124,7 @@ h2:hover > .headerlink, h3:hover > .head
</li>
<li><a href="#contexts-and-configuration-references">Contexts and configuration references</a></li>
<li><a href="#describe-configurations-via-annotation-classes">Describe configurations via annotation classes</a></li>
-<li><a href="#context-aware-configuration-bnd-plugin">Context-Aware Configuration BND plugin</a></li>
+<li><a href="#context-aware-configuration-bnd-plugin">Context-Aware Configuration bnd plugin</a></li>
<li><a href="#customizing-the-configuration-lookup">Customizing the configuration lookup</a></li>
<li><a href="#references">References</a></li>
</ul>
@@ -236,9 +236,9 @@ the applications/libraries you use, or y
</pre></div>
-<p>To automate this you can use the Context-Aware Configuration BND plugin (see next chapter). </p>
-<h1 id="context-aware-configuration-bnd-plugin">Context-Aware Configuration BND plugin<a class="headerlink" href="#context-aware-configuration-bnd-plugin" title="Permanent link">¶</a></h1>
-<p>A <a href="http://bnd.bndtools.org/">BND</a> plugin is provided that scans the classpath of a bundle Maven project at build time and automatically generates a <code>Sling-ContextAware-Configuration-Classes</code> bundle header for all annotation classes annotated with <code>@Configuration</code>. It can be used by both <a href="http://felix.apache.org/documentation/subprojects/apache-felix-maven-bundle-plugin-bnd.html">maven-bundle-plugin</a> and <a href="https://github.com/bndtools/bnd/tree/master/maven">bnd-maven-plugin</a>, as both use the BND library internally.</p>
+<p>To automate this you can use the Context-Aware Configuration bnd plugin (see next chapter). </p>
+<h1 id="context-aware-configuration-bnd-plugin">Context-Aware Configuration bnd plugin<a class="headerlink" href="#context-aware-configuration-bnd-plugin" title="Permanent link">¶</a></h1>
+<p>A <a href="http://bnd.bndtools.org/">bnd</a> plugin is provided that scans the classpath of a bundle Maven project at build time and automatically generates a <code>Sling-ContextAware-Configuration-Classes</code> bundle header for all annotation classes annotated with <code>@Configuration</code>. It can be used by both <a href="http://felix.apache.org/documentation/subprojects/apache-felix-maven-bundle-plugin-bnd.html">maven-bundle-plugin</a> and <a href="https://github.com/bndtools/bnd/tree/master/maven">bnd-maven-plugin</a>, as both use the bnd library internally.</p>
<p>Example configuration:</p>
<table class="codehilitetable"><tr><td class="linenos"><div class="linenodiv"><pre> 1
2
@@ -290,7 +290,7 @@ the applications/libraries you use, or y
<li><a href="https://adapt.to/2016/en/schedule/sling-context-aware-configuration.html">Sling Context-Aware Configuration - Talk from adaptTo() 2016</a></li>
</ul>
<div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
- Rev. 1770469 by sseifert on Sat, 19 Nov 2016 05:02:17 +0000
+ Rev. 1770754 by sseifert on Mon, 21 Nov 2016 20:48:56 +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/models.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/bundles/models.html (original)
+++ websites/staging/sling/trunk/content/documentation/bundles/models.html Mon Nov 21 20:49:15 2016
@@ -147,7 +147,7 @@ h2:hover > .headerlink, h3:hover > .head
<li><a href="#specifying-an-alternate-adapter-class-since-110">Specifying an Alternate Adapter Class (since 1.1.0)</a></li>
<li><a href="#associating-a-model-class-with-a-resource-type-since-130">Associating a Model Class with a Resource Type (since 1.3.0)</a></li>
<li><a href="#exporter-framework-since-130">Exporter Framework (since 1.3.0)</a></li>
-<li><a href="#registration-of-sling-models-classes-via-bnd-plugin-since-134">Registration of Sling Models classes via BND plugin (since 1.3.4)</a></li>
+<li><a href="#registration-of-sling-models-classes-via-bnd-plugin-since-134">Registration of Sling Models classes via bnd plugin (since 1.3.4)</a></li>
</ul>
</div>
<p>Many Sling projects want to be able to create model objects - POJOs which are automatically mapped from Sling objects, typically resources, but also request objects. Sometimes these POJOs need OSGi services as well.</p>
@@ -214,7 +214,7 @@ can be listed in a comma-separated list
<p>Alternatively it is possible to list all classes individually that are Sling Models classes via the <code>Sling-Model-Classes</code> header.</p>
-<p>If you use the Sling Models BND plugin all required bundle headers are generated automatically at build time (see chapter 'Registration of Sling Models classes via BND plugin' below).</p>
+<p>If you use the Sling Models bnd plugin all required bundle headers are generated automatically at build time (see chapter 'Registration of Sling Models classes via bnd plugin' below).</p>
<h1 id="client-code">Client Code<a class="headerlink" href="#client-code" title="Permanent link">¶</a></h1>
<h2 id="adaptto">adaptTo()<a class="headerlink" href="#adaptto" title="Permanent link">¶</a></h2>
<p>Client code doesn't need to be aware that Sling Models is being used. It just uses the Sling Adapter framework:</p>
@@ -738,8 +738,8 @@ currently includes a single exporter, us
<p>results in the registration of a servlet with the resource type and extension specified and a selector of 'model' (overridable
through the <code>@Exporter</code> annotation's <code>selector</code> attribute). When this servlet is invoked, the <code>Resource</code> will be adapted to the
model, exported as a <code>java.lang.String</code> (via the named Exporter) and then returned to the client.</p>
-<h1 id="registration-of-sling-models-classes-via-bnd-plugin-since-134">Registration of Sling Models classes via BND plugin (since 1.3.4)<a class="headerlink" href="#registration-of-sling-models-classes-via-bnd-plugin-since-134" title="Permanent link">¶</a></h1>
-<p>Since Sling Models Implementation 1.3.4 it is possible to automatically generated the necessary bundle header to register the Sling Models classes contained in the Maven bundle project by using the Sling Models BND plugin - either with maven-bundle-plugin or with bnd-maven-plugin. By default the plugin generates a <code>Sling-Model-Classes</code> header.</p>
+<h1 id="registration-of-sling-models-classes-via-bnd-plugin-since-134">Registration of Sling Models classes via bnd plugin (since 1.3.4)<a class="headerlink" href="#registration-of-sling-models-classes-via-bnd-plugin-since-134" title="Permanent link">¶</a></h1>
+<p>Since Sling Models Implementation 1.3.4 it is possible to automatically generated the necessary bundle header to register the Sling Models classes contained in the Maven bundle project by using the Sling Models bnd plugin - either with maven-bundle-plugin or with bnd-maven-plugin. By default the plugin generates a <code>Sling-Model-Classes</code> header.</p>
<p>Example configuration:</p>
<table class="codehilitetable"><tr><td class="linenos"><div class="linenodiv"><pre> 1
2
@@ -777,7 +777,7 @@ model, exported as a <code>java.lang.Str
</pre></div>
</td></tr></table>
<div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
- Rev. 1770699 by sseifert on Mon, 21 Nov 2016 15:23:35 +0000
+ Rev. 1770754 by sseifert on Mon, 21 Nov 2016 20:48:56 +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/development/version-policy.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/development/version-policy.html (original)
+++ websites/staging/sling/trunk/content/documentation/development/version-policy.html Mon Nov 21 20:49:15 2016
@@ -184,7 +184,7 @@ Please note that this page is currently
<p>I am not sure ....</p>
<p>This has not been discussed at large, but I would assume, that the POM is still the correct place to take note of the version of the exported packages.</p>
<h3 id="future">Future<a class="headerlink" href="#future" title="Permanent link">¶</a></h3>
-<p>The newest versions of the BND library also support an <code>@Export</code> annotation in the <code>package-info.java</code> pseudo class file. This pseudo class is supported starting with Java 5 to take package level annotations (like the <code>@Export</code> annotation) and as a replacement of the <code>package-info.html</code> file.</p>
+<p>The newest versions of the bnd library also support an <code>@Export</code> annotation in the <code>package-info.java</code> pseudo class file. This pseudo class is supported starting with Java 5 to take package level annotations (like the <code>@Export</code> annotation) and as a replacement of the <code>package-info.html</code> file.</p>
<p>Using this syntax something like the following would be easily possible:</p>
<div class="codehilite"><pre><span class="cm">/**</span>
<span class="cm"> * This is the Package Level JavaDoc</span>
@@ -195,7 +195,7 @@ Please note that this page is currently
</pre></div>
-<p>See <a href="http://www.aqute.biz/Bnd/Versioning">BND Versioning</a> for details.</p>
+<p>See <a href="http://www.aqute.biz/Bnd/Versioning">bnd Versioning</a> for details.</p>
<h2 id="version-number-syntax">Version Number Syntax<a class="headerlink" href="#version-number-syntax" title="Permanent link">¶</a></h2>
<p>As a small reminder, this is how a version number is constructed: In OSGi version numbers are composed of four (4) segments: three integers and one string named <em>major</em>.<em>minor</em>.<em>micro</em>.<em>qualifier</em>.</p>
<p>Each segment captures a different intent:</p>
@@ -343,17 +343,17 @@ Please note that this page is currently
<p>This allows for the implementation to work correctly with bug fixed package exports but as soon as there are any <em>externally visible</em> changes, the implementation bundle has to be adapted -- even if this just means increasing the upper version bound in the <code>Import-Package</code> statement thus guaranteeing compliance (again).</p>
<h3 id="future_1">Future<a class="headerlink" href="#future_1" title="Permanent link">¶</a></h3>
-<p>Recent versions of the BND library support automatic differentiation between <em>use</em> and <em>implementation</em> of API and to set the import version ranges accordingly. See <a href="http://www.aqute.biz/Bnd/Versioning">BND Versioning</a> for details.</p>
+<p>Recent versions of the bnd library support automatic differentiation between <em>use</em> and <em>implementation</em> of API and to set the import version ranges accordingly. See <a href="http://www.aqute.biz/Bnd/Versioning">bnd Versioning</a> for details.</p>
<h2 id="references">References<a class="headerlink" href="#references" title="Permanent link">¶</a></h2>
<ul>
<li><a href="http://markmail.org/thread/zshobgjwtqrncajt">Version Numbers</a> -- The mail thread discussing version numbering</li>
<li><a href="http://blog.meschberger.ch/2009/10/on-version-numbers.html">On Version Numbers</a> -- Blog about version numbers</li>
<li><a href="http://wiki.eclipse.org/index.php/Version_Numbering">Version Numbering</a> -- An Eclipse paper on assigning version numbers. Very good read.</li>
<li><a href="http://www.osgi.org/wiki/uploads/Links/SemanticVersioning.pdf">Semantic Versioning</a> -- An OSGi Alliance paper on semantic versioning.</li>
-<li><a href="http://www.aqute.biz/Bnd/Versioning">BND Versioning</a> -- Describes how the BND library used by the Maven Bundle plugin supports package versioning</li>
+<li><a href="http://www.aqute.biz/Bnd/Versioning">bnd Versioning</a> -- Describes how the bnd library used by the Maven Bundle plugin supports package versioning</li>
</ul>
<div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
- Rev. 1585095 by olli on Sat, 5 Apr 2014 14:02:59 +0000
+ Rev. 1770754 by sseifert on Mon, 21 Nov 2016 20:48:56 +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/tutorials-how-tos/jackrabbit-persistence.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/tutorials-how-tos/jackrabbit-persistence.html (original)
+++ websites/staging/sling/trunk/content/documentation/tutorials-how-tos/jackrabbit-persistence.html Mon Nov 21 20:49:15 2016
@@ -126,7 +126,7 @@ h2:hover > .headerlink, h3:hover > .head
<p>When you are not using the Derby persistence manager, you may safely remove the Derby bundle from your Sling instance.</p>
<h2 id="jdbc-driver">JDBC Driver<a class="headerlink" href="#jdbc-driver" title="Permanent link">¶</a></h2>
<p>The hardest thing to do is probably getting the JDBC driver for your database. One option is to look at the bundles provided by Spring Source in their repository at <a href="http://www.springsource.com/repository/">http://www.springsource.com/repository/</a>.</p>
-<p>Another option is to create the bundle on your own using Peter Kriens' <a href="http://www.aqute.biz/Bnd/Bnd">BND Tool</a>:</p>
+<p>Another option is to create the bundle on your own using Peter Kriens' <a href="http://www.aqute.biz/Bnd/Bnd">bnd Tool</a>:</p>
<ol>
<li>Get the JDBC driver for your database from the driver provider</li>
<li>
@@ -148,7 +148,7 @@ h2:hover > .headerlink, h3:hover > .head
</li>
</ol>
-<p>Tony reports no success with the Spring Source bundle, whily the BND approach worked for the PostgreSQL JDBC driver.</p>
+<p>Tony reports no success with the Spring Source bundle, whily the bnd approach worked for the PostgreSQL JDBC driver.</p>
<h2 id="replace-derby-in-a-running-sling-instance">Replace Derby in a running Sling Instance<a class="headerlink" href="#replace-derby-in-a-running-sling-instance" title="Permanent link">¶</a></h2>
<p>To replace Derby in a running Sling instance follow these steps (e.g. through the Web Console at <code>/system/console</code>):</p>
<ol>
@@ -203,7 +203,7 @@ This needs to be reconfigured and restar
<h2 id="credits">Credits<a class="headerlink" href="#credits" title="Permanent link">¶</a></h2>
<p>This description is based on Tony Giaccone's description <a href="http://markmail.org/message/wlbfrukmjjsl33hh">Swapping Postgres for Derby</a> sent to the Sling Users mailing list.</p>
<div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
- Rev. 1500501 by fmeschbe on Sun, 7 Jul 2013 18:49:51 +0000
+ Rev. 1770754 by sseifert on Mon, 21 Nov 2016 20:48:56 +0000
</div>
<div class="trademarkFooter">
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project
Modified: websites/staging/sling/trunk/content/downloads.html
==============================================================================
--- websites/staging/sling/trunk/content/downloads.html (original)
+++ websites/staging/sling/trunk/content/downloads.html Mon Nov 21 20:49:15 2016
@@ -476,12 +476,6 @@ h2:hover > .headerlink, h3:hover > .head
<td><a href="[preferred]/sling/org.apache.sling.caconfig.api-1.0.0-source-release.zip">Source ZIP</a> (<a href="http://www.apache.org/dist/sling/org.apache.sling.caconfig.api-1.0.0-source-release.zip.asc">asc</a>, <a href="http://www.apache.org/dist/sling/org.apache.sling.caconfig.api-1.0.0-source-release.zip.md5">md5</a>)</td>
</tr>
<tr>
-<td>Context-Aware Configuration BND Plugin</td>
-<td>1.0.0</td>
-<td><a href="[preferred]/sling/org.apache.sling.caconfig.bnd-plugin-1.0.0.jar">Bundle</a> (<a href="http://www.apache.org/dist/sling/org.apache.sling.caconfig.bnd-plugin-1.0.0.jar.asc">asc</a>, <a href="http://www.apache.org/dist/sling/org.apache.sling.caconfig.bnd-plugin-1.0.0.jar.md5">md5</a>)</td>
-<td><a href="[preferred]/sling/org.apache.sling.caconfig.bnd-plugin-1.0.0-source-release.zip">Source ZIP</a> (<a href="http://www.apache.org/dist/sling/org.apache.sling.caconfig.bnd-plugin-1.0.0-source-release.zip.asc">asc</a>, <a href="http://www.apache.org/dist/sling/org.apache.sling.caconfig.bnd-plugin-1.0.0-source-release.zip.md5">md5</a>)</td>
-</tr>
-<tr>
<td>Context-Aware Configuration Impl</td>
<td>1.1.0</td>
<td><a href="[preferred]/sling/org.apache.sling.caconfig.impl-1.1.0.jar">Bundle</a> (<a href="http://www.apache.org/dist/sling/org.apache.sling.caconfig.impl-1.1.0.jar.asc">asc</a>, <a href="http://www.apache.org/dist/sling/org.apache.sling.caconfig.impl-1.1.0.jar.md5">md5</a>)</td>
@@ -494,6 +488,12 @@ h2:hover > .headerlink, h3:hover > .head
<td><a href="[preferred]/sling/org.apache.sling.caconfig.spi-1.1.0-source-release.zip">Source ZIP</a> (<a href="http://www.apache.org/dist/sling/org.apache.sling.caconfig.spi-1.1.0-source-release.zip.asc">asc</a>, <a href="http://www.apache.org/dist/sling/org.apache.sling.caconfig.spi-1.1.0-source-release.zip.md5">md5</a>)</td>
</tr>
<tr>
+<td>Context-Aware Configuration bnd Plugin</td>
+<td>1.0.0</td>
+<td><a href="[preferred]/sling/org.apache.sling.caconfig.bnd-plugin-1.0.0.jar">Bundle</a> (<a href="http://www.apache.org/dist/sling/org.apache.sling.caconfig.bnd-plugin-1.0.0.jar.asc">asc</a>, <a href="http://www.apache.org/dist/sling/org.apache.sling.caconfig.bnd-plugin-1.0.0.jar.md5">md5</a>)</td>
+<td><a href="[preferred]/sling/org.apache.sling.caconfig.bnd-plugin-1.0.0-source-release.zip">Source ZIP</a> (<a href="http://www.apache.org/dist/sling/org.apache.sling.caconfig.bnd-plugin-1.0.0-source-release.zip.asc">asc</a>, <a href="http://www.apache.org/dist/sling/org.apache.sling.caconfig.bnd-plugin-1.0.0-source-release.zip.md5">md5</a>)</td>
+</tr>
+<tr>
<td>Crankstart API Fragment</td>
<td>1.0.2</td>
<td><a href="[preferred]/sling/org.apache.sling.crankstart.api.fragment-1.0.2.jar">Bundle</a> (<a href="http://www.apache.org/dist/sling/org.apache.sling.crankstart.api.fragment-1.0.2.jar.asc">asc</a>, <a href="http://www.apache.org/dist/sling/org.apache.sling.crankstart.api.fragment-1.0.2.jar.md5">md5</a>)</td>
@@ -1429,7 +1429,7 @@ h2:hover > .headerlink, h3:hover > .head
<div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
- Rev. 1770653 by stefanegli on Mon, 21 Nov 2016 11:31:22 +0000
+ Rev. 1770754 by sseifert on Mon, 21 Nov 2016 20:48:56 +0000
</div>
<div class="trademarkFooter">
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project
Modified: websites/staging/sling/trunk/content/news.html
==============================================================================
--- websites/staging/sling/trunk/content/news.html (original)
+++ websites/staging/sling/trunk/content/news.html Mon Nov 21 20:49:15 2016
@@ -131,7 +131,7 @@ h2:hover > .headerlink, h3:hover > .head
<li>New Release: Apache Sling Scripting HTL Engine 1.0.26, Apache Sling Commons Log 5.0.0, Log WebConsole 1.0.0, Apache Sling DataSource Provider 1.0.2 and Apache Sling Log Tracer 1.0.2 (October 24th, 2016)</li>
<li>New Release: Apache Sling Servlets Resolver 2.4.6 (October 22nd, 2016)</li>
<li>New Releases: Apache Sling Scripting JSP 2.2.0, Apache Sling Engine 2.6.6, Apache Sling Scripting Java 2.1.0, Apache Sling Scripting HTL JS Use Provider 1.0.16 (October 20th, 2016)</li>
-<li>New Releases: Apache Sling Context-Aware Configuration API 1.0.0, SPI 1.0.0, Impl 1.0.0, BND Plugin 1.0.0, Resource Builder 1.0.2, Testing Hamcrest 1.0.0 (October 18th, 2016)</li>
+<li>New Releases: Apache Sling Context-Aware Configuration API 1.0.0, SPI 1.0.0, Impl 1.0.0, bnd Plugin 1.0.0, Resource Builder 1.0.2, Testing Hamcrest 1.0.0 (October 18th, 2016)</li>
<li>New Releases: Apache Sling Scripting Core 2.0.40, Apache Sling Scripting HTL Java Compiler 1.0.4, Apache Sling Scripting HTL Engine 1.0.24 (October 17th, 2016)</li>
<li>New Release: Apache Sling Launchpad Base 2.6.12 (October 16th, 2016)</li>
<li>New Releases: Apache Sling Event 3.4.0, Apache Sling Distributed Eventing 1.1.0, and Apache Sling Rewriter 1.2.0 (October 15th, 2016)</li>
@@ -520,7 +520,7 @@ Apache Sling Scripting Sightly JS Use Pr
<li>Apache Sling has graduated into a top level project! (June 17, 2009)</li>
</ul>
<div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
- Rev. 1770653 by stefanegli on Mon, 21 Nov 2016 11:31:22 +0000
+ Rev. 1770754 by sseifert on Mon, 21 Nov 2016 20:48:56 +0000
</div>
<div class="trademarkFooter">
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project