Changeset 71:326369d4bc4d in AnnotationManagerN4J

Timestamp:

Mar 7, 2014, 12:48:50 PM (11 years ago)

Author:

casties

Branch:

default

Message:

trying restlet 2.1. doesn't work yet.

Files:

• LICENSE.txt (added)
• pom.xml (modified) (1 diff)
• src/main/java/de/mpiwg/itgroup/annotations/restlet/BaseRestlet.java (modified) (14 diffs)

pom.xml

@@ -8 +8 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <neo4j-version>2.0.1</neo4j-version>
-    <restlet-version>2.0.15</restlet-version>
-    <!-- <restlet-version>2.1.7</restlet-version> -->
+    <!-- <restlet-version>2.0.15</restlet-version> -->
+    <restlet-version>2.1.7</restlet-version>
   </properties>
   <repositories>

src/main/java/de/mpiwg/itgroup/annotations/restlet/BaseRestlet.java

@@ -31 +31 @@
 import java.util.Hashtable;
 import java.util.Properties;
+import java.util.concurrent.ConcurrentMap;
 
 import javax.naming.NamingEnumeration;
@@ -51 +52 @@
 import org.restlet.Application;
 import org.restlet.Context;
+import org.restlet.Restlet;
+import org.restlet.data.LocalReference;
 
 import de.mpiwg.itgroup.annotations.neo4j.AnnotationStore;
@@ -62 +65 @@
      */
     protected Properties consumerKeys;
-    public String CONSUMER_KEYS_PATH = "WEB-INF/consumerkeys.property";
+    public String CONSUMER_KEYS_PATH = "consumerkeys.property";
     public static final String CONSUMERKEYS_KEY = "annotationmanager.consumerkeys";
 
@@ -69 +72 @@
      */
     protected Properties serverConfig;
-    public String CONFIG_PROPS_PATH = "WEB-INF/serverconfig.property";
+    public String CONFIG_PROPS_PATH = "serverconfig.property";
     public static final String SERVERCONFIG_KEY = "annotationmanager.serverconfig";
 
@@ -78 +81 @@
     public static final String GRAPHDB_KEY = "annotationmanager.graphdb";
     public static final String GRAPHDB_PATH_KEY = "annotationmanager.graphdb.path";
-    public String graphdbPath = "WEB-INF/neo4j-annotation-db";
+    public String graphdbPath = "neo4j-annotation-db";
 
     /**
@@ -134 +137 @@
     public BaseRestlet(Context context) {
         super(context);
-        configure();
+        configure(context);
     }
 
@@ -141 +144 @@
      * Reads serverConfig, consumerKeys and graphDb config from config files and starts graphDb.
      * Uses config from webapp context if already initialized. 
-     */
-    protected void configure() {
-        ServletContext sc = (ServletContext) getContext().getServerDispatcher().getContext().getAttributes()
+     * @param context 
+     */
+    protected void configure(Context context) {
+        Context ctx = Context.getCurrent();
+        ConcurrentMap<String, Object> attrs = ctx.getAttributes();
+        ServletContext sc = null;
+        if (context != null) {
+            Restlet a = context.getServerDispatcher();
+            Context b = a.getContext();
+            ConcurrentMap<String, Object> c = b.getAttributes();
+            sc = (ServletContext) context.getServerDispatcher().getContext().getAttributes()
                 .get("org.restlet.ext.servlet.ServletContext");
-        if (sc != null) {
-            if (sc.getAttribute("annotationserver.log4j.configured") == null) {
+        }
+        if (attrs != null) {
+            if (attrs.get("annotationserver.log4j.configured") == null) {
                 // TODO: is this the right place to run the log4j configurator?
                 BasicConfigurator.configure();
-                sc.setAttribute("annotationserver.log4j.configured", "done");
+                attrs.put("annotationserver.log4j.configured", "done");
             }
             logger.info(getVersion() + " starting...");
@@ -156 +168 @@
              * read config from webapp
              */
-            serverConfig = (Properties) sc.getAttribute(SERVERCONFIG_KEY);
+            serverConfig = (Properties) attrs.get(SERVERCONFIG_KEY);
             if (serverConfig == null) {
                 serverConfig = new Properties();
@@ -192 +204 @@
                 }
                 // store config
-                sc.setAttribute(SERVERCONFIG_KEY, serverConfig);
+                attrs.put(SERVERCONFIG_KEY, serverConfig);
             }
             // look for database service in context
-            graphDb = (GraphDatabaseService) sc.getAttribute(GRAPHDB_KEY);
+            graphDb = (GraphDatabaseService) attrs.get(GRAPHDB_KEY);
             if (graphDb == null) {
                 /*
@@ -208 +220 @@
                     registerShutdownHook(graphDb);
                     // store in context
-                    sc.setAttribute(GRAPHDB_KEY, graphDb);
+                    attrs.put(GRAPHDB_KEY, graphDb);
                     // AnnotationStore
                     store = new AnnotationStore(graphDb);
-                    sc.setAttribute(ANNSTORE_KEY, store);
+                    attrs.put(ANNSTORE_KEY, store);
                     // admin server
                     srv = new WrappingNeoServerBootstrapper((GraphDatabaseAPI) graphDb);
                     logger.debug("Starting DB admin server...");
                     // store in context
-                    sc.setAttribute(GRAPHDBSRV_KEY, srv);
+                    attrs.put(GRAPHDBSRV_KEY, srv);
                     srv.start();
                 } else {
@@ -223 +235 @@
             } else {
                 // get existing AnnotationStore
-                store = (AnnotationStore) sc.getAttribute(ANNSTORE_KEY);
+                store = (AnnotationStore) attrs.get(ANNSTORE_KEY);
             }
             /*
              * read consumerKeys from webapp
              */
-            consumerKeys = (Properties) sc.getAttribute(CONSUMERKEYS_KEY);
+            consumerKeys = (Properties) attrs.get(CONSUMERKEYS_KEY);
             if (consumerKeys == null) {
                 consumerKeys = new Properties();
@@ -245 +257 @@
                 }
                 // store config
-                sc.setAttribute(CONSUMERKEYS_KEY, consumerKeys);
+                attrs.put(CONSUMERKEYS_KEY, consumerKeys);
             }
         } else {
@@ -342 +354 @@
      */
     protected InputStream getResourceAsStream(ServletContext sc, String path) {
-        InputStream ps = sc.getResourceAsStream(path);
-        if (ps == null) {
-            // try as file
-            File pf = new File(sc.getRealPath(path));
-            if (pf != null) {
-                logger.debug("trying file for: " + pf);
-                try {
-                    ps = new FileInputStream(pf);
-                } catch (FileNotFoundException e) {
-                    logger.error(e);
+        InputStream ps = null;
+        if (sc == null) {
+            ps = Thread.currentThread().getContextClassLoader().getResourceAsStream(path);
+        } else {
+            ps = sc.getResourceAsStream(path);
+            if (ps == null) {
+                // try as file
+                File pf = new File(sc.getRealPath(path));
+                if (pf != null) {
+                    logger.debug("trying file for: " + pf);
+                    try {
+                        ps = new FileInputStream(pf);
+                    } catch (FileNotFoundException e) {
+                        logger.error(e);
+                    }
                 }
             }
@@ -371 +388 @@
         File f = new File(filename);
         // is the filename absolute?
-        if (!f.isAbsolute()) {
+        if (!f.isAbsolute() && sc != null) {
             // relative path -> use getRealPath to resolve in webapp
             filename = sc.getRealPath(filename);