svn commit: r1244669 - in /jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk: MicroKernelFactory.java simple/MemoryKernelImpl.java simple/SimpleKernelImpl.java

[th...@apache.org]

Author: thomasm
Date: Wed Feb 15 19:25:37 2012
New Revision: 1244669

URL: http://svn.apache.org/viewvc?rev=1244669&view=rev
Log:
Rename package

Added:
    jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/SimpleKernelImpl.java
      - copied, changed from r1244555, jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/MemoryKernelImpl.java
Removed:
    jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/MemoryKernelImpl.java
Modified:
    jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/MicroKernelFactory.java

Modified: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/MicroKernelFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/MicroKernelFactory.java?rev=1244669&r1=1244668&r2=1244669&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/MicroKernelFactory.java (original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/MicroKernelFactory.java Wed Feb 15 19:25:37 2012
@@ -21,7 +21,7 @@ import java.io.IOException;
 import org.apache.jackrabbit.mk.api.MicroKernel;
 import org.apache.jackrabbit.mk.client.Client;
 import org.apache.jackrabbit.mk.fs.FileUtils;
-import org.apache.jackrabbit.mk.simple.MemoryKernelImpl;
+import org.apache.jackrabbit.mk.simple.SimpleKernelImpl;
 import org.apache.jackrabbit.mk.util.ExceptionFactory;
 import org.apache.jackrabbit.mk.wrapper.IndexWrapper;
 import org.apache.jackrabbit.mk.wrapper.LogWrapper;
@@ -48,9 +48,9 @@ public class MicroKernelFactory {
      */
     public static MicroKernel getInstance(String url) {
         if (url.startsWith("mem:")) {
-            return MemoryKernelImpl.get(url);
+            return SimpleKernelImpl.get(url);
         } else if (url.startsWith("simple:")) {
-                return MemoryKernelImpl.get(url);
+                return SimpleKernelImpl.get(url);
         } else if (url.startsWith("log:")) {
             return LogWrapper.get(url);
         } else if (url.startsWith("sec:")) {

Copied: jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/SimpleKernelImpl.java (from r1244555, jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/MemoryKernelImpl.java)
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/SimpleKernelImpl.java?p2=jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/SimpleKernelImpl.java&p1=jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/MemoryKernelImpl.java&r1=1244555&r2=1244669&rev=1244669&view=diff
==============================================================================
--- jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/MemoryKernelImpl.java (original)
+++ jackrabbit/sandbox/microkernel/src/main/java/org/apache/jackrabbit/mk/simple/SimpleKernelImpl.java Wed Feb 15 19:25:37 2012
@@ -60,9 +60,9 @@ Node structure:
 /**
  * A simple MicroKernel implementation.
  */
-public class MemoryKernelImpl extends WrapperBase implements MicroKernel {
+public class SimpleKernelImpl extends WrapperBase implements MicroKernel {
 
-    private static final HashMap<String, MemoryKernelImpl> INSTANCES = new HashMap<String, MemoryKernelImpl>();
+    private static final HashMap<String, SimpleKernelImpl> INSTANCES = new HashMap<String, SimpleKernelImpl>();
 
     private static final int REV_SKIP_OFFSET = 20;
 
@@ -78,7 +78,7 @@ public class MemoryKernelImpl extends Wr
     private Server server;
     private boolean disposed;
 
-    private MemoryKernelImpl(String name) {
+    private SimpleKernelImpl(String name) {
         this.name = name;
         boolean startServer = false;
         if (name.startsWith("server:")) {
@@ -131,7 +131,7 @@ public class MemoryKernelImpl extends Wr
      * @param url the url
      * @return the object
      */
-    public static synchronized MemoryKernelImpl get(String url) {
+    public static synchronized SimpleKernelImpl get(String url) {
         boolean clean = false;
         if (url.endsWith(";clean")) {
             url = url.substring(0, url.length() - ";clean".length());
@@ -155,9 +155,9 @@ public class MemoryKernelImpl extends Wr
         if (clean) {
             INSTANCES.remove(name);
         }
-        MemoryKernelImpl instance = INSTANCES.get(name);
+        SimpleKernelImpl instance = INSTANCES.get(name);
         if (instance == null) {
-            instance = new MemoryKernelImpl(name);
+            instance = new SimpleKernelImpl(name);
             INSTANCES.put(name, instance);
         }
         return instance;