You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by he...@apache.org on 2010/05/26 18:58:41 UTC
svn commit: r948502 - in
/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet:
GuiceServletContextListener.java InjectedFilter.java InjectedServlet.java
Author: henning
Date: Wed May 26 16:58:41 2010
New Revision: 948502
URL: http://svn.apache.org/viewvc?rev=948502&view=rev
Log:
SHINDIG-1340: Extend InjectedServlet and InjectedFilter to allow direct usage with guice-servlet.
This requires looking up the context attribute used by guice-servlet in addition to the attribute used by Shindig injection.
Modified:
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/GuiceServletContextListener.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/InjectedFilter.java
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/InjectedServlet.java
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/GuiceServletContextListener.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/GuiceServletContextListener.java?rev=948502&r1=948501&r2=948502&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/GuiceServletContextListener.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/GuiceServletContextListener.java Wed May 26 16:58:41 2010
@@ -40,6 +40,10 @@ import javax.servlet.ServletContextListe
public class GuiceServletContextListener implements ServletContextListener {
public static final String INJECTOR_ATTRIBUTE = "guice-injector";
public static final String MODULES_ATTRIBUTE = "guice-modules";
+
+ // From guice-servlet-2.0
+ public static final String INJECTOR_NAME = Injector.class.getName();
+
private boolean jmxInitialized = false;
public void contextInitialized(ServletContextEvent event) {
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/InjectedFilter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/InjectedFilter.java?rev=948502&r1=948501&r2=948502&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/InjectedFilter.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/InjectedFilter.java Wed May 26 16:58:41 2010
@@ -36,9 +36,13 @@ public abstract class InjectedFilter imp
ServletContext context = config.getServletContext();
injector = (Injector) context.getAttribute(GuiceServletContextListener.INJECTOR_ATTRIBUTE);
if (injector == null) {
- throw new UnavailableException(
- "Guice Injector not found! Make sure you registered " +
- GuiceServletContextListener.class.getName() + " as a listener");
+ injector = (Injector)
+ context.getAttribute(GuiceServletContextListener.INJECTOR_NAME);
+ if (injector == null) {
+ throw new UnavailableException(
+ "Guice Injector not found! Make sure you registered " +
+ GuiceServletContextListener.class.getName() + " as a listener");
+ }
}
injector.injectMembers(this);
}
Modified: shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/InjectedServlet.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/InjectedServlet.java?rev=948502&r1=948501&r2=948502&view=diff
==============================================================================
--- shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/InjectedServlet.java (original)
+++ shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/InjectedServlet.java Wed May 26 16:58:41 2010
@@ -39,10 +39,14 @@ public abstract class InjectedServlet ex
injector = (Injector)
context.getAttribute(GuiceServletContextListener.INJECTOR_ATTRIBUTE);
if (injector == null) {
- throw new UnavailableException(
- "Guice Injector not found! Make sure you registered " +
- GuiceServletContextListener.class.getName() + " as a listener");
+ injector = (Injector)
+ context.getAttribute(GuiceServletContextListener.INJECTOR_NAME);
+ if (injector == null) {
+ throw new UnavailableException(
+ "Guice Injector not found! Make sure you registered " +
+ GuiceServletContextListener.class.getName() + " as a listener");
+ }
}
injector.injectMembers(this);
}
-}
\ No newline at end of file
+}