From 575d4f690b8eaedfdd3981fe7c00ecc41d358e73 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 03 Jul 2014 16:57:47 -0400
Subject: [PATCH] Temporarily depend on patched guice-servlet (guice-807)
---
src/main/java/com/gitblit/servlet/LogoServlet.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/gitblit/servlet/LogoServlet.java b/src/main/java/com/gitblit/servlet/LogoServlet.java
index e91fad0..d5d298b 100644
--- a/src/main/java/com/gitblit/servlet/LogoServlet.java
+++ b/src/main/java/com/gitblit/servlet/LogoServlet.java
@@ -21,8 +21,8 @@
import java.io.InputStream;
import java.io.OutputStream;
-import javax.inject.Inject;
-import javax.inject.Singleton;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
@@ -30,7 +30,6 @@
import javax.servlet.http.HttpServletResponse;
import com.gitblit.Keys;
-import com.gitblit.Keys.web;
import com.gitblit.manager.IRuntimeManager;
/**
@@ -46,11 +45,10 @@
private static final long lastModified = System.currentTimeMillis();
- private final IRuntimeManager runtimeManager;
+ private IRuntimeManager runtimeManager;
@Inject
public LogoServlet(IRuntimeManager runtimeManager) {
- super();
this.runtimeManager = runtimeManager;
}
--
Gitblit v1.9.1