From 65d5bb3f1cbfb42be5a3c4aa077b7ab2504082af Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 11 Dec 2013 23:12:12 -0500
Subject: [PATCH] Rollback to Servlet 2.5
---
src/main/java/com/gitblit/dagger/DaggerContext.java | 27 +++++++--------------------
1 files changed, 7 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/gitblit/dagger/DaggerContextListener.java b/src/main/java/com/gitblit/dagger/DaggerContext.java
similarity index 77%
rename from src/main/java/com/gitblit/dagger/DaggerContextListener.java
rename to src/main/java/com/gitblit/dagger/DaggerContext.java
index 6a04e4a..28ee25d 100644
--- a/src/main/java/com/gitblit/dagger/DaggerContextListener.java
+++ b/src/main/java/com/gitblit/dagger/DaggerContext.java
@@ -17,8 +17,10 @@
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
-import com.gitblit.servlet.InjectionContextListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import dagger.ObjectGraph;
@@ -29,9 +31,11 @@
* @author James Moger
*
*/
-public abstract class DaggerContextListener extends InjectionContextListener {
+public abstract class DaggerContext implements ServletContextListener {
- protected static final String INJECTOR_NAME = ObjectGraph.class.getName();
+ public static final String INJECTOR_NAME = ObjectGraph.class.getName();
+
+ protected final Logger logger = LoggerFactory.getLogger(getClass());
protected abstract Object [] getModules();
@@ -52,23 +56,6 @@
}
}
return (ObjectGraph) o;
- }
-
- /**
- * Instantiates an object.
- *
- * @param clazz
- * @return the object
- */
- @Override
- protected <X> X instantiate(ServletContext context, Class<X> clazz) {
- try {
- ObjectGraph injector = getInjector(context);
- return injector.get(clazz);
- } catch (Throwable t) {
- logger.error(null, t);
- }
- return null;
}
@Override
--
Gitblit v1.9.1