I think this commit is responsible for the current state of the trunk (compilation error) [0]
Also, there's a warning in the build now [1], you might want to also cleanup the OSGi exports as well after the move. best, alex [0] https://travis-ci.org/apache/jackrabbit-oak/builds/6243130 [1] [WARNING] Bundle org.apache.jackrabbit:oak-mongomk:bundle:0.7-SNAPSHOT : Instructions in Export-Package that are never used: org\.apache\.jackrabbit\.mongomk\.api\..*|org\.apache\.jackrabbit\.mongomk\.api Classpath: Jar:.,Jar:oak-mk,Jar:oak-mk-api,Jar:oak-commons,Jar:jsr305,Jar:guava,Jar:mongo-java-driver,Jar:slf4j-api,Jar:commons-codec,Jar:json,Jar:org.apache.sling.commons.osgi,Jar:org.osgi.core,Jar:org.osgi.compendium,Jar:bndlib,Jar:org.apache.felix.scr.annotations,Jar:json-simple [WARNING] Bundle org.apache.jackrabbit:oak-mongomk:bundle:0.7-SNAPSHOT : Superfluous export-package instructions: [org.apache.jackrabbit.mongomk.api.*] On Thu, Apr 11, 2013 at 10:58 AM, <[email protected]> wrote: > Author: thomasm > Date: Thu Apr 11 08:58:38 2013 > New Revision: 1466800 > > URL: http://svn.apache.org/r1466800 > Log: > OAK-752 Remove deprecated code and code in "old" packages (move blob > support to a separate package) > > Added: > > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/ > > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/MongoBlob.java > - copied, changed from r1466794, > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/model/MongoBlob.java > > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/MongoBlobStore.java > - copied, changed from r1466794, > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/blob/MongoBlobStore.java > > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/gridfs/ > > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/gridfs/BaseCommand.java > - copied, changed from r1466794, > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/BaseCommand.java > > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/gridfs/Command.java > - copied, changed from r1466794, > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/api/command/Command.java > > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/gridfs/CommandExecutor.java > - copied, changed from r1466794, > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/api/command/CommandExecutor.java > > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/gridfs/DefaultCommandExecutor.java > - copied, changed from r1466794, > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/DefaultCommandExecutor.java > > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/gridfs/GetBlobLengthCommandGridFS.java > - copied, changed from r1466794, > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/blob/GetBlobLengthCommandGridFS.java > > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/gridfs/MongoGridFSBlobStore.java > - copied, changed from r1466794, > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/blob/MongoGridFSBlobStore.java > > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/gridfs/ReadBlobCommandGridFS.java > - copied, changed from r1466794, > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/blob/ReadBlobCommandGridFS.java > > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/gridfs/WriteBlobCommandGridFS.java > - copied, changed from r1466794, > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/blob/WriteBlobCommandGridFS.java > > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/ > > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoBlobStoreTest.java > - copied, changed from r1466794, > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mk/blobs/MongoBlobStoreTest.java > > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoMKGetLengthGridFSTest.java > - copied, changed from r1466794, > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetLengthGridFSTest.java > > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoMKGetLengthTest.java > - copied, changed from r1466794, > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetLengthTest.java > > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoMKReadGridFSTest.java > - copied, changed from r1466794, > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKReadGridFSTest.java > > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoMKReadTest.java > - copied, changed from r1466794, > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKReadTest.java > > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoMKWriteGridFSTest.java > - copied, changed from r1466794, > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKWriteGridFSTest.java > > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoMKWriteTest.java > - copied, changed from r1466794, > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKWriteTest.java > Removed: > > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/api/command/Command.java > > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/api/command/CommandExecutor.java > > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/api/command/package-info.java > > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/blob/ > > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/BaseCommand.java > > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/DefaultCommandExecutor.java > > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/blob/GetBlobLengthCommandGridFS.java > > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/blob/ReadBlobCommandGridFS.java > > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/blob/WriteBlobCommandGridFS.java > > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/model/MongoBlob.java > > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mk/blobs/MongoBlobStoreTest.java > > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetLengthGridFSTest.java > > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetLengthTest.java > > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKReadGridFSTest.java > > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKReadTest.java > > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKWriteGridFSTest.java > > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKWriteTest.java > Modified: > > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/prototype/MongoMK.java > > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/command/ConcurrentWriteMultipleMkMongoTest.java > > Copied: > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/MongoBlob.java > (from r1466794, > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/model/MongoBlob.java) > URL: > http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/MongoBlob.java?p2=jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/MongoBlob.java&p1=jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/model/MongoBlob.java&r1=1466794&r2=1466800&rev=1466800&view=diff > > ============================================================================== > --- > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/model/MongoBlob.java > (original) > +++ > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/MongoBlob.java > Thu Apr 11 08:58:38 2013 > @@ -14,12 +14,12 @@ > * See the License for the specific language governing permissions and > * limitations under the License. > */ > -package org.apache.jackrabbit.mongomk.impl.model; > +package org.apache.jackrabbit.mongomk.blob; > > import com.mongodb.BasicDBObject; > > /** > - * The {@code MongoDB} representation of a blob. Only used by {@link > MongoBlobStore} > + * The {@code MongoDB} representation of a blob. Only used by > MongoBlobStore > */ > public class MongoBlob extends BasicDBObject { > > @@ -45,7 +45,7 @@ public class MongoBlob extends BasicDBOb > } > > public byte[] getData() { > - return (byte[])get(KEY_DATA); > + return (byte[]) get(KEY_DATA); > } > > public void setData(byte[] data) { > > Copied: > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/MongoBlobStore.java > (from r1466794, > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/blob/MongoBlobStore.java) > URL: > http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/MongoBlobStore.java?p2=jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/MongoBlobStore.java&p1=jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/blob/MongoBlobStore.java&r1=1466794&r2=1466800&rev=1466800&view=diff > > ============================================================================== > --- > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/blob/MongoBlobStore.java > (original) > +++ > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/MongoBlobStore.java > Thu Apr 11 08:58:38 2013 > @@ -14,12 +14,10 @@ > * See the License for the specific language governing permissions and > * limitations under the License. > */ > -package org.apache.jackrabbit.mongomk.impl.blob; > +package org.apache.jackrabbit.mongomk.blob; > > import org.apache.jackrabbit.mk.blobs.AbstractBlobStore; > -import org.apache.jackrabbit.mk.blobs.BlobStore; > import org.apache.jackrabbit.mk.util.StringUtils; > -import org.apache.jackrabbit.mongomk.impl.model.MongoBlob; > import org.slf4j.Logger; > import org.slf4j.LoggerFactory; > > @@ -31,14 +29,12 @@ import com.mongodb.QueryBuilder; > import com.mongodb.WriteResult; > > /** > - * Implementation of {@link BlobStore} for the {@code MongoDB} extending > from > - * {@link AbstractBlobStore}. Unlike {@link MongoGridFSBlobStore}, it > saves blobs > - * into a separate collection in {@link MongoDB} instead of GridFS and it > supports > - * basic garbage collection. > - * > - * FIXME: > - * -Do we need to create commands for retry etc.? > - * -Not sure if this is going to work for multiple MKs talking to same > MongoDB? > + * Implementation of blob store for the MongoDB extending from > + * {@link AbstractBlobStore}. It saves blobs into a separate collection in > + * MongoDB (not using GridFS) and it supports basic garbage collection. > + * > + * FIXME: -Do we need to create commands for retry etc.? -Not sure if > this is > + * going to work for multiple MKs talking to same MongoDB? > */ > public class MongoBlobStore extends AbstractBlobStore { > > @@ -127,7 +123,7 @@ public class MongoBlobStore extends Abst > > long countAfter = getBlobCollection().count(query); > minLastModified = 0; > - return (int)(countBefore - countAfter); > + return (int) (countBefore - countAfter); > } > > private DBCollection getBlobCollection() { > @@ -150,10 +146,10 @@ public class MongoBlobStore extends Abst > > private MongoBlob getBlob(String id, long lastMod) { > DBObject query = getBlobQuery(id, lastMod); > - return (MongoBlob)getBlobCollection().findOne(query); > + return (MongoBlob) getBlobCollection().findOne(query); > } > > - private DBObject getBlobQuery(String id, long lastMod) { > + private static DBObject getBlobQuery(String id, long lastMod) { > QueryBuilder queryBuilder = new QueryBuilder(); > if (id != null) { > queryBuilder = queryBuilder.and(MongoBlob.KEY_ID).is(id); > @@ -163,4 +159,5 @@ public class MongoBlobStore extends Abst > } > return queryBuilder.get(); > } > + > } > \ No newline at end of file > > Copied: > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/gridfs/BaseCommand.java > (from r1466794, > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/BaseCommand.java) > URL: > http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/gridfs/BaseCommand.java?p2=jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/gridfs/BaseCommand.java&p1=jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/BaseCommand.java&r1=1466794&r2=1466800&rev=1466800&view=diff > > ============================================================================== > --- > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/BaseCommand.java > (original) > +++ > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/gridfs/BaseCommand.java > Thu Apr 11 08:58:38 2013 > @@ -14,9 +14,8 @@ > * See the License for the specific language governing permissions and > * limitations under the License. > */ > -package org.apache.jackrabbit.mongomk.impl.command; > +package org.apache.jackrabbit.mongomk.blob.gridfs; > > -import org.apache.jackrabbit.mongomk.api.command.Command; > > /** > * Base {@code Command} implementation. > > Copied: > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/gridfs/Command.java > (from r1466794, > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/api/command/Command.java) > URL: > http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/gridfs/Command.java?p2=jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/gridfs/Command.java&p1=jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/api/command/Command.java&r1=1466794&r2=1466800&rev=1466800&view=diff > > ============================================================================== > --- > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/api/command/Command.java > (original) > +++ > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/gridfs/Command.java > Thu Apr 11 08:58:38 2013 > @@ -14,7 +14,7 @@ > * See the License for the specific language governing permissions and > * limitations under the License. > */ > -package org.apache.jackrabbit.mongomk.api.command; > +package org.apache.jackrabbit.mongomk.blob.gridfs; > > > /** > > Copied: > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/gridfs/CommandExecutor.java > (from r1466794, > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/api/command/CommandExecutor.java) > URL: > http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/gridfs/CommandExecutor.java?p2=jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/gridfs/CommandExecutor.java&p1=jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/api/command/CommandExecutor.java&r1=1466794&r2=1466800&rev=1466800&view=diff > > ============================================================================== > --- > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/api/command/CommandExecutor.java > (original) > +++ > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/gridfs/CommandExecutor.java > Thu Apr 11 08:58:38 2013 > @@ -14,7 +14,7 @@ > * See the License for the specific language governing permissions and > * limitations under the License. > */ > -package org.apache.jackrabbit.mongomk.api.command; > +package org.apache.jackrabbit.mongomk.blob.gridfs; > > /** > * The executor part of the <a href=" > http://en.wikipedia.org/wiki/Command_pattern";>Command Pattern</a>. > > Copied: > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/gridfs/DefaultCommandExecutor.java > (from r1466794, > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/DefaultCommandExecutor.java) > URL: > http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/gridfs/DefaultCommandExecutor.java?p2=jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/gridfs/DefaultCommandExecutor.java&p1=jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/DefaultCommandExecutor.java&r1=1466794&r2=1466800&rev=1466800&view=diff > > ============================================================================== > --- > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/DefaultCommandExecutor.java > (original) > +++ > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/gridfs/DefaultCommandExecutor.java > Thu Apr 11 08:58:38 2013 > @@ -14,10 +14,8 @@ > * See the License for the specific language governing permissions and > * limitations under the License. > */ > -package org.apache.jackrabbit.mongomk.impl.command; > +package org.apache.jackrabbit.mongomk.blob.gridfs; > > -import org.apache.jackrabbit.mongomk.api.command.Command; > -import org.apache.jackrabbit.mongomk.api.command.CommandExecutor; > > /** > * Implementation of the {@link CommandExecutor} interface. > > Copied: > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/gridfs/GetBlobLengthCommandGridFS.java > (from r1466794, > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/blob/GetBlobLengthCommandGridFS.java) > URL: > http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/gridfs/GetBlobLengthCommandGridFS.java?p2=jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/gridfs/GetBlobLengthCommandGridFS.java&p1=jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/blob/GetBlobLengthCommandGridFS.java&r1=1466794&r2=1466800&rev=1466800&view=diff > > ============================================================================== > --- > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/blob/GetBlobLengthCommandGridFS.java > (original) > +++ > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/gridfs/GetBlobLengthCommandGridFS.java > Thu Apr 11 08:58:38 2013 > @@ -14,9 +14,8 @@ > * See the License for the specific language governing permissions and > * limitations under the License. > */ > -package org.apache.jackrabbit.mongomk.impl.command.blob; > +package org.apache.jackrabbit.mongomk.blob.gridfs; > > -import org.apache.jackrabbit.mongomk.impl.command.BaseCommand; > > import com.mongodb.BasicDBObject; > import com.mongodb.gridfs.GridFS; > > Copied: > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/gridfs/MongoGridFSBlobStore.java > (from r1466794, > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/blob/MongoGridFSBlobStore.java) > URL: > http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/gridfs/MongoGridFSBlobStore.java?p2=jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/gridfs/MongoGridFSBlobStore.java&p1=jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/blob/MongoGridFSBlobStore.java&r1=1466794&r2=1466800&rev=1466800&view=diff > > ============================================================================== > --- > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/blob/MongoGridFSBlobStore.java > (original) > +++ > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/gridfs/MongoGridFSBlobStore.java > Thu Apr 11 08:58:38 2013 > @@ -14,24 +14,18 @@ > * See the License for the specific language governing permissions and > * limitations under the License. > */ > -package org.apache.jackrabbit.mongomk.impl.blob; > +package org.apache.jackrabbit.mongomk.blob.gridfs; > > import java.io.InputStream; > > import org.apache.jackrabbit.mk.blobs.BlobStore; > -import org.apache.jackrabbit.mongomk.api.command.Command; > -import org.apache.jackrabbit.mongomk.api.command.CommandExecutor; > -import org.apache.jackrabbit.mongomk.impl.command.DefaultCommandExecutor; > -import > org.apache.jackrabbit.mongomk.impl.command.blob.GetBlobLengthCommandGridFS; > -import > org.apache.jackrabbit.mongomk.impl.command.blob.ReadBlobCommandGridFS; > -import > org.apache.jackrabbit.mongomk.impl.command.blob.WriteBlobCommandGridFS; > > import com.mongodb.DB; > import com.mongodb.gridfs.GridFS; > > /** > - * Implementation of {@link BlobStore} for the {@code MongoDB} using > GridFS. It > - * does not support garbage collection at the moment. > + * Implementation of {@link BlobStore} for MongoDB using GridFS. It does > not > + * support garbage collection at the moment. > */ > public class MongoGridFSBlobStore implements BlobStore { > > @@ -66,4 +60,5 @@ public class MongoGridFSBlobStore implem > Command<String> command = new WriteBlobCommandGridFS(gridFS, is); > return commandExecutor.execute(command); > } > + > } > > Copied: > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/gridfs/ReadBlobCommandGridFS.java > (from r1466794, > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/blob/ReadBlobCommandGridFS.java) > URL: > http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/gridfs/ReadBlobCommandGridFS.java?p2=jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/gridfs/ReadBlobCommandGridFS.java&p1=jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/blob/ReadBlobCommandGridFS.java&r1=1466794&r2=1466800&rev=1466800&view=diff > > ============================================================================== > --- > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/blob/ReadBlobCommandGridFS.java > (original) > +++ > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/gridfs/ReadBlobCommandGridFS.java > Thu Apr 11 08:58:38 2013 > @@ -14,12 +14,11 @@ > * See the License for the specific language governing permissions and > * limitations under the License. > */ > -package org.apache.jackrabbit.mongomk.impl.command.blob; > +package org.apache.jackrabbit.mongomk.blob.gridfs; > > import java.io.InputStream; > > import org.apache.jackrabbit.mk.util.IOUtils; > -import org.apache.jackrabbit.mongomk.impl.command.BaseCommand; > > import com.mongodb.BasicDBObject; > import com.mongodb.gridfs.GridFS; > @@ -73,7 +72,7 @@ public class ReadBlobCommandGridFS exten > if (end > fileLength) { > end = fileLength; > } > - length = (int)(end - start); > + length = (int) (end - start); > > if (start < end) { > InputStream is = gridFile.getInputStream(); > > Copied: > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/gridfs/WriteBlobCommandGridFS.java > (from r1466794, > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/blob/WriteBlobCommandGridFS.java) > URL: > http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/gridfs/WriteBlobCommandGridFS.java?p2=jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/gridfs/WriteBlobCommandGridFS.java&p1=jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/blob/WriteBlobCommandGridFS.java&r1=1466794&r2=1466800&rev=1466800&view=diff > > ============================================================================== > --- > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/impl/command/blob/WriteBlobCommandGridFS.java > (original) > +++ > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/blob/gridfs/WriteBlobCommandGridFS.java > Thu Apr 11 08:58:38 2013 > @@ -14,14 +14,13 @@ > * See the License for the specific language governing permissions and > * limitations under the License. > */ > -package org.apache.jackrabbit.mongomk.impl.command.blob; > +package org.apache.jackrabbit.mongomk.blob.gridfs; > > import java.io.BufferedInputStream; > import java.io.IOException; > import java.io.InputStream; > > import org.apache.commons.codec.digest.DigestUtils; > -import org.apache.jackrabbit.mongomk.impl.command.BaseCommand; > > import com.mongodb.BasicDBObject; > import com.mongodb.gridfs.GridFS; > @@ -67,7 +66,7 @@ public class WriteBlobCommandGridFS exte > return gridFSInputFile.getMD5(); > } > > - private String calculateMd5(BufferedInputStream bis) throws > IOException { > + private static String calculateMd5(BufferedInputStream bis) throws > IOException { > bis.mark(Integer.MAX_VALUE); > String md5 = DigestUtils.md5Hex(bis); > bis.reset(); > > Modified: > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/prototype/MongoMK.java > URL: > http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/prototype/MongoMK.java?rev=1466800&r1=1466799&r2=1466800&view=diff > > ============================================================================== > --- > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/prototype/MongoMK.java > (original) > +++ > jackrabbit/oak/trunk/oak-mongomk/src/main/java/org/apache/jackrabbit/mongomk/prototype/MongoMK.java > Thu Apr 11 08:58:38 2013 > @@ -44,7 +44,7 @@ import org.apache.jackrabbit.mk.json.Jso > import org.apache.jackrabbit.mk.json.JsopStream; > import org.apache.jackrabbit.mk.json.JsopTokenizer; > import org.apache.jackrabbit.mk.json.JsopWriter; > -import org.apache.jackrabbit.mongomk.impl.blob.MongoBlobStore; > +import org.apache.jackrabbit.mongomk.blob.MongoBlobStore; > import org.apache.jackrabbit.mongomk.prototype.DocumentStore.Collection; > import org.apache.jackrabbit.mongomk.prototype.Node.Children; > import org.apache.jackrabbit.oak.commons.PathUtils; > @@ -160,6 +160,8 @@ public class MongoMK implements MicroKer > /** > * Maps branch commit revision to revision it is based on > */ > + // TODO at some point, open (unmerged) branches > + // need to be garbage collected (in-memory and on disk) > private final Map<Revision, Revision> branchCommits > = new ConcurrentHashMap<Revision, Revision>(); > > > Copied: > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoBlobStoreTest.java > (from r1466794, > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mk/blobs/MongoBlobStoreTest.java) > URL: > http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoBlobStoreTest.java?p2=jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoBlobStoreTest.java&p1=jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mk/blobs/MongoBlobStoreTest.java&r1=1466794&r2=1466800&rev=1466800&view=diff > > ============================================================================== > --- > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mk/blobs/MongoBlobStoreTest.java > (original) > +++ > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoBlobStoreTest.java > Thu Apr 11 08:58:38 2013 > @@ -14,7 +14,7 @@ > * See the License for the specific language governing permissions and > * limitations under the License. > */ > -package org.apache.jackrabbit.mk.blobs; > +package org.apache.jackrabbit.mongomk.blob; > > import static org.junit.Assert.assertEquals; > import static org.junit.Assert.assertTrue; > @@ -32,8 +32,9 @@ import java.util.HashMap; > import java.util.Random; > import java.util.concurrent.atomic.AtomicBoolean; > > +import org.apache.jackrabbit.mk.blobs.AbstractBlobStore; > +import org.apache.jackrabbit.mk.blobs.BlobStoreInputStream; > import org.apache.jackrabbit.mongomk.AbstractMongoConnectionTest; > -import org.apache.jackrabbit.mongomk.impl.blob.MongoBlobStore; > import org.junit.After; > import org.junit.Before; > import org.junit.Test; > @@ -153,12 +154,6 @@ public class MongoBlobStoreTest extends > } catch (Exception e) { > // expected > } > - try { > - store.mark("ff"); > - fail(); > - } catch (Exception e) { > - // expected > - } > } > > @Test > @@ -211,7 +206,8 @@ public class MongoBlobStoreTest extends > if (d[0] != 0) { > continue; > } > - store.mark(id); > + // this should mark the id > + store.getBlobLength(id); > } > count = store.sweep(); > > > Copied: > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoMKGetLengthGridFSTest.java > (from r1466794, > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetLengthGridFSTest.java) > URL: > http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoMKGetLengthGridFSTest.java?p2=jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoMKGetLengthGridFSTest.java&p1=jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetLengthGridFSTest.java&r1=1466794&r2=1466800&rev=1466800&view=diff > > ============================================================================== > --- > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetLengthGridFSTest.java > (original) > +++ > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoMKGetLengthGridFSTest.java > Thu Apr 11 08:58:38 2013 > @@ -14,7 +14,7 @@ > * See the License for the specific language governing permissions and > * limitations under the License. > */ > -package org.apache.jackrabbit.mongomk.impl; > +package org.apache.jackrabbit.mongomk.blob; > > import static org.junit.Assert.assertEquals; > import static org.junit.Assert.fail; > > Copied: > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoMKGetLengthTest.java > (from r1466794, > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetLengthTest.java) > URL: > http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoMKGetLengthTest.java?p2=jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoMKGetLengthTest.java&p1=jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetLengthTest.java&r1=1466794&r2=1466800&rev=1466800&view=diff > > ============================================================================== > --- > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKGetLengthTest.java > (original) > +++ > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoMKGetLengthTest.java > Thu Apr 11 08:58:38 2013 > @@ -14,16 +14,14 @@ > * See the License for the specific language governing permissions and > * limitations under the License. > */ > -package org.apache.jackrabbit.mongomk.impl; > +package org.apache.jackrabbit.mongomk.blob; > > import static org.junit.Assert.assertEquals; > import static org.junit.Assert.fail; > > import java.io.ByteArrayInputStream; > > -import org.apache.jackrabbit.mk.blobs.BlobStore; > import org.apache.jackrabbit.mongomk.AbstractMongoConnectionTest; > -import org.apache.jackrabbit.mongomk.impl.blob.MongoBlobStore; > import org.apache.jackrabbit.mongomk.prototype.MongoMK; > import org.junit.Before; > import org.junit.Test; > @@ -50,6 +48,7 @@ public class MongoMKGetLengthTest extend > mk.getLength("nonExistentBlob"); > fail("Exception expected"); > } catch (Exception expected) { > + // expected > } > } > > @@ -79,10 +78,10 @@ public class MongoMKGetLengthTest extend > return mk.write(new ByteArrayInputStream(blob)); > } > > - private byte[] createBlob(int blobLength) { > + private static byte[] createBlob(int blobLength) { > byte[] blob = new byte[blobLength]; > for (int i = 0; i < blob.length; i++) { > - blob[i] = (byte)i; > + blob[i] = (byte) i; > } > return blob; > } > > Copied: > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoMKReadGridFSTest.java > (from r1466794, > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKReadGridFSTest.java) > URL: > http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoMKReadGridFSTest.java?p2=jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoMKReadGridFSTest.java&p1=jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKReadGridFSTest.java&r1=1466794&r2=1466800&rev=1466800&view=diff > > ============================================================================== > --- > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKReadGridFSTest.java > (original) > +++ > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoMKReadGridFSTest.java > Thu Apr 11 08:58:38 2013 > @@ -14,7 +14,7 @@ > * See the License for the specific language governing permissions and > * limitations under the License. > */ > -package org.apache.jackrabbit.mongomk.impl; > +package org.apache.jackrabbit.mongomk.blob; > > import java.io.ByteArrayInputStream; > import java.util.Arrays; > > Copied: > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoMKReadTest.java > (from r1466794, > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKReadTest.java) > URL: > http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoMKReadTest.java?p2=jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoMKReadTest.java&p1=jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKReadTest.java&r1=1466794&r2=1466800&rev=1466800&view=diff > > ============================================================================== > --- > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKReadTest.java > (original) > +++ > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoMKReadTest.java > Thu Apr 11 08:58:38 2013 > @@ -14,7 +14,7 @@ > * See the License for the specific language governing permissions and > * limitations under the License. > */ > -package org.apache.jackrabbit.mongomk.impl; > +package org.apache.jackrabbit.mongomk.blob; > > import java.io.ByteArrayInputStream; > import java.util.Arrays; > > Copied: > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoMKWriteGridFSTest.java > (from r1466794, > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKWriteGridFSTest.java) > URL: > http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoMKWriteGridFSTest.java?p2=jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoMKWriteGridFSTest.java&p1=jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKWriteGridFSTest.java&r1=1466794&r2=1466800&rev=1466800&view=diff > > ============================================================================== > --- > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKWriteGridFSTest.java > (original) > +++ > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoMKWriteGridFSTest.java > Thu Apr 11 08:58:38 2013 > @@ -14,7 +14,7 @@ > * See the License for the specific language governing permissions and > * limitations under the License. > */ > -package org.apache.jackrabbit.mongomk.impl; > +package org.apache.jackrabbit.mongomk.blob; > > import static org.junit.Assert.assertNotNull; > import static org.junit.Assert.assertTrue; > > Copied: > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoMKWriteTest.java > (from r1466794, > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKWriteTest.java) > URL: > http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoMKWriteTest.java?p2=jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoMKWriteTest.java&p1=jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKWriteTest.java&r1=1466794&r2=1466800&rev=1466800&view=diff > > ============================================================================== > --- > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/MongoMKWriteTest.java > (original) > +++ > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/blob/MongoMKWriteTest.java > Thu Apr 11 08:58:38 2013 > @@ -14,7 +14,7 @@ > * See the License for the specific language governing permissions and > * limitations under the License. > */ > -package org.apache.jackrabbit.mongomk.impl; > +package org.apache.jackrabbit.mongomk.blob; > > import static org.junit.Assert.assertNotNull; > import static org.junit.Assert.assertTrue; > > Modified: > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/command/ConcurrentWriteMultipleMkMongoTest.java > URL: > http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/command/ConcurrentWriteMultipleMkMongoTest.java?rev=1466800&r1=1466799&r2=1466800&view=diff > > ============================================================================== > --- > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/command/ConcurrentWriteMultipleMkMongoTest.java > (original) > +++ > jackrabbit/oak/trunk/oak-mongomk/src/test/java/org/apache/jackrabbit/mongomk/impl/command/ConcurrentWriteMultipleMkMongoTest.java > Thu Apr 11 08:58:38 2013 > @@ -22,7 +22,7 @@ import java.util.concurrent.TimeUnit; > > import org.apache.jackrabbit.mk.api.MicroKernel; > import org.apache.jackrabbit.mongomk.BaseMongoMicroKernelTest; > -import org.apache.jackrabbit.mongomk.impl.blob.MongoGridFSBlobStore; > +import org.apache.jackrabbit.mongomk.blob.gridfs.MongoGridFSBlobStore; > import org.apache.jackrabbit.mongomk.prototype.MongoMK; > import org.junit.Ignore; > import org.junit.Test; > > >
