Skip to content
Browse files

Merge commit 'trunk/master'

  • Loading branch information...
2 parents c8ee06d + 6f6276c commit d5ad745f4ee7adcd2e484f18f25c48a650532644 @afeinberg afeinberg committed Feb 1, 2010
View
2 src/java/voldemort/server/http/HttpService.java
@@ -91,7 +91,7 @@ public void startInner() {
httpServer.setSendServerVersion(false);
httpServer.setSendDateHeader(false);
Context context = new Context(httpServer, "/", Context.NO_SESSIONS);
- context.setAttribute(VoldemortServletContextListener.SERVER_CONFIG_KEY, server);
+ context.setAttribute(VoldemortServletContextListener.SERVER_KEY, server);
context.setAttribute(VoldemortServletContextListener.VELOCITY_ENGINE_KEY,
velocityEngine);
context.addServlet(new ServletHolder(new AdminServlet(server, velocityEngine)),
View
2 src/java/voldemort/server/http/StoreServlet.java
@@ -62,7 +62,7 @@ public void init() throws ServletException {
// servlet context
if(this.requestHandler == null) {
ServletContext context = this.getServletContext();
- VoldemortServer server = (VoldemortServer) Utils.notNull(context.getAttribute(VoldemortServletContextListener.SERVER_CONFIG_KEY));
+ VoldemortServer server = (VoldemortServer) Utils.notNull(context.getAttribute(VoldemortServletContextListener.SERVER_KEY));
HttpService httpService = (HttpService) server.getService(ServiceType.HTTP);
this.requestHandler = httpService.getRequestHandler();
}
View
2 src/java/voldemort/server/http/gui/AdminServlet.java
@@ -54,7 +54,7 @@ public AdminServlet(VoldemortServer server, VelocityEngine engine) {
@Override
public void init() throws ServletException {
super.init();
- this.server = (VoldemortServer) Utils.notNull(getServletContext().getAttribute(VoldemortServletContextListener.SERVER_CONFIG_KEY));
+ this.server = (VoldemortServer) Utils.notNull(getServletContext().getAttribute(VoldemortServletContextListener.SERVER_KEY));
this.velocityEngine = (VelocityEngine) Utils.notNull(getServletContext().getAttribute(VoldemortServletContextListener.VELOCITY_ENGINE_KEY));
}
View
2 src/java/voldemort/server/http/gui/ReadOnlyStoreManagementServlet.java
@@ -77,7 +77,7 @@ public ReadOnlyStoreManagementServlet(VoldemortServer server, VelocityEngine eng
@Override
public void init() throws ServletException {
super.init();
- VoldemortServer server = (VoldemortServer) getServletContext().getAttribute(VoldemortServletContextListener.SERVER_CONFIG_KEY);
+ VoldemortServer server = (VoldemortServer) getServletContext().getAttribute(VoldemortServletContextListener.SERVER_KEY);
this.stores = getReadOnlyStores(server);
this.velocityEngine = (VelocityEngine) Utils.notNull(getServletContext().getAttribute(VoldemortServletContextListener.VELOCITY_ENGINE_KEY));
View
2 src/java/voldemort/server/http/gui/StatusServlet.java
@@ -64,7 +64,7 @@ public StatusServlet(VoldemortServer server, VelocityEngine engine) {
@Override
public void init() throws ServletException {
super.init();
- this.server = (VoldemortServer) Utils.notNull(getServletContext().getAttribute(VoldemortServletContextListener.SERVER_CONFIG_KEY));
+ this.server = (VoldemortServer) Utils.notNull(getServletContext().getAttribute(VoldemortServletContextListener.SERVER_KEY));
this.velocityEngine = (VelocityEngine) Utils.notNull(getServletContext().getAttribute(VoldemortServletContextListener.VELOCITY_ENGINE_KEY));
}

0 comments on commit d5ad745

Please sign in to comment.
Something went wrong with that request. Please try again.