Return-Path: X-Original-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Delivered-To: apmail-jackrabbit-oak-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6A156F2B9 for ; Thu, 11 Apr 2013 09:38:05 +0000 (UTC) Received: (qmail 31620 invoked by uid 500); 11 Apr 2013 09:38:05 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 31535 invoked by uid 500); 11 Apr 2013 09:38:03 -0000 Mailing-List: contact oak-commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: oak-dev@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 31468 invoked by uid 99); 11 Apr 2013 09:38:00 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Apr 2013 09:38:00 +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; Thu, 11 Apr 2013 09:37:57 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 73A8723888E4; Thu, 11 Apr 2013 09:37:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1466812 - in /jackrabbit/oak/trunk: ./ oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/ oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/ Date: Thu, 11 Apr 2013 09:37:36 -0000 To: oak-commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130411093736.73A8723888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jukka Date: Thu Apr 11 09:37:35 2013 New Revision: 1466812 URL: http://svn.apache.org/r1466812 Log: OAK-752 Remove deprecated code and code in "old" packages Fix broken imports Remove the oak-mk-perf component from the build until it gets fixed Modified: jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/BaseMongoMicroKernelFixture.java jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/MongoGridFSMicroKernelFixture.java jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/MongoMicroKernelFixture.java jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakMongoMKRepositoryStub.java jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java jackrabbit/oak/trunk/pom.xml Modified: jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/BaseMongoMicroKernelFixture.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/BaseMongoMicroKernelFixture.java?rev=1466812&r1=1466811&r2=1466812&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/BaseMongoMicroKernelFixture.java (original) +++ jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/BaseMongoMicroKernelFixture.java Thu Apr 11 09:37:35 2013 @@ -18,10 +18,10 @@ package org.apache.jackrabbit.mk.test; import org.apache.jackrabbit.mk.api.MicroKernel; import org.apache.jackrabbit.mk.blobs.BlobStore; -import org.apache.jackrabbit.mongomk.impl.MongoConnection; -import org.apache.jackrabbit.mongomk.impl.blob.MongoBlobStore; -import org.apache.jackrabbit.mongomk.prototype.DocumentStore; -import org.apache.jackrabbit.mongomk.prototype.MongoMK; +import org.apache.jackrabbit.mongomk.DocumentStore; +import org.apache.jackrabbit.mongomk.MongoMK; +import org.apache.jackrabbit.mongomk.blob.MongoBlobStore; +import org.apache.jackrabbit.mongomk.util.MongoConnection; import com.mongodb.BasicDBObject; import com.mongodb.DB; Modified: jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/MongoGridFSMicroKernelFixture.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/MongoGridFSMicroKernelFixture.java?rev=1466812&r1=1466811&r2=1466812&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/MongoGridFSMicroKernelFixture.java (original) +++ jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/MongoGridFSMicroKernelFixture.java Thu Apr 11 09:37:35 2013 @@ -17,7 +17,7 @@ package org.apache.jackrabbit.mk.test; import org.apache.jackrabbit.mk.blobs.BlobStore; -import org.apache.jackrabbit.mongomk.impl.blob.MongoGridFSBlobStore; +import org.apache.jackrabbit.mongomk.blob.gridfs.MongoGridFSBlobStore; import com.mongodb.DB; Modified: jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/MongoMicroKernelFixture.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/MongoMicroKernelFixture.java?rev=1466812&r1=1466811&r2=1466812&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/MongoMicroKernelFixture.java (original) +++ jackrabbit/oak/trunk/oak-it/mk/src/test/java/org/apache/jackrabbit/mk/test/MongoMicroKernelFixture.java Thu Apr 11 09:37:35 2013 @@ -17,7 +17,7 @@ package org.apache.jackrabbit.mk.test; import org.apache.jackrabbit.mk.blobs.BlobStore; -import org.apache.jackrabbit.mongomk.impl.blob.MongoBlobStore; +import org.apache.jackrabbit.mongomk.blob.MongoBlobStore; import com.mongodb.DB; Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakMongoMKRepositoryStub.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakMongoMKRepositoryStub.java?rev=1466812&r1=1466811&r2=1466812&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakMongoMKRepositoryStub.java (original) +++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/OakMongoMKRepositoryStub.java Thu Apr 11 09:37:35 2013 @@ -29,8 +29,8 @@ import javax.jcr.Session; import javax.jcr.UnsupportedRepositoryOperationException; import org.apache.jackrabbit.api.JackrabbitSession; -import org.apache.jackrabbit.mongomk.impl.MongoConnection; -import org.apache.jackrabbit.mongomk.prototype.MongoMK; +import org.apache.jackrabbit.mongomk.MongoMK; +import org.apache.jackrabbit.mongomk.util.MongoConnection; import org.apache.jackrabbit.test.NotExecutableException; import org.apache.jackrabbit.test.RepositoryStub; Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java?rev=1466812&r1=1466811&r2=1466812&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java (original) +++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/fixture/OakRepositoryFixture.java Thu Apr 11 09:37:35 2013 @@ -23,8 +23,8 @@ import javax.jcr.Repository; import org.apache.commons.io.FileUtils; import org.apache.jackrabbit.mk.api.MicroKernel; import org.apache.jackrabbit.mk.core.MicroKernelImpl; -import org.apache.jackrabbit.mongomk.impl.MongoConnection; -import org.apache.jackrabbit.mongomk.prototype.MongoMK; +import org.apache.jackrabbit.mongomk.MongoMK; +import org.apache.jackrabbit.mongomk.util.MongoConnection; import org.apache.jackrabbit.oak.Oak; import org.apache.jackrabbit.oak.jcr.Jcr; import org.apache.jackrabbit.oak.kernel.KernelNodeStore; Modified: jackrabbit/oak/trunk/pom.xml URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/pom.xml?rev=1466812&r1=1466811&r2=1466812&view=diff ============================================================================== --- jackrabbit/oak/trunk/pom.xml (original) +++ jackrabbit/oak/trunk/pom.xml Thu Apr 11 09:37:35 2013 @@ -52,7 +52,7 @@ oak-solr-embedded oak-run oak-it - oak-mk-perf +