Fixed meta and server
This commit is contained in:
parent
677f4de91f
commit
9f205dcd07
@ -5,7 +5,7 @@ buildscript {
|
||||
jcenter()
|
||||
}
|
||||
dependencies {
|
||||
classpath 'io.ratpack:ratpack-gradle:1.4.5'
|
||||
classpath 'io.ratpack:ratpack-gradle:1.4.6'
|
||||
classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.3'
|
||||
}
|
||||
}
|
||||
@ -18,7 +18,7 @@ mainClassName = "inr.numass.server.ServerRunner"
|
||||
|
||||
dependencies {
|
||||
compile project(':numass-core')
|
||||
compile "hep.dataforge:storage-servlet" // project(':dataforge-storage:storage-servlet')
|
||||
compile "hep.dataforge:storage-server" // project(':dataforge-storage:storage-servlet')
|
||||
compile 'commons-daemon:commons-daemon:1.+'
|
||||
}
|
||||
|
||||
|
@ -20,7 +20,7 @@ import java.io.StringWriter;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import static hep.dataforge.server.StorageRenderer.renderStorage;
|
||||
import static hep.dataforge.server.storage.StorageRenderer.renderStorage;
|
||||
import static inr.numass.server.HandlerUtils.renderStates;
|
||||
|
||||
/**
|
||||
|
@ -9,7 +9,7 @@ import freemarker.template.Template;
|
||||
import hep.dataforge.meta.MetaBuilder;
|
||||
import hep.dataforge.server.ServerManager;
|
||||
import hep.dataforge.server.ServletUtils;
|
||||
import hep.dataforge.server.StorageRatpackHandler;
|
||||
import hep.dataforge.server.storage.StorageRatpackHandler;
|
||||
import hep.dataforge.storage.api.ObjectLoader;
|
||||
import hep.dataforge.storage.api.PointLoader;
|
||||
import hep.dataforge.storage.api.Storage;
|
||||
|
@ -35,7 +35,7 @@ public class TestServer {
|
||||
context.getLogger().info("Starting test numass storage servlet in '{}'", path);
|
||||
|
||||
NumassStorage storage = new NumassStorage(context, FileStorageFactory.buildStorageMeta(path, true, true));
|
||||
serverManager.addObject("numass", storage, NumassStorageHandler::new);
|
||||
serverManager.bind("numass", storage, NumassStorageHandler::new);
|
||||
|
||||
serverManager.startServer();
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user