Modified: jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/blobs/AbstractBlobStore.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/blobs/AbstractBlobStore.java?rev=1570228&r1=1570227&r2=1570228&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/blobs/AbstractBlobStore.java (original) +++ jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/blobs/AbstractBlobStore.java Thu Feb 20 15:31:58 2014 @@ -36,8 +36,8 @@ import java.util.WeakHashMap; import java.util.concurrent.atomic.AtomicReference; import org.apache.jackrabbit.mk.util.Cache; -import org.apache.jackrabbit.mk.util.IOUtils; -import org.apache.jackrabbit.mk.util.StringUtils; +import org.apache.jackrabbit.oak.commons.IOUtils; +import org.apache.jackrabbit.oak.commons.StringUtils; /** * An abstract data store that splits the binaries in relatively small blocks,
Modified: jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/blobs/BlobStoreInputStream.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/blobs/BlobStoreInputStream.java?rev=1570228&r1=1570227&r2=1570228&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/blobs/BlobStoreInputStream.java (original) +++ jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/blobs/BlobStoreInputStream.java Thu Feb 20 15:31:58 2014 @@ -16,7 +16,7 @@ */ package org.apache.jackrabbit.mk.blobs; -import org.apache.jackrabbit.mk.util.IOUtils; +import org.apache.jackrabbit.oak.commons.IOUtils; import java.io.IOException; import java.io.InputStream; Modified: jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/blobs/DbBlobStore.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/blobs/DbBlobStore.java?rev=1570228&r1=1570227&r2=1570228&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/blobs/DbBlobStore.java (original) +++ jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/blobs/DbBlobStore.java Thu Feb 20 15:31:58 2014 @@ -27,7 +27,7 @@ import java.util.Iterator; import com.google.common.collect.AbstractIterator; -import org.apache.jackrabbit.mk.util.StringUtils; +import org.apache.jackrabbit.oak.commons.StringUtils; import org.h2.jdbcx.JdbcConnectionPool; /** Modified: jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/blobs/FileBlobStore.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/blobs/FileBlobStore.java?rev=1570228&r1=1570227&r2=1570228&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/blobs/FileBlobStore.java (original) +++ jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/blobs/FileBlobStore.java Thu Feb 20 15:31:58 2014 @@ -37,8 +37,8 @@ import com.google.common.io.Files; import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; -import org.apache.jackrabbit.mk.util.IOUtils; -import org.apache.jackrabbit.mk.util.StringUtils; +import org.apache.jackrabbit.oak.commons.IOUtils; +import org.apache.jackrabbit.oak.commons.StringUtils; /** * A file blob store. Modified: jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/blobs/MemoryBlobStore.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/blobs/MemoryBlobStore.java?rev=1570228&r1=1570227&r2=1570228&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/blobs/MemoryBlobStore.java (original) +++ jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/blobs/MemoryBlobStore.java Thu Feb 20 15:31:58 2014 @@ -23,7 +23,7 @@ import java.util.Iterator; import com.google.common.collect.AbstractIterator; import com.google.common.collect.Maps; -import org.apache.jackrabbit.mk.util.StringUtils; +import org.apache.jackrabbit.oak.commons.StringUtils; /** * A memory blob store. Useful for testing. Modified: jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/core/MicroKernelImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/core/MicroKernelImpl.java?rev=1570228&r1=1570227&r2=1570228&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/core/MicroKernelImpl.java (original) +++ jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/core/MicroKernelImpl.java Thu Feb 20 15:31:58 2014 @@ -26,10 +26,10 @@ import javax.annotation.Nonnull; import org.apache.jackrabbit.mk.api.MicroKernel; import org.apache.jackrabbit.mk.api.MicroKernelException; -import org.apache.jackrabbit.mk.json.JsonObject; -import org.apache.jackrabbit.mk.json.JsopBuilder; -import org.apache.jackrabbit.mk.json.JsopReader; -import org.apache.jackrabbit.mk.json.JsopTokenizer; +import org.apache.jackrabbit.oak.commons.json.JsonObject; +import org.apache.jackrabbit.oak.commons.json.JsopBuilder; +import org.apache.jackrabbit.oak.commons.json.JsopReader; +import org.apache.jackrabbit.oak.commons.json.JsopTokenizer; import org.apache.jackrabbit.mk.model.ChildNodeEntry; import org.apache.jackrabbit.mk.model.Commit; import org.apache.jackrabbit.mk.model.CommitBuilder; Modified: jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/core/Repository.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/core/Repository.java?rev=1570228&r1=1570227&r2=1570228&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/core/Repository.java (original) +++ jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/core/Repository.java Thu Feb 20 15:31:58 2014 @@ -32,7 +32,7 @@ import org.apache.jackrabbit.mk.persiste import org.apache.jackrabbit.mk.store.DefaultRevisionStore; import org.apache.jackrabbit.mk.store.NotFoundException; import org.apache.jackrabbit.mk.store.RevisionStore; -import org.apache.jackrabbit.mk.util.IOUtils; +import org.apache.jackrabbit.oak.commons.IOUtils; import org.apache.jackrabbit.oak.commons.PathUtils; /** Modified: jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/CommitBuilder.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/CommitBuilder.java?rev=1570228&r1=1570227&r2=1570228&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/CommitBuilder.java (original) +++ jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/CommitBuilder.java Thu Feb 20 15:31:58 2014 @@ -19,8 +19,8 @@ package org.apache.jackrabbit.mk.model; import java.util.ArrayList; import java.util.List; -import org.apache.jackrabbit.mk.json.JsonObject; -import org.apache.jackrabbit.mk.json.JsopBuilder; +import org.apache.jackrabbit.oak.commons.json.JsonObject; +import org.apache.jackrabbit.oak.commons.json.JsopBuilder; import org.apache.jackrabbit.mk.store.NotFoundException; import org.apache.jackrabbit.mk.store.RevisionStore; import org.apache.jackrabbit.oak.commons.PathUtils; Modified: jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/DiffBuilder.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/DiffBuilder.java?rev=1570228&r1=1570227&r2=1570228&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/DiffBuilder.java (original) +++ jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/DiffBuilder.java Thu Feb 20 15:31:58 2014 @@ -16,7 +16,7 @@ */ package org.apache.jackrabbit.mk.model; -import org.apache.jackrabbit.mk.json.JsopBuilder; +import org.apache.jackrabbit.oak.commons.json.JsopBuilder; import org.apache.jackrabbit.mk.store.RevisionProvider; import org.apache.jackrabbit.oak.commons.PathUtils; Modified: jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/Id.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/Id.java?rev=1570228&r1=1570227&r2=1570228&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/Id.java (original) +++ jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/Id.java Thu Feb 20 15:31:58 2014 @@ -16,7 +16,7 @@ */ package org.apache.jackrabbit.mk.model; -import org.apache.jackrabbit.mk.util.StringUtils; +import org.apache.jackrabbit.oak.commons.StringUtils; import java.util.Arrays; Modified: jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/StagedNodeTree.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/StagedNodeTree.java?rev=1570228&r1=1570227&r2=1570228&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/StagedNodeTree.java (original) +++ jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/StagedNodeTree.java Thu Feb 20 15:31:58 2014 @@ -22,7 +22,7 @@ import java.util.Map; import java.util.Map.Entry; import org.apache.jackrabbit.mk.api.MicroKernel; -import org.apache.jackrabbit.mk.json.JsonObject; +import org.apache.jackrabbit.oak.commons.json.JsonObject; import org.apache.jackrabbit.mk.store.NotFoundException; import org.apache.jackrabbit.mk.store.RevisionStore; import org.apache.jackrabbit.mk.store.RevisionStore.PutToken; Modified: jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/store/BinaryBinding.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/store/BinaryBinding.java?rev=1570228&r1=1570227&r2=1570228&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/store/BinaryBinding.java (original) +++ jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/store/BinaryBinding.java Thu Feb 20 15:31:58 2014 @@ -16,7 +16,7 @@ */ package org.apache.jackrabbit.mk.store; -import org.apache.jackrabbit.mk.util.IOUtils; +import org.apache.jackrabbit.oak.commons.IOUtils; import java.io.IOException; import java.io.InputStream; Modified: jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/store/DefaultRevisionStore.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/store/DefaultRevisionStore.java?rev=1570228&r1=1570227&r2=1570228&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/store/DefaultRevisionStore.java (original) +++ jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/store/DefaultRevisionStore.java Thu Feb 20 15:31:58 2014 @@ -26,7 +26,7 @@ import org.apache.jackrabbit.mk.model.St import org.apache.jackrabbit.mk.model.StoredNode; import org.apache.jackrabbit.mk.persistence.GCPersistence; import org.apache.jackrabbit.mk.persistence.Persistence; -import org.apache.jackrabbit.mk.util.IOUtils; +import org.apache.jackrabbit.oak.commons.IOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; Modified: jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/util/MicroKernelInputStream.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/util/MicroKernelInputStream.java?rev=1570228&r1=1570227&r2=1570228&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/util/MicroKernelInputStream.java (original) +++ jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/util/MicroKernelInputStream.java Thu Feb 20 15:31:58 2014 @@ -17,6 +17,7 @@ package org.apache.jackrabbit.mk.util; import org.apache.jackrabbit.mk.api.MicroKernel; +import org.apache.jackrabbit.oak.commons.IOUtils; import java.io.IOException; import java.io.InputStream; Modified: jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/util/NodeFilter.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/util/NodeFilter.java?rev=1570228&r1=1570227&r2=1570228&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/util/NodeFilter.java (original) +++ jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/util/NodeFilter.java Thu Feb 20 15:31:58 2014 @@ -16,7 +16,7 @@ */ package org.apache.jackrabbit.mk.util; -import org.apache.jackrabbit.mk.json.JsopTokenizer; +import org.apache.jackrabbit.oak.commons.json.JsopTokenizer; import java.util.ArrayList; import java.util.List; Modified: jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/blobs/AbstractBlobStoreTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/blobs/AbstractBlobStoreTest.java?rev=1570228&r1=1570227&r2=1570228&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/blobs/AbstractBlobStoreTest.java (original) +++ jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/blobs/AbstractBlobStoreTest.java Thu Feb 20 15:31:58 2014 @@ -31,13 +31,11 @@ import java.util.Random; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; -import junit.framework.TestCase; - import com.google.common.collect.Sets; - -import org.apache.jackrabbit.mk.json.JsopBuilder; -import org.apache.jackrabbit.mk.json.JsopTokenizer; -import org.apache.jackrabbit.mk.util.IOUtilsTest; +import junit.framework.TestCase; +import org.apache.jackrabbit.oak.commons.IOUtilsTest; +import org.apache.jackrabbit.oak.commons.json.JsopBuilder; +import org.apache.jackrabbit.oak.commons.json.JsopTokenizer; import org.junit.Test; /** Modified: jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/concurrent/ConcurrentBlobTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/concurrent/ConcurrentBlobTest.java?rev=1570228&r1=1570227&r2=1570228&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/concurrent/ConcurrentBlobTest.java (original) +++ jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/concurrent/ConcurrentBlobTest.java Thu Feb 20 15:31:58 2014 @@ -18,7 +18,7 @@ package org.apache.jackrabbit.mk.concurr import junit.framework.Assert; import org.apache.jackrabbit.mk.blobs.MemoryBlobStore; -import org.apache.jackrabbit.mk.util.IOUtils; +import org.apache.jackrabbit.oak.commons.IOUtils; import org.junit.Before; import org.junit.Test; Modified: jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/persistence/GCPersistenceTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/persistence/GCPersistenceTest.java?rev=1570228&r1=1570227&r2=1570228&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/persistence/GCPersistenceTest.java (original) +++ jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/persistence/GCPersistenceTest.java Thu Feb 20 15:31:58 2014 @@ -21,7 +21,7 @@ import org.apache.jackrabbit.mk.model.Mu import org.apache.jackrabbit.mk.model.MutableNode; import org.apache.jackrabbit.mk.model.StoredNode; import org.apache.jackrabbit.mk.store.NotFoundException; -import org.apache.jackrabbit.mk.util.IOUtils; +import org.apache.jackrabbit.oak.commons.IOUtils; import org.junit.After; import org.junit.Before; import org.junit.Test; Modified: jackrabbit/oak/trunk/oak-solr-embedded/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/embedded/EmbeddedSolrServerProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-embedded/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/embedded/EmbeddedSolrServerProvider.java?rev=1570228&r1=1570227&r2=1570228&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-solr-embedded/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/embedded/EmbeddedSolrServerProvider.java (original) +++ jackrabbit/oak/trunk/oak-solr-embedded/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/embedded/EmbeddedSolrServerProvider.java Thu Feb 20 15:31:58 2014 @@ -23,7 +23,7 @@ import java.io.InputStream; import java.util.Arrays; import org.apache.felix.scr.annotations.Deactivate; -import org.apache.jackrabbit.mk.util.IOUtils; +import org.apache.jackrabbit.oak.commons.IOUtils; import org.apache.jackrabbit.oak.plugins.index.solr.configuration.SolrServerConfiguration; import org.apache.jackrabbit.oak.plugins.index.solr.configuration.SolrServerConfigurationDefaults; import org.apache.jackrabbit.oak.plugins.index.solr.server.SolrServerProvider;
