Mercurial > hg > AnnotationManager
diff src/de/mpiwg/itgroup/annotationManager/restlet/AnnotatorSearch.java @ 10:0bdfe01e30b5
checking auth token works now.
author | casties |
---|---|
date | Tue, 20 Mar 2012 15:55:51 +0100 |
parents | e9fd2e1e0979 |
children | 2f8c72ae4c43 |
line wrap: on
line diff
--- a/src/de/mpiwg/itgroup/annotationManager/restlet/AnnotatorSearch.java Mon Mar 19 21:26:20 2012 +0100 +++ b/src/de/mpiwg/itgroup/annotationManager/restlet/AnnotatorSearch.java Tue Mar 20 15:55:51 2012 +0100 @@ -34,8 +34,6 @@ */ public class AnnotatorSearch extends AnnotatorResourceImpl { - private Logger logger = Logger.getRootLogger(); - protected String getAllowedMethodsForHeader() { return "OPTIONS,GET"; } @@ -52,14 +50,8 @@ doOptions(entity); - // check authToken - Form requestHeaders = (Form) getRequest().getAttributes().get("org.restlet.http.headers"); - String ck = requestHeaders.getFirstValue("x-annotator-consumer-key", true); - if (ck != null) { - RestServer restServer = (RestServer) getApplication(); - String cs = restServer.getConsumerSecret(ck); - logger.debug("requested consumer key=" + ck + " secret=" + cs); - } + boolean authenticated = isAuthenticated(entity); + logger.debug("request authenticated="+authenticated); Form form = getRequest().getResourceRef().getQueryAsForm(); String uri = form.getFirstValue("uri"); @@ -68,12 +60,7 @@ String limit = form.getFirstValue("limit"); String offset = form.getFirstValue("offset"); - RDFSearcher searcher = new RDFSearcher("file:///annotations"); // TODO - // should - // ge - // into - // config - // file + RDFSearcher searcher = new RDFSearcher("file:///annotations"); // TODO should go into config file JSONArray ja; try {