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 2006/08/10 00:59:28 UTC
svn commit: r430180 - in /incubator/tuscany/java/sca:
core/src/main/java/org/apache/tuscany/core/launcher/
test/src/main/java/org/apache/tuscany/test/
Author: jboynes
Date: Wed Aug 9 15:59:28 2006
New Revision: 430180
URL: http://svn.apache.org/viewvc?rev=430180&view=rev
Log:
do not use tuscany.system as the application name
allow the host to specify the application component name
for servlets, use the servlet context name if supplied
Modified:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/Launcher.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/MainLauncher.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/ServletLauncherListener.java
incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/SCATestCase.java
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/Launcher.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/Launcher.java?rev=430180&r1=430179&r2=430180&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/Launcher.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/Launcher.java Wed Aug 9 15:59:28 2006
@@ -20,6 +20,10 @@
import java.net.URL;
import javax.xml.stream.XMLInputFactory;
+import org.apache.tuscany.core.bootstrap.Bootstrapper;
+import org.apache.tuscany.core.bootstrap.DefaultBootstrapper;
+import org.apache.tuscany.core.implementation.system.component.SystemCompositeComponent;
+import org.apache.tuscany.core.implementation.system.model.SystemCompositeImplementation;
import org.apache.tuscany.spi.bootstrap.ComponentNames;
import org.apache.tuscany.spi.bootstrap.RuntimeComponent;
import org.apache.tuscany.spi.component.CompositeComponent;
@@ -30,11 +34,6 @@
import org.apache.tuscany.spi.monitor.MonitorFactory;
import org.apache.tuscany.spi.services.info.RuntimeInfo;
-import org.apache.tuscany.core.bootstrap.Bootstrapper;
-import org.apache.tuscany.core.bootstrap.DefaultBootstrapper;
-import org.apache.tuscany.core.implementation.system.component.SystemCompositeComponent;
-import org.apache.tuscany.core.implementation.system.model.SystemCompositeImplementation;
-
/**
* Basic launcher implementation.
*
@@ -50,8 +49,6 @@
/**
* A conventional META-INF based location for the application SCDL.
- *
- * @see #bootApplication(URL)
*/
public static final String METAINF_APPLICATION_SCDL_PATH = "META-INF/sca/default.scdl";
@@ -144,12 +141,13 @@
/**
* Boots the application defined by the specified SCDL.
*
+ * @param name the name of the application component
* @param appScdl URL to the SCDL defining the application
* @return a CompositeComponent for the newly booted application
* @throws LoaderException
* @see METAINF_APPLICATION_SCDL_PATH
*/
- public CompositeComponent<?> bootApplication(URL appScdl) throws LoaderException {
+ public CompositeComponent<?> bootApplication(String name, URL appScdl) throws LoaderException {
if (appScdl == null) {
throw new LoaderException("No application scdl found");
}
@@ -160,8 +158,7 @@
impl.setScdlLocation(appScdl);
impl.setClassLoader(applicationLoader);
ComponentDefinition<CompositeImplementation> moduleDefinition =
- new ComponentDefinition<CompositeImplementation>(
- ComponentNames.TUSCANY_SYSTEM, impl);
+ new ComponentDefinition<CompositeImplementation>(name, impl);
// deploy the component into the runtime under the system parent
CompositeComponent parent = runtime.getRootComponent();
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/MainLauncher.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/MainLauncher.java?rev=430180&r1=430179&r2=430180&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/MainLauncher.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/MainLauncher.java Wed Aug 9 15:59:28 2006
@@ -136,7 +136,7 @@
URL scdl = getClass().getClassLoader().getResource(METAINF_SYSTEM_SCDL_PATH);
bootRuntime(scdl, new NullMonitorFactory());
URL appScdl = getApplicationLoader().getResource(METAINF_APPLICATION_SCDL_PATH);
- CompositeComponent application = bootApplication(appScdl);
+ CompositeComponent application = bootApplication("application", appScdl);
application.start();
try {
callApplication(application);
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/ServletLauncherListener.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/ServletLauncherListener.java?rev=430180&r1=430179&r2=430180&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/ServletLauncherListener.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/ServletLauncherListener.java Wed Aug 9 15:59:28 2006
@@ -109,7 +109,11 @@
}
}
- component = launcher.bootApplication(appScdl);
+ String name = servletContext.getServletContextName();
+ if (name == null) {
+ name = "application";
+ }
+ component = launcher.bootApplication(name, appScdl);
component.start();
context = new CompositeContextImpl(component);
context.start();
Modified: incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/SCATestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/SCATestCase.java?rev=430180&r1=430179&r2=430180&view=diff
==============================================================================
--- incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/SCATestCase.java (original)
+++ incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/SCATestCase.java Wed Aug 9 15:59:28 2006
@@ -60,7 +60,7 @@
if (applicationScdlURL == null) {
throw new RuntimeException("application SCDL not found: " + applicationSCDL);
}
- component = launcher.bootApplication(applicationScdlURL);
+ component = launcher.bootApplication("application", applicationScdlURL);
component.start();
context = new CompositeContextImpl(component);
context.start();
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org