You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jm...@apache.org on 2006/02/22 23:58:37 UTC
svn commit: r379957 - in /incubator/tuscany/java/sca:
core/src/main/java/org/apache/tuscany/core/client/
core/src/main/java/org/apache/tuscany/core/context/
core/src/main/java/org/apache/tuscany/core/context/impl/
core/src/main/java/org/apache/tuscany/...
Author: jmarino
Date: Wed Feb 22 14:58:24 2006
New Revision: 379957
URL: http://svn.apache.org/viewcvs?rev=379957&view=rev
Log:
removal of TuscanyModuleComponentContext interface
Removed:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/TuscanyModuleComponentContext.java
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/TuscanyRuntime.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AggregateContextImpl.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/webapp/HTTPSessionExpirationListener.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/webapp/TuscanyRequestFilter.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/webapp/TuscanyWebAppRuntime.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/jdk/NullProxyFactory.java
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/lifecycle/listener/TomcatWebAppLifecycleListener.java
incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/lifecycle/listener/WebAppLifecycleListener.java
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/TuscanyRuntime.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/TuscanyRuntime.java?rev=379957&r1=379956&r2=379957&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/TuscanyRuntime.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/client/TuscanyRuntime.java Wed Feb 22 14:58:24 2006
@@ -16,24 +16,32 @@
*/
package org.apache.tuscany.core.client;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.tuscany.common.monitor.MonitorFactory;
import org.apache.tuscany.common.monitor.impl.NullMonitorFactory;
import org.apache.tuscany.common.resource.loader.ResourceLoader;
import org.apache.tuscany.common.resource.loader.ResourceLoaderFactory;
+import org.apache.tuscany.core.builder.RuntimeConfigurationBuilder;
+import org.apache.tuscany.core.builder.WireBuilder;
import org.apache.tuscany.core.config.ConfigurationException;
import org.apache.tuscany.core.config.ConfigurationLoader;
import org.apache.tuscany.core.config.impl.EMFConfigurationLoader;
+import org.apache.tuscany.core.context.AggregateContext;
import org.apache.tuscany.core.context.CoreRuntimeException;
import org.apache.tuscany.core.context.EventContext;
-import org.apache.tuscany.core.context.ScopeStrategy;
-import org.apache.tuscany.core.context.TuscanyModuleComponentContext;
-import org.apache.tuscany.core.context.impl.EventContextImpl;
-import org.apache.tuscany.core.context.scope.DefaultScopeStrategy;
+import org.apache.tuscany.core.runtime.RuntimeContext;
+import org.apache.tuscany.core.runtime.RuntimeContextImpl;
+import org.apache.tuscany.core.system.builder.SystemComponentContextBuilder;
+import org.apache.tuscany.core.system.builder.SystemEntryPointBuilder;
+import org.apache.tuscany.core.system.builder.SystemExternalServiceBuilder;
import org.apache.tuscany.model.assembly.AssemblyModelContext;
import org.apache.tuscany.model.assembly.ModuleComponent;
import org.apache.tuscany.model.assembly.impl.AssemblyModelContextImpl;
import org.apache.tuscany.model.assembly.loader.AssemblyLoader;
import org.apache.tuscany.model.assembly.loader.impl.AssemblyLoaderImpl;
+import org.osoa.sca.ModuleContext;
import org.osoa.sca.SCA;
import org.osoa.sca.ServiceRuntimeException;
@@ -44,8 +52,11 @@
*/
public class TuscanyRuntime extends SCA {
private final Monitor monitor;
- private final TuscanyModuleComponentContext ctx;
private final Object sessionKey = new Object();
+
+ private final RuntimeContext runtime;
+ private AggregateContext ctx;
+
/**
* Construct a runtime using a null MonitorFactory.
@@ -82,13 +93,17 @@
ConfigurationLoader loader = new EMFConfigurationLoader(modelContext);
ModuleComponent moduleComponent = loader.loadModuleComponent(name, uri);
- // create the module component context
- EventContext context = new EventContextImpl();
- ScopeStrategy scopeStrategy = new DefaultScopeStrategy();
+ List<RuntimeConfigurationBuilder> configBuilders = new ArrayList();
+ configBuilders.add((new SystemComponentContextBuilder()));
+ configBuilders.add(new SystemEntryPointBuilder());
+ configBuilders.add(new SystemExternalServiceBuilder());
+
+ List<WireBuilder> wireBuilders = new ArrayList();
- //FIXME This is going away and will be replaced by Jim's AggregateContext
- //ctx = new TuscanyModuleComponentContextImpl(moduleComponent, context, scopeStrategy, modelContext);
- ctx = null;
+ runtime = new RuntimeContextImpl(monitorFactory,configBuilders,wireBuilders);
+ //TODO Come up with a configuration mechanism for registering Java builders
+ //TODO register an aggregate context under the root
+ //runtime.getRootContext().registerModelObject()
}
/**
@@ -96,8 +111,11 @@
*/
@Override
public void start() {
- setModuleContext(ctx);
+ setModuleContext((ModuleContext)ctx);
try {
+ runtime.start();
+ monitor.started(runtime);
+ ctx = null;
ctx.start();
ctx.fireEvent(EventContext.MODULE_START, null);
ctx.fireEvent(EventContext.REQUEST_START, null);
@@ -122,6 +140,8 @@
ctx.fireEvent(EventContext.MODULE_STOP, null);
ctx.stop();
monitor.stopped(ctx);
+ runtime.stop();
+ monitor.stopped(runtime);
}
/**
@@ -133,7 +153,7 @@
*
* @param ctx the runtime's module component context
*/
- void started(TuscanyModuleComponentContext ctx);
+ void started(AggregateContext ctx);
/**
* Event emitted when an attempt to start the runtime failed.
@@ -141,13 +161,13 @@
* @param ctx the runtime's module component context
* @param e the exception that caused the failure
*/
- void startFailed(TuscanyModuleComponentContext ctx, CoreRuntimeException e);
+ void startFailed(AggregateContext ctx, CoreRuntimeException e);
/**
* Event emitted after the runtime has been stopped.
*
* @param ctx the runtime's module component context
*/
- void stopped(TuscanyModuleComponentContext ctx);
+ void stopped(AggregateContext ctx);
}
}
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AggregateContextImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AggregateContextImpl.java?rev=379957&r1=379956&r2=379957&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AggregateContextImpl.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/impl/AggregateContextImpl.java Wed Feb 22 14:58:24 2006
@@ -30,12 +30,10 @@
import org.apache.tuscany.core.context.ScopeStrategy;
import org.apache.tuscany.core.context.ServiceNotFoundException;
import org.apache.tuscany.core.context.TargetException;
-import org.apache.tuscany.core.context.TuscanyModuleComponentContext;
import org.apache.tuscany.core.invocation.spi.ProxyFactory;
import org.apache.tuscany.core.system.annotation.Autowire;
-import org.apache.tuscany.model.assembly.AssemblyModelContext;
import org.apache.tuscany.model.assembly.Extensible;
-import org.apache.tuscany.model.assembly.ModuleComponent;
+import org.osoa.sca.ModuleContext;
import org.osoa.sca.RequestContext;
import org.osoa.sca.ServiceReference;
import org.osoa.sca.ServiceUnavailableException;
@@ -45,7 +43,7 @@
*
* @version $Rev$ $Date$
*/
-public class AggregateContextImpl extends AbstractAggregateContext implements TuscanyModuleComponentContext, ConfigurationContext {
+public class AggregateContextImpl extends AbstractAggregateContext implements ConfigurationContext, ModuleContext {
// ----------------------------------
// Fields
@@ -54,9 +52,6 @@
@Autowire(required = false)
private AutowireContext autowireContext;
- // FIXME remove
- private AssemblyModelContext modelContext;
-
// ----------------------------------
// Constructors
// ----------------------------------
@@ -132,14 +127,6 @@
}
public ServiceReference newSession(String serviceName, Object sessionId) {
- throw new UnsupportedOperationException();
- }
-
- public AssemblyModelContext getAssemblyModelContext() {
- return modelContext;
- }
-
- public ModuleComponent getModuleComponent() {
throw new UnsupportedOperationException();
}
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/webapp/HTTPSessionExpirationListener.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/webapp/HTTPSessionExpirationListener.java?rev=379957&r1=379956&r2=379957&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/webapp/HTTPSessionExpirationListener.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/webapp/HTTPSessionExpirationListener.java Wed Feb 22 14:58:24 2006
@@ -19,25 +19,25 @@
import javax.servlet.http.HttpSessionEvent;
import javax.servlet.http.HttpSessionListener;
+import org.apache.tuscany.core.context.AggregateContext;
import org.apache.tuscany.core.context.EventContext;
-import org.apache.tuscany.core.context.TuscanyModuleComponentContext;
/**
* Cleans up resources used by expired sessions
- *
+ *
* @version $Rev$ $Date$
*/
public class HTTPSessionExpirationListener implements HttpSessionListener {
- //----------------------------------
+ // ----------------------------------
// Constructors
- //----------------------------------
+ // ----------------------------------
public HTTPSessionExpirationListener() {
}
- //----------------------------------
+ // ----------------------------------
// Methods
- //----------------------------------
+ // ----------------------------------
public void sessionCreated(HttpSessionEvent event) {
// do nothing since sessions are lazily created in {@link
@@ -52,8 +52,8 @@
tuscanyRuntime.start();
// End the session
- TuscanyModuleComponentContext moduleComponentContext = tuscanyRuntime.getModuleComponentContext();
- moduleComponentContext.fireEvent(EventContext.SESSION_END, event.getSession());
+ AggregateContext context = tuscanyRuntime.getModuleComponentContext();
+ context.fireEvent(EventContext.SESSION_END, event.getSession());
} finally {
if (tuscanyRuntime != null)
tuscanyRuntime.stop();
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/webapp/TuscanyRequestFilter.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/webapp/TuscanyRequestFilter.java?rev=379957&r1=379956&r2=379957&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/webapp/TuscanyRequestFilter.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/webapp/TuscanyRequestFilter.java Wed Feb 22 14:58:24 2006
@@ -17,6 +17,7 @@
package org.apache.tuscany.core.context.webapp;
import java.io.IOException;
+
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
@@ -25,14 +26,15 @@
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
+import org.apache.tuscany.core.context.AggregateContext;
import org.apache.tuscany.core.context.EventContext;
-import org.apache.tuscany.core.context.TuscanyModuleComponentContext;
/**
- * Notifies the {@link TuscanyModuleComponentContext} of web request start and end events as well as setting up the current
- * session context. The latter is done using lazy Servlet-based session retrieval. The filter fires a session start event, passing
- * a <tt>LazyServletSessionId</tt> as the session id. The <tt>LazyServletSessionId</tt> is a wrapper for the servlet request
- * which may be called by the <tt>ModuleContext</tt> to retrieve the session id lazily.
+ * Notifies the {@link org.apache.tuscany.core.context.AggregateContext} of web request start and end events as well as setting up the
+ * current session context. The latter is done using lazy Servlet-based session retrieval. The filter fires a session
+ * start event, passing a <tt>LazyServletSessionId</tt> as the session id. The <tt>LazyServletSessionId</tt> is a
+ * wrapper for the servlet request which may be called by the <tt>ModuleContext</tt> to retrieve the session id
+ * lazily.
*
* @version $Rev$ $Date$
*/
@@ -63,7 +65,7 @@
public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws ServletException,
IOException {
// Get the module component context from the tuscany runtime
- TuscanyModuleComponentContext moduleComponentContext = tuscanyRuntime.getModuleComponentContext();
+ AggregateContext context = tuscanyRuntime.getModuleComponentContext();
try {
// Start the SCA implementation
@@ -74,35 +76,27 @@
if (((HttpServletRequest) request).getSession(false) != null) {
// A session is already active
- moduleComponentContext
- .fireEvent(EventContext.SESSION_NOTIFY, ((HttpServletRequest) request).getSession(true));
+ context.fireEvent(EventContext.SESSION_NOTIFY, ((HttpServletRequest) request).getSession(true));
} else {
// Create a lazy wrapper since a session is not yet active
- moduleComponentContext.fireEvent(EventContext.SESSION_NOTIFY, new LazyHTTPSessionId(
- (HttpServletRequest) request));
+ context.fireEvent(EventContext.SESSION_NOTIFY, new LazyHTTPSessionId((HttpServletRequest) request));
}
} else {
- moduleComponentContext.fireEvent(EventContext.SESSION_NOTIFY, request);
+ context.fireEvent(EventContext.SESSION_NOTIFY, request);
}
-
// Start processing the request
- moduleComponentContext.fireEvent(EventContext.REQUEST_START, request);
-
+ context.fireEvent(EventContext.REQUEST_START, request);
// Dispatch to the next filter
filterChain.doFilter(request, response);
-
} catch (Exception e) {
throw new ServletException(e);
} finally {
try {
-
// End processing the request
- moduleComponentContext.fireEvent(EventContext.REQUEST_END, request);
-
+ context.fireEvent(EventContext.REQUEST_END, request);
// Stop the SCA implementation
tuscanyRuntime.stop();
-
} catch (Exception e) {
throw new ServletException(e);
}
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/webapp/TuscanyWebAppRuntime.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/webapp/TuscanyWebAppRuntime.java?rev=379957&r1=379956&r2=379957&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/webapp/TuscanyWebAppRuntime.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/context/webapp/TuscanyWebAppRuntime.java Wed Feb 22 14:58:24 2006
@@ -16,23 +16,23 @@
*/
package org.apache.tuscany.core.context.webapp;
+import org.apache.tuscany.core.context.AggregateContext;
+import org.osoa.sca.ModuleContext;
import org.osoa.sca.SCA;
-import org.apache.tuscany.core.context.TuscanyModuleComponentContext;
-
/**
* An implementation of the SCA runtime for use in a Web app
*
* @version $Rev$ $Date$
*/
public class TuscanyWebAppRuntime extends SCA {
- private TuscanyModuleComponentContext moduleComponentContext;
+ private AggregateContext moduleComponentContext;
// ----------------------------------
// Constructors
// ----------------------------------
- public TuscanyWebAppRuntime(TuscanyModuleComponentContext moduleComponentContext) {
+ public TuscanyWebAppRuntime(AggregateContext moduleComponentContext) {
this.moduleComponentContext = moduleComponentContext;
}
@@ -43,13 +43,13 @@
/**
* Returns the module component context associated with this runtime
*/
- public TuscanyModuleComponentContext getModuleComponentContext() {
+ public AggregateContext getModuleComponentContext() {
return moduleComponentContext;
}
public void start() {
// Associate it with the current thread
- setModuleContext(moduleComponentContext);
+ setModuleContext((ModuleContext) moduleComponentContext);
}
public void stop() {
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/jdk/NullProxyFactory.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/jdk/NullProxyFactory.java?rev=379957&r1=379956&r2=379957&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/jdk/NullProxyFactory.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/invocation/jdk/NullProxyFactory.java Wed Feb 22 14:58:24 2006
@@ -1,35 +1,33 @@
package org.apache.tuscany.core.invocation.jdk;
-import org.apache.tuscany.core.context.TuscanyModuleComponentContext;
+import org.apache.tuscany.core.context.AggregateContext;
import org.apache.tuscany.core.invocation.ProxyConfiguration;
import org.apache.tuscany.core.invocation.spi.ProxyCreationException;
import org.apache.tuscany.core.invocation.spi.ProxyFactory;
import org.apache.tuscany.core.invocation.spi.ProxyInitializationException;
/**
- * Passes back an actual instance as opposed to a proxy. Used in cases where proxying may be optimized away.
+ * Returns an actual implementation instance as opposed to a proxy. Used in cases where proxying may be optimized away.
*
- * @FIXME optimize to support scope containers
* @version $Rev$ $Date$
*/
public class NullProxyFactory implements ProxyFactory {
- private TuscanyModuleComponentContext ctx;
+ private AggregateContext parentContext;
- private String serviceName;
+ private String targetName;
- public NullProxyFactory(String serviceName, TuscanyModuleComponentContext ctx) {
- assert (serviceName != null) : "Service name was null";
- assert (ctx != null) : "Module component context was null";
- this.serviceName = serviceName;
- this.ctx = ctx;
+ public NullProxyFactory(String componentName, AggregateContext parentContext) {
+ assert (parentContext != null) : "Parent context was null";
+ this.targetName = componentName;
+ this.parentContext = parentContext;
}
public void initialize(Class businessInterface, ProxyConfiguration config) throws ProxyInitializationException {
}
public Object createProxy() throws ProxyCreationException {
- return ctx.locateService(serviceName);
+ return parentContext.getContext(targetName);
}
public void initialize() throws ProxyInitializationException {
Modified: incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/lifecycle/listener/TomcatWebAppLifecycleListener.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/lifecycle/listener/TomcatWebAppLifecycleListener.java?rev=379957&r1=379956&r2=379957&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/lifecycle/listener/TomcatWebAppLifecycleListener.java (original)
+++ incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/lifecycle/listener/TomcatWebAppLifecycleListener.java Wed Feb 22 14:58:24 2006
@@ -32,7 +32,6 @@
import org.apache.tuscany.core.context.AggregateContext;
import org.apache.tuscany.core.context.CoreRuntimeException;
import org.apache.tuscany.core.context.EventContext;
-import org.apache.tuscany.core.context.TuscanyModuleComponentContext;
import org.apache.tuscany.core.context.impl.EventContextImpl;
import org.apache.tuscany.core.context.scope.DefaultScopeStrategy;
import org.apache.tuscany.core.context.webapp.HTTPSessionExpirationListener;
@@ -120,19 +119,19 @@
//FIXME TuscanyModuleComponentContext replaced by new bootstrap code
// TuscanyModuleComponentContext moduleComponentContext = new TuscanyModuleComponentContextImpl(
// moduleComponent, eventContext, scopeStrategy, modelContext);
- TuscanyModuleComponentContext moduleComponentContext=null;
+ AggregateContext aggregateContext=null;
// Create a Tuscany runtime and store it in the servlet
// context
- TuscanyWebAppRuntime tuscanyRuntime = new TuscanyWebAppRuntime(moduleComponentContext);
+ TuscanyWebAppRuntime tuscanyRuntime = new TuscanyWebAppRuntime(aggregateContext);
context.getServletContext().setAttribute(TuscanyWebAppRuntime.class.getName(), tuscanyRuntime);
// Start the runtime and the module component context
tuscanyRuntime.start();
try {
- moduleComponentContext.start();
+ aggregateContext.start();
- moduleComponentContext.fireEvent(EventContext.MODULE_START, null);
+ aggregateContext.fireEvent(EventContext.MODULE_START, null);
} finally {
tuscanyRuntime.stop();
@@ -177,14 +176,10 @@
// Start the runtime
tuscanyRuntime.start();
try {
-
// Stop the module context
- TuscanyModuleComponentContext moduleComponentContext = tuscanyRuntime.getModuleComponentContext();
-
- moduleComponentContext.fireEvent(EventContext.MODULE_STOP, null);
-
- moduleComponentContext.stop();
-
+ AggregateContext aggregateContext = tuscanyRuntime.getModuleComponentContext();
+ aggregateContext.fireEvent(EventContext.MODULE_STOP, null);
+ aggregateContext.stop();
} finally {
// Stop the runtime
Modified: incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/lifecycle/listener/WebAppLifecycleListener.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/lifecycle/listener/WebAppLifecycleListener.java?rev=379957&r1=379956&r2=379957&view=diff
==============================================================================
--- incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/lifecycle/listener/WebAppLifecycleListener.java (original)
+++ incubator/tuscany/java/sca/tomcat/src/main/java/org/apache/tuscany/tomcat/lifecycle/listener/WebAppLifecycleListener.java Wed Feb 22 14:58:24 2006
@@ -26,13 +26,13 @@
import org.apache.catalina.deploy.FilterDef;
import org.apache.catalina.deploy.FilterMap;
import org.apache.tuscany.core.TuscanyRuntimeException;
-import org.apache.tuscany.core.runtime.RuntimeContext;
import org.apache.tuscany.core.config.ConfigurationException;
+import org.apache.tuscany.core.context.AggregateContext;
import org.apache.tuscany.core.context.EventContext;
-import org.apache.tuscany.core.context.TuscanyModuleComponentContext;
import org.apache.tuscany.core.context.webapp.HTTPSessionExpirationListener;
import org.apache.tuscany.core.context.webapp.TuscanyRequestFilter;
import org.apache.tuscany.core.context.webapp.TuscanyWebAppRuntime;
+import org.apache.tuscany.core.runtime.RuntimeContext;
import org.apache.tuscany.core.runtime.RuntimeMonitor;
import org.apache.tuscany.model.assembly.ModuleComponent;
@@ -81,21 +81,20 @@
Context context = (Context) lifecycleEventSource;
String name = context.getPath().substring(1);
try {
- ModuleComponent moduleComponent = null;//FIXME runtime.loadModuleComponent(name, "sca.module");
+ ModuleComponent moduleComponent = null;// FIXME runtime.loadModuleComponent(name, "sca.module");
if (moduleComponent == null) {
return; // not an SCA module component
}
// create the module component
runtime.registerModelObject(moduleComponent);
- TuscanyModuleComponentContext moduleComponentContext = (TuscanyModuleComponentContext) runtime
- .getContext(moduleComponent.getName());
- TuscanyWebAppRuntime tuscanyRuntime = new TuscanyWebAppRuntime(moduleComponentContext);
+ AggregateContext aggregateContext = (AggregateContext) runtime.getContext(moduleComponent.getName());
+ TuscanyWebAppRuntime tuscanyRuntime = new TuscanyWebAppRuntime(aggregateContext);
context.getServletContext().setAttribute(TuscanyWebAppRuntime.class.getName(), tuscanyRuntime);
// Start the runtime and the module component context
tuscanyRuntime.start();
try {
- moduleComponentContext.start();
- moduleComponentContext.fireEvent(EventContext.MODULE_START, null);
+ aggregateContext.start();
+ aggregateContext.fireEvent(EventContext.MODULE_START, null);
} finally {
tuscanyRuntime.stop();
}
@@ -132,9 +131,9 @@
try {
// Stop the module context
tuscanyRuntime.start();
- TuscanyModuleComponentContext moduleComponentContext = tuscanyRuntime.getModuleComponentContext();
- moduleComponentContext.fireEvent(EventContext.MODULE_STOP, null);
- moduleComponentContext.stop();
+ AggregateContext aggregateContext = tuscanyRuntime.getModuleComponentContext();
+ aggregateContext.fireEvent(EventContext.MODULE_STOP, null);
+ aggregateContext.stop();
} catch (TuscanyRuntimeException e) {
monitor.log(e);
} finally {