You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ri...@apache.org on 2006/10/04 00:09:03 UTC
svn commit: r452655 - in /incubator/tuscany/java/sca:
kernel/core/src/main/java/org/apache/tuscany/core/component/scope/
runtime/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/
Author: rineholt
Date: Tue Oct 3 15:09:02 2006
New Revision: 452655
URL: http://svn.apache.org/viewvc?view=rev&rev=452655
Log:
TUSCANY-777
http://issues.apache.org/jira/browse/TUSCANY-777
Complete plumbing so HttpSession start and stop events are sent to HttpSessionScopeContainer
Added:
incubator/tuscany/java/sca/runtime/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/UnSupportedRuntimeException.java
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeContainer.java
incubator/tuscany/java/sca/runtime/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/ServletHostImpl.java
incubator/tuscany/java/sca/runtime/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeImpl.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeContainer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeContainer.java?view=diff&rev=452655&r1=452654&r2=452655
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeContainer.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/component/scope/HttpSessionScopeContainer.java Tue Oct 3 15:09:02 2006
@@ -61,15 +61,19 @@
public void onEvent(Event event) {
checkInit();
- if (event instanceof HttpSessionStart) {
+ if (event instanceof HttpSessionStart) {
Object key = ((HttpSessionStart) event).getId();
+ workContext.setIdentifier(HTTP_IDENTIFIER, key);
for (Map.Entry<AtomicComponent, Map<Object, InstanceWrapper>> entry : contexts.entrySet()) {
if (entry.getKey().isEagerInit()) {
+
getInstance(entry.getKey(), key);
}
}
} else if (event instanceof HttpSessionEnd) {
- shutdownInstances(((HttpSessionEnd) event).getId());
+ Object key = ((HttpSessionEnd) event).getId();
+ shutdownInstances(key);
+ workContext.clearIdentifier(key);
}
}
Modified: incubator/tuscany/java/sca/runtime/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/ServletHostImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/ServletHostImpl.java?view=diff&rev=452655&r1=452654&r2=452655
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/ServletHostImpl.java (original)
+++ incubator/tuscany/java/sca/runtime/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/ServletHostImpl.java Tue Oct 3 15:09:02 2006
@@ -21,26 +21,34 @@
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
+
import javax.servlet.Servlet;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
+import org.apache.tuscany.host.servlet.ServletRequestInjector;
+import org.apache.tuscany.spi.annotation.Autowire;
+import org.apache.tuscany.spi.component.ScopeContainer;
+import org.apache.tuscany.spi.component.ScopeRegistry;
+import org.apache.tuscany.spi.event.Event;
+import org.apache.tuscany.spi.event.EventFilter;
+import org.apache.tuscany.spi.event.EventPublisher;
+import org.apache.tuscany.spi.event.RuntimeEventListener;
+import org.apache.tuscany.spi.host.ServletHost;
+import org.apache.tuscany.spi.model.Scope;
import org.osoa.sca.annotations.Init;
import org.osoa.sca.annotations.Service;
-import org.apache.tuscany.spi.host.ServletHost;
-
-import org.apache.tuscany.host.servlet.ServletRequestInjector;
-
/**
* A <code>ServletHost</code> implementation that forwards requests to registered servlets
*/
@Service(ServletHost.class)
-public class ServletHostImpl implements ServletHost, ServletRequestInjector {
+public class ServletHostImpl implements ServletHost, ServletRequestInjector, EventPublisher {
protected Map<String, Servlet> servlets;
+
public ServletHostImpl() {
this.servlets = new HashMap<String, Servlet>();
@@ -49,6 +57,15 @@
@Init(eager = true)
public void init() {
}
+
+ protected ScopeRegistry registry= null;
+
+
+ @Autowire(required=false)
+ public void setSessionScopeContainer(ScopeRegistry registry) {
+ this.registry = registry;
+ }
+
public void service(ServletRequest req, ServletResponse resp) throws ServletException, IOException {
assert req instanceof HttpServletRequest : "implementation only supports HttpServletRequest";
@@ -69,6 +86,32 @@
public void unregisterMapping(String path) {
servlets.remove(path);
+ }
+
+ public void addListener(RuntimeEventListener listener) {
+ throw new UnSupportedRuntimeException("Not Supported");
+
+ }
+
+ public void addListener(EventFilter filter, RuntimeEventListener listener) {
+ throw new UnSupportedRuntimeException("Not Supported");
+
+ }
+
+ public void publish(Event event) {
+ if(registry != null){
+ ScopeContainer sc = registry.getScopeContainer(Scope.SESSION);
+ if(null != sc) {
+ sc.onEvent(event);
+
+ }
+ }
+
+ }
+
+ public void removeListener(RuntimeEventListener listener) {
+ throw new UnSupportedRuntimeException("Not Supported");
+
}
}
Added: incubator/tuscany/java/sca/runtime/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/UnSupportedRuntimeException.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/UnSupportedRuntimeException.java?view=auto&rev=452655
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/UnSupportedRuntimeException.java (added)
+++ incubator/tuscany/java/sca/runtime/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/UnSupportedRuntimeException.java Tue Oct 3 15:09:02 2006
@@ -0,0 +1,44 @@
+/*
+ * 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.runtime.webapp;
+
+import org.apache.tuscany.api.TuscanyRuntimeException;
+
+/**
+ * Thrown when an error is encountered booting the runtme in a web app environment
+ *
+ * @version $Rev: 439728 $ $Date: 2006-09-03 02:02:44 -0400 (Sun, 03 Sep 2006) $
+ */
+public class UnSupportedRuntimeException extends TuscanyRuntimeException {
+
+ public UnSupportedRuntimeException() {
+ }
+
+ public UnSupportedRuntimeException(String message) {
+ super(message);
+ }
+
+ public UnSupportedRuntimeException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ public UnSupportedRuntimeException(Throwable cause) {
+ super(cause);
+ }
+}
Modified: incubator/tuscany/java/sca/runtime/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeImpl.java?view=diff&rev=452655&r1=452654&r2=452655
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeImpl.java (original)
+++ incubator/tuscany/java/sca/runtime/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeImpl.java Tue Oct 3 15:09:02 2006
@@ -21,17 +21,11 @@
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
+
import javax.servlet.ServletContext;
import javax.servlet.http.HttpSessionEvent;
import javax.xml.stream.XMLInputFactory;
-import org.osoa.sca.SCA;
-
-import org.apache.tuscany.spi.bootstrap.ComponentNames;
-import org.apache.tuscany.spi.bootstrap.RuntimeComponent;
-import org.apache.tuscany.spi.component.CompositeComponent;
-import org.apache.tuscany.spi.deployer.Deployer;
-
import org.apache.tuscany.core.bootstrap.Bootstrapper;
import org.apache.tuscany.core.bootstrap.DefaultBootstrapper;
import org.apache.tuscany.core.component.event.HttpSessionEnd;
@@ -44,6 +38,12 @@
import org.apache.tuscany.host.MonitorFactory;
import org.apache.tuscany.host.RuntimeInfo;
import org.apache.tuscany.host.servlet.ServletRequestInjector;
+import org.apache.tuscany.spi.bootstrap.ComponentNames;
+import org.apache.tuscany.spi.bootstrap.RuntimeComponent;
+import org.apache.tuscany.spi.component.CompositeComponent;
+import org.apache.tuscany.spi.deployer.Deployer;
+import org.apache.tuscany.spi.event.EventPublisher;
+import org.osoa.sca.SCA;
/**
* Bootstrapper for the Tuscany runtime in a web application host. This listener manages one runtime per servlet
@@ -65,7 +65,7 @@
public class WebappRuntimeImpl extends AbstractRuntime implements WebappRuntime {
private ServletContext servletContext;
- private ServletLauncherMonitor monitor;
+
private ServletRequestInjector requestInjector;
private CompositeContextImpl context;
@@ -87,7 +87,7 @@
// Read optional system monitor factory classname
MonitorFactory mf = getMonitorFactory();
- monitor = mf.getMonitor(ServletLauncherMonitor.class);
+
XMLInputFactory xmlFactory = XMLInputFactory.newInstance("javax.xml.stream.XMLInputFactory", bootClassLoader);
@@ -163,11 +163,15 @@
}
public void sessionCreated(HttpSessionEvent event) {
- application.publish(new HttpSessionStart(this, event.getSession().getId()));
+ HttpSessionStart startSession = new HttpSessionStart(this, event.getSession().getId());
+ application.publish(startSession);
+ ((EventPublisher)requestInjector).publish(startSession);
}
public void sessionDestroyed(HttpSessionEvent event) {
- application.publish(new HttpSessionEnd(this, event.getSession().getId()));
+ HttpSessionEnd endSession = new HttpSessionEnd(this, event.getSession().getId());
+ application.publish(endSession);
+ ((EventPublisher)requestInjector).publish(endSession);
}
public void startRequest() {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org