summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/branches/2.0-Beta2/modules/implementation-spring-webapp/src
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--sca-java-2.x/branches/2.0-Beta2/modules/implementation-spring-webapp/src/main/java/org/apache/tuscany/sca/implementation/spring/webapp/ApplicationContextAccessorBean.java43
-rw-r--r--sca-java-2.x/branches/2.0-Beta2/modules/implementation-spring-webapp/src/main/java/org/apache/tuscany/sca/implementation/spring/webapp/SpringWebApplicationContextAccessor.java73
-rw-r--r--sca-java-2.x/branches/2.0-Beta2/modules/implementation-spring-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.spring.context.SpringApplicationContextAccessor17
-rw-r--r--sca-java-2.x/branches/2.0-Beta2/modules/implementation-spring-webapp/src/main/resources/org/apache/tuscany/sca/implementation/spring/webapp/spring-webapp-context.xml29
-rw-r--r--sca-java-2.x/branches/2.0-Beta2/modules/implementation-spring-webapp/src/test/java/org/apache/tuscany/sca/implementation/spring/webapp/ApplicationContextAccessorTestCase.java41
5 files changed, 0 insertions, 203 deletions
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/implementation-spring-webapp/src/main/java/org/apache/tuscany/sca/implementation/spring/webapp/ApplicationContextAccessorBean.java b/sca-java-2.x/branches/2.0-Beta2/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/branches/2.0-Beta2/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/branches/2.0-Beta2/modules/implementation-spring-webapp/src/main/java/org/apache/tuscany/sca/implementation/spring/webapp/SpringWebApplicationContextAccessor.java b/sca-java-2.x/branches/2.0-Beta2/modules/implementation-spring-webapp/src/main/java/org/apache/tuscany/sca/implementation/spring/webapp/SpringWebApplicationContextAccessor.java
deleted file mode 100644
index f95ba27242..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/implementation-spring-webapp/src/main/java/org/apache/tuscany/sca/implementation/spring/webapp/SpringWebApplicationContextAccessor.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.implementation.spring.webapp;
-
-import java.util.logging.Logger;
-
-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.springframework.context.ApplicationContext;
-import org.springframework.web.context.support.WebApplicationContextUtils;
-
-public class SpringWebApplicationContextAccessor implements SpringApplicationContextAccessor, LifeCycleListener {
- 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");
- }
- }
-
- if (parentApplicationContext == null) {
- parentApplicationContext = ApplicationContextAccessorBean.getInstance().getApplicationContext();
- }
- }
-
- @Override
- public void stop() {
- parentApplicationContext = null;
- }
-
- public ApplicationContext getParentApplicationContext() {
- return parentApplicationContext;
- }
-
- public void setParentApplicationContext(ApplicationContext parentApplicationContext) {
- this.parentApplicationContext = parentApplicationContext;
- }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/implementation-spring-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.spring.context.SpringApplicationContextAccessor b/sca-java-2.x/branches/2.0-Beta2/modules/implementation-spring-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.spring.context.SpringApplicationContextAccessor
deleted file mode 100644
index 506b02c782..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/implementation-spring-webapp/src/main/resources/META-INF/services/org.apache.tuscany.sca.implementation.spring.context.SpringApplicationContextAccessor
+++ /dev/null
@@ -1,17 +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.
-org.apache.tuscany.sca.implementation.spring.webapp.SpringWebApplicationContextAccessor \ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/implementation-spring-webapp/src/main/resources/org/apache/tuscany/sca/implementation/spring/webapp/spring-webapp-context.xml b/sca-java-2.x/branches/2.0-Beta2/modules/implementation-spring-webapp/src/main/resources/org/apache/tuscany/sca/implementation/spring/webapp/spring-webapp-context.xml
deleted file mode 100644
index b98374a88b..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/implementation-spring-webapp/src/main/resources/org/apache/tuscany/sca/implementation/spring/webapp/spring-webapp-context.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
-
- <bean id="tuscanySpringApplicationContextAccessor"
- class="org.apache.tuscany.sca.implementation.spring.webapp.ApplicationContextAccessorBean"
- scope="singleton" factory-method="getInstance">
- </bean>
-
-</beans>
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/implementation-spring-webapp/src/test/java/org/apache/tuscany/sca/implementation/spring/webapp/ApplicationContextAccessorTestCase.java b/sca-java-2.x/branches/2.0-Beta2/modules/implementation-spring-webapp/src/test/java/org/apache/tuscany/sca/implementation/spring/webapp/ApplicationContextAccessorTestCase.java
deleted file mode 100644
index 6a5ae882b1..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/implementation-spring-webapp/src/test/java/org/apache/tuscany/sca/implementation/spring/webapp/ApplicationContextAccessorTestCase.java
+++ /dev/null
@@ -1,41 +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.junit.Assert;
-import org.junit.Test;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-public class ApplicationContextAccessorTestCase {
-
- @Test
- public void testContext() {
- ApplicationContext context =
- new ClassPathXmlApplicationContext(
- new String[] {"org/apache/tuscany/sca/implementation/spring/webapp/spring-webapp-context.xml"});
- Object accessor = context.getBean(ApplicationContextAccessorBean.BEAN_ID);
- Assert.assertSame(ApplicationContextAccessorBean.getInstance(), accessor);
- ApplicationContextAccessorBean contextAccessor = (ApplicationContextAccessorBean)accessor;
- Assert.assertSame(context, contextAccessor.getApplicationContext());
-
- }
-
-}