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/17 07:49:16 UTC
svn commit: r432158 - in /incubator/tuscany/java/sca:
commands/launcher/src/main/java/org/apache/tuscany/launcher/
core/src/main/java/org/apache/tuscany/core/launcher/
host-api/src/main/java/org/apache/tuscany/host/
test/src/main/java/org/apache/tuscan...
Author: jboynes
Date: Wed Aug 16 22:49:15 2006
New Revision: 432158
URL: http://svn.apache.org/viewvc?rev=432158&view=rev
Log:
rename Launcher to LauncherImpl
add Launcher interface to host-api and have the LauncherImpl implement it
Added:
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/LauncherImpl.java (contents, props changed)
- copied, changed from r432142, 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/MainLauncherImpl.java (contents, props changed)
- copied, changed from r432139, incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/MainLauncher.java
Removed:
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
Modified:
incubator/tuscany/java/sca/commands/launcher/src/main/java/org/apache/tuscany/launcher/MainLauncherBooter.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/ServletLauncherListener.java
incubator/tuscany/java/sca/host-api/src/main/java/org/apache/tuscany/host/Launcher.java
incubator/tuscany/java/sca/test/src/main/java/org/apache/tuscany/test/SCATestCase.java
Modified: incubator/tuscany/java/sca/commands/launcher/src/main/java/org/apache/tuscany/launcher/MainLauncherBooter.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/commands/launcher/src/main/java/org/apache/tuscany/launcher/MainLauncherBooter.java?rev=432158&r1=432157&r2=432158&view=diff
==============================================================================
--- incubator/tuscany/java/sca/commands/launcher/src/main/java/org/apache/tuscany/launcher/MainLauncherBooter.java (original)
+++ incubator/tuscany/java/sca/commands/launcher/src/main/java/org/apache/tuscany/launcher/MainLauncherBooter.java Wed Aug 16 22:49:15 2006
@@ -45,7 +45,7 @@
ClassLoader tuscanyCL = booter.getTuscanyClassLoader();
String className = System.getProperty("tuscany.launcherClass",
- "org.apache.tuscany.core.launcher.MainLauncher");
+ "org.apache.tuscany.core.launcher.MainLauncherImpl");
Object launcher = Beans.instantiate(tuscanyCL, className);
try {
LaunchHelper.invoke(launcher, "boot", new Class<?>[]{String[].class}, (Object[]) new Object[]{args});
Copied: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/LauncherImpl.java (from r432142, 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/LauncherImpl.java?p2=incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/LauncherImpl.java&p1=incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/Launcher.java&r1=432142&r2=432158&rev=432158&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/LauncherImpl.java Wed Aug 16 22:49:15 2006
@@ -22,6 +22,8 @@
import java.net.URL;
import javax.xml.stream.XMLInputFactory;
+import org.osoa.sca.CompositeContext;
+
import org.apache.tuscany.core.bootstrap.Bootstrapper;
import org.apache.tuscany.core.bootstrap.DefaultBootstrapper;
import org.apache.tuscany.core.implementation.system.component.SystemCompositeComponent;
@@ -34,6 +36,7 @@
import org.apache.tuscany.spi.model.ComponentDefinition;
import org.apache.tuscany.spi.model.CompositeImplementation;
import org.apache.tuscany.host.MonitorFactory;
+import org.apache.tuscany.host.Launcher;
import org.apache.tuscany.spi.services.info.RuntimeInfo;
/**
@@ -41,7 +44,7 @@
*
* @version $Rev$ $Date$
*/
-public class Launcher {
+public class LauncherImpl implements Launcher {
/**
* A conventional META-INF based location for the system SCDL.
*
@@ -62,6 +65,16 @@
private CompositeComponent<?> composite;
+ public void bootRuntime(URL systemScdl, ClassLoader systemClassLoader, MonitorFactory monitorFactory) {
+ // FIXME implement
+ throw new UnsupportedOperationException();
+ }
+
+ public CompositeContext bootApplication(URL applicationScdl, ClassLoader applicationClassLoader) {
+ // FIXME implement
+ throw new UnsupportedOperationException();
+ }
+
/**
* Returns the classloader for application classes.
*
@@ -182,7 +195,7 @@
return new File(property);
}
- URL url = getClass().getResource("Launcher.class");
+ URL url = getClass().getResource("LauncherImpl.class");
if (!"jar".equals(url.getProtocol())) {
throw new IllegalStateException("Must be run from a jar: " + url);
}
Propchange: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/LauncherImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/LauncherImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Copied: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/MainLauncherImpl.java (from r432139, 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/MainLauncherImpl.java?p2=incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/MainLauncherImpl.java&p1=incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/MainLauncher.java&r1=432139&r2=432158&rev=432158&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/MainLauncherImpl.java Wed Aug 16 22:49:15 2006
@@ -33,11 +33,11 @@
/**
- * Launcher for launcher runtime environment that invokes a jar's Main class.
+ * LauncherImpl for launcher runtime environment that invokes a jar's Main class.
*
* @version $Rev$ $Date$
*/
-public class MainLauncher extends Launcher {
+public class MainLauncherImpl extends LauncherImpl {
private String className;
private String[] args;
@@ -198,7 +198,7 @@
protected void usage() {
- ResourceBundle bundle = ResourceBundle.getBundle(MainLauncher.class.getName());
+ ResourceBundle bundle = ResourceBundle.getBundle(MainLauncherImpl.class.getName());
System.err.print(bundle.getString("org.apache.tuscany.core.launcher.Usage"));
System.exit(1);
}
Propchange: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/MainLauncherImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/launcher/MainLauncherImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
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=432158&r1=432157&r2=432158&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 16 22:49:15 2006
@@ -34,8 +34,8 @@
import org.apache.tuscany.host.MonitorFactory;
/**
- * Launcher for runtime environment that loads info from servlet context params.
- * This listener manages one top-level Launcher (and hence one Tuscany runtime context)
+ * LauncherImpl for runtime environment that loads info from servlet context params.
+ * This listener manages one top-level LauncherImpl (and hence one Tuscany runtime context)
* per servlet context; the lifecycle of that runtime corresponds to the the lifecycle of the
* associated servlet context.
*
@@ -72,13 +72,13 @@
* Context attribute to which an Exception or Error object will be bound to if the
* launcher fails to initialize.
*/
- public static final String LAUNCHER_THROWABLE_ATTRIBUTE = "Tuscany.Launcher.Throwable";
+ public static final String LAUNCHER_THROWABLE_ATTRIBUTE = "Tuscany.LauncherImpl.Throwable";
/**
- * Context attribute to which the active {@link Launcher} managing the runtime for this
+ * Context attribute to which the active {@link LauncherImpl} managing the runtime for this
* servlet context is stored.
*/
- private static final String LAUNCHER_ATTRIBUTE = "Tuscany.Launcher";
+ private static final String LAUNCHER_ATTRIBUTE = "Tuscany.LauncherImpl";
public void contextInitialized(ServletContextEvent servletContextEvent) {
ServletContext servletContext = servletContextEvent.getServletContext();
@@ -86,7 +86,7 @@
// Read optional path to system SCDL from context-param
String systemScdlPath = servletContext.getInitParameter(SYSTEM_SCDL_PATH_PARAM);
if (systemScdlPath == null) {
- systemScdlPath = "/" + Launcher.METAINF_SYSTEM_SCDL_PATH;
+ systemScdlPath = "/" + LauncherImpl.METAINF_SYSTEM_SCDL_PATH;
}
// Read optional path to application SCDL from context-param
@@ -99,7 +99,7 @@
String systemLogging = servletContext.getInitParameter(SYSTEM_MONITORING_PARAM);
MonitorFactory mf = getMonitorFactory(systemLogging);
- Launcher launcher = new Launcher();
+ LauncherImpl launcher = new LauncherImpl();
// Current thread context classloader should be the webapp classloader
launcher.setApplicationLoader(Thread.currentThread().getContextClassLoader());
@@ -147,7 +147,7 @@
public void contextDestroyed(ServletContextEvent servletContextEvent) {
ServletContext servletContext = servletContextEvent.getServletContext();
- Launcher launcher = (Launcher) servletContext.getAttribute(LAUNCHER_ATTRIBUTE);
+ LauncherImpl launcher = (LauncherImpl) servletContext.getAttribute(LAUNCHER_ATTRIBUTE);
if (launcher != null) {
launcher.shutdownRuntime();
Modified: incubator/tuscany/java/sca/host-api/src/main/java/org/apache/tuscany/host/Launcher.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/host-api/src/main/java/org/apache/tuscany/host/Launcher.java?rev=432158&r1=432157&r2=432158&view=diff
==============================================================================
--- incubator/tuscany/java/sca/host-api/src/main/java/org/apache/tuscany/host/Launcher.java (original)
+++ incubator/tuscany/java/sca/host-api/src/main/java/org/apache/tuscany/host/Launcher.java Wed Aug 16 22:49:15 2006
@@ -20,9 +20,15 @@
import java.net.URL;
+import org.osoa.sca.CompositeContext;
+
/**
* @version $Rev$ $Date$
*/
public interface Launcher {
- void bootRuntime(URL systemScdl, MonitorFactory monitorFactory);
+ void bootRuntime(URL systemScdl, ClassLoader systemClassLoader, MonitorFactory monitorFactory);
+
+ void shutdownRuntime();
+
+ CompositeContext bootApplication(URL applicationScdl, ClassLoader applicationClassLoader);
}
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=432158&r1=432157&r2=432158&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 16 22:49:15 2006
@@ -27,7 +27,7 @@
import org.apache.tuscany.core.implementation.system.model.SystemCompositeImplementation;
import org.apache.tuscany.core.launcher.CompositeContextImpl;
-import org.apache.tuscany.core.launcher.Launcher;
+import org.apache.tuscany.core.launcher.LauncherImpl;
import org.apache.tuscany.spi.component.Component;
import org.apache.tuscany.core.monitor.NullMonitorFactory;
import org.apache.tuscany.spi.component.CompositeComponent;
@@ -44,14 +44,14 @@
protected CompositeComponent<?> component;
private CompositeContextImpl context;
private Map<String, URL> extensions = new HashMap<String, URL>();
- private String applicationSCDL = Launcher.METAINF_APPLICATION_SCDL_PATH;
+ private String applicationSCDL = LauncherImpl.METAINF_APPLICATION_SCDL_PATH;
protected void setUp() throws Exception {
super.setUp();
ClassLoader cl = getClass().getClassLoader();
- Launcher launcher = new Launcher();
+ LauncherImpl launcher = new LauncherImpl();
launcher.setApplicationLoader(cl);
- CompositeComponent<?> composite = launcher.bootRuntime(cl.getResource(Launcher.METAINF_SYSTEM_SCDL_PATH),
+ CompositeComponent<?> composite = launcher.bootRuntime(cl.getResource(LauncherImpl.METAINF_SYSTEM_SCDL_PATH),
new NullMonitorFactory());
for (String extensionName : extensions.keySet()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org