aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlyn Normington2012-11-23 10:05:17 (EST)
committerGlyn Normington2012-11-23 10:05:17 (EST)
commit4bf332b4990a48df3ad7a32e3353ffc68ae024de (patch)
tree7966520ff0c718339269303c63c29f0e810ceac3
parent72a4f2188ff0c6fab36571dc77e0541cb14e19f6 (diff)
downloadorg.eclipse.virgo.web-4bf332b.zip
org.eclipse.virgo.web-4bf332b.tar.gz
org.eclipse.virgo.web-4bf332b.tar.bz2
394800: avoid pre-req'ing Spring framework 3.2
-rw-r--r--org.eclipse.virgo.web.dm/src/main/java/org/eclipse/virgo/web/dm/ServerOsgiBundleXmlWebApplicationContext.java14
1 files changed, 0 insertions, 14 deletions
diff --git a/org.eclipse.virgo.web.dm/src/main/java/org/eclipse/virgo/web/dm/ServerOsgiBundleXmlWebApplicationContext.java b/org.eclipse.virgo.web.dm/src/main/java/org/eclipse/virgo/web/dm/ServerOsgiBundleXmlWebApplicationContext.java
index 43d7f69..98efa5c 100644
--- a/org.eclipse.virgo.web.dm/src/main/java/org/eclipse/virgo/web/dm/ServerOsgiBundleXmlWebApplicationContext.java
+++ b/org.eclipse.virgo.web.dm/src/main/java/org/eclipse/virgo/web/dm/ServerOsgiBundleXmlWebApplicationContext.java
@@ -37,7 +37,6 @@ import org.springframework.util.Assert;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.context.ConfigurableWebApplicationContext;
-import org.springframework.web.context.ConfigurableWebEnvironment;
import org.springframework.web.context.ServletConfigAware;
import org.springframework.web.context.ServletContextAware;
import org.springframework.web.context.support.AbstractRefreshableWebApplicationContext;
@@ -362,19 +361,6 @@ public class ServerOsgiBundleXmlWebApplicationContext extends OsgiBundleXmlAppli
return this.themeSource.getTheme(themeName);
}
- /**
- * {@inheritDoc}
- */
- @Override
- public ConfigurableWebEnvironment getEnvironment() {
- ConfigurableEnvironment env = super.getEnvironment();
- if (env instanceof ConfigurableWebEnvironment) {
- return (ConfigurableWebEnvironment) env;
- } else {
- throw new IllegalStateException("Environment is not a ConfigurableWebEnvironment");
- }
- }
-
/**
* {@inheritDoc}
*/