diff src/de/mpiwg/itgroup/annotationManager/restlet/RestServer.java @ 8:11baadcdd2c8

start of new Annotator API implementation.
author casties
date Mon, 19 Mar 2012 14:50:28 +0100
parents 97f68ab3430f
children e9fd2e1e0979
line wrap: on
line diff
--- a/src/de/mpiwg/itgroup/annotationManager/restlet/RestServer.java	Mon Mar 19 12:01:39 2012 +0100
+++ b/src/de/mpiwg/itgroup/annotationManager/restlet/RestServer.java	Mon Mar 19 14:50:28 2012 +0100
@@ -12,11 +12,7 @@
 import javax.naming.directory.SearchControls;
 import javax.naming.directory.SearchResult;
 import javax.security.auth.Subject;
-import javax.security.auth.callback.Callback;
 import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.NameCallback;
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.login.AppConfigurationEntry;
 import javax.security.auth.login.Configuration;
 import javax.security.auth.login.LoginContext;
 import javax.security.auth.login.LoginException;
@@ -29,21 +25,13 @@
 import org.restlet.Request;
 import org.restlet.Response;
 import org.restlet.Restlet;
-
 import org.restlet.data.ChallengeScheme;
 import org.restlet.data.ClientInfo;
-import org.restlet.engine.component.ChildContext;
 import org.restlet.ext.jaas.JaasVerifier;
-import org.restlet.routing.Redirector;
 import org.restlet.routing.Router;
-import org.restlet.routing.Template;
-import org.restlet.routing.TemplateRoute;
 import org.restlet.security.ChallengeAuthenticator;
-import org.restlet.security.MapVerifier;
 import org.restlet.security.User;
-import org.restlet.security.Verifier;
 
-import com.sun.org.apache.xalan.internal.xsltc.runtime.Attributes;
 import com.sun.security.auth.login.ConfigFile;
 
 
@@ -134,7 +122,8 @@
 		
 		
 		router.attach("/annotations",AddAndReadAnnotations.class);
-		router.attach("/search",SearchAnnotations.class); // annotator api askes for different uris for search and adding
+        router.attach("/search",AnnotatorSearch.class); // annotator api askes for different uris for search and adding
+		//router.attach("/search",SearchAnnotations.class); // annotator api askes for different uris for search and adding
 		router.attach("/dummy",Dummy.class);
 		
 		//router.attach("",redirector);