svn commit: r1382795 - in /cocoon/subprojects/cocoon-rcl-spring-reloader/trunk: pom.xml src/main/java/org/apache/cocoon/tools/rcl/springreloader/SynchronizedConfigureableWebApplicationContext.java

Author: ilgrosso
Date: Mon Sep 10 12:31:34 2012
New Revision: 1382795

URL: http://svn.apache.org/viewvc?rev=1382795&view=rev
Log:
Upgrading some deps

Modified:
    cocoon/subprojects/cocoon-rcl-spring-reloader/trunk/pom.xml
    cocoon/subprojects/cocoon-rcl-spring-reloader/trunk/src/main/java/org/apache/cocoon/tools/rcl/springreloader/SynchronizedConfigureableWebApplicationContext.java

Modified: cocoon/subprojects/cocoon-rcl-spring-reloader/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-rcl-spring-reloader/trunk/pom.xml?rev=1382795&r1=1382794&r2=1382795&view=diff
==============================================================================
--- cocoon/subprojects/cocoon-rcl-spring-reloader/trunk/pom.xml (original)
+++ cocoon/subprojects/cocoon-rcl-spring-reloader/trunk/pom.xml Mon Sep 10 12:31:34 2012
@@ -47,7 +47,7 @@
   </scm>
   
   <properties>
-    <spring.version>3.1.1.RELEASE</spring.version>
+    <spring.version>3.1.2.RELEASE</spring.version>
   </properties>
   
   <!--+

Modified: cocoon/subprojects/cocoon-rcl-spring-reloader/trunk/src/main/java/org/apache/cocoon/tools/rcl/springreloader/SynchronizedConfigureableWebApplicationContext.java
URL: http://svn.apache.org/viewvc/cocoon/subprojects/cocoon-rcl-spring-reloader/trunk/src/main/java/org/apache/cocoon/tools/rcl/springreloader/SynchronizedConfigureableWebApplicationContext.java?rev=1382795&r1=1382794&r2=1382795&view=diff
==============================================================================
--- cocoon/subprojects/cocoon-rcl-spring-reloader/trunk/src/main/java/org/apache/cocoon/tools/rcl/springreloader/SynchronizedConfigureableWebApplicationContext.java (original)
+++ cocoon/subprojects/cocoon-rcl-spring-reloader/trunk/src/main/java/org/apache/cocoon/tools/rcl/springreloader/SynchronizedConfigureableWebApplicationContext.java Mon Sep 10 12:31:34 2012
@@ -20,10 +20,8 @@ import java.io.IOException;
 import java.lang.annotation.Annotation;
 import java.util.Locale;
 import java.util.Map;
-
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletContext;
-
 import org.springframework.beans.BeanInstantiationException;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeansException;
@@ -40,6 +38,7 @@ import org.springframework.context.NoSuc
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.io.Resource;
 import org.springframework.web.context.ConfigurableWebApplicationContext;
+import org.springframework.web.context.ConfigurableWebEnvironment;
 import org.springframework.web.context.support.XmlWebApplicationContext;
 
 /**
@@ -289,8 +288,7 @@ public class SynchronizedConfigureableWe
     }
 
     public synchronized void reload() {
-        ConfigurableWebApplicationContext newAppContext = null;
-
+        ConfigurableWebApplicationContext newAppContext;
         try {
             newAppContext = BeanUtils.instantiateClass(XmlWebApplicationContext.class);
         } catch (BeanInstantiationException e) {
@@ -351,7 +349,7 @@ public class SynchronizedConfigureableWe
     }
 
     @Override
-    public ConfigurableEnvironment getEnvironment() {
+    public ConfigurableWebEnvironment getEnvironment() {
         return this.appContext.getEnvironment();
     }