Refix the things that were lost in the merge.

guod08 · Sep 20, 2013 · fefc71e · fefc71e
1 parent b13ae3f
commit fefc71e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 24 deletions.
diff --git a/services/src/main/java/io/druid/cli/CliBroker.java b/services/src/main/java/io/druid/cli/CliBroker.java
@@ -20,6 +20,8 @@
 package io.druid.cli;
 
 import com.google.common.collect.ImmutableList;
+import com.google.inject.Binder;
+import com.google.inject.Module;
 import com.metamx.common.logger.Logger;
 import io.airlift.command.Command;
 import io.druid.client.BrokerServerView;
@@ -29,19 +31,18 @@
 import io.druid.client.cache.CacheMonitor;
 import io.druid.client.cache.CacheProvider;
 import io.druid.curator.discovery.DiscoveryModule;
+import io.druid.guice.Jerseys;
 import io.druid.guice.JsonConfigProvider;
 import io.druid.guice.LazySingleton;
 import io.druid.guice.ManageLifecycle;
 import io.druid.guice.annotations.Self;
+import io.druid.query.MapQueryToolChestWarehouse;
+import io.druid.query.QuerySegmentWalker;
+import io.druid.query.QueryToolChestWarehouse;
+import io.druid.server.ClientInfoResource;
 import io.druid.server.ClientQuerySegmentWalker;
 import io.druid.server.initialization.JettyServerInitializer;
 import io.druid.server.metrics.MetricsModule;
-import org.eclipse.jetty.server.Handler;
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.handler.HandlerList;
-import org.eclipse.jetty.servlet.DefaultServlet;
-import org.eclipse.jetty.servlet.ServletContextHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
 
 import java.util.List;
 
@@ -79,27 +80,12 @@ public void configure(Binder binder)
 
             binder.bind(QuerySegmentWalker.class).to(ClientQuerySegmentWalker.class).in(LazySingleton.class);
             binder.bind(JettyServerInitializer.class).to(QueryJettyServerInitializer.class).in(LazySingleton.class);
+            Jerseys.addResource(binder, ClientInfoResource.class);
+
             DiscoveryModule.register(binder, Self.class);
             MetricsModule.register(binder, CacheMonitor.class);
           }
         }
     );
   }
-
-  private static class BrokerJettyServerInitializer extends QueryJettyServerInitializer
-  {
-    @Override
-    public void initialize(Server server, Injector injector)
-    {
-      super.initialize(server, injector);
-
-      final ServletContextHandler resources = new ServletContextHandler(ServletContextHandler.SESSIONS);
-      resources.addServlet(new ServletHolder(new DefaultServlet()), "/*");
-      resources.addFilter(GuiceFilter.class, "/druid/v2/datasources/*", null);
-
-      final HandlerList handlerList = new HandlerList();
-      handlerList.setHandlers(new Handler[]{resources});
-      server.setHandler(handlerList);
-    }
-  }
 }
diff --git a/services/src/main/java/io/druid/cli/CliCoordinator.java b/services/src/main/java/io/druid/cli/CliCoordinator.java
@@ -42,7 +42,7 @@
 import io.druid.guice.LifecycleModule;
 import io.druid.guice.ManageLifecycle;
 import io.druid.guice.annotations.Self;
-import io.druid.server.StatusResource;
+import io.druid.server.http.BackwardsCompatiableInfoResource;
 import io.druid.server.http.InfoResource;
 import io.druid.server.http.MasterRedirectInfo;
 import io.druid.server.http.MasterResource;
@@ -107,6 +107,7 @@ public void configure(Binder binder)
             DiscoveryModule.register(binder, Self.class);
 
             binder.bind(JettyServerInitializer.class).toInstance(new CoordinatorJettyServerInitializer());
+            Jerseys.addResource(binder, BackwardsCompatiableInfoResource.class);
             Jerseys.addResource(binder, InfoResource.class);
             Jerseys.addResource(binder, MasterResource.class);
           }