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/08 22:54:36 UTC
svn commit: r505045 - in /incubator/tuscany/java/sca/runtime/webapp:
webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/
webapp-host/src/main/java/org/apache/tuscany/runtime/webapp/
webapp-host/src/test/java/org/apache/tuscany/runtime/webapp/
Author: jboynes
Date: Thu Feb 8 13:54:36 2007
New Revision: 505045
URL: http://svn.apache.org/viewvc?view=rev&rev=505045
Log:
make WebappRuntime use component manager
Modified:
incubator/tuscany/java/sca/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeInfo.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/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeInfo.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeInfo.java?view=diff&rev=505045&r1=505044&r2=505045
==============================================================================
--- incubator/tuscany/java/sca/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeInfo.java (original)
+++ incubator/tuscany/java/sca/runtime/webapp/webapp-api/src/main/java/org/apache/tuscany/runtime/webapp/WebappRuntimeInfo.java Thu Feb 8 13:54:36 2007
@@ -18,6 +18,7 @@
*/
package org.apache.tuscany.runtime.webapp;
+import java.net.URI;
import javax.servlet.ServletContext;
import org.apache.tuscany.host.RuntimeInfo;
@@ -26,7 +27,8 @@
* @version $Rev$ $Date$
*/
public interface WebappRuntimeInfo extends RuntimeInfo {
- String COMPONENT_NAME = "WebappRuntimeInfo";
+ URI COMPONENT_NAME = URI.create("WebappRuntimeInfo");
+
/**
* Returns the ServletContext associated with this webapp runtime.
*
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=505045&r1=505044&r2=505045
==============================================================================
--- 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 Thu Feb 8 13:54:36 2007
@@ -62,10 +62,10 @@
this.servletContext = servletContext;
}
- protected void registerSystemComponents(CompositeComponent systemComponent) throws InitializationException {
- super.registerSystemComponents(systemComponent);
+ protected void registerSystemComponents() throws InitializationException {
+ super.registerSystemComponents();
try {
- systemComponent.registerJavaObject(WebappRuntimeInfo.COMPONENT_NAME,
+ getComponentManager().registerJavaObject(WebappRuntimeInfo.COMPONENT_NAME,
WebappRuntimeInfo.class,
(WebappRuntimeInfo) getRuntimeInfo());
} catch (ComponentRegistrationException e) {
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=505045&r1=505044&r2=505045
==============================================================================
--- 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 Thu Feb 8 13:54:36 2007
@@ -48,7 +48,6 @@
* Verifies the web app host is configured properly to perform a basic boot
*/
public void testBootWithDefaults() throws Exception {
- expect(context.getResourcePaths("/WEB-INF/tuscany/extensions/")).andReturn(null);
replay(context);
runtime.initialize();
verify(context);
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org