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 ju...@apache.org on 2012/10/25 11:57:01 UTC
svn commit: r1402075 [2/2] - in /jackrabbit/oak/trunk:
oak-bench/base/src/main/java/org/apache/jackrabbit/oak/performance/
oak-core/src/main/java/org/apache/jackrabbit/mk/
oak-core/src/main/java/org/apache/jackrabbit/mk/index/
oak-core/src/main/java/or...
Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/mk/large/StopWatch.java (from r1402040, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/large/StopWatch.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/mk/large/StopWatch.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/mk/large/StopWatch.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/large/StopWatch.java&r1=1402040&r2=1402075&rev=1402075&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/large/StopWatch.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/mk/large/StopWatch.java Thu Oct 25 09:56:57 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.mk.large;
+package org.apache.jackrabbit.oak.plugins.index.old.mk.large;
/**
* A utility class to time an operation.
Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/mk/mem/MemoryNodeTest.java (from r1402040, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/mem/MemoryNodeTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/mk/mem/MemoryNodeTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/mk/mem/MemoryNodeTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/mem/MemoryNodeTest.java&r1=1402040&r2=1402075&rev=1402075&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/mem/MemoryNodeTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/mk/mem/MemoryNodeTest.java Thu Oct 25 09:56:57 2012
@@ -14,12 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.mk.mem;
+package org.apache.jackrabbit.oak.plugins.index.old.mk.mem;
import junit.framework.Assert;
-import org.apache.jackrabbit.mk.simple.NodeId;
-import org.apache.jackrabbit.mk.simple.NodeImpl;
-import org.apache.jackrabbit.mk.simple.NodeMap;
+
+import org.apache.jackrabbit.oak.plugins.index.old.mk.simple.NodeId;
+import org.apache.jackrabbit.oak.plugins.index.old.mk.simple.NodeImpl;
+import org.apache.jackrabbit.oak.plugins.index.old.mk.simple.NodeMap;
import org.junit.Test;
/**
Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/mk/simple/AscendingClockTest.java (from r1402040, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/simple/AscendingClockTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/mk/simple/AscendingClockTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/mk/simple/AscendingClockTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/simple/AscendingClockTest.java&r1=1402040&r2=1402075&rev=1402075&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/simple/AscendingClockTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/mk/simple/AscendingClockTest.java Thu Oct 25 09:56:57 2012
@@ -14,7 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.mk.simple;
+package org.apache.jackrabbit.oak.plugins.index.old.mk.simple;
+
+import org.apache.jackrabbit.oak.plugins.index.old.mk.simple.AscendingClock;
import junit.framework.TestCase;
Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/mk/simple/MoveNodeIT.java (from r1402040, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/simple/MoveNodeIT.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/mk/simple/MoveNodeIT.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/mk/simple/MoveNodeIT.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/simple/MoveNodeIT.java&r1=1402040&r2=1402075&rev=1402075&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/simple/MoveNodeIT.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/mk/simple/MoveNodeIT.java Thu Oct 25 09:56:57 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.mk.simple;
+package org.apache.jackrabbit.oak.plugins.index.old.mk.simple;
import junit.framework.Assert;
@@ -22,6 +22,7 @@ import org.apache.jackrabbit.mk.api.Micr
import org.apache.jackrabbit.mk.api.MicroKernelException;
import org.apache.jackrabbit.mk.json.JsopReader;
import org.apache.jackrabbit.mk.json.JsopTokenizer;
+import org.apache.jackrabbit.oak.plugins.index.old.mk.simple.SimpleKernelImpl;
import org.junit.Before;
import org.junit.Test;
Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/mk/simple/NodeVersionTest.java (from r1402040, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/simple/NodeVersionTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/mk/simple/NodeVersionTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/mk/simple/NodeVersionTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/simple/NodeVersionTest.java&r1=1402040&r2=1402075&rev=1402075&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/simple/NodeVersionTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/mk/simple/NodeVersionTest.java Thu Oct 25 09:56:57 2012
@@ -14,9 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.mk.simple;
+package org.apache.jackrabbit.oak.plugins.index.old.mk.simple;
import org.apache.jackrabbit.mk.api.MicroKernel;
+import org.apache.jackrabbit.oak.plugins.index.old.mk.simple.NodeImpl;
+import org.apache.jackrabbit.oak.plugins.index.old.mk.simple.SimpleKernelImpl;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/mk/simple/SimpleKernelImplFixture.java (from r1402040, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/simple/SimpleKernelImplFixture.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/mk/simple/SimpleKernelImplFixture.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/mk/simple/SimpleKernelImplFixture.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/simple/SimpleKernelImplFixture.java&r1=1402040&r2=1402075&rev=1402075&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/simple/SimpleKernelImplFixture.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/mk/simple/SimpleKernelImplFixture.java Thu Oct 25 09:56:57 2012
@@ -14,10 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.mk.simple;
+package org.apache.jackrabbit.oak.plugins.index.old.mk.simple;
import org.apache.jackrabbit.mk.api.MicroKernel;
import org.apache.jackrabbit.mk.test.MicroKernelFixture;
+import org.apache.jackrabbit.oak.plugins.index.old.mk.simple.SimpleKernelImpl;
public class SimpleKernelImplFixture implements MicroKernelFixture {
Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/mk/simple/SimpleKernelTest.java (from r1402040, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/simple/SimpleKernelTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/mk/simple/SimpleKernelTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/mk/simple/SimpleKernelTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/simple/SimpleKernelTest.java&r1=1402040&r2=1402075&rev=1402075&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/simple/SimpleKernelTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/mk/simple/SimpleKernelTest.java Thu Oct 25 09:56:57 2012
@@ -14,9 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.mk.simple;
+package org.apache.jackrabbit.oak.plugins.index.old.mk.simple;
import org.apache.jackrabbit.mk.api.MicroKernel;
+import org.apache.jackrabbit.oak.plugins.index.old.mk.simple.SimpleKernelImpl;
import org.junit.Test;
/**
Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/mk/wrapper/IndexWrapperTest.java (from r1402040, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/wrapper/IndexWrapperTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/mk/wrapper/IndexWrapperTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/mk/wrapper/IndexWrapperTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/wrapper/IndexWrapperTest.java&r1=1402040&r2=1402075&rev=1402075&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/wrapper/IndexWrapperTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/mk/wrapper/IndexWrapperTest.java Thu Oct 25 09:56:57 2012
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.mk.wrapper;
+package org.apache.jackrabbit.oak.plugins.index.old.mk.wrapper;
import static org.apache.jackrabbit.oak.plugins.index.old.Indexer.INDEX_CONFIG_PATH;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import org.apache.jackrabbit.mk.api.MicroKernel;
-import org.apache.jackrabbit.mk.index.IndexWrapper;
-import org.apache.jackrabbit.mk.simple.SimpleKernelImpl;
+import org.apache.jackrabbit.oak.plugins.index.old.mk.IndexWrapper;
+import org.apache.jackrabbit.oak.plugins.index.old.mk.simple.SimpleKernelImpl;
import org.junit.Test;
/**
Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/mk/wrapper/SecurityWrapperTest.java (from r1402040, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/wrapper/SecurityWrapperTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/mk/wrapper/SecurityWrapperTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/mk/wrapper/SecurityWrapperTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/wrapper/SecurityWrapperTest.java&r1=1402040&r2=1402075&rev=1402075&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/wrapper/SecurityWrapperTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/mk/wrapper/SecurityWrapperTest.java Thu Oct 25 09:56:57 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.mk.wrapper;
+package org.apache.jackrabbit.oak.plugins.index.old.mk.wrapper;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -26,7 +26,7 @@ import org.apache.jackrabbit.mk.api.Micr
import org.apache.jackrabbit.mk.api.MicroKernelException;
import org.apache.jackrabbit.mk.json.JsopReader;
import org.apache.jackrabbit.mk.json.JsopTokenizer;
-import org.apache.jackrabbit.mk.simple.SimpleKernelImpl;
+import org.apache.jackrabbit.oak.plugins.index.old.mk.simple.SimpleKernelImpl;
import org.junit.Before;
import org.junit.Test;
Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/mk/wrapper/VirtualRepositoryWrapperTest.java (from r1402040, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapperTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/mk/wrapper/VirtualRepositoryWrapperTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/mk/wrapper/VirtualRepositoryWrapperTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapperTest.java&r1=1402040&r2=1402075&rev=1402075&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/wrapper/VirtualRepositoryWrapperTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/mk/wrapper/VirtualRepositoryWrapperTest.java Thu Oct 25 09:56:57 2012
@@ -11,7 +11,7 @@
* KIND, either express or implied. See the License for the specific language
* governing permissions and limitations under the License.
*/
-package org.apache.jackrabbit.mk.wrapper;
+package org.apache.jackrabbit.oak.plugins.index.old.mk.wrapper;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -20,9 +20,9 @@ import static org.junit.Assert.assertTru
import java.io.ByteArrayInputStream;
import java.util.Arrays;
import java.util.Random;
-import org.apache.jackrabbit.mk.MicroKernelFactory;
-import org.apache.jackrabbit.mk.MultiMkTestBase;
import org.apache.jackrabbit.mk.api.MicroKernel;
+import org.apache.jackrabbit.oak.plugins.index.old.mk.MicroKernelFactory;
+import org.apache.jackrabbit.oak.plugins.index.old.mk.MultiMkTestBase;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/MicroKernelServer.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/MicroKernelServer.java?rev=1402075&r1=1402074&r2=1402075&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/MicroKernelServer.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/run/MicroKernelServer.java Thu Oct 25 09:56:57 2012
@@ -18,20 +18,20 @@ package org.apache.jackrabbit.oak.run;
import java.net.InetAddress;
-import org.apache.jackrabbit.mk.MicroKernelFactory;
import org.apache.jackrabbit.mk.api.MicroKernel;
+import org.apache.jackrabbit.mk.core.MicroKernelImpl;
import org.apache.jackrabbit.mk.server.Server;
public class MicroKernelServer {
public static void main(String[] args) throws Exception {
if (args.length == 0) {
- System.out.format("usage: %s microkernel-url [port] [bindaddr]%n",
+ System.out.format("usage: %s /path/to/mk [port] [bindaddr]%n",
MicroKernelServer.class.getName());
return;
}
- final MicroKernel mk = MicroKernelFactory.getInstance(args[0]);
+ final MicroKernelImpl mk = new MicroKernelImpl(args[0]);
final Server server = new Server(mk);
if (args.length >= 2) {
@@ -48,7 +48,7 @@ public class MicroKernelServer {
@Override
public void run() {
server.stop();
- MicroKernelFactory.disposeInstance(mk);
+ mk.dispose();
}
}, "ShutdownHook"));
}