svn commit: r1680746 - in /sling/trunk/contrib/nosql: couchbase-client/src/main/java/org/apache/sling/nosql/couchbase/client/impl/ generic/

[ss...@apache.org]

Author: sseifert
Date: Thu May 21 07:12:11 2015
New Revision: 1680746

URL: http://svn.apache.org/r1680746
Log:
SLING-4381 fix logic error for buckets with password; update readme

Added:
    sling/trunk/contrib/nosql/couchbase-client/src/main/java/org/apache/sling/nosql/couchbase/client/impl/CouchbaseEnvironmentSingleton.java
      - copied, changed from r1680650, sling/trunk/contrib/nosql/couchbase-client/src/main/java/org/apache/sling/nosql/couchbase/client/impl/CouchbaseUtil.java
Removed:
    sling/trunk/contrib/nosql/couchbase-client/src/main/java/org/apache/sling/nosql/couchbase/client/impl/CouchbaseUtil.java
Modified:
    sling/trunk/contrib/nosql/couchbase-client/src/main/java/org/apache/sling/nosql/couchbase/client/impl/CouchbaseClientImpl.java
    sling/trunk/contrib/nosql/generic/README.md

Modified: sling/trunk/contrib/nosql/couchbase-client/src/main/java/org/apache/sling/nosql/couchbase/client/impl/CouchbaseClientImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/nosql/couchbase-client/src/main/java/org/apache/sling/nosql/couchbase/client/impl/CouchbaseClientImpl.java?rev=1680746&r1=1680745&r2=1680746&view=diff
==============================================================================
--- sling/trunk/contrib/nosql/couchbase-client/src/main/java/org/apache/sling/nosql/couchbase/client/impl/CouchbaseClientImpl.java (original)
+++ sling/trunk/contrib/nosql/couchbase-client/src/main/java/org/apache/sling/nosql/couchbase/client/impl/CouchbaseClientImpl.java Thu May 21 07:12:11 2015
@@ -97,8 +97,8 @@ public class CouchbaseClientImpl impleme
         }
 
         try {
-            cluster = CouchbaseUtil.createCluster(couchbaseHosts);
-            bucket = CouchbaseUtil.openBucket(cluster, bucketName, bucketPassword);
+            cluster = CouchbaseEnvironmentSingleton.createCluster(couchbaseHosts);
+            bucket = CouchbaseEnvironmentSingleton.openBucket(cluster, bucketName, bucketPassword);
         }
         catch (Throwable ex) {
             enabled = false;

Copied: sling/trunk/contrib/nosql/couchbase-client/src/main/java/org/apache/sling/nosql/couchbase/client/impl/CouchbaseEnvironmentSingleton.java (from r1680650, sling/trunk/contrib/nosql/couchbase-client/src/main/java/org/apache/sling/nosql/couchbase/client/impl/CouchbaseUtil.java)
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/nosql/couchbase-client/src/main/java/org/apache/sling/nosql/couchbase/client/impl/CouchbaseEnvironmentSingleton.java?p2=sling/trunk/contrib/nosql/couchbase-client/src/main/java/org/apache/sling/nosql/couchbase/client/impl/CouchbaseEnvironmentSingleton.java&p1=sling/trunk/contrib/nosql/couchbase-client/src/main/java/org/apache/sling/nosql/couchbase/client/impl/CouchbaseUtil.java&r1=1680650&r2=1680746&rev=1680746&view=diff
==============================================================================
--- sling/trunk/contrib/nosql/couchbase-client/src/main/java/org/apache/sling/nosql/couchbase/client/impl/CouchbaseUtil.java (original)
+++ sling/trunk/contrib/nosql/couchbase-client/src/main/java/org/apache/sling/nosql/couchbase/client/impl/CouchbaseEnvironmentSingleton.java Thu May 21 07:12:11 2015
@@ -27,11 +27,11 @@ import com.couchbase.client.java.env.Def
 /**
  * Manages couchbase environment.
  */
-final class CouchbaseUtil {
+final class CouchbaseEnvironmentSingleton {
 
     private static final CouchbaseEnvironment COUCHBASE_ENVIRONMENT = DefaultCouchbaseEnvironment.builder().build();
 
-    private CouchbaseUtil() {
+    private CouchbaseEnvironmentSingleton() {
         // static methods only
     }
 
@@ -52,7 +52,7 @@ final class CouchbaseUtil {
      * @return Couchbase bucket
      */
     public static Bucket openBucket(Cluster cluster, String bucketName, String bucketPassword) {
-        if (bucketPassword == null) {
+        if (bucketPassword != null) {
             return cluster.openBucket(bucketName, bucketPassword);
         }
         else {

Modified: sling/trunk/contrib/nosql/generic/README.md
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/nosql/generic/README.md?rev=1680746&r1=1680745&r2=1680746&view=diff
==============================================================================
--- sling/trunk/contrib/nosql/generic/README.md (original)
+++ sling/trunk/contrib/nosql/generic/README.md Thu May 21 07:12:11 2015
@@ -10,6 +10,7 @@ Features:
 * Defines a simplified "NoSqlAdapter" concept that is implemented for each NoSQL database. It boils down to simple get/put/list operations. Query support is optional.
 * Complete implementation of Resource, ResourceProvider, ResourceProviderFactory and ValueMap based on the NoSqlAdapter
 * "Transaction management" of Sling CRUD (commit/revert methods) is implemented
-* ValueMap supports String, Integer, Long, Double, Date, Calendar and InputStream/byte[] (binary data) and arrays of them. Date/Calendar and binary data is serialized to a string before storing, so the NoSQL databases have not to support them directly.
+* ValueMap supports String, Integer, Long, Double, Date, Calendar and InputStream/byte\[\] (binary data) and arrays of them. Date/Calendar and binary data is serialized to a string before storing, so the NoSQL databases have not to support them directly.
 * Sends resource notifications via OSGi EventAdmin
 * Provides a "tests" JAR that can be used for integration tests with NoSQL databases to test the own adapter implementation
+* Can be mounted as root provider without any JCR at all