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/15 19:01:19 UTC
svn commit: r508052 - in /incubator/tuscany/java/sca/runtime/standalone:
launcher/src/main/java/org/apache/tuscany/launcher/
smoketest/src/test/java/org/apache/tuscany/sca/runtime/standalone/smoketest/
smoketest/src/test/resources/org/apache/tuscany/sc...
Author: jboynes
Date: Thu Feb 15 10:01:18 2007
New Revision: 508052
URL: http://svn.apache.org/viewvc?view=rev&rev=508052
Log:
comment out compile problem with launcher
the spi classes needed by the problem code should not be on the application classpath
update smoketest for new command syntax
Modified:
incubator/tuscany/java/sca/runtime/standalone/launcher/src/main/java/org/apache/tuscany/launcher/Main.java
incubator/tuscany/java/sca/runtime/standalone/smoketest/src/test/java/org/apache/tuscany/sca/runtime/standalone/smoketest/SmokeTestLauncher.java
incubator/tuscany/java/sca/runtime/standalone/smoketest/src/test/resources/org/apache/tuscany/sca/runtime/standalone/smoketest/LauncherUsage.txt
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=508052&r1=508051&r2=508052
==============================================================================
--- 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 Thu Feb 15 10:01:18 2007
@@ -33,8 +33,6 @@
import org.apache.tuscany.host.runtime.TuscanyRuntime;
import org.apache.tuscany.runtime.standalone.DirectoryHelper;
import org.apache.tuscany.runtime.standalone.StandaloneRuntimeInfo;
-import org.apache.tuscany.spi.model.ComponentDefinition;
-import org.apache.tuscany.spi.model.CompositeImplementation;
/**
* Main class for launcher runtime environment. <code>
@@ -94,13 +92,16 @@
ClassLoader applicationClassLoader =
new URLClassLoader(new URL[] {applicationJar}, runtime.getHostClassLoader());
URL appScdl = applicationClassLoader.getResource("META-INF/sca/default.scdl");
+ // TODO Deploy the SCDL
+/* the launcher's classloader should not contain the SPI module
+
CompositeImplementation impl = new CompositeImplementation();
impl.setScdlLocation(appScdl);
impl.setClassLoader(applicationClassLoader);
ComponentDefinition<CompositeImplementation> definition =
new ComponentDefinition<CompositeImplementation>(applicationURI, impl);
- // TODO Deploy the SCDL
+*/
}
private static void usage() {
Modified: incubator/tuscany/java/sca/runtime/standalone/smoketest/src/test/java/org/apache/tuscany/sca/runtime/standalone/smoketest/SmokeTestLauncher.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/standalone/smoketest/src/test/java/org/apache/tuscany/sca/runtime/standalone/smoketest/SmokeTestLauncher.java?view=diff&rev=508052&r1=508051&r2=508052
==============================================================================
--- incubator/tuscany/java/sca/runtime/standalone/smoketest/src/test/java/org/apache/tuscany/sca/runtime/standalone/smoketest/SmokeTestLauncher.java (original)
+++ incubator/tuscany/java/sca/runtime/standalone/smoketest/src/test/java/org/apache/tuscany/sca/runtime/standalone/smoketest/SmokeTestLauncher.java Thu Feb 15 10:01:18 2007
@@ -46,7 +46,11 @@
}
public void testLauncherNoComponent() throws Exception {
- ProcessBuilder pb = new ProcessBuilder("java", "-jar", launcher.getAbsolutePath(), "http://no.such.component");
+ ProcessBuilder pb = new ProcessBuilder("java",
+ "-jar",
+ launcher.getAbsolutePath(),
+ "http://no.such.component",
+ testJar.getAbsolutePath());
pb.directory(installDir);
Process process = pb.start();
try {
Modified: incubator/tuscany/java/sca/runtime/standalone/smoketest/src/test/resources/org/apache/tuscany/sca/runtime/standalone/smoketest/LauncherUsage.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/runtime/standalone/smoketest/src/test/resources/org/apache/tuscany/sca/runtime/standalone/smoketest/LauncherUsage.txt?view=diff&rev=508052&r1=508051&r2=508052
==============================================================================
--- incubator/tuscany/java/sca/runtime/standalone/smoketest/src/test/resources/org/apache/tuscany/sca/runtime/standalone/smoketest/LauncherUsage.txt (original)
+++ incubator/tuscany/java/sca/runtime/standalone/smoketest/src/test/resources/org/apache/tuscany/sca/runtime/standalone/smoketest/LauncherUsage.txt Thu Feb 15 10:01:18 2007
@@ -1 +1 @@
-usage: java [jvm-options] -jar launcher.jar <componentURI>
+usage: java [jvm-options] -jar launcher.jar <componentURI> <componentJar>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org