--- a/src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java	Wed Sep 05 18:05:54 2012 +0200
+++ b/src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java	Thu Sep 06 19:02:59 2012 +0200
@@ -15,8 +15,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.servlet.ServletContext;
-
 import net.oauth.jsontoken.Checker;
 import net.oauth.jsontoken.JsonToken;
 import net.oauth.jsontoken.JsonTokenParser;
@@ -37,9 +35,9 @@
 
 import de.mpiwg.itgroup.annotations.Actor;
 import de.mpiwg.itgroup.annotations.Annotation;
-import de.mpiwg.itgroup.annotations.NS;
 import de.mpiwg.itgroup.annotations.Annotation.FragmentTypes;
 import de.mpiwg.itgroup.annotations.Group;
+import de.mpiwg.itgroup.annotations.NS;
 import de.mpiwg.itgroup.annotations.Person;
 import de.mpiwg.itgroup.annotations.neo4j.AnnotationStore;
 
@@ -61,10 +59,7 @@
 
     protected AnnotationStore getAnnotationStore() {
         if (store == null) {
-            ServletContext sc = (ServletContext) getContext().getServerDispatcher().getContext().getAttributes()
-                    .get("org.restlet.ext.servlet.ServletContext");
-            logger.debug("Getting AnnotationStore from Context");
-            store = (AnnotationStore) sc.getAttribute(BaseRestlet.ANNSTORE_KEY);
+            store = ((BaseRestlet) getApplication()).getAnnotationStore();
         }
         return store;
     }