svn commit: r1680609 - in /sling/trunk/contrib/nosql: couchbase-resourceprovider/ couchbase-resourceprovider/src/main/java/org/apache/sling/nosql/couchbase/resourceprovider/impl/ generic/src/main/java/org/apache/sling/nosql/generic/resource/impl/

[sseifert]

Author: sseifert
Date: Wed May 20 15:46:51 2015
New Revision: 1680609

URL: http://svn.apache.org/r1680609
Log:
SLING-4381 fix problem with deleted resources; define profile for integration 
tests

Modified:
    sling/trunk/contrib/nosql/couchbase-resourceprovider/pom.xml
    
sling/trunk/contrib/nosql/couchbase-resourceprovider/src/main/java/org/apache/sling/nosql/couchbase/resourceprovider/impl/CouchbaseNoSqlAdapter.java
    
sling/trunk/contrib/nosql/generic/src/main/java/org/apache/sling/nosql/generic/resource/impl/NoSqlResourceProvider.java

Modified: sling/trunk/contrib/nosql/couchbase-resourceprovider/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/nosql/couchbase-resourceprovider/pom.xml?rev=1680609&r1=1680608&r2=1680609&view=diff
==============================================================================
--- sling/trunk/contrib/nosql/couchbase-resourceprovider/pom.xml (original)
+++ sling/trunk/contrib/nosql/couchbase-resourceprovider/pom.xml Wed May 20 
15:46:51 2015
@@ -113,7 +113,60 @@
               <artifactId>maven-scr-plugin</artifactId>
           </plugin>
     
+          <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-surefire-plugin</artifactId>
+              <configuration>
+                  <testFailureIgnore>false</testFailureIgnore>
+                  <includes>
+                      <include>**/*Test.java</include>
+                  </includes>
+                  <excludes>
+                      <exclude>**/*IT.java</exclude>
+                  </excludes>
+              </configuration>
+          </plugin>
+    
         </plugins>
     </build>
+    
+    <profiles>
+    
+      <!-- 
+          Profile for Integration tests with a real couchbase server running.
+          You have to set JVM parameters for couchbase host and bucket name, 
e.g.
+          mvn -Pcouchbase-integration-test -DcouchbaseHosts=localhost:8091 
-DbucketName=test integration-test
+      -->
+      <profile>
+        <id>couchbase-integration-test</id>
+        <build>
+          <plugins>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <includes>
+                        <include>**/*IT.java</include>
+                    </includes>
+                    <excludes>
+                        <exclude>**/*Test.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+    
+          </plugins>
+        </build>
+      </profile>
+
+    </profiles>
   
 </project>

Modified: 
sling/trunk/contrib/nosql/couchbase-resourceprovider/src/main/java/org/apache/sling/nosql/couchbase/resourceprovider/impl/CouchbaseNoSqlAdapter.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/nosql/couchbase-resourceprovider/src/main/java/org/apache/sling/nosql/couchbase/resourceprovider/impl/CouchbaseNoSqlAdapter.java?rev=1680609&r1=1680608&r2=1680609&view=diff
==============================================================================
--- 
sling/trunk/contrib/nosql/couchbase-resourceprovider/src/main/java/org/apache/sling/nosql/couchbase/resourceprovider/impl/CouchbaseNoSqlAdapter.java
 (original)
+++ 
sling/trunk/contrib/nosql/couchbase-resourceprovider/src/main/java/org/apache/sling/nosql/couchbase/resourceprovider/impl/CouchbaseNoSqlAdapter.java
 Wed May 20 15:46:51 2015
@@ -52,7 +52,7 @@ class CouchbaseNoSqlAdapter implements N
 
     @Override
     public boolean validPath(String path) {
-        return (couchbaseClient != null);
+        return (couchbaseClient != null && couchbaseClient.isEnabled());
     }
 
     @Override

Modified: 
sling/trunk/contrib/nosql/generic/src/main/java/org/apache/sling/nosql/generic/resource/impl/NoSqlResourceProvider.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/nosql/generic/src/main/java/org/apache/sling/nosql/generic/resource/impl/NoSqlResourceProvider.java?rev=1680609&r1=1680608&r2=1680609&view=diff
==============================================================================
--- 
sling/trunk/contrib/nosql/generic/src/main/java/org/apache/sling/nosql/generic/resource/impl/NoSqlResourceProvider.java
 (original)
+++ 
sling/trunk/contrib/nosql/generic/src/main/java/org/apache/sling/nosql/generic/resource/impl/NoSqlResourceProvider.java
 Wed May 20 15:46:51 2015
@@ -116,7 +116,9 @@ public class NoSqlResourceProvider imple
 
     private boolean isDeleted(String path) {
         for (String deletedPath : deletedResources) {
-            return path.equals(deletedPath) || path.equals(deletedPath + "/");
+            if (path.equals(deletedPath) || path.equals(deletedPath + "/")) {
+                return true;
+            }
         }
         return false;
     }