You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by an...@apache.org on 2012/04/27 16:41:50 UTC
svn commit: r1331442 - in /jackrabbit/oak/trunk: ./ oak-commons/
oak-commons/src/ oak-commons/src/main/ oak-commons/src/main/java/
oak-commons/src/main/java/org/ oak-commons/src/main/java/org/apache/
oak-commons/src/main/java/org/apache/jackrabbit/ oak...
Author: angela
Date: Fri Apr 27 14:41:47 2012
New Revision: 1331442
URL: http://svn.apache.org/viewvc?rev=1331442&view=rev
Log:
OAK-77 : Consolidate Utilities (WIP)
- create oak-commons module
- move mk/PathUtils and get rid of duplicates in oak-core/Paths
- move mk/ArrayUtils and merge oak-jcr/Arrays into it (with TODOs)
Added:
jackrabbit/oak/trunk/oak-commons/
jackrabbit/oak/trunk/oak-commons/src/
jackrabbit/oak/trunk/oak-commons/src/main/
jackrabbit/oak/trunk/oak-commons/src/main/java/
jackrabbit/oak/trunk/oak-commons/src/main/java/org/
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/ArrayUtils.java (contents, props changed)
- copied, changed from r1331424, jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/util/ArrayUtils.java
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/PathUtils.java (contents, props changed)
- copied, changed from r1331324, jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/util/PathUtils.java
jackrabbit/oak/trunk/oak-commons/src/test/
jackrabbit/oak/trunk/oak-commons/src/test/java/
jackrabbit/oak/trunk/oak-commons/src/test/java/org/
jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/
jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/
jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/
jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/
jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/ArrayUtilsTest.java
jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/PathTest.java (contents, props changed)
- copied, changed from r1331424, jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/util/PathTest.java
Removed:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/util/Arrays.java
jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/util/ArrayUtils.java
jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/util/PathUtils.java
jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/util/ArrayUtilsTest.java
jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/util/PathTest.java
Modified:
jackrabbit/oak/trunk/oak-core/pom.xml
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/BTree.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/BTreeLeaf.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/BTreeNode.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/BTreePage.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/SimpleKernelImpl.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
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/RootImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStateBuilder.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/Paths.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/XPathToSQL2Converter.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/ChildNodeImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/ChildNodeJoinConditionImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/DescendantNodeImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/DescendantNodeJoinConditionImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/NodeLocalNameImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/NodeNameImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/PropertyValueImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/TraversingCursor.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/TraversingIndex.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/RootImplFuzzIT.java
jackrabbit/oak/trunk/oak-jcr/pom.xml
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/ItemImpl.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeDelegate.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/PropertyDelegate.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionImpl.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/WorkspaceImpl.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/RepositoryTest.java
jackrabbit/oak/trunk/oak-mk/pom.xml
jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/core/MicroKernelImpl.java
jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/core/Repository.java
jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/CommitBuilder.java
jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/DiffBuilder.java
jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/TraversingNodeDiffHandler.java
jackrabbit/oak/trunk/pom.xml
Copied: jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/ArrayUtils.java (from r1331424, jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/util/ArrayUtils.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/ArrayUtils.java?p2=jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/ArrayUtils.java&p1=jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/util/ArrayUtils.java&r1=1331424&r2=1331442&rev=1331442&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/util/ArrayUtils.java (original)
+++ jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/ArrayUtils.java Fri Apr 27 14:41:47 2012
@@ -14,9 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.mk.util;
+package org.apache.jackrabbit.oak.commons;
import java.lang.reflect.Array;
+import java.util.HashSet;
+import java.util.Set;
/**
* Array utility methods.
@@ -194,4 +196,43 @@ public class ArrayUtils {
}
}
+ /**
+ * Check whether an array contains a given element
+ * @param array
+ * @param element
+ * @param <T>
+ * @return {@code true} iff {@code array} contains {@code element}.
+ */
+ public static <T> boolean contains(T[] array, T element) {
+ for (T t : array) {
+ if (element == null && t == null || element != null && element.equals(t)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Convert an array to a set.
+ * @param elements
+ * @param <T>
+ * @return
+ */
+ public static <T> Set<T> toSet(T... elements) {
+ return new HashSet<T>(java.util.Arrays.asList(elements));
+ }
+
+ // TODO duplicate of copyArrayAdd?
+ /**
+ * Create a new array of the same type with an additional element added.
+ * @param array
+ * @param value
+ * @param <T>
+ * @return array of {@code array.length + 1} with {@code value} as its last element.
+ */
+ public static <T> T[] add(T[] array, T value) {
+ T[] copy = java.util.Arrays.copyOf(array, array.length + 1);
+ copy[array.length] = value;
+ return copy;
+ }
}
Propchange: jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/ArrayUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/PathUtils.java (from r1331324, jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/util/PathUtils.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/PathUtils.java?p2=jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/PathUtils.java&p1=jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/util/PathUtils.java&r1=1331324&r2=1331442&rev=1331442&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/util/PathUtils.java (original)
+++ jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/PathUtils.java Fri Apr 27 14:41:47 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.oak.commons;
import java.util.ArrayList;
import java.util.Iterator;
Propchange: jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/PathUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/ArrayUtilsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/ArrayUtilsTest.java?rev=1331442&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/ArrayUtilsTest.java (added)
+++ jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/ArrayUtilsTest.java Fri Apr 27 14:41:47 2012
@@ -0,0 +1,128 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.oak.commons;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+
+import org.apache.jackrabbit.oak.commons.ArrayUtils;
+import org.junit.Test;
+
+/**
+ * Tests the ArrayUtils class
+ */
+public class ArrayUtilsTest {
+
+ @Test
+ public void insertInt() {
+ int[] x = {10, 20};
+ int[] y = ArrayUtils.arrayInsert(x, 1, 15);
+ assertFalse(x == y);
+ assertEquals(3, y.length);
+ assertEquals(10, y[0]);
+ assertEquals(15, y[1]);
+ assertEquals(20, y[2]);
+ }
+
+ @Test
+ public void insertLong() {
+ long[] x = {10, 20};
+ long[] y = ArrayUtils.arrayInsert(x, 1, 15);
+ assertFalse(x == y);
+ assertEquals(3, y.length);
+ assertEquals(10, y[0]);
+ assertEquals(15, y[1]);
+ assertEquals(20, y[2]);
+ }
+
+ @Test
+ public void insertObject() {
+ Long[] x = {Long.valueOf(10), Long.valueOf(20)};
+ Long[] y = ArrayUtils.arrayInsert(x, 1, Long.valueOf(15));
+ assertFalse(x == y);
+ assertEquals(3, y.length);
+ assertEquals(Long.valueOf(10), y[0]);
+ assertEquals(Long.valueOf(15), y[1]);
+ assertEquals(Long.valueOf(20), y[2]);
+ }
+
+ @Test
+ public void insertString() {
+ String[] x = {"10", "20"};
+ String[] y = ArrayUtils.arrayInsert(x, 1, "15");
+ assertFalse(x == y);
+ assertEquals(3, y.length);
+ assertEquals("10", y[0]);
+ assertEquals("15", y[1]);
+ assertEquals("20", y[2]);
+ }
+
+ @Test
+ public void removeInt() {
+ int[] x = {10, 20};
+ int[] y = ArrayUtils.arrayRemove(x, 1);
+ assertFalse(x == y);
+ assertEquals(1, y.length);
+ assertEquals(10, y[0]);
+ y = ArrayUtils.arrayRemove(y, 0);
+ assertEquals(0, y.length);
+ }
+
+ @Test
+ public void removeLong() {
+ long[] x = {10, 20};
+ long[] y = ArrayUtils.arrayRemove(x, 1);
+ assertFalse(x == y);
+ assertEquals(1, y.length);
+ assertEquals(10, y[0]);
+ y = ArrayUtils.arrayRemove(y, 0);
+ assertEquals(0, y.length);
+ }
+
+ @Test
+ public void removeObject() {
+ Long[] x = {Long.valueOf(10), Long.valueOf(20)};
+ Long[] y = ArrayUtils.arrayRemove(x, 1);
+ assertFalse(x == y);
+ assertEquals(1, y.length);
+ assertEquals(Long.valueOf(10), y[0]);
+ y = ArrayUtils.arrayRemove(y, 0);
+ assertEquals(0, y.length);
+ }
+
+ @Test
+ public void removeString() {
+ String[] x = {"10", "20"};
+ String[] y = ArrayUtils.arrayRemove(x, 1);
+ assertFalse(x == y);
+ assertEquals(1, y.length);
+ assertEquals("10", y[0]);
+ y = ArrayUtils.arrayRemove(y, 0);
+ assertEquals(0, y.length);
+ }
+
+ @Test
+ public void replaceObject() {
+ Long[] x = {Long.valueOf(10), Long.valueOf(20)};
+ Long[] y = ArrayUtils.arrayReplace(x, 1, Long.valueOf(11));
+ assertFalse(x == y);
+ assertEquals(2, y.length);
+ assertEquals(Long.valueOf(10), y[0]);
+ assertEquals(Long.valueOf(11), y[1]);
+ }
+
+}
Copied: jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/PathTest.java (from r1331424, jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/util/PathTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/PathTest.java?p2=jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/PathTest.java&p1=jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/util/PathTest.java&r1=1331424&r2=1331442&rev=1331442&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/util/PathTest.java (original)
+++ jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/PathTest.java Fri Apr 27 14:41:47 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.oak.commons;
import junit.framework.TestCase;
Propchange: jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/PathTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jackrabbit/oak/trunk/oak-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/pom.xml?rev=1331442&r1=1331441&r2=1331442&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-core/pom.xml Fri Apr 27 14:41:47 2012
@@ -81,6 +81,12 @@
</dependency>
<dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-commons</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
<version>3.2.1</version>
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/BTree.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/BTree.java?rev=1331442&r1=1331441&r2=1331442&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/BTree.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/BTree.java Fri Apr 27 14:41:47 2012
@@ -17,7 +17,7 @@
package org.apache.jackrabbit.mk.index;
import org.apache.jackrabbit.mk.json.JsopBuilder;
-import org.apache.jackrabbit.mk.util.PathUtils;
+import org.apache.jackrabbit.oak.commons.PathUtils;
/**
* A tree allows to query a value for a given key, similar to
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/BTreeLeaf.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/BTreeLeaf.java?rev=1331442&r1=1331441&r2=1331442&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/BTreeLeaf.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/BTreeLeaf.java Fri Apr 27 14:41:47 2012
@@ -17,8 +17,8 @@
package org.apache.jackrabbit.mk.index;
import org.apache.jackrabbit.mk.json.JsopBuilder;
-import org.apache.jackrabbit.mk.util.ArrayUtils;
-import org.apache.jackrabbit.mk.util.PathUtils;
+import org.apache.jackrabbit.oak.commons.ArrayUtils;
+import org.apache.jackrabbit.oak.commons.PathUtils;
import java.util.Arrays;
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/BTreeNode.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/BTreeNode.java?rev=1331442&r1=1331441&r2=1331442&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/BTreeNode.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/BTreeNode.java Fri Apr 27 14:41:47 2012
@@ -18,8 +18,8 @@ package org.apache.jackrabbit.mk.index;
import java.util.Arrays;
import org.apache.jackrabbit.mk.json.JsopBuilder;
-import org.apache.jackrabbit.mk.util.ArrayUtils;
-import org.apache.jackrabbit.mk.util.PathUtils;
+import org.apache.jackrabbit.oak.commons.ArrayUtils;
+import org.apache.jackrabbit.oak.commons.PathUtils;
/**
* An index node page.
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/BTreePage.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/BTreePage.java?rev=1331442&r1=1331441&r2=1331442&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/BTreePage.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/mk/index/BTreePage.java Fri Apr 27 14:41:47 2012
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.mk.index;
-import org.apache.jackrabbit.mk.util.PathUtils;
+import org.apache.jackrabbit.oak.commons.PathUtils;
/**
* An index page.
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=1331442&r1=1331441&r2=1331442&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 Fri Apr 27 14:41:47 2012
@@ -26,7 +26,7 @@ import org.apache.jackrabbit.mk.json.Jso
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.PathUtils;
+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=1331442&r1=1331441&r2=1331442&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 Fri Apr 27 14:41:47 2012
@@ -24,8 +24,8 @@ import org.apache.jackrabbit.mk.json.Jso
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.PathUtils;
import org.apache.jackrabbit.mk.util.SimpleLRUCache;
+import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.query.index.PropertyContentIndex;
import org.apache.jackrabbit.oak.spi.QueryIndex;
import org.apache.jackrabbit.oak.spi.QueryIndexProvider;
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=1331442&r1=1331441&r2=1331442&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 Fri Apr 27 14:41:47 2012
@@ -23,9 +23,9 @@ import org.apache.jackrabbit.mk.json.Jso
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.PathUtils;
import org.apache.jackrabbit.mk.util.StringCache;
import org.apache.jackrabbit.mk.util.StringUtils;
+import org.apache.jackrabbit.oak.commons.PathUtils;
import java.io.OutputStream;
import java.security.DigestOutputStream;
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=1331442&r1=1331441&r2=1331442&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 Fri Apr 27 14:41:47 2012
@@ -24,7 +24,7 @@ import java.util.Iterator;
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.mk.util.ArrayUtils;
+import org.apache.jackrabbit.oak.commons.ArrayUtils;
import org.apache.jackrabbit.mk.util.ExceptionFactory;
import org.apache.jackrabbit.mk.util.IOUtils;
import org.apache.jackrabbit.mk.util.StringCache;
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=1331442&r1=1331441&r2=1331442&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 Fri Apr 27 14:41:47 2012
@@ -30,8 +30,8 @@ import org.apache.jackrabbit.mk.util.Asc
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.util.PathUtils;
import org.apache.jackrabbit.mk.wrapper.MicroKernelWrapperBase;
+import org.apache.jackrabbit.oak.commons.PathUtils;
import java.io.IOException;
import java.io.InputStream;
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=1331442&r1=1331441&r2=1331442&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 Fri Apr 27 14:41:47 2012
@@ -25,8 +25,8 @@ import org.apache.jackrabbit.mk.json.Jso
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.PathUtils;
import org.apache.jackrabbit.mk.util.SimpleLRUCache;
+import org.apache.jackrabbit.oak.commons.PathUtils;
/**
* A microkernel prototype implementation that filters nodes based on simple
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=1331442&r1=1331441&r2=1331442&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 Fri Apr 27 14:41:47 2012
@@ -30,7 +30,7 @@ import org.apache.jackrabbit.mk.json.Jso
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.PathUtils;
+import org.apache.jackrabbit.oak.commons.PathUtils;
/**
* A microkernel prototype implementation that distributes nodes based on the path,
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/RootImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/RootImpl.java?rev=1331442&r1=1331441&r2=1331442&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/RootImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/core/RootImpl.java Fri Apr 27 14:41:47 2012
@@ -19,12 +19,12 @@
package org.apache.jackrabbit.oak.core;
import org.apache.jackrabbit.mk.api.MicroKernelException;
-import org.apache.jackrabbit.mk.util.PathUtils;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.CoreValue;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.api.Tree;
+import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.core.TreeImpl.Listener;
import org.apache.jackrabbit.oak.kernel.ChildNodeEntry;
import org.apache.jackrabbit.oak.kernel.NodeState;
@@ -41,9 +41,9 @@ import java.util.Iterator;
import java.util.List;
import static java.util.Collections.singletonList;
-import static org.apache.jackrabbit.mk.util.PathUtils.elements;
-import static org.apache.jackrabbit.mk.util.PathUtils.getName;
-import static org.apache.jackrabbit.mk.util.PathUtils.getParentPath;
+import static org.apache.jackrabbit.oak.commons.PathUtils.elements;
+import static org.apache.jackrabbit.oak.commons.PathUtils.getName;
+import static org.apache.jackrabbit.oak.commons.PathUtils.getParentPath;
/**
* This {@code Root} implementation listens on the root of the underlying
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStateBuilder.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStateBuilder.java?rev=1331442&r1=1331441&r2=1331442&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStateBuilder.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelNodeStateBuilder.java Fri Apr 27 14:41:47 2012
@@ -18,10 +18,10 @@ package org.apache.jackrabbit.oak.kernel
import org.apache.jackrabbit.mk.api.MicroKernel;
import org.apache.jackrabbit.mk.api.MicroKernelException;
-import org.apache.jackrabbit.mk.util.PathUtils;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.CoreValueFactory;
import org.apache.jackrabbit.oak.api.PropertyState;
+import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.util.CoreValueUtil;
public class KernelNodeStateBuilder implements NodeStateBuilder {
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/Paths.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/Paths.java?rev=1331442&r1=1331441&r2=1331442&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/Paths.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/namepath/Paths.java Fri Apr 27 14:41:47 2012
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.namepath;
-import org.apache.jackrabbit.mk.util.PathUtils;
import org.apache.jackrabbit.oak.namepath.JcrNameParser.Listener;
import java.util.ArrayList;
@@ -36,88 +35,6 @@ public final class Paths {
private Paths() {}
- /**
- * Get the parent of a path. The parent of the root path ("/") is the root
- * path.
- *
- * @param path the path
- * @return the parent path
- */
- public static String getParentPath(String path) {
- return PathUtils.getParentPath(path);
- }
-
- /**
- * Get the last element of the (absolute or relative) path. The name of the
- * root node ("/") and the name of the empty path ("") is the empty path.
- *
- * @param path the complete path
- * @return the last element
- */
- public static String getName(String path) {
- return PathUtils.getName(path);
- }
-
- /**
- * Get the nth ancestor of a path. The 1st ancestor is the parent path,
- * 2nd ancestor the grandparent path, and so on...
- * <p/>
- * If nth <= 0, the path argument is returned as is.
- *
- * @param path the path
- * @param nth Integer indicating which ancestor path to retrieve.
- * @return the ancestor path
- */
- public static String getAncestorPath(String path, int nth) {
- return PathUtils.getAncestorPath(path, nth);
- }
-
- /**
- * Concatenate path elements.
- *
- * @param parentPath the parent path
- * @param subPath the subPath path to add
- * @return the concatenated path
- */
- public static String concat(String parentPath, String subPath) {
- return PathUtils.concat(parentPath, subPath);
- }
-
- /**
- * Relativize a path wrt. a parent path such that
- * {@code relativize(parentPath, concat(parentPath, path)) == paths}
- * holds.
- *
- * @param parentPath parent pth
- * @param path path to relativize
- * @return relativized path
- */
- public static String relativize(String parentPath, String path) {
- return PathUtils.relativize(parentPath, path);
- }
-
- /**
- * Calculate the number of elements in the path. The root path has zero
- * elements.
- *
- * @param path the path
- * @return the number of elements
- */
- public static int getDepth(String path) {
- return PathUtils.getDepth(path);
- }
-
- /**
- * Split a path into elements. The root path ("/") and the empty path ("")
- * is zero elements.
- *
- * @param path the path
- * @return an Iterable for the path elements
- */
- public static Iterable<String> elements(String path) {
- return PathUtils.elements(path);
- }
-
public static String toOakName(String name, final NameMapper mapper) {
final StringBuilder element = new StringBuilder();
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/XPathToSQL2Converter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/XPathToSQL2Converter.java?rev=1331442&r1=1331441&r2=1331442&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/XPathToSQL2Converter.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/XPathToSQL2Converter.java Fri Apr 27 14:41:47 2012
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.query;
-import org.apache.jackrabbit.mk.util.PathUtils;
+import org.apache.jackrabbit.oak.commons.PathUtils;
import java.math.BigDecimal;
import java.text.ParseException;
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/ChildNodeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/ChildNodeImpl.java?rev=1331442&r1=1331441&r2=1331442&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/ChildNodeImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/ChildNodeImpl.java Fri Apr 27 14:41:47 2012
@@ -18,7 +18,7 @@
*/
package org.apache.jackrabbit.oak.query.ast;
-import org.apache.jackrabbit.mk.util.PathUtils;
+import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.query.index.FilterImpl;
import org.apache.jackrabbit.oak.spi.Filter;
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/ChildNodeJoinConditionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/ChildNodeJoinConditionImpl.java?rev=1331442&r1=1331441&r2=1331442&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/ChildNodeJoinConditionImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/ChildNodeJoinConditionImpl.java Fri Apr 27 14:41:47 2012
@@ -18,7 +18,7 @@
*/
package org.apache.jackrabbit.oak.query.ast;
-import org.apache.jackrabbit.mk.util.PathUtils;
+import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.query.index.FilterImpl;
import org.apache.jackrabbit.oak.spi.Filter;
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/DescendantNodeImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/DescendantNodeImpl.java?rev=1331442&r1=1331441&r2=1331442&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/DescendantNodeImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/DescendantNodeImpl.java Fri Apr 27 14:41:47 2012
@@ -18,7 +18,7 @@
*/
package org.apache.jackrabbit.oak.query.ast;
-import org.apache.jackrabbit.mk.util.PathUtils;
+import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.query.index.FilterImpl;
import org.apache.jackrabbit.oak.spi.Filter;
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/DescendantNodeJoinConditionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/DescendantNodeJoinConditionImpl.java?rev=1331442&r1=1331441&r2=1331442&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/DescendantNodeJoinConditionImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/DescendantNodeJoinConditionImpl.java Fri Apr 27 14:41:47 2012
@@ -18,7 +18,7 @@
*/
package org.apache.jackrabbit.oak.query.ast;
-import org.apache.jackrabbit.mk.util.PathUtils;
+import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.query.index.FilterImpl;
import org.apache.jackrabbit.oak.spi.Filter;
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/NodeLocalNameImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/NodeLocalNameImpl.java?rev=1331442&r1=1331441&r2=1331442&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/NodeLocalNameImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/NodeLocalNameImpl.java Fri Apr 27 14:41:47 2012
@@ -18,7 +18,7 @@
*/
package org.apache.jackrabbit.oak.query.ast;
-import org.apache.jackrabbit.mk.util.PathUtils;
+import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.api.CoreValue;
import org.apache.jackrabbit.oak.query.index.FilterImpl;
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/NodeNameImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/NodeNameImpl.java?rev=1331442&r1=1331441&r2=1331442&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/NodeNameImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/NodeNameImpl.java Fri Apr 27 14:41:47 2012
@@ -18,7 +18,7 @@
*/
package org.apache.jackrabbit.oak.query.ast;
-import org.apache.jackrabbit.mk.util.PathUtils;
+import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.api.CoreValue;
import org.apache.jackrabbit.oak.query.index.FilterImpl;
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/PropertyValueImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/PropertyValueImpl.java?rev=1331442&r1=1331441&r2=1331442&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/PropertyValueImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/PropertyValueImpl.java Fri Apr 27 14:41:47 2012
@@ -20,7 +20,7 @@ package org.apache.jackrabbit.oak.query.
import org.apache.jackrabbit.mk.json.JsopTokenizer;
import org.apache.jackrabbit.mk.simple.NodeImpl;
-import org.apache.jackrabbit.mk.util.PathUtils;
+import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.api.CoreValue;
import org.apache.jackrabbit.oak.query.index.FilterImpl;
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java?rev=1331442&r1=1331441&r2=1331442&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/FilterImpl.java Fri Apr 27 14:41:47 2012
@@ -18,7 +18,7 @@
*/
package org.apache.jackrabbit.oak.query.index;
-import org.apache.jackrabbit.mk.util.PathUtils;
+import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.api.CoreValue;
import org.apache.jackrabbit.oak.query.ast.Operator;
import org.apache.jackrabbit.oak.query.ast.SelectorImpl;
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/TraversingCursor.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/TraversingCursor.java?rev=1331442&r1=1331441&r2=1331442&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/TraversingCursor.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/TraversingCursor.java Fri Apr 27 14:41:47 2012
@@ -15,7 +15,7 @@ package org.apache.jackrabbit.oak.query.
import org.apache.jackrabbit.mk.api.MicroKernel;
import org.apache.jackrabbit.mk.simple.NodeImpl;
-import org.apache.jackrabbit.mk.util.PathUtils;
+import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.spi.Cursor;
import java.util.ArrayList;
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/TraversingIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/TraversingIndex.java?rev=1331442&r1=1331441&r2=1331442&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/TraversingIndex.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/query/index/TraversingIndex.java Fri Apr 27 14:41:47 2012
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.query.index;
import org.apache.jackrabbit.mk.api.MicroKernel;
-import org.apache.jackrabbit.mk.util.PathUtils;
+import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.spi.Cursor;
import org.apache.jackrabbit.oak.spi.Filter;
import org.apache.jackrabbit.oak.spi.QueryIndex;
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/RootImplFuzzIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/RootImplFuzzIT.java?rev=1331442&r1=1331441&r2=1331442&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/RootImplFuzzIT.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/core/RootImplFuzzIT.java Fri Apr 27 14:41:47 2012
@@ -20,7 +20,7 @@ package org.apache.jackrabbit.oak.core;
import org.apache.jackrabbit.mk.api.MicroKernel;
import org.apache.jackrabbit.mk.core.MicroKernelImpl;
-import org.apache.jackrabbit.mk.util.PathUtils;
+import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.api.CoreValue;
import org.apache.jackrabbit.oak.api.CoreValueFactory;
import org.apache.jackrabbit.oak.api.PropertyState;
@@ -48,6 +48,7 @@ import static org.junit.Assert.assertEqu
* Run with -DKernelRootFuzzIT-seed=42 to set a specific seed (i.e. 42);
*/
public class RootImplFuzzIT {
+
static final Logger log = LoggerFactory.getLogger(RootImplFuzzIT.class);
private static final int OP_COUNT = 5000;
Modified: jackrabbit/oak/trunk/oak-jcr/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/pom.xml?rev=1331442&r1=1331441&r2=1331442&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-jcr/pom.xml Fri Apr 27 14:41:47 2012
@@ -78,6 +78,11 @@
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-commons</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-api</artifactId>
<version>2.4.0</version>
</dependency>
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/ItemImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/ItemImpl.java?rev=1331442&r1=1331441&r2=1331442&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/ItemImpl.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/ItemImpl.java Fri Apr 27 14:41:47 2012
@@ -16,6 +16,7 @@
*/
package org.apache.jackrabbit.oak.jcr;
+import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.namepath.Paths;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -52,7 +53,7 @@ abstract class ItemImpl implements Item
*/
@Override
public int getDepth() throws RepositoryException {
- return Paths.getDepth(dlg.getPath());
+ return PathUtils.getDepth(dlg.getPath());
}
/**
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeDelegate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeDelegate.java?rev=1331442&r1=1331441&r2=1331442&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeDelegate.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/NodeDelegate.java Fri Apr 27 14:41:47 2012
@@ -20,7 +20,7 @@ import org.apache.jackrabbit.oak.api.Cor
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.api.Tree.Status;
-import org.apache.jackrabbit.oak.namepath.Paths;
+import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.util.Function1;
import org.apache.jackrabbit.oak.util.Iterators;
@@ -41,12 +41,12 @@ public class NodeDelegate extends ItemDe
}
NodeDelegate addNode(String relPath) throws RepositoryException {
- Tree parentState = getTree(Paths.getParentPath(relPath));
+ Tree parentState = getTree(PathUtils.getParentPath(relPath));
if (parentState == null) {
throw new PathNotFoundException(relPath);
}
- String name = Paths.getName(relPath);
+ String name = PathUtils.getName(relPath);
parentState.addChild(name);
return new NodeDelegate(sessionContext, parentState.getChild(name));
}
@@ -74,7 +74,7 @@ public class NodeDelegate extends ItemDe
}
int getDepth() throws RepositoryException {
- return Paths.getDepth(getPath());
+ return PathUtils.getDepth(getPath());
}
@Override
@@ -115,12 +115,12 @@ public class NodeDelegate extends ItemDe
PropertyDelegate getPropertyOrNull(String relOakPath)
throws RepositoryException {
- Tree parent = getTree(Paths.getParentPath(relOakPath));
+ Tree parent = getTree(PathUtils.getParentPath(relOakPath));
if (parent == null) {
return null;
}
- String name = Paths.getName(relOakPath);
+ String name = PathUtils.getName(relOakPath);
PropertyState propertyState = parent.getProperty(name);
return propertyState == null ? null : new PropertyDelegate(
sessionContext, parent, propertyState);
@@ -148,11 +148,11 @@ public class NodeDelegate extends ItemDe
return getPropertyOrNull(oakName);
}
- // ------------------------------------------------------------< private >---
+ // -----------------------------------------------------------< private >---
private Tree getTree(String relPath) {
Tree tree = getTree();
- for (String name : Paths.elements(relPath)) {
+ for (String name : PathUtils.elements(relPath)) {
if (tree == null) {
return null;
}
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/PropertyDelegate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/PropertyDelegate.java?rev=1331442&r1=1331441&r2=1331442&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/PropertyDelegate.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/PropertyDelegate.java Fri Apr 27 14:41:47 2012
@@ -19,6 +19,7 @@ package org.apache.jackrabbit.oak.jcr;
import org.apache.jackrabbit.oak.api.CoreValue;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Tree;
+import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.namepath.Paths;
import javax.jcr.RepositoryException;
@@ -167,12 +168,12 @@ public class PropertyDelegate extends It
private synchronized void resolve() {
parent = sessionContext.getTree(parent.getPath());
- String path = Paths.concat(parent.getPath(), propertyState.getName());
+ String path = PathUtils.concat(parent.getPath(), propertyState.getName());
if (parent == null) {
propertyState = null;
} else {
- propertyState = parent.getProperty(Paths.getName(path));
+ propertyState = parent.getProperty(PathUtils.getName(path));
}
}
}
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionImpl.java?rev=1331442&r1=1331441&r2=1331442&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionImpl.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/SessionImpl.java Fri Apr 27 14:41:47 2012
@@ -24,6 +24,7 @@ import org.apache.jackrabbit.oak.api.Com
import org.apache.jackrabbit.oak.api.ContentSession;
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.api.Tree;
+import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.jcr.namespace.NamespaceRegistryImpl;
import org.apache.jackrabbit.oak.jcr.value.ValueFactoryImpl;
import org.apache.jackrabbit.oak.namepath.AbstractNameMapper;
@@ -160,8 +161,8 @@ public class SessionImpl extends Abstrac
private void internalMove(String srcAbsPath, String destAbsPath) throws RepositoryException {
ensureIsAlive();
- String srcPath = Paths.relativize("/", srcAbsPath);
- String destPath = Paths.relativize("/", destAbsPath);
+ String srcPath = PathUtils.relativize("/", srcAbsPath);
+ String destPath = PathUtils.relativize("/", destAbsPath);
root.move(srcPath, destPath);
}
Modified: jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/WorkspaceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/WorkspaceImpl.java?rev=1331442&r1=1331441&r2=1331442&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/WorkspaceImpl.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/WorkspaceImpl.java Fri Apr 27 14:41:47 2012
@@ -21,6 +21,7 @@ import org.apache.jackrabbit.api.securit
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.ContentSession;
+import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.jcr.nodetype.NodeTypeManagerImpl;
import org.apache.jackrabbit.oak.jcr.query.QueryManagerImpl;
import org.apache.jackrabbit.oak.jcr.security.privileges.PrivilegeManagerImpl;
@@ -101,8 +102,8 @@ public class WorkspaceImpl implements Ja
ContentSession contentSession = sessionContext.getContentSession();
Root root = contentSession.getCurrentRoot();
- String srcPath = Paths.relativize("/", srcAbsPath);
- String destPath = Paths.relativize("/", destAbsPath);
+ String srcPath = PathUtils.relativize("/", srcAbsPath);
+ String destPath = PathUtils.relativize("/", destAbsPath);
root.copy(srcPath, destPath);
root.commit();
@@ -132,8 +133,8 @@ public class WorkspaceImpl implements Ja
ContentSession contentSession = sessionContext.getContentSession();
Root root = contentSession.getCurrentRoot();
- String srcPath = Paths.relativize("/", srcAbsPath);
- String destPath = Paths.relativize("/", destAbsPath);
+ String srcPath = PathUtils.relativize("/", srcAbsPath);
+ String destPath = PathUtils.relativize("/", destAbsPath);
root.move(srcPath, destPath);
root.commit();
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/RepositoryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/RepositoryTest.java?rev=1331442&r1=1331441&r2=1331442&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/RepositoryTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/RepositoryTest.java Fri Apr 27 14:41:47 2012
@@ -64,8 +64,8 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import static java.util.Arrays.asList;
-import static org.apache.jackrabbit.oak.jcr.util.Arrays.contains;
-import static org.apache.jackrabbit.oak.jcr.util.Arrays.toSet;
+import static org.apache.jackrabbit.oak.commons.ArrayUtils.contains;
+import static org.apache.jackrabbit.oak.commons.ArrayUtils.toSet;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
Modified: jackrabbit/oak/trunk/oak-mk/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/pom.xml?rev=1331442&r1=1331441&r2=1331442&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-mk/pom.xml Fri Apr 27 14:41:47 2012
@@ -68,6 +68,13 @@
<scope>provided</scope>
</dependency>
+ <!-- commons dependency -->
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-commons</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<!-- Optional dependencies for different persistence backends -->
<dependency>
<groupId>com.h2database</groupId>
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=1331442&r1=1331441&r2=1331442&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 Fri Apr 27 14:41:47 2012
@@ -35,7 +35,7 @@ import org.apache.jackrabbit.mk.model.No
import org.apache.jackrabbit.mk.model.PropertyState;
import org.apache.jackrabbit.mk.model.StoredCommit;
import org.apache.jackrabbit.mk.util.CommitGate;
-import org.apache.jackrabbit.mk.util.PathUtils;
+import org.apache.jackrabbit.oak.commons.PathUtils;
/**
*
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=1331442&r1=1331441&r2=1331442&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 Fri Apr 27 14:41:47 2012
@@ -32,7 +32,7 @@ import org.apache.jackrabbit.mk.store.De
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.mk.util.PathUtils;
+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=1331442&r1=1331441&r2=1331442&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 Fri Apr 27 14:41:47 2012
@@ -26,7 +26,7 @@ import java.util.Map;
import org.apache.jackrabbit.mk.store.NotFoundException;
import org.apache.jackrabbit.mk.store.RevisionStore;
-import org.apache.jackrabbit.mk.util.PathUtils;
+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=1331442&r1=1331441&r2=1331442&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 Fri Apr 27 14:41:47 2012
@@ -17,7 +17,7 @@
package org.apache.jackrabbit.mk.model;
import org.apache.jackrabbit.mk.json.JsopBuilder;
-import org.apache.jackrabbit.mk.util.PathUtils;
+import org.apache.jackrabbit.oak.commons.PathUtils;
import java.util.HashMap;
import java.util.Map;
Modified: jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/TraversingNodeDiffHandler.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/TraversingNodeDiffHandler.java?rev=1331442&r1=1331441&r2=1331442&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/TraversingNodeDiffHandler.java (original)
+++ jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/model/TraversingNodeDiffHandler.java Fri Apr 27 14:41:47 2012
@@ -16,9 +16,9 @@
*/
package org.apache.jackrabbit.mk.model;
-import java.util.Stack;
+import org.apache.jackrabbit.oak.commons.PathUtils;
-import org.apache.jackrabbit.mk.util.PathUtils;
+import java.util.Stack;
/**
*
Modified: jackrabbit/oak/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/pom.xml?rev=1331442&r1=1331441&r2=1331442&view=diff
==============================================================================
--- jackrabbit/oak/trunk/pom.xml (original)
+++ jackrabbit/oak/trunk/pom.xml Fri Apr 27 14:41:47 2012
@@ -44,6 +44,7 @@
<module>oak-run</module>
<module>oak-it</module>
<module>oak-bench</module>
+ <module>oak-commons</module>
</modules>
<scm>