You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by li...@apache.org on 2010/11/09 06:59:15 UTC
svn commit: r1032854 - in /shindig/trunk: java/common/pom.xml
java/common/src/main/java/org/apache/shindig/common/servlet/GuiceServletContextListener.java
pom.xml
Author: lindner
Date: Tue Nov 9 05:59:15 2010
New Revision: 1032854
URL: http://svn.apache.org/viewvc?rev=1032854&view=rev
Log:
remove guice-jmx
Modified:
shindig/trunk/java/common/pom.xml
shindig/trunk/java/common/src/main/java/org/apache/shindig/common/servlet/GuiceServletContextListener.java
shindig/trunk/pom.xml
Modified: shindig/trunk/java/common/pom.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/java/common/pom.xml?rev=1032854&r1=1032853&r2=1032854&view=diff
==============================================================================
--- shindig/trunk/java/common/pom.xml (original)
+++ shindig/trunk/java/common/pom.xml Tue Nov 9 05:59:15 2010
@@ -104,10 +104,6 @@
<artifactId>guice</artifactId>
</dependency>
<dependency>
- <groupId>com.google.inject.extensions</groupId>
- <artifactId>guice-jmx</artifactId>
- </dependency>
- <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
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=1032854&r1=1032853&r2=1032854&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 Tue Nov 9 05:59:15 2010
@@ -24,7 +24,6 @@ import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.Module;
import com.google.inject.Stage;
-import com.google.inject.tools.jmx.Manager;
import org.apache.commons.lang.StringUtils;
import java.util.List;
@@ -46,7 +45,6 @@ public class GuiceServletContextListener
//HNN- constant name matched system.properties <contextparam> specified in the web.xml
private static final String SYSTEM_PROPERTIES = "system.properties";
- private boolean jmxInitialized = false;
public void contextInitialized(ServletContextEvent event) {
ServletContext context = event.getServletContext();
@@ -73,14 +71,6 @@ public class GuiceServletContextListener
Injector injector = Guice.createInjector(Stage.PRODUCTION, modules);
context.setAttribute(INJECTOR_ATTRIBUTE, injector);
- try {
- if (!jmxInitialized) {
- Manager.manage("ShindigGuiceContext", injector);
- jmxInitialized = true;
- }
- } catch (Exception e) {
- // Ignore errors
- }
}
public void contextDestroyed(ServletContextEvent event) {
Modified: shindig/trunk/pom.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/pom.xml?rev=1032854&r1=1032853&r2=1032854&view=diff
==============================================================================
--- shindig/trunk/pom.xml (original)
+++ shindig/trunk/pom.xml Tue Nov 9 05:59:15 2010
@@ -1453,12 +1453,6 @@
<dependency>
<groupId>com.google.inject.extensions</groupId>
- <artifactId>guice-jmx</artifactId>
- <version>2.0</version>
- </dependency>
-
- <dependency>
- <groupId>com.google.inject.extensions</groupId>
<artifactId>guice-multibindings</artifactId>
<version>2.0</version>
</dependency>