Bring up the servlet-scoped node start/stop with Spring MVC

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1083940 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 5 insertions, 2 deletions

diff --git a/sca-java-2.x/trunk/modules/implementation-spring-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/spring/TuscanyDispatcherServlet.java b/sca-java-2.x/trunk/modules/implementation-spring-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/spring/TuscanyDispatcherServlet.java
index 4a615b9a3a..e15840f613 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/spring/TuscanyDispatcherServlet.java
+++ b/sca-java-2.x/trunk/modules/implementation-spring-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/spring/TuscanyDispatcherServlet.java
@@ -48,7 +48,8 @@ public class TuscanyDispatcherServlet extends DispatcherServlet {
     public void init(ServletConfig config) throws ServletException {
         try {
             super.init(config);
-            WebAppHelper.init(WebAppHelper.getConfigurator(this));
+            configurator = WebAppHelper.getConfigurator(this);
+            WebAppHelper.init(configurator);
         } catch (Throwable e) {
             logger.log(Level.SEVERE, e.getMessage(), e);
             configurator.getServletContext().log(e.getMessage(), e);
diff --git a/sca-java-2.x/trunk/modules/implementation-spring-webapp/src/main/java/org/apache/tuscany/sca/implementation/spring/webapp/SpringWebApplicationContextAccessor.java b/sca-java-2.x/trunk/modules/implementation-spring-webapp/src/main/java/org/apache/tuscany/sca/implementation/spring/webapp/SpringWebApplicationContextAccessor.java
index d9596e3ecf..d94494fbe0 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring-webapp/src/main/java/org/apache/tuscany/sca/implementation/spring/webapp/SpringWebApplicationContextAccessor.java
+++ b/sca-java-2.x/trunk/modules/implementation-spring-webapp/src/main/java/org/apache/tuscany/sca/implementation/spring/webapp/SpringWebApplicationContextAccessor.java
@@ -42,8 +42,10 @@ public class SpringWebApplicationContextAccessor implements SpringApplicationCon
         ApplicationContext context = null;
         Servlet servlet = component.getComponentContext().getCompositeContext().getAttribute(Servlet.class.getName());
         if (servlet instanceof FrameworkServlet) {
-            context = ((FrameworkServlet)servlet).getWebApplicationContext();
+            FrameworkServlet frameworkServlet = (FrameworkServlet)servlet;
+            context = frameworkServlet.getWebApplicationContext();
             if (context != null) {
+                log.info("Spring application context is found for servlet: " + frameworkServlet.getServletName());
                 return context;
             }
         }