Return-Path: X-Original-To: apmail-jackrabbit-commits-archive@www.apache.org Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A90107181 for ; Wed, 14 Sep 2011 13:50:58 +0000 (UTC) Received: (qmail 69245 invoked by uid 500); 14 Sep 2011 13:50:58 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 69212 invoked by uid 500); 14 Sep 2011 13:50:58 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 69204 invoked by uid 99); 14 Sep 2011 13:50:58 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 14 Sep 2011 13:50:58 +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; Wed, 14 Sep 2011 13:50:56 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 26031238890A; Wed, 14 Sep 2011 13:50:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1170625 - in /jackrabbit/sandbox/jackrabbit-mk: jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/util/ jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/ jackrabbit-spi2microkernel/src/mai... Date: Wed, 14 Sep 2011 13:50:35 -0000 To: commits@jackrabbit.apache.org From: mduerig@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110914135036.26031238890A@eris.apache.org> Author: mduerig Date: Wed Sep 14 13:50:34 2011 New Revision: 1170625 URL: http://svn.apache.org/viewvc?rev=1170625&view=rev Log: Microkernel based Jackrabbit prototype (WIP) refactor: consolidate utils Added: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/util/Arrays.java - copied, changed from r1170591, jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/Arrays.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/util/Exceptions.java - copied, changed from r1170591, jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/Exceptions.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/util/Function1.java - copied, changed from r1170591, jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/Function1.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/util/Maps.java - copied, changed from r1170591, jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/Maps.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/util/Predicate1.java - copied, changed from r1170591, jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/Predicate1.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/util/Predicates.java - copied, changed from r1170591, jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/Predicates.java Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/ItemInfos.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/NodeTypes.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/Values.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/Arrays.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/Exceptions.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/Function1.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/Maps.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/Predicate1.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/Predicates.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/test/java/org/apache/jackrabbit/spi2microkernel/RepositoryTest.java jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/test/java/org/apache/jackrabbit/spi2microkernel/tck/RepositoryStubImpl.java Copied: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/util/Arrays.java (from r1170591, jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/Arrays.java) URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/util/Arrays.java?p2=jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/util/Arrays.java&p1=jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/Arrays.java&r1=1170591&r2=1170625&rev=1170625&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/Arrays.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/util/Arrays.java Wed Sep 14 13:50:34 2011 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.jackrabbit.spi2microkernel.util; +package org.apache.jackrabbit.spi.commons.util; import java.util.HashSet; import java.util.Set; Copied: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/util/Exceptions.java (from r1170591, jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/Exceptions.java) URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/util/Exceptions.java?p2=jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/util/Exceptions.java&p1=jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/Exceptions.java&r1=1170591&r2=1170625&rev=1170625&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/Exceptions.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/util/Exceptions.java Wed Sep 14 13:50:34 2011 @@ -17,9 +17,7 @@ * under the License. */ -package org.apache.jackrabbit.spi2microkernel.util; - -import org.apache.jackrabbit.spi.commons.util.Unchecked; +package org.apache.jackrabbit.spi.commons.util; public final class Exceptions { private Exceptions() {} Copied: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/util/Function1.java (from r1170591, jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/Function1.java) URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/util/Function1.java?p2=jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/util/Function1.java&p1=jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/Function1.java&r1=1170591&r2=1170625&rev=1170625&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/Function1.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/util/Function1.java Wed Sep 14 13:50:34 2011 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.jackrabbit.spi2microkernel.util; +package org.apache.jackrabbit.spi.commons.util; public interface Function1 { R apply(T arg) throws Exception; Copied: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/util/Maps.java (from r1170591, jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/Maps.java) URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/util/Maps.java?p2=jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/util/Maps.java&p1=jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/Maps.java&r1=1170591&r2=1170625&rev=1170625&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/Maps.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/util/Maps.java Wed Sep 14 13:50:34 2011 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.jackrabbit.spi2microkernel.util; +package org.apache.jackrabbit.spi.commons.util; import java.util.Map; Copied: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/util/Predicate1.java (from r1170591, jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/Predicate1.java) URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/util/Predicate1.java?p2=jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/util/Predicate1.java&p1=jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/Predicate1.java&r1=1170591&r2=1170625&rev=1170625&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/Predicate1.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/util/Predicate1.java Wed Sep 14 13:50:34 2011 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.jackrabbit.spi2microkernel.util; +package org.apache.jackrabbit.spi.commons.util; public interface Predicate1 extends Function1 { } Copied: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/util/Predicates.java (from r1170591, jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/Predicates.java) URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/util/Predicates.java?p2=jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/util/Predicates.java&p1=jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/Predicates.java&r1=1170591&r2=1170625&rev=1170625&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/util/Predicates.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/util/Predicates.java Wed Sep 14 13:50:34 2011 @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.jackrabbit.spi2microkernel.util; +package org.apache.jackrabbit.spi.commons.util; import java.util.Iterator; Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/ItemInfos.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/ItemInfos.java?rev=1170625&r1=1170624&r2=1170625&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/ItemInfos.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/ItemInfos.java Wed Sep 14 13:50:34 2011 @@ -31,7 +31,7 @@ import org.apache.jackrabbit.spi.commons import org.apache.jackrabbit.spi.commons.ItemInfoBuilder.Listener; import org.apache.jackrabbit.spi.commons.ItemInfoBuilder.NodeInfoBuilder; import org.apache.jackrabbit.spi.commons.ItemInfoBuilder.PropertyInfoBuilder; -import org.apache.jackrabbit.spi2microkernel.util.Function1; +import org.apache.jackrabbit.spi.commons.util.Function1; import org.json.simple.parser.JSONParser; import org.json.simple.parser.ParseException; @@ -48,7 +48,7 @@ import static org.apache.jackrabbit.spi. import static org.apache.jackrabbit.spi.commons.name.NameConstants.JCR_MIXINTYPES; import static org.apache.jackrabbit.spi.commons.name.NameConstants.JCR_PRIMARYTYPE; import static org.apache.jackrabbit.spi.commons.name.NameConstants.JCR_UUID; -import static org.apache.jackrabbit.spi2microkernel.util.Exceptions.setCause; +import static org.apache.jackrabbit.spi.commons.util.Exceptions.setCause; import static org.json.simple.parser.ParseException.ERROR_UNEXPECTED_EXCEPTION; public final class ItemInfos { Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/NodeTypes.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/NodeTypes.java?rev=1170625&r1=1170624&r2=1170625&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/NodeTypes.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/NodeTypes.java Wed Sep 14 13:50:34 2011 @@ -4,13 +4,13 @@ import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.spi.QNodeTypeDefinition; import org.apache.jackrabbit.spi.commons.iterator.Iterators; import org.apache.jackrabbit.spi.commons.nodetype.NodeTypeStorage; -import org.apache.jackrabbit.spi2microkernel.util.Predicate1; +import org.apache.jackrabbit.spi.commons.util.Predicate1; import javax.jcr.RepositoryException; import java.util.Iterator; -import static org.apache.jackrabbit.spi2microkernel.util.Predicates.containsElement; -import static org.apache.jackrabbit.spi2microkernel.util.Predicates.exists; +import static org.apache.jackrabbit.spi.commons.util.Predicates.containsElement; +import static org.apache.jackrabbit.spi.commons.util.Predicates.exists; public final class NodeTypes { private NodeTypes() {} Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java?rev=1170625&r1=1170624&r2=1170625&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/RepositoryServiceImpl.java Wed Sep 14 13:50:34 2011 @@ -55,7 +55,7 @@ import org.apache.jackrabbit.spi.commons import org.apache.jackrabbit.spi.commons.iterator.Predicate; import org.apache.jackrabbit.spi.commons.iterator.Transformer; import org.apache.jackrabbit.spi.commons.name.NameConstants; -import org.apache.jackrabbit.spi2microkernel.util.Function1; +import org.apache.jackrabbit.spi.commons.util.Function1; import org.json.simple.parser.JSONParser; import org.json.simple.parser.ParseException; import org.slf4j.Logger; @@ -126,7 +126,7 @@ import static org.apache.jackrabbit.spi. import static org.apache.jackrabbit.spi.commons.name.NameConstants.REP_ROOT; import static org.apache.jackrabbit.spi.commons.name.NameConstants.ROOT; import static org.apache.jackrabbit.spi2microkernel.ItemInfos.buildItemInfos; -import static org.apache.jackrabbit.spi2microkernel.util.Maps.getOrElse; +import static org.apache.jackrabbit.spi.commons.util.Maps.getOrElse; public class RepositoryServiceImpl extends AbstractRepositoryService { private static final long BINARY_VALUE_INLINE_THRESHOLD = 0x1000; Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/Values.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/Values.java?rev=1170625&r1=1170624&r2=1170625&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/Values.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/main/java/org/apache/jackrabbit/spi2microkernel/Values.java Wed Sep 14 13:50:34 2011 @@ -27,7 +27,7 @@ import org.apache.jackrabbit.spi.QValueF import org.apache.jackrabbit.spi.SessionInfo; import org.apache.jackrabbit.spi.commons.nodetype.NodeTypeStorage; import org.apache.jackrabbit.spi.commons.value.QValueFactoryImpl; -import org.apache.jackrabbit.spi2microkernel.util.Function1; +import org.apache.jackrabbit.spi.commons.util.Function1; import org.apache.jackrabbit.util.Base64; import org.apache.jackrabbit.util.ISO8601; import org.slf4j.Logger; Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/test/java/org/apache/jackrabbit/spi2microkernel/RepositoryTest.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/test/java/org/apache/jackrabbit/spi2microkernel/RepositoryTest.java?rev=1170625&r1=1170624&r2=1170625&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/test/java/org/apache/jackrabbit/spi2microkernel/RepositoryTest.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/test/java/org/apache/jackrabbit/spi2microkernel/RepositoryTest.java Wed Sep 14 13:50:34 2011 @@ -22,7 +22,7 @@ import org.apache.jackrabbit.mk.MicroKer import org.apache.jackrabbit.mk.api.MicroKernel; import org.apache.jackrabbit.mk.json.JsonBuilder; import org.apache.jackrabbit.spi.commons.name.NameConstants; -import org.apache.jackrabbit.spi2microkernel.util.Arrays; +import org.apache.jackrabbit.spi.commons.util.Arrays; import org.apache.jackrabbit.spi2microkernel.util.Loop; import org.apache.jackrabbit.spi2microkernel.util.NumberStream; import org.junit.After; @@ -73,7 +73,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import static java.util.Arrays.asList; -import static org.apache.jackrabbit.spi2microkernel.util.Arrays.contains; +import static org.apache.jackrabbit.spi.commons.util.Arrays.contains; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; Modified: jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/test/java/org/apache/jackrabbit/spi2microkernel/tck/RepositoryStubImpl.java URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/test/java/org/apache/jackrabbit/spi2microkernel/tck/RepositoryStubImpl.java?rev=1170625&r1=1170624&r2=1170625&view=diff ============================================================================== --- jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/test/java/org/apache/jackrabbit/spi2microkernel/tck/RepositoryStubImpl.java (original) +++ jackrabbit/sandbox/jackrabbit-mk/jackrabbit-spi2microkernel/src/test/java/org/apache/jackrabbit/spi2microkernel/tck/RepositoryStubImpl.java Wed Sep 14 13:50:34 2011 @@ -31,7 +31,7 @@ import java.util.Collections; import java.util.Iterator; import java.util.Properties; -import static org.apache.jackrabbit.spi2microkernel.util.Exceptions.setCause; +import static org.apache.jackrabbit.spi.commons.util.Exceptions.setCause; /** * {@code RepositoryStubImpl} implements a repository stub that