Official Tuscany 2.0.1 Release

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

3 files changed, 0 insertions, 180 deletions

diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/implementation-spring-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/spring/TuscanyDispatcherServlet.java b/sca-java-2.x/tags/2.0.1-RC1/modules/implementation-spring-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/spring/TuscanyDispatcherServlet.java
deleted file mode 100644
index 9976ab0100..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/implementation-spring-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/spring/TuscanyDispatcherServlet.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * 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.apache.tuscany.sca.node.Node;
-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;
-    private transient Node node;
-
-    public TuscanyDispatcherServlet() {
-        super();
-    }
-
-    @Override
-    public void init(ServletConfig config) throws ServletException {
-        try {
-            super.init(config);
-            configurator = WebAppHelper.getConfigurator(this);
-            node = WebAppHelper.init(configurator);
-        } 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);
-        node = null;
-        configurator = null;
-        super.destroy();
-    }
-
-    public Node getNode() {
-        return node;
-    }
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/implementation-spring-webapp/src/main/java/org/apache/tuscany/sca/implementation/spring/webapp/ApplicationContextAccessorBean.java b/sca-java-2.x/tags/2.0.1-RC1/modules/implementation-spring-webapp/src/main/java/org/apache/tuscany/sca/implementation/spring/webapp/ApplicationContextAccessorBean.java
deleted file mode 100644
index a54ef8df17..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/implementation-spring-webapp/src/main/java/org/apache/tuscany/sca/implementation/spring/webapp/ApplicationContextAccessorBean.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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.implementation.spring.webapp;
-
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.context.support.ApplicationObjectSupport;
-
-/**
- * A singleton utility class that can be added to the Spring application context to receive injection of the containing
- * Spring application context.
- * 
- * The Spring bean definition file is: org/apache/tuscany/sca/implementation/spring/webapp/spring-webapp-context.xml
- */
-public class ApplicationContextAccessorBean extends ApplicationObjectSupport implements ApplicationContextAware {
-    public final static String BEAN_ID = "tuscanySpringApplicationContextAccessor";
-    private final static ApplicationContextAccessorBean INSTANCE = new ApplicationContextAccessorBean();
-
-    private ApplicationContextAccessorBean() {
-    }
-
-    // Spring static factory method to create the singleton instance
-    public static ApplicationContextAccessorBean getInstance() {
-        return INSTANCE;
-    }
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/implementation-spring-webapp/src/main/java/org/apache/tuscany/sca/implementation/spring/webapp/SpringWebApplicationContextAccessor.java b/sca-java-2.x/tags/2.0.1-RC1/modules/implementation-spring-webapp/src/main/java/org/apache/tuscany/sca/implementation/spring/webapp/SpringWebApplicationContextAccessor.java
deleted file mode 100644
index d94494fbe0..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/implementation-spring-webapp/src/main/java/org/apache/tuscany/sca/implementation/spring/webapp/SpringWebApplicationContextAccessor.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * 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.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.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 {
-    private static Logger log = Logger.getLogger(SpringWebApplicationContextAccessor.class.getName());
-
-    public SpringWebApplicationContextAccessor(ExtensionPointRegistry registry) {
-        super();
-    }
-
-    public ApplicationContext getParentApplicationContext(RuntimeComponent component) {
-        ApplicationContext context = null;
-        Servlet servlet = component.getComponentContext().getCompositeContext().getAttribute(Servlet.class.getName());
-        if (servlet instanceof FrameworkServlet) {
-            FrameworkServlet frameworkServlet = (FrameworkServlet)servlet;
-            context = frameworkServlet.getWebApplicationContext();
-            if (context != null) {
-                log.info("Spring application context is found for servlet: " + frameworkServlet.getServletName());
-                return context;
-            }
-        }
-        ServletContext servletContext =
-            component.getComponentContext().getCompositeContext().getAttribute(ServletContext.class.getName());
-        if (servletContext != null) {
-            context = WebApplicationContextUtils.getWebApplicationContext(servletContext);
-            if (context == null) {
-                context = ApplicationContextAccessorBean.getInstance().getApplicationContext();
-            }
-        }
-
-        return context;
-    }
-
-}