Mercurial > hg > AnnotationManagerN4J

changeset 72:4c2cea836bc0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
restlet 2.1 works now. (it's the start() method, stupid!)
author casties
date Tue, 11 Mar 2014 17:43:00 +0100
parents 326369d4bc4d
children 4b8c909cabf3
files src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorRestlet.java src/main/java/de/mpiwg/itgroup/annotations/restlet/BaseRestlet.java src/main/java/de/mpiwg/itgroup/annotations/restlet/annotations_ui/AnnotationsUiRestlet.java
diffstat 4 files changed, 39 insertions(+), 49 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java	Fri Mar 07 13:48:50 2014 +0100
+++ b/src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java	Tue Mar 11 17:43:00 2014 +0100
@@ -51,9 +51,11 @@
 import org.json.JSONObject;
 import org.restlet.data.Form;
 import org.restlet.data.Status;
+import org.restlet.engine.header.Header;
 import org.restlet.representation.Representation;
 import org.restlet.resource.Options;
 import org.restlet.resource.ServerResource;
+import org.restlet.util.Series;
 
 import de.mpiwg.itgroup.annotations.Actor;
 import de.mpiwg.itgroup.annotations.Annotation;
@@ -122,14 +124,16 @@
      * set headers to allow CORS for AJAX.
      */
     protected void setCorsHeaders() {
-        Form responseHeaders = (Form) getResponse().getAttributes().get("org.restlet.http.headers");
+        @SuppressWarnings("unchecked")
+        Series<Header> responseHeaders = (Series<Header>) getResponse().getAttributes().get("org.restlet.http.headers");
         if (responseHeaders == null) {
-            responseHeaders = new Form();
+            responseHeaders = new Series<Header>(Header.class);
             getResponse().getAttributes().put("org.restlet.http.headers", responseHeaders);
         }
         responseHeaders.add("Access-Control-Allow-Methods", getAllowedMethodsForHeader());
         // echo back Origin and Request-Headers
-        Form requestHeaders = (Form) getRequest().getAttributes().get("org.restlet.http.headers");
+        @SuppressWarnings("unchecked")
+        Series<Header> requestHeaders = (Series<Header>) getRequest().getAttributes().get("org.restlet.http.headers");
         String origin = requestHeaders.getFirstValue("Origin", true);
         if (origin == null) {
             responseHeaders.add("Access-Control-Allow-Origin", "*");
@@ -163,7 +167,8 @@
      * @return
      */
     public String checkAuthToken(Representation entity) {
-        Form requestHeaders = (Form) getRequest().getAttributes().get("org.restlet.http.headers");
+        @SuppressWarnings("unchecked")
+        Series<Header> requestHeaders = (Series<Header>) getRequest().getAttributes().get("org.restlet.http.headers");
         String authToken = requestHeaders.getFirstValue("x-annotator-auth-token", true);
         if (authToken == null) {
             if (!((BaseRestlet) getApplication()).isAuthorizationMode()) {
--- a/src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorRestlet.java	Fri Mar 07 13:48:50 2014 +0100
+++ b/src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorRestlet.java	Tue Mar 11 17:43:00 2014 +0100
@@ -26,7 +26,6 @@
  */
 
 import org.apache.log4j.Logger;
-import org.restlet.Context;
 import org.restlet.Restlet;
 import org.restlet.routing.Router;
 
@@ -40,14 +39,6 @@
 
     public static Logger logger = Logger.getLogger(AnnotatorRestlet.class);
 
-    /**
-     * @param context
-     */
-    public AnnotatorRestlet(Context context) {
-        super(context);
-        logger.debug("AnnotatorRestlet!");
-    }
-
     /*
      * (non-Javadoc)
      * 
--- a/src/main/java/de/mpiwg/itgroup/annotations/restlet/BaseRestlet.java	Fri Mar 07 13:48:50 2014 +0100
+++ b/src/main/java/de/mpiwg/itgroup/annotations/restlet/BaseRestlet.java	Tue Mar 11 17:43:00 2014 +0100
@@ -129,14 +129,14 @@
 
     public static final String ANNOTATIONS_URI_KEY = "annotationmanager.uris.annotations";
 
-    /**
-     * constructor
-     * 
-     * @param context
+
+    /* (non-Javadoc)
+     * @see org.restlet.Application#start()
      */
-    public BaseRestlet(Context context) {
-        super(context);
-        configure(context);
+    @Override
+    public synchronized void start() throws Exception {
+        configure(getContext());
+        super.start();
     }
 
     /**
@@ -146,28 +146,20 @@
      * @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 (attrs != null) {
-            if (attrs.get("annotationserver.log4j.configured") == null) {
+        ConcurrentMap<String, Object> attrs = context.getAttributes();
+        ServletContext sc = (ServletContext) attrs.get("org.restlet.ext.servlet.ServletContext");
+        if (sc != null) {
+            if (sc.getAttribute("annotationserver.log4j.configured") == null) {
                 // TODO: is this the right place to run the log4j configurator?
                 BasicConfigurator.configure();
-                attrs.put("annotationserver.log4j.configured", "done");
+                sc.setAttribute("annotationserver.log4j.configured", "done");
             }
             logger.info(getVersion() + " starting...");
 
             /*
              * read config from webapp
              */
-            serverConfig = (Properties) attrs.get(SERVERCONFIG_KEY);
+            serverConfig = (Properties) sc.getAttribute(SERVERCONFIG_KEY);
             if (serverConfig == null) {
                 serverConfig = new Properties();
                 InputStream ps = getResourceAsStream(sc, CONFIG_PROPS_PATH);
@@ -203,10 +195,10 @@
                     logger.error("Unable to get resource " + CONFIG_PROPS_PATH);
                 }
                 // store config
-                attrs.put(SERVERCONFIG_KEY, serverConfig);
+                sc.setAttribute(SERVERCONFIG_KEY, serverConfig);
             }
             // look for database service in context
-            graphDb = (GraphDatabaseService) attrs.get(GRAPHDB_KEY);
+            graphDb = (GraphDatabaseService) sc.getAttribute(GRAPHDB_KEY);
             if (graphDb == null) {
                 /*
                  * open database
@@ -219,27 +211,27 @@
                     graphDb = graphDbBuilder.newGraphDatabase();
                     registerShutdownHook(graphDb);
                     // store in context
-                    attrs.put(GRAPHDB_KEY, graphDb);
+                    sc.setAttribute(GRAPHDB_KEY, graphDb);
                     // AnnotationStore
                     store = new AnnotationStore(graphDb);
-                    attrs.put(ANNSTORE_KEY, store);
+                    sc.setAttribute(ANNSTORE_KEY, store);
                     // admin server
                     srv = new WrappingNeoServerBootstrapper((GraphDatabaseAPI) graphDb);
                     logger.debug("Starting DB admin server...");
                     // store in context
-                    attrs.put(GRAPHDBSRV_KEY, srv);
+                    sc.setAttribute(GRAPHDBSRV_KEY, srv);
                     srv.start();
                 } else {
                     logger.error("Unable to get resource " + dbFn);
                 }
             } else {
                 // get existing AnnotationStore
-                store = (AnnotationStore) attrs.get(ANNSTORE_KEY);
+                store = (AnnotationStore) sc.getAttribute(ANNSTORE_KEY);
             }
             /*
              * read consumerKeys from webapp
              */
-            consumerKeys = (Properties) attrs.get(CONSUMERKEYS_KEY);
+            consumerKeys = (Properties) sc.getAttribute(CONSUMERKEYS_KEY);
             if (consumerKeys == null) {
                 consumerKeys = new Properties();
                 InputStream ps = getResourceAsStream(sc, CONSUMER_KEYS_PATH);
@@ -256,7 +248,7 @@
                     logger.error("Unable to get resource " + CONSUMER_KEYS_PATH);
                 }
                 // store config
-                attrs.put(CONSUMERKEYS_KEY, consumerKeys);
+                sc.setAttribute(CONSUMERKEYS_KEY, consumerKeys);
             }
         } else {
             logger.error("Unable to get ServletContext!");
@@ -355,19 +347,27 @@
     protected InputStream getResourceAsStream(ServletContext sc, String path) {
         InputStream ps = null;
         if (sc == null) {
+            // no servlet context -> use class loader
             ps = Thread.currentThread().getContextClassLoader().getResourceAsStream(path);
+            /* Request request = new Request(Method.GET, "riap://component/ping");
+               Response response = getContext().getClientDispatcher().handle(request);
+               Representation repr = response.getEntity(); */
         } else {
+            // try path in webapp first
             ps = sc.getResourceAsStream(path);
             if (ps == null) {
                 // try as file
                 File pf = new File(sc.getRealPath(path));
-                if (pf != null) {
+                if (pf.canRead()) {
                     logger.debug("trying file for: " + pf);
                     try {
                         ps = new FileInputStream(pf);
                     } catch (FileNotFoundException e) {
                         logger.error(e);
                     }
+                } else {
+                    // use class loader
+                    ps = Thread.currentThread().getContextClassLoader().getResourceAsStream(path);                    
                 }
             }
         }
--- a/src/main/java/de/mpiwg/itgroup/annotations/restlet/annotations_ui/AnnotationsUiRestlet.java	Fri Mar 07 13:48:50 2014 +0100
+++ b/src/main/java/de/mpiwg/itgroup/annotations/restlet/annotations_ui/AnnotationsUiRestlet.java	Tue Mar 11 17:43:00 2014 +0100
@@ -26,7 +26,6 @@
  */
 
 import org.apache.log4j.Logger;
-import org.restlet.Context;
 import org.restlet.Restlet;
 import org.restlet.data.ChallengeScheme;
 import org.restlet.routing.Router;
@@ -45,11 +44,6 @@
 
     public static Logger logger = Logger.getLogger(AnnotationsUiRestlet.class);
 
-    public AnnotationsUiRestlet(Context context) {
-        super(context);
-        logger.info(version);
-    }
-
     /*
      * (non-Javadoc)
      *