Improved the store library massively and added a preliminary filesystem store.

[jsvc.git] / src / dolda / jsvc / store / Store.java

diff --git a/src/dolda/jsvc/store/Store.java b/src/dolda/jsvc/store/Store.java
index 833c1da..0664156 100644 (file)
--- a/src/dolda/jsvc/store/Store.java
+++ b/src/dolda/jsvc/store/Store.java
@@ -3,49 +3,68 @@ package dolda.jsvc.store;
 import dolda.jsvc.*;
 import dolda.jsvc.util.Misc;
 import java.io.*;
-import java.security.*;
-import java.security.cert.Certificate;
 import java.util.*;
 
-public class Store {
+public abstract class Store implements Iterable<File> {
+    private static Map<String, Factory> kinds = new TreeMap<String, Factory>();
     private static Map<Package, Store> interned = new WeakHashMap<Package, Store>();
-    private final Package pkg;
-    private final File base;
+    protected final Package pkg;
     
-    private Store(Package pkg, File root) {
+    protected Store(Package pkg) {
        this.pkg = pkg;
-       String nm = pkg.getName();
-       File base = root;
-       int p = 0;
-       int p2;
-       while((p2 = nm.indexOf('.', p)) >= 0) {
-           base = new File(base, nm.substring(p, p2));
-           p = p2 + 1;
-       }
-       this.base = new File(base, nm.substring(p));
     }
     
-    private static File getstoreroot() {
+    public abstract File get(String name);
+    
+    public static interface Factory {
+       public Store create(String root, Package pkg);
+    }
+
+    private static String getstoreroot() {
        ThreadContext ctx = ThreadContext.current();
        if(ctx == null)
            throw(new RuntimeException("Not running in jsvc context"));
        String bn = ctx.server().config("jsvc.storage");
        if(bn == null)
            throw(new RuntimeException("No storage root has been configured"));
-       return(new File(bn));
+       return(bn);
     }
-
+    
     public static Store forclass(final Class<?> cl) {
        Package pkg = cl.getPackage();
-       File root = getstoreroot();
        Store s;
        synchronized(interned) {
            s = interned.get(pkg);
            if(s == null) {
-               s = new Store(pkg, root);
+               String root = getstoreroot();
+               int p = root.indexOf(':');
+               if(p < 0)
+                   throw(new RuntimeException("Invalid store specification: " + root));
+               String kind = root.substring(0, p);
+               root = root.substring(p + 1);
+               Factory fac;
+               synchronized(kinds) {
+                   fac = kinds.get(kind);
+                   if(fac == null)
+                       throw(new RuntimeException("No such store kind: " + kind));
+               }
+               s = fac.create(root, pkg);
                interned.put(pkg, s);
            }
        }
        return(s);
     }
+    
+    public static void register(String kind, Factory fac) {
+       synchronized(kinds) {
+           if(!kinds.containsKey(kind))
+               kinds.put(kind, fac);
+           else
+               throw(new RuntimeException("Store of type " + kind + " already exists"));
+       }
+    }
+    
+    static {
+       FileStore.register();
+    }
 }