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

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
comparison
equal deleted inserted replaced
65:c0dd5314bada 66:5b568de5ee0d
18 import javax.servlet.ServletContext; 18 import javax.servlet.ServletContext;
19 19
20 import org.apache.log4j.BasicConfigurator; 20 import org.apache.log4j.BasicConfigurator;
21 import org.apache.log4j.Logger; 21 import org.apache.log4j.Logger;
22 import org.neo4j.graphdb.GraphDatabaseService; 22 import org.neo4j.graphdb.GraphDatabaseService;
23 import org.neo4j.graphdb.factory.GraphDatabaseBuilder;
23 import org.neo4j.graphdb.factory.GraphDatabaseFactory; 24 import org.neo4j.graphdb.factory.GraphDatabaseFactory;
25 import org.neo4j.graphdb.factory.GraphDatabaseSettings;
24 import org.neo4j.kernel.AbstractGraphDatabase; 26 import org.neo4j.kernel.AbstractGraphDatabase;
27 import org.neo4j.kernel.GraphDatabaseAPI;
25 import org.neo4j.server.WrappingNeoServerBootstrapper; 28 import org.neo4j.server.WrappingNeoServerBootstrapper;
26 import org.restlet.Application; 29 import org.restlet.Application;
27 import org.restlet.Context; 30 import org.restlet.Context;
28 31
29 import de.mpiwg.itgroup.annotations.neo4j.AnnotationStore; 32 import de.mpiwg.itgroup.annotations.neo4j.AnnotationStore;
175 * open database 178 * open database
176 */ 179 */
177 String dbFn = getResourcePath(sc, graphdbPath); 180 String dbFn = getResourcePath(sc, graphdbPath);
178 if (dbFn != null) { 181 if (dbFn != null) {
179 logger.debug("opening DB " + dbFn); 182 logger.debug("opening DB " + dbFn);
180 graphDb = new GraphDatabaseFactory().newEmbeddedDatabase(dbFn); 183 GraphDatabaseBuilder graphDbBuilder = new GraphDatabaseFactory().newEmbeddedDatabaseBuilder(dbFn);
184 graphDbBuilder.setConfig(GraphDatabaseSettings.allow_store_upgrade, "true");
185 graphDb = graphDbBuilder.newGraphDatabase();
181 registerShutdownHook(graphDb); 186 registerShutdownHook(graphDb);
182 // store in context 187 // store in context
183 sc.setAttribute(GRAPHDB_KEY, graphDb); 188 sc.setAttribute(GRAPHDB_KEY, graphDb);
184 // AnnotationStore 189 // AnnotationStore
185 store = new AnnotationStore(graphDb); 190 store = new AnnotationStore(graphDb);
186 sc.setAttribute(ANNSTORE_KEY, store); 191 sc.setAttribute(ANNSTORE_KEY, store);
187 // admin server 192 // admin server
188 srv = new WrappingNeoServerBootstrapper((AbstractGraphDatabase) graphDb); 193 srv = new WrappingNeoServerBootstrapper((GraphDatabaseAPI) graphDb);
189 logger.debug("Starting DB admin server..."); 194 logger.debug("Starting DB admin server...");
190 // store in context 195 // store in context
191 sc.setAttribute(GRAPHDBSRV_KEY, srv); 196 sc.setAttribute(GRAPHDBSRV_KEY, srv);
192 srv.start(); 197 srv.start();
193 } else { 198 } else {