Return-Path: X-Original-To: apmail-sling-commits-archive@www.apache.org Delivered-To: apmail-sling-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DF9801086D for ; Sun, 22 Sep 2013 10:38:54 +0000 (UTC) Received: (qmail 90321 invoked by uid 500); 22 Sep 2013 10:38:50 -0000 Delivered-To: apmail-sling-commits-archive@sling.apache.org Received: (qmail 90246 invoked by uid 500); 22 Sep 2013 10:38:38 -0000 Mailing-List: contact commits-help@sling.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@sling.apache.org Delivered-To: mailing list commits@sling.apache.org Received: (qmail 89897 invoked by uid 99); 22 Sep 2013 10:38:33 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 22 Sep 2013 10:38:33 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 22 Sep 2013 10:38:30 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E5CF723888A6; Sun, 22 Sep 2013 10:38:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1525343 - in /sling/trunk/contrib/extensions/mongodb: pom.xml src/main/java/org/apache/sling/mongodb/impl/MongoDBResource.java src/main/java/org/apache/sling/mongodb/impl/MongoDBResourceProvider.java Date: Sun, 22 Sep 2013 10:38:08 -0000 To: commits@sling.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130922103808.E5CF723888A6@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cziegeler Date: Sun Sep 22 10:38:08 2013 New Revision: 1525343 URL: http://svn.apache.org/r1525343 Log: Use latest mongo driver Modified: sling/trunk/contrib/extensions/mongodb/pom.xml sling/trunk/contrib/extensions/mongodb/src/main/java/org/apache/sling/mongodb/impl/MongoDBResource.java sling/trunk/contrib/extensions/mongodb/src/main/java/org/apache/sling/mongodb/impl/MongoDBResourceProvider.java Modified: sling/trunk/contrib/extensions/mongodb/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/mongodb/pom.xml?rev=1525343&r1=1525342&r2=1525343&view=diff ============================================================================== --- sling/trunk/contrib/extensions/mongodb/pom.xml (original) +++ sling/trunk/contrib/extensions/mongodb/pom.xml Sun Sep 22 10:38:08 2013 @@ -76,7 +76,7 @@ org.mongodb mongo-java-driver - 2.9.1 + 2.11.3 provided Modified: sling/trunk/contrib/extensions/mongodb/src/main/java/org/apache/sling/mongodb/impl/MongoDBResource.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/mongodb/src/main/java/org/apache/sling/mongodb/impl/MongoDBResource.java?rev=1525343&r1=1525342&r2=1525343&view=diff ============================================================================== --- sling/trunk/contrib/extensions/mongodb/src/main/java/org/apache/sling/mongodb/impl/MongoDBResource.java (original) +++ sling/trunk/contrib/extensions/mongodb/src/main/java/org/apache/sling/mongodb/impl/MongoDBResource.java Sun Sep 22 10:38:08 2013 @@ -58,6 +58,13 @@ public class MongoDBResource extends Abs this.provider = provider; } + public MongoDBResource(final MongoDBResource source) { + this.resourceResolver = source.resourceResolver; + this.resourcePath = source.resourcePath; + this.collection = source.collection; + this.dbObject = source.dbObject; + this.provider = source.provider; + } /** * @see org.apache.sling.api.resource.Resource#getPath() */ Modified: sling/trunk/contrib/extensions/mongodb/src/main/java/org/apache/sling/mongodb/impl/MongoDBResourceProvider.java URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/mongodb/src/main/java/org/apache/sling/mongodb/impl/MongoDBResourceProvider.java?rev=1525343&r1=1525342&r2=1525343&view=diff ============================================================================== --- sling/trunk/contrib/extensions/mongodb/src/main/java/org/apache/sling/mongodb/impl/MongoDBResourceProvider.java (original) +++ sling/trunk/contrib/extensions/mongodb/src/main/java/org/apache/sling/mongodb/impl/MongoDBResourceProvider.java Sun Sep 22 10:38:08 2013 @@ -230,7 +230,7 @@ public class MongoDBResourceProvider imp return null; } if ( this.changedResources.containsKey(path) ) { - return this.changedResources.get(path); + return new MongoDBResource(this.changedResources.get(path)); } final String[] info = this.extractResourceInfo(path); if ( info != null ) { @@ -366,12 +366,12 @@ public class MongoDBResourceProvider imp return names.contains(name) && !this.context.isFilterCollectionName(name); } - + /** * Check if a collection with a given name exists and return it */ protected DBCollection getCollection(final String name) { - if ( this.hasCollection(name) ) { + if ( this.hasCollection(name) ) { return this.context.getDatabase().getCollection(name); } return null; @@ -418,19 +418,19 @@ public class MongoDBResourceProvider imp } return dbObj; } - + protected Set getDeletedResources() { return this.deletedResources; } - + protected Map getChangedResources() { return this.changedResources; } - + protected MongoDBContext getContext() { return this.context; } - + protected String getPROP_PATH() { return PROP_PATH; }