You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2009/11/16 09:00:12 UTC
svn commit: r880649 -
/tuscany/java/sca/modules/launcher/src/main/java/org/apache/tuscany/sca/launcher/LauncherMain.java
Author: antelder
Date: Mon Nov 16 08:00:07 2009
New Revision: 880649
URL: http://svn.apache.org/viewvc?rev=880649&view=rev
Log:
Update launcher to support the client access
Modified:
tuscany/java/sca/modules/launcher/src/main/java/org/apache/tuscany/sca/launcher/LauncherMain.java
Modified: tuscany/java/sca/modules/launcher/src/main/java/org/apache/tuscany/sca/launcher/LauncherMain.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/launcher/src/main/java/org/apache/tuscany/sca/launcher/LauncherMain.java?rev=880649&r1=880648&r2=880649&view=diff
==============================================================================
--- tuscany/java/sca/modules/launcher/src/main/java/org/apache/tuscany/sca/launcher/LauncherMain.java (original)
+++ tuscany/java/sca/modules/launcher/src/main/java/org/apache/tuscany/sca/launcher/LauncherMain.java Mon Nov 16 08:00:07 2009
@@ -138,6 +138,20 @@
return new URLClassLoader(jarURLs.toArray(new URL[]{}), parentCL);
}
+ private static void argJars(Set<URL> jarURLs, Properties launcherProperties) throws IOException {
+ String[] args = (String[])launcherProperties.get(LAUNCHER_ARGS);
+ if (args != null && args.length > 0) {
+ for (String a : args) {
+ File f = new File(a);
+ if (!f.exists()) {
+ throw new FileNotFoundException(args[0]);
+ }
+ jarURLs.add(f.toURI().toURL());
+ }
+ }
+ launcherProperties.put(LAUNCHER_ARGS, new String[]{});
+ }
+
private static URL firstArgJarManifestMainClass(Properties launcherProperties) throws IOException {
String[] args = (String[])launcherProperties.get(LAUNCHER_ARGS);
if (args.length < 1) {
@@ -274,7 +288,14 @@
if (!f.exists()) {
// throw new FileNotFoundException(f.getName());
- properties.put("mainClass", "[firstArgJarManifestMainClass]|org.apache.tuscany.sca.domain.node.DomainNodeMain");
+ if (args.length > 0 && "client".equals(args[0])) {
+ properties.put("mainClass", "org.apache.tuscany.sca.client.javascript.TuscanyShell");
+ String[] args2 = new String[args.length-1];
+ System.arraycopy(args, 1, args2, 0, args.length-1);
+ args = args2;
+ } else {
+ properties.put("mainClass", "[firstArgJarManifestMainClass]|org.apache.tuscany.sca.domain.node.DomainNodeMain");
+ }
} else {
try {
FileInputStream fis = new FileInputStream(f);