Mercurial > hg > AnnotationManagerN4J

diff src/main/java/de/mpiwg/itgroup/annotations/restlet/BaseRestlet.java @ 66:5b568de5ee0d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated to new Neo4J version 2.0. doesn't use new features. problems with neo4j admin web ui.
author casties
date Wed, 19 Feb 2014 14:38:31 +0100
parents 99d9afcfd04d
children 2b1e6df5e21a
line wrap: on
line diff
--- a/src/main/java/de/mpiwg/itgroup/annotations/restlet/BaseRestlet.java	Wed Dec 05 15:36:43 2012 +0100
+++ b/src/main/java/de/mpiwg/itgroup/annotations/restlet/BaseRestlet.java	Wed Feb 19 14:38:31 2014 +0100
@@ -20,8 +20,11 @@
 import org.apache.log4j.BasicConfigurator;
 import org.apache.log4j.Logger;
 import org.neo4j.graphdb.GraphDatabaseService;
+import org.neo4j.graphdb.factory.GraphDatabaseBuilder;
 import org.neo4j.graphdb.factory.GraphDatabaseFactory;
+import org.neo4j.graphdb.factory.GraphDatabaseSettings;
 import org.neo4j.kernel.AbstractGraphDatabase;
+import org.neo4j.kernel.GraphDatabaseAPI;
 import org.neo4j.server.WrappingNeoServerBootstrapper;
 import org.restlet.Application;
 import org.restlet.Context;
@@ -177,7 +180,9 @@
                 String dbFn = getResourcePath(sc, graphdbPath);
                 if (dbFn != null) {
                     logger.debug("opening DB " + dbFn);
-                    graphDb = new GraphDatabaseFactory().newEmbeddedDatabase(dbFn);
+                    GraphDatabaseBuilder graphDbBuilder = new GraphDatabaseFactory().newEmbeddedDatabaseBuilder(dbFn);
+                    graphDbBuilder.setConfig(GraphDatabaseSettings.allow_store_upgrade, "true");
+                    graphDb = graphDbBuilder.newGraphDatabase();
                     registerShutdownHook(graphDb);
                     // store in context
                     sc.setAttribute(GRAPHDB_KEY, graphDb);
@@ -185,7 +190,7 @@
                     store = new AnnotationStore(graphDb);
                     sc.setAttribute(ANNSTORE_KEY, store);
                     // admin server
-                    srv = new WrappingNeoServerBootstrapper((AbstractGraphDatabase) graphDb);
+                    srv = new WrappingNeoServerBootstrapper((GraphDatabaseAPI) graphDb);
                     logger.debug("Starting DB admin server...");
                     // store in context
                     sc.setAttribute(GRAPHDBSRV_KEY, srv);