Changeset 72:4c2cea836bc0 in AnnotationManagerN4J for src

Timestamp:

Mar 11, 2014, 4:43:00 PM (10 years ago)

Author:

casties

Branch:

default

Message:

restlet 2.1 works now. (it's the start() method, stupid!)

Location:

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

Files:

• AnnotatorResourceImpl.java (modified) (3 diffs)
• AnnotatorRestlet.java (modified) (2 diffs)
• BaseRestlet.java (modified) (9 diffs)
• annotations_ui/AnnotationsUiRestlet.java (modified) (2 diffs)

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

@@ -52 +52 @@
 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;
@@ -123 +125 @@
      */
     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) {
@@ -164 +168 @@
      */
     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) {

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

@@ -27 +27 @@
 
 import org.apache.log4j.Logger;
-import org.restlet.Context;
 import org.restlet.Restlet;
 import org.restlet.routing.Router;
@@ -40 +39 @@
 
     public static Logger logger = Logger.getLogger(AnnotatorRestlet.class);
-
-    /**
-     * @param context
-     */
-    public AnnotatorRestlet(Context context) {
-        super(context);
-        logger.debug("AnnotatorRestlet!");
-    }
 
     /*

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

@@ -130 +130 @@
     public static final String ANNOTATIONS_URI_KEY = "annotationmanager.uris.annotations";
 
-    /**
-     * constructor
-     * 
-     * @param context
-     */
-    public BaseRestlet(Context context) {
-        super(context);
-        configure(context);
+
+    /* (non-Javadoc)
+     * @see org.restlet.Application#start()
+     */
+    @Override
+    public synchronized void start() throws Exception {
+        configure(getContext());
+        super.start();
     }
 
@@ -147 +147 @@
      */
     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...");
@@ -168 +160 @@
              * read config from webapp
              */
-            serverConfig = (Properties) attrs.get(SERVERCONFIG_KEY);
+            serverConfig = (Properties) sc.getAttribute(SERVERCONFIG_KEY);
             if (serverConfig == null) {
                 serverConfig = new Properties();
@@ -204 +196 @@
                 }
                 // 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) {
                 /*
@@ -220 +212 @@
                     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 {
@@ -235 +227 @@
             } 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();
@@ -257 +249 @@
                 }
                 // store config
-                attrs.put(CONSUMERKEYS_KEY, consumerKeys);
+                sc.setAttribute(CONSUMERKEYS_KEY, consumerKeys);
             }
         } else {
@@ -356 +348 @@
         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 {
@@ -369 +366 @@
                         logger.error(e);
                     }
+                } else {
+                    // use class loader
+                    ps = Thread.currentThread().getContextClassLoader().getResourceAsStream(path);                    
                 }
             }

src/main/java/de/mpiwg/itgroup/annotations/restlet/annotations_ui/AnnotationsUiRestlet.java

@@ -27 +27 @@
 
 import org.apache.log4j.Logger;
-import org.restlet.Context;
 import org.restlet.Restlet;
 import org.restlet.data.ChallengeScheme;
@@ -45 +44 @@
 
     public static Logger logger = Logger.getLogger(AnnotationsUiRestlet.class);
-
-    public AnnotationsUiRestlet(Context context) {
-        super(context);
-        logger.info(version);
-    }
 
     /*