svn commit: r965584 - in /websites/staging/sling/trunk/content: ./ documentation/bundles/nosql-resource-providers.html

[bu...@apache.org]

Author: buildbot
Date: Tue Sep 15 22:02:06 2015
New Revision: 965584

Log:
Staging update by buildbot for sling

Modified:
    websites/staging/sling/trunk/content/   (props changed)
    websites/staging/sling/trunk/content/documentation/bundles/nosql-resource-providers.html

Propchange: websites/staging/sling/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Sep 15 22:02:06 2015
@@ -1 +1 @@
-1703258
+1703299

Modified: websites/staging/sling/trunk/content/documentation/bundles/nosql-resource-providers.html
==============================================================================
--- websites/staging/sling/trunk/content/documentation/bundles/nosql-resource-providers.html (original)
+++ websites/staging/sling/trunk/content/documentation/bundles/nosql-resource-providers.html Tue Sep 15 22:02:06 2015
@@ -117,7 +117,6 @@ h2:hover > .headerlink, h3:hover > .head
 <li><a href="#introduction">Introduction</a></li>
 <li><a href="#mongodb-nosql-resource-provider">MongoDB NoSQL Resource Provider</a></li>
 <li><a href="#couchbase-nosql-resource-provider">Couchbase NoSQL Resource Provider</a></li>
-<li><a href="#writing-your-own-nosql-resource-provider">Writing your own NoSQL Resource Provider</a></li>
 </ul>
 </div>
 <h2 id="introduction">Introduction<a class="headerlink" href="#introduction" title="Permanent link">&para;</a></h2>
@@ -137,7 +136,7 @@ h2:hover > .headerlink, h3:hover > .head
 <p>Resource provider for <a href="https://www.mongodb.org/">MongoDB</a> NoSQL database.</p>
 <p>Tested with MongoDB Server 3.0.6 and MongoDB Java Driver 3.0.4.</p>
 <p>Configuration example:</p>
-<p><code>org.apache.sling.nosql.mongodb.resourceprovider.MongoDBNoSqlResourceProviderFactory.factory.config
+<p><code>org.apache.sling.nosql.mongodb.resourceprovider.MongoDBNoSqlResourceProviderFactory.factory.config-default
     provider.roots=["/"]
     connectionString="localhost:27017"
     database="sling"
@@ -146,11 +145,23 @@ h2:hover > .headerlink, h3:hover > .head
 <p>Source code: <a href="https://svn.apache.org/repos/asf/sling/trunk/contrib/nosql/mongodb-resourceprovider">Apache Sling NoSQL MongoDB Resource Provider</a></p>
 <p>Please note: there is an <a href="https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/mongodb">alternative MongoDB resource provider implementation</a> from 2012 which has less features, a slightly different concept for storing resource data (in multiple collections), and it does not use the "Generic Resource Provider".</p>
 <h2 id="couchbase-nosql-resource-provider">Couchbase NoSQL Resource Provider<a class="headerlink" href="#couchbase-nosql-resource-provider" title="Permanent link">&para;</a></h2>
-<p>tbd.</p>
-<h2 id="writing-your-own-nosql-resource-provider">Writing your own NoSQL Resource Provider<a class="headerlink" href="#writing-your-own-nosql-resource-provider" title="Permanent link">&para;</a></h2>
-<p>tbd.</p>
+<p>Resource provider for <a href="http://www.couchbase.com/">Couchbase</a> NoSQL database.</p>
+<p>Tested with Couchbase Server 4.0.0-rc0 and MongoDB Java SDK 2.2.0. Please note: Couchbase 4 or higher is mandatory because N1QL support is required.</p>
+<p>Configuration example:</p>
+<p>```
+  org.apache.sling.nosql.couchbase.resourceprovider.CouchbaseNoSqlResourceProviderFactory.factory.config-default
+    provider.roots=["/"]</p>
+<p>org.apache.sling.nosql.couchbase.client.CouchbaseClient.factory.config-default
+    clientId="sling-resourceprovider-couchbase"
+    couchbaseHosts="localhost:8091"
+    bucketName="sling"
+    enabled=B"true"
+    ```</p>
+<p>See Apache Felix OSGi console for detailed documentation of the parameters. All resource data is stored in one Couchbase bucket. Each resource is stored as a document with the path as key.</p>
+<p>Source code: <a href="https://svn.apache.org/repos/asf/sling/trunk/contrib/nosql/couchbase-resourceprovider">Apache Sling NoSQL Couchbase Resource Provider</a></p>
+<p>The resource provider requires and additional bundle <a href="https://svn.apache.org/repos/asf/sling/trunk/contrib/nosql/couchbase-client">Apache Sling NoSQL Couchbase Client</a> which wraps the Couchbase Java SDK (which itself is not an OSGi bundle), and ensures that the Couchbase Environment instance is used as a singleton in the VM.</p>
       <div class="timestamp" style="margin-top: 30px; font-size: 80%; text-align: right;">
-        Rev. 1703258 by sseifert on Tue, 15 Sep 2015 17:02:17 +0000
+        Rev. 1703299 by sseifert on Tue, 15 Sep 2015 22:01:54 +0000
       </div>
       <div class="trademarkFooter"> 
         Apache Sling, Sling, Apache, the Apache feather logo, and the Apache Sling project