You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jb...@apache.org on 2007/02/02 21:54:36 UTC
svn commit: r502748 - in /incubator/tuscany/java/sca/runtime:
standalone/launcher/src/main/java/org/apache/tuscany/launcher/
standalone/server.shutdown/ standalone/server.start/
webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/ webapp/...
Author: jboynes
Date: Fri Feb 2 12:54:35 2007
New Revision: 502748
URL: http://svn.apache.org/viewvc?view=rev&rev=502748
Log:
make runtime compile against latest spec api
application initialization is not yet converted
Modified:
incubator/tuscany/java/sca/runtime/standalone/launcher/src/main/java/org/apache/tuscany/launcher/Main.java
incubator/tuscany/java/sca/runtime/standalone/server.shutdown/pom.xml
incubator/tuscany/java/sca/runtime/standalone/server.start/pom.xml
incubator/tuscany/java/sca/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyContextListener.java
incubator/tuscany/java/sca/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyFilter.java
incubator/tuscany/java/sca/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/TuscanyContextListenerTestCase.java
incubator/tuscany/java/sca/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/TuscanyFilterTestCase.java
incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeImpl.java
incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/test/java/org/apache/tuscany/runtime/webapp/WebappRuntimeImplTestCase.java
Modified: incubator/tuscany/java/sca/runtime/standalone/launcher/src/main/java/org/apache/tuscany/launcher/Main.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/standalone/launcher/src/main/java/org/apache/tuscany/launcher/Main.java?view=diff&rev=502748&r1=502747&r2=502748
==============================================================================
--- incubator/tuscany/java/sca/runtime/standalone/launcher/src/main/java/org/apache/tuscany/launcher/Main.java (original)
+++ incubator/tuscany/java/sca/runtime/standalone/launcher/src/main/java/org/apache/tuscany/launcher/Main.java Fri Feb 2 12:54:35 2007
@@ -29,9 +29,6 @@
import java.util.jar.JarFile;
import java.util.jar.Manifest;
-import org.osoa.sca.CompositeContext;
-import org.osoa.sca.CurrentCompositeContext;
-
import org.apache.tuscany.host.runtime.TuscanyRuntime;
import org.apache.tuscany.runtime.standalone.DirectoryHelper;
import org.apache.tuscany.runtime.standalone.StandaloneRuntimeInfo;
@@ -68,16 +65,13 @@
URL applicationScdl = getApplicationScdl(applicationClassLoader);
+/*
CompositeContext context = runtime.deployApplication("application",
applicationScdl,
applicationClassLoader);
- CompositeContext old = CurrentCompositeContext.setContext(context);
- try {
- runApplication(applicationJar, applicationClassLoader, appArgs);
- } finally {
- CurrentCompositeContext.setContext(old);
- }
+*/
+ runApplication(applicationJar, applicationClassLoader, appArgs);
} finally {
runtime.destroy();
}
Modified: incubator/tuscany/java/sca/runtime/standalone/server.shutdown/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/standalone/server.shutdown/pom.xml?view=diff&rev=502748&r1=502747&r2=502748
==============================================================================
--- incubator/tuscany/java/sca/runtime/standalone/server.shutdown/pom.xml (original)
+++ incubator/tuscany/java/sca/runtime/standalone/server.shutdown/pom.xml Fri Feb 2 12:54:35 2007
@@ -34,10 +34,6 @@
-->
<dependencies>
<dependency>
- <groupId>org.osoa</groupId>
- <artifactId>sca-api-r0.95</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.tuscany.sca.runtime.standalone</groupId>
<artifactId>standalone-api</artifactId>
<version>${sca.version}</version>
Modified: incubator/tuscany/java/sca/runtime/standalone/server.start/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/standalone/server.start/pom.xml?view=diff&rev=502748&r1=502747&r2=502748
==============================================================================
--- incubator/tuscany/java/sca/runtime/standalone/server.start/pom.xml (original)
+++ incubator/tuscany/java/sca/runtime/standalone/server.start/pom.xml Fri Feb 2 12:54:35 2007
@@ -34,10 +34,6 @@
-->
<dependencies>
<dependency>
- <groupId>org.osoa</groupId>
- <artifactId>sca-api-r0.95</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.tuscany.sca.runtime.standalone</groupId>
<artifactId>standalone-api</artifactId>
<version>${sca.version}</version>
Modified: incubator/tuscany/java/sca/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyContextListener.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyContextListener.java?view=diff&rev=502748&r1=502747&r2=502748
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyContextListener.java (original)
+++ incubator/tuscany/java/sca/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyContextListener.java Fri Feb 2 12:54:35 2007
@@ -69,8 +69,10 @@
runtime.setRuntimeInfo(info);
runtime.setHostClassLoader(webappClassLoader);
runtime.setSystemScdl(systemScdl);
+/*
runtime.setApplicationName(name);
runtime.setApplicationScdl(applicationScdl);
+*/
runtime.initialize();
servletContext.setAttribute(RUNTIME_ATTRIBUTE, runtime);
Modified: incubator/tuscany/java/sca/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyFilter.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyFilter.java?view=diff&rev=502748&r1=502747&r2=502748
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyFilter.java (original)
+++ incubator/tuscany/java/sca/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/TuscanyFilter.java Fri Feb 2 12:54:35 2007
@@ -27,11 +27,7 @@
import javax.servlet.ServletResponse;
import javax.servlet.ServletContext;
-import org.osoa.sca.CompositeContext;
-import org.osoa.sca.CurrentCompositeContext;
-
import static org.apache.tuscany.runtime.webapp.Constants.RUNTIME_ATTRIBUTE;
-import static org.apache.tuscany.runtime.webapp.Constants.CONTEXT_ATTRIBUTE;
/**
* Maps an incoming request and the current composite context to the composite component for the web application. This
@@ -41,7 +37,6 @@
* @version $Rev$ $Date$
*/
public class TuscanyFilter implements Filter {
- private CompositeContext context;
private WebappRuntime runtime;
public void init(FilterConfig config) throws ServletException {
@@ -50,26 +45,19 @@
if (runtime == null) {
throw new ServletException("Tuscany is not configured for the web application");
}
- context = (CompositeContext) servletContext.getAttribute(CONTEXT_ATTRIBUTE);
- if (context == null) {
- throw new ServletException("No context specified");
- }
}
public void doFilter(ServletRequest req, ServletResponse resp, FilterChain filterChain)
throws IOException, ServletException {
- CompositeContext oldContext = CurrentCompositeContext.setContext(context);
try {
runtime.startRequest();
filterChain.doFilter(req, resp);
} finally {
- CurrentCompositeContext.setContext(oldContext);
runtime.stopRequest();
}
}
public void destroy() {
- context = null;
runtime = null;
}
}
Modified: incubator/tuscany/java/sca/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/TuscanyContextListenerTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/TuscanyContextListenerTestCase.java?view=diff&rev=502748&r1=502747&r2=502748
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/TuscanyContextListenerTestCase.java (original)
+++ incubator/tuscany/java/sca/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/TuscanyContextListenerTestCase.java Fri Feb 2 12:54:35 2007
@@ -67,8 +67,10 @@
runtime.setRuntimeInfo(isA(WebappRuntimeInfo.class));
runtime.setHostClassLoader(cl);
runtime.setSystemScdl(systemUrl);
+/*
runtime.setApplicationName("application");
runtime.setApplicationScdl(applicationUrl);
+*/
runtime.initialize();
replay(runtime);
Modified: incubator/tuscany/java/sca/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/TuscanyFilterTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/TuscanyFilterTestCase.java?view=diff&rev=502748&r1=502747&r2=502748
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/TuscanyFilterTestCase.java (original)
+++ incubator/tuscany/java/sca/runtime/webapp/webapp-api/src/test/java/org/apache/tuscany/runtime/webapp/TuscanyFilterTestCase.java Fri Feb 2 12:54:35 2007
@@ -28,9 +28,7 @@
import junit.framework.TestCase;
import org.easymock.EasyMock;
-import org.osoa.sca.CompositeContext;
-import static org.apache.tuscany.runtime.webapp.Constants.CONTEXT_ATTRIBUTE;
import static org.apache.tuscany.runtime.webapp.Constants.RUNTIME_ATTRIBUTE;
/**
@@ -41,7 +39,6 @@
private FilterConfig config;
private ServletContext servletContext;
private WebappRuntime runtime;
- private CompositeContext context;
private ServletRequest request;
private ServletResponse response;
private FilterChain chain;
@@ -49,12 +46,10 @@
public void testFilterInit() {
EasyMock.expect(config.getServletContext()).andReturn(servletContext);
EasyMock.expect(servletContext.getAttribute(RUNTIME_ATTRIBUTE)).andReturn(runtime);
- EasyMock.expect(servletContext.getAttribute(CONTEXT_ATTRIBUTE)).andReturn(context);
EasyMock.replay(servletContext);
EasyMock.replay(config);
EasyMock.replay(runtime);
- EasyMock.replay(context);
try {
filter.init(config);
} catch (ServletException e) {
@@ -63,7 +58,6 @@
EasyMock.verify(servletContext);
EasyMock.verify(config);
EasyMock.verify(runtime);
- EasyMock.verify(context);
}
public void testFilterInitWithNoRuntimeConfigured() {
@@ -73,7 +67,6 @@
EasyMock.replay(servletContext);
EasyMock.replay(config);
EasyMock.replay(runtime);
- EasyMock.replay(context);
try {
filter.init(config);
fail("Expected a ServletException");
@@ -83,13 +76,11 @@
EasyMock.verify(servletContext);
EasyMock.verify(config);
EasyMock.verify(runtime);
- EasyMock.verify(context);
}
public void testContextIsAssociatedWithThread() throws ServletException, IOException {
EasyMock.expect(config.getServletContext()).andReturn(servletContext);
EasyMock.expect(servletContext.getAttribute(RUNTIME_ATTRIBUTE)).andReturn(runtime);
- EasyMock.expect(servletContext.getAttribute(CONTEXT_ATTRIBUTE)).andReturn(context);
EasyMock.replay(servletContext);
EasyMock.replay(config);
filter.init(config);
@@ -114,7 +105,6 @@
config = EasyMock.createMock(FilterConfig.class);
servletContext = EasyMock.createMock(ServletContext.class);
runtime = EasyMock.createMock(WebappRuntime.class);
- context = EasyMock.createMock(CompositeContext.class);
request = EasyMock.createMock(ServletRequest.class);
response = EasyMock.createMock(ServletResponse.class);
chain = EasyMock.createMock(FilterChain.class);
Modified: incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeImpl.java?view=diff&rev=502748&r1=502747&r2=502748
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeImpl.java (original)
+++ incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeImpl.java Fri Feb 2 12:54:35 2007
@@ -18,21 +18,17 @@
*/
package org.apache.tuscany.runtime.webapp;
-import java.util.StringTokenizer;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpSessionEvent;
-import org.osoa.sca.CompositeContext;
-
import org.apache.tuscany.core.component.event.HttpRequestEnded;
import org.apache.tuscany.core.component.event.HttpRequestStart;
import org.apache.tuscany.core.component.event.HttpSessionEnd;
import org.apache.tuscany.core.component.event.HttpSessionStart;
import org.apache.tuscany.core.component.event.RequestEnd;
import org.apache.tuscany.core.component.event.RequestStart;
-import org.apache.tuscany.core.launcher.CompositeContextImpl;
import org.apache.tuscany.core.runtime.AbstractRuntime;
import org.apache.tuscany.host.runtime.InitializationException;
import org.apache.tuscany.host.servlet.ServletRequestInjector;
@@ -51,10 +47,6 @@
* the attribute {@link Constants#RUNTIME_PARAM}. The runtime implements {@link WebappRuntime} so that filters and
* servlets loaded in the parent web app classloader may pass events and requests to it.
* <p/>
- * By default, the top-most application composite component will be returned when "non-managed" web application code
- * such as JSPs call {@link org.osoa.sca.CurrentCompositeContext}. If a composite deeper in the hierarchy should be
- * returned instead, the <code>web.xml</code> must contain an entry for {@link Constants#CURRENT_COMPOSITE_PATH_PARAM}
- * whose value is a component path expression using '/' as a delimeter such as foo/bar/baz.
*
* @version $$Rev$$ $$Date$$
*/
@@ -64,7 +56,6 @@
private ServletRequestInjector requestInjector;
- private CompositeContextImpl context;
private CompositeComponent application;
public ServletContext getServletContext() {
@@ -100,6 +91,7 @@
throw new TuscanyInitException("Could not find application SCDL");
}
getRuntime().getRootComponent().start();
+/*
application = deployApplicationScdl(getDeployer(),
getRuntime().getRootComponent(),
getApplicationName(),
@@ -120,13 +112,13 @@
}
context = new CompositeContextImpl(current, getWireService());
servletContext.setAttribute(Constants.CONTEXT_ATTRIBUTE, context);
+*/
} catch (Exception e) {
throw new ServletLauncherInitException(e);
}
}
public void destroy() {
- servletContext.removeAttribute(Constants.CONTEXT_ATTRIBUTE);
if (application != null) {
application.stop();
application = null;
@@ -134,10 +126,6 @@
super.destroy();
}
- public CompositeContext getContext() {
- return context;
- }
-
public ServletRequestInjector getRequestInjector() {
return requestInjector;
}
@@ -158,22 +146,30 @@
HttpSession session = request.getSession(false);
Object sessionId = session == null ? new LazyHTTPSessionId(request) : session.getId();
HttpRequestStart httpRequestStart = new HttpRequestStart(this, sessionId);
+/*
application.publish(httpRequestStart);
+*/
((EventPublisher) requestInjector).publish(httpRequestStart);
}
public void httpRequestEnded(Object sessionid) {
HttpRequestEnded httpRequestEnded = new HttpRequestEnded(this, sessionid);
+/*
application.publish(httpRequestEnded);
+*/
((EventPublisher) requestInjector).publish(httpRequestEnded);
}
public void startRequest() {
+/*
application.publish(new RequestStart(this));
+*/
}
public void stopRequest() {
+/*
application.publish(new RequestEnd(this));
+*/
}
}
Modified: incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/test/java/org/apache/tuscany/runtime/webapp/WebappRuntimeImplTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/test/java/org/apache/tuscany/runtime/webapp/WebappRuntimeImplTestCase.java?view=diff&rev=502748&r1=502747&r2=502748
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/test/java/org/apache/tuscany/runtime/webapp/WebappRuntimeImplTestCase.java (original)
+++ incubator/tuscany/java/sca/runtime/webapp/webapp-host/src/test/java/org/apache/tuscany/runtime/webapp/WebappRuntimeImplTestCase.java Fri Feb 2 12:54:35 2007
@@ -22,9 +22,6 @@
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
import static org.easymock.EasyMock.verify;
-import static org.easymock.EasyMock.isA;
-import static org.easymock.EasyMock.eq;
-import org.osoa.sca.CompositeContext;
import java.net.URL;
@@ -52,8 +49,6 @@
*/
public void testBootWithDefaults() throws Exception {
expect(context.getResourcePaths("/WEB-INF/tuscany/extensions/")).andReturn(null);
- expect(context.getInitParameter("tuscany.currentCompositePath")).andReturn(null);
- context.setAttribute(eq(Constants.CONTEXT_ATTRIBUTE), isA(CompositeContext.class));
replay(context);
runtime.initialize();
verify(context);
@@ -61,13 +56,11 @@
public void testLazyHttpSessionId() throws Exception {
expect(context.getResourcePaths("/WEB-INF/tuscany/extensions/")).andReturn(null);
- expect(context.getInitParameter("tuscany.currentCompositePath")).andReturn(null);
- context.setAttribute(eq(Constants.CONTEXT_ATTRIBUTE), isA(CompositeContext.class));
replay(context);
runtime.initialize();
verify(context);
- HttpServletRequest request = createMock(HttpServletRequest.class);;
+ HttpServletRequest request = createMock(HttpServletRequest.class);
expect(request.getSession(true)).andReturn(null);
expect(request.getSession(false)).andReturn(null);
replay(request);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org