Allow the spring component to receive parent application context from the composite context

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

4 files changed, 122 insertions, 46 deletions

diff --git a/sca-java-2.x/trunk/modules/implementation-spring-webapp/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/modules/implementation-spring-webapp/META-INF/MANIFEST.MF
index 42c577b6eb..81841b38f7 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring-webapp/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/trunk/modules/implementation-spring-webapp/META-INF/MANIFEST.MF
@@ -10,20 +10,25 @@ Bundle-SymbolicName: org.apache.tuscany.sca.implementation.spring.webapp
 Bundle-DocURL: http://www.apache.org/

 Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
 Import-Package: javax.servlet,

+ org.apache.tuscany.sca.context;version="2.0.0",

  org.apache.tuscany.sca.core;version="2.0.0",

  org.apache.tuscany.sca.extensibility;version="2.0.0",

+ org.apache.tuscany.sca.host.webapp;version="2.0.0",

  org.apache.tuscany.sca.implementation.spring;version="2.0.0",

  org.apache.tuscany.sca.implementation.spring.context;version="2.0.0",

+ org.apache.tuscany.sca.node;version="2.0.0",

  org.apache.tuscany.sca.provider;version="2.0.0",

  org.apache.tuscany.sca.runtime;version="2.0.0",

- org.springframework.beans;version="3.0.2.RELEASE",

- org.springframework.beans.factory;version="3.0.2.RELEASE",

- org.springframework.beans.factory.annotation;version="3.0.2.RELEASE",

- org.springframework.beans.factory.config;version="3.0.2.RELEASE",

- org.springframework.beans.factory.support;version="3.0.2.RELEASE",

- org.springframework.beans.factory.xml;version="3.0.2.RELEASE",

- org.springframework.context;version="3.0.2.RELEASE",

- org.springframework.context.support;version="3.0.2.RELEASE",

- org.springframework.core.io;version="3.0.2.RELEASE",

- org.springframework.util;version="3.0.2.RELEASE"

+ org.springframework.beans,

+ org.springframework.beans.factory,

+ org.springframework.beans.factory.annotation,

+ org.springframework.beans.factory.config,

+ org.springframework.beans.factory.support,

+ org.springframework.beans.factory.xml,

+ org.springframework.context,

+ org.springframework.context.support,

+ org.springframework.core.io,

+ org.springframework.util,

+ org.springframework.web.servlet;resolution:=optional

+

 

diff --git a/sca-java-2.x/trunk/modules/implementation-spring-webapp/pom.xml b/sca-java-2.x/trunk/modules/implementation-spring-webapp/pom.xml
index 081af3c80d..0d593caa67 100644
--- a/sca-java-2.x/trunk/modules/implementation-spring-webapp/pom.xml
+++ b/sca-java-2.x/trunk/modules/implementation-spring-webapp/pom.xml
@@ -35,6 +35,18 @@
             <artifactId>tuscany-implementation-spring-runtime</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-webapp</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-core-spi</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
@@ -46,15 +58,21 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
-            <version>3.0.2.RELEASE</version>
+            <version>3.0.5.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <version>3.0.5.RELEASE</version>
         </dependency>
 
         <dependency>
-        	<groupId>javax.servlet</groupId>
-        	<artifactId>servlet-api</artifactId>
-        	<version>2.5</version>
-        	<type>jar</type>
-        	<scope>provided</scope>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.5</version>
+            <type>jar</type>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 </project>
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
new file mode 100644
index 0000000000..4a615b9a3a
--- /dev/null
+++ b/sca-java-2.x/trunk/modules/implementation-spring-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/spring/TuscanyDispatcherServlet.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.host.webapp.spring;
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+
+import org.apache.tuscany.sca.host.webapp.WebAppHelper;
+import org.apache.tuscany.sca.host.webapp.WebContextConfigurator;
+import org.springframework.web.servlet.DispatcherServlet;
+
+/**
+ * A Servlet that provides a hook to control the lifecycle of Tuscany node and extend Spring Web MVC's DispatcherServlet
+ *
+ * @version $Rev$ $Date$
+ */
+public class TuscanyDispatcherServlet extends DispatcherServlet {
+    private static final long serialVersionUID = 1L;
+    private Logger logger = Logger.getLogger(TuscanyDispatcherServlet.class.getName());
+
+    private transient WebContextConfigurator configurator;
+
+    public TuscanyDispatcherServlet() {
+        super();
+    }
+
+    @Override
+    public void init(ServletConfig config) throws ServletException {
+        try {
+            super.init(config);
+            WebAppHelper.init(WebAppHelper.getConfigurator(this));
+        } catch (Throwable e) {
+            logger.log(Level.SEVERE, e.getMessage(), e);
+            configurator.getServletContext().log(e.getMessage(), e);
+            throw new ServletException(e);
+        }
+    }
+
+    public void destroy() {
+        WebAppHelper.stop(configurator);
+        super.destroy();
+    }
+
+}
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 f95ba27242..d9596e3ecf 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
@@ -21,53 +21,42 @@ package org.apache.tuscany.sca.implementation.spring.webapp;
 
 import java.util.logging.Logger;
 
+import javax.servlet.Servlet;
 import javax.servlet.ServletContext;
 
 import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.LifeCycleListener;
-import org.apache.tuscany.sca.host.http.ExtensibleServletHost;
 import org.apache.tuscany.sca.implementation.spring.context.SpringApplicationContextAccessor;
+import org.apache.tuscany.sca.runtime.RuntimeComponent;
 import org.springframework.context.ApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
+import org.springframework.web.servlet.FrameworkServlet;
 
-public class SpringWebApplicationContextAccessor implements SpringApplicationContextAccessor, LifeCycleListener {
+public class SpringWebApplicationContextAccessor implements SpringApplicationContextAccessor {
     private static Logger log = Logger.getLogger(SpringWebApplicationContextAccessor.class.getName());
-    private ExtensionPointRegistry registry;
-    private ApplicationContext parentApplicationContext;
 
     public SpringWebApplicationContextAccessor(ExtensionPointRegistry registry) {
         super();
-        this.registry = registry;
     }
 
-    @Override
-    public void start() {
-        ExtensibleServletHost servletHost = ExtensibleServletHost.getInstance(registry);
-
-        ServletContext servletContext = servletHost.getServletContext();
-        if (servletContext != null) {
-            parentApplicationContext = WebApplicationContextUtils.getWebApplicationContext(servletContext);
-            if (parentApplicationContext != null) {
-                log.info("Spring WebApplicationContext is now injected on Tuscany");
+    public ApplicationContext getParentApplicationContext(RuntimeComponent component) {
+        ApplicationContext context = null;
+        Servlet servlet = component.getComponentContext().getCompositeContext().getAttribute(Servlet.class.getName());
+        if (servlet instanceof FrameworkServlet) {
+            context = ((FrameworkServlet)servlet).getWebApplicationContext();
+            if (context != null) {
+                return context;
             }
         }
-
-        if (parentApplicationContext == null) {
-            parentApplicationContext = ApplicationContextAccessorBean.getInstance().getApplicationContext();
+        ServletContext servletContext =
+            component.getComponentContext().getCompositeContext().getAttribute(ServletContext.class.getName());
+        if (servletContext != null) {
+            context = WebApplicationContextUtils.getWebApplicationContext(servletContext);
+            if (context == null) {
+                context = ApplicationContextAccessorBean.getInstance().getApplicationContext();
+            }
         }
-    }
-
-    @Override
-    public void stop() {
-        parentApplicationContext = null;
-    }
-
-    public ApplicationContext getParentApplicationContext() {
-        return parentApplicationContext;
-    }
 
-    public void setParentApplicationContext(ApplicationContext parentApplicationContext) {
-        this.parentApplicationContext = parentApplicationContext;
+        return context;
     }
 
 }