From oak-commits-return-1036-apmail-jackrabbit-oak-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org Sun Jun 24 20:44:49 2012 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 42C7398F9 for ; Sun, 24 Jun 2012 20:44:49 +0000 (UTC) Received: (qmail 87248 invoked by uid 500); 24 Jun 2012 20:44:49 -0000 Delivered-To: apmail-jackrabbit-oak-commits-archive@jackrabbit.apache.org Received: (qmail 87233 invoked by uid 500); 24 Jun 2012 20:44:49 -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-commits@jackrabbit.apache.org Delivered-To: mailing list oak-commits@jackrabbit.apache.org Received: (qmail 87224 invoked by uid 99); 24 Jun 2012 20:44:49 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 24 Jun 2012 20:44:49 +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, 24 Jun 2012 20:44:47 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0A15C2388A32; Sun, 24 Jun 2012 20:44:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1353327 - in /jackrabbit/oak/trunk/oak-core/src: main/java/org/apache/jackrabbit/mk/ main/java/org/apache/jackrabbit/mk/index/ main/java/org/apache/jackrabbit/mk/simple/ main/java/org/apache/jackrabbit/mk/util/ main/java/org/apache/jackrab... Date: Sun, 24 Jun 2012 20:44:24 -0000 To: oak-commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120624204427.0A15C2388A32@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jukka Date: Sun Jun 24 20:44:22 2012 New Revision: 1353327 URL: http://svn.apache.org/viewvc?rev=1353327&view=rev Log: OAK-13: Cleanup org.apache.jackrabbit.mk Move classes from .mk.util to .mk.simple and .mk based on usage. That's one fewer package to worry about. Added: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/ExceptionFactory.java - copied, changed from r1353323, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/util/ExceptionFactory.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/AscendingClock.java - copied, changed from r1353323, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/util/AscendingClock.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/StringCache.java - copied, changed from r1353323, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/util/StringCache.java jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/simple/AscendingClockTest.java - copied, changed from r1353323, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/util/AscendingClockTest.java Removed: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/util/AscendingClock.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/util/ExceptionFactory.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/util/StringCache.java jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/util/AscendingClockTest.java Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/MicroKernelFactory.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/IndexWrapper.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/Indexer.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeImpl.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeListSmall.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeListTrie.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeMap.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeMapInDb.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeMapInMongoDb.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/SimpleKernelImpl.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/LogWrapper.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/SecurityWrapper.java jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapper.java Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/ExceptionFactory.java (from r1353323, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/util/ExceptionFactory.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/ExceptionFactory.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/ExceptionFactory.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/util/ExceptionFactory.java&r1=1353323&r2=1353327&rev=1353327&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/util/ExceptionFactory.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/ExceptionFactory.java Sun Jun 24 20:44:22 2012 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.mk.util; +package org.apache.jackrabbit.mk; import java.io.FileInputStream; import java.io.IOException; @@ -27,7 +27,7 @@ import org.apache.jackrabbit.mk.api.Micr */ public class ExceptionFactory { - private static final String POM = "META-INF/maven/org.apache.jackrabbit/microkernel/pom.properties"; + private static final String POM = "META-INF/maven/org.apache.jackrabbit/oak-core/pom.properties"; private static String version; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/MicroKernelFactory.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/MicroKernelFactory.java?rev=1353327&r1=1353326&r2=1353327&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/MicroKernelFactory.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/MicroKernelFactory.java Sun Jun 24 20:44:22 2012 @@ -23,7 +23,6 @@ import org.apache.jackrabbit.mk.core.Mic import org.apache.jackrabbit.mk.index.IndexWrapper; import org.apache.jackrabbit.mk.server.Server; import org.apache.jackrabbit.mk.simple.SimpleKernelImpl; -import org.apache.jackrabbit.mk.util.ExceptionFactory; import org.apache.jackrabbit.mk.wrapper.LogWrapper; import org.apache.jackrabbit.mk.wrapper.SecurityWrapper; import org.apache.jackrabbit.mk.wrapper.VirtualRepositoryWrapper; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/IndexWrapper.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/IndexWrapper.java?rev=1353327&r1=1353326&r2=1353327&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/IndexWrapper.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/IndexWrapper.java Sun Jun 24 20:44:22 2012 @@ -19,11 +19,12 @@ package org.apache.jackrabbit.mk.index; import java.io.InputStream; import java.util.HashSet; import java.util.Iterator; + +import org.apache.jackrabbit.mk.ExceptionFactory; import org.apache.jackrabbit.mk.api.MicroKernel; import org.apache.jackrabbit.mk.api.MicroKernelException; import org.apache.jackrabbit.mk.json.JsopReader; import org.apache.jackrabbit.mk.json.JsopStream; -import org.apache.jackrabbit.mk.util.ExceptionFactory; import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.mk.wrapper.MicroKernelWrapper; import org.apache.jackrabbit.mk.wrapper.MicroKernelWrapperBase; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/Indexer.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/Indexer.java?rev=1353327&r1=1353326&r2=1353327&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/Indexer.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/Indexer.java Sun Jun 24 20:44:22 2012 @@ -16,6 +16,7 @@ */ package org.apache.jackrabbit.mk.index; +import org.apache.jackrabbit.mk.ExceptionFactory; import org.apache.jackrabbit.mk.api.MicroKernel; import org.apache.jackrabbit.mk.api.MicroKernelException; import org.apache.jackrabbit.mk.json.JsopBuilder; @@ -23,7 +24,6 @@ import org.apache.jackrabbit.mk.json.Jso import org.apache.jackrabbit.mk.json.JsopTokenizer; import org.apache.jackrabbit.mk.simple.NodeImpl; import org.apache.jackrabbit.mk.simple.NodeMap; -import org.apache.jackrabbit.mk.util.ExceptionFactory; import org.apache.jackrabbit.mk.util.SimpleLRUCache; import org.apache.jackrabbit.oak.commons.PathUtils; import org.apache.jackrabbit.oak.query.index.PropertyContentIndex; Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/AscendingClock.java (from r1353323, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/util/AscendingClock.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/AscendingClock.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/AscendingClock.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/util/AscendingClock.java&r1=1353323&r2=1353327&rev=1353327&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/util/AscendingClock.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/AscendingClock.java Sun Jun 24 20:44:22 2012 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.mk.util; +package org.apache.jackrabbit.mk.simple; /** * A clock that normally returns the current system time since 1970, and is @@ -23,7 +23,7 @@ package org.apache.jackrabbit.mk.util; * returns incrementing values. Unique nanosecond values are returned for system * times between the years 1970 and 2554. */ -public class AscendingClock { +class AscendingClock { /** * The offset between System.nanoTime() (which returns elapsed time) and the Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeImpl.java?rev=1353327&r1=1353326&r2=1353327&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeImpl.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeImpl.java Sun Jun 24 20:44:22 2012 @@ -16,14 +16,13 @@ */ package org.apache.jackrabbit.mk.simple; +import org.apache.jackrabbit.mk.ExceptionFactory; 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.mk.json.JsopWriter; import org.apache.jackrabbit.mk.util.Cache; -import org.apache.jackrabbit.mk.util.ExceptionFactory; import org.apache.jackrabbit.mk.util.IOUtils; -import org.apache.jackrabbit.mk.util.StringCache; import org.apache.jackrabbit.mk.util.StringUtils; import org.apache.jackrabbit.oak.commons.PathUtils; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeListSmall.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeListSmall.java?rev=1353327&r1=1353326&r2=1353327&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeListSmall.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeListSmall.java Sun Jun 24 20:44:22 2012 @@ -21,13 +21,13 @@ import java.io.OutputStream; import java.io.UnsupportedEncodingException; import java.util.Arrays; import java.util.Iterator; + +import org.apache.jackrabbit.mk.ExceptionFactory; import org.apache.jackrabbit.mk.json.JsopBuilder; import org.apache.jackrabbit.mk.json.JsopWriter; import org.apache.jackrabbit.mk.simple.NodeImpl.ChildVisitor; import org.apache.jackrabbit.oak.util.ArrayUtils; -import org.apache.jackrabbit.mk.util.ExceptionFactory; import org.apache.jackrabbit.mk.util.IOUtils; -import org.apache.jackrabbit.mk.util.StringCache; /** * A list of child nodes that fits in memory. Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeListTrie.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeListTrie.java?rev=1353327&r1=1353326&r2=1353327&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeListTrie.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeListTrie.java Sun Jun 24 20:44:22 2012 @@ -20,10 +20,11 @@ import java.io.IOException; import java.io.OutputStream; import java.util.ArrayList; import java.util.Iterator; + +import org.apache.jackrabbit.mk.ExceptionFactory; import org.apache.jackrabbit.mk.json.JsopTokenizer; import org.apache.jackrabbit.mk.json.JsopWriter; import org.apache.jackrabbit.mk.simple.NodeImpl.ChildVisitor; -import org.apache.jackrabbit.mk.util.ExceptionFactory; import org.apache.jackrabbit.mk.util.IOUtils; /** Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeMap.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeMap.java?rev=1353327&r1=1353326&r2=1353327&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeMap.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeMap.java Sun Jun 24 20:44:22 2012 @@ -20,8 +20,9 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.concurrent.atomic.AtomicLong; + +import org.apache.jackrabbit.mk.ExceptionFactory; import org.apache.jackrabbit.mk.simple.NodeImpl.ChildVisitor; -import org.apache.jackrabbit.mk.util.ExceptionFactory; public class NodeMap { Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeMapInDb.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeMapInDb.java?rev=1353327&r1=1353326&r2=1353327&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeMapInDb.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeMapInDb.java Sun Jun 24 20:44:22 2012 @@ -27,10 +27,11 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.TreeMap; import java.util.Map.Entry; + +import org.apache.jackrabbit.mk.ExceptionFactory; import org.apache.jackrabbit.mk.json.JsopBuilder; import org.apache.jackrabbit.mk.simple.NodeImpl.ChildVisitor; import org.apache.jackrabbit.mk.util.Cache; -import org.apache.jackrabbit.mk.util.ExceptionFactory; /** * A node map that stores data in a database. Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeMapInMongoDb.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeMapInMongoDb.java?rev=1353327&r1=1353326&r2=1353327&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeMapInMongoDb.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/NodeMapInMongoDb.java Sun Jun 24 20:44:22 2012 @@ -20,9 +20,10 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.TreeMap; import java.util.Map.Entry; + +import org.apache.jackrabbit.mk.ExceptionFactory; import org.apache.jackrabbit.mk.simple.NodeImpl.ChildVisitor; import org.apache.jackrabbit.mk.util.Cache; -import org.apache.jackrabbit.mk.util.ExceptionFactory; import com.mongodb.BasicDBObject; import com.mongodb.DB; import com.mongodb.DBCollection; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/SimpleKernelImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/SimpleKernelImpl.java?rev=1353327&r1=1353326&r2=1353327&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/SimpleKernelImpl.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/SimpleKernelImpl.java Sun Jun 24 20:44:22 2012 @@ -16,6 +16,7 @@ */ package org.apache.jackrabbit.mk.simple; +import org.apache.jackrabbit.mk.ExceptionFactory; import org.apache.jackrabbit.mk.api.MicroKernel; import org.apache.jackrabbit.mk.api.MicroKernelException; import org.apache.jackrabbit.mk.blobs.AbstractBlobStore; @@ -26,10 +27,8 @@ import org.apache.jackrabbit.mk.json.Jso import org.apache.jackrabbit.mk.json.JsopTokenizer; import org.apache.jackrabbit.mk.json.JsopWriter; import org.apache.jackrabbit.mk.server.Server; -import org.apache.jackrabbit.mk.util.AscendingClock; import org.apache.jackrabbit.mk.util.Cache; import org.apache.jackrabbit.mk.util.CommitGate; -import org.apache.jackrabbit.mk.util.ExceptionFactory; import org.apache.jackrabbit.mk.wrapper.MicroKernelWrapperBase; import org.apache.jackrabbit.oak.commons.PathUtils; Copied: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/StringCache.java (from r1353323, jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/util/StringCache.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/StringCache.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/StringCache.java&p1=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/util/StringCache.java&r1=1353323&r2=1353327&rev=1353327&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/util/StringCache.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/simple/StringCache.java Sun Jun 24 20:44:22 2012 @@ -14,14 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.mk.util; +package org.apache.jackrabbit.mk.simple; import java.lang.ref.SoftReference; +import org.apache.jackrabbit.mk.util.IOUtils; + /** * A simple string cache. */ -public class StringCache { +class StringCache { public static final boolean OBJECT_CACHE = getBooleanSetting("mk.objectCache", true); public static final int OBJECT_CACHE_SIZE = IOUtils.nextPowerOf2(getIntSetting("mk.objectCacheSize", 1024)); Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/LogWrapper.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/LogWrapper.java?rev=1353327&r1=1353326&r2=1353327&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/LogWrapper.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/LogWrapper.java Sun Jun 24 20:44:22 2012 @@ -18,9 +18,10 @@ package org.apache.jackrabbit.mk.wrapper import java.io.InputStream; import java.util.concurrent.atomic.AtomicInteger; + +import org.apache.jackrabbit.mk.ExceptionFactory; import org.apache.jackrabbit.mk.api.MicroKernel; import org.apache.jackrabbit.mk.json.JsopBuilder; -import org.apache.jackrabbit.mk.util.ExceptionFactory; /** * A logging microkernel implementation. Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/SecurityWrapper.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/SecurityWrapper.java?rev=1353327&r1=1353326&r2=1353327&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/SecurityWrapper.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/SecurityWrapper.java Sun Jun 24 20:44:22 2012 @@ -16,6 +16,7 @@ */ package org.apache.jackrabbit.mk.wrapper; +import org.apache.jackrabbit.mk.ExceptionFactory; import org.apache.jackrabbit.mk.api.MicroKernel; import org.apache.jackrabbit.mk.json.JsopReader; import org.apache.jackrabbit.mk.json.JsopStream; @@ -23,7 +24,6 @@ import org.apache.jackrabbit.mk.json.Jso import org.apache.jackrabbit.mk.json.JsopWriter; import org.apache.jackrabbit.mk.simple.NodeImpl; import org.apache.jackrabbit.mk.simple.NodeMap; -import org.apache.jackrabbit.mk.util.ExceptionFactory; import org.apache.jackrabbit.mk.util.SimpleLRUCache; import org.apache.jackrabbit.oak.commons.PathUtils; Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapper.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapper.java?rev=1353327&r1=1353326&r2=1353327&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapper.java (original) +++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapper.java Sun Jun 24 20:44:22 2012 @@ -20,6 +20,8 @@ import java.io.InputStream; import java.util.HashMap; import java.util.TreeMap; import java.util.Map.Entry; + +import org.apache.jackrabbit.mk.ExceptionFactory; import org.apache.jackrabbit.mk.MicroKernelFactory; import org.apache.jackrabbit.mk.api.MicroKernel; import org.apache.jackrabbit.mk.api.MicroKernelException; @@ -29,7 +31,6 @@ import org.apache.jackrabbit.mk.json.Jso import org.apache.jackrabbit.mk.json.JsopWriter; import org.apache.jackrabbit.mk.simple.NodeImpl; import org.apache.jackrabbit.mk.simple.NodeMap; -import org.apache.jackrabbit.mk.util.ExceptionFactory; import org.apache.jackrabbit.oak.commons.PathUtils; /** Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/simple/AscendingClockTest.java (from r1353323, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/util/AscendingClockTest.java) URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/simple/AscendingClockTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/simple/AscendingClockTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/util/AscendingClockTest.java&r1=1353323&r2=1353327&rev=1353327&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/util/AscendingClockTest.java (original) +++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/simple/AscendingClockTest.java Sun Jun 24 20:44:22 2012 @@ -14,7 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.jackrabbit.mk.util; +package org.apache.jackrabbit.mk.simple; + +import org.apache.jackrabbit.mk.simple.AscendingClock; import junit.framework.TestCase;