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/02 12:47:47 UTC
svn commit: r831869 - in /tuscany/branches/sca-java-2.0-M4/modules/launcher:
./ src/main/java/org/apache/tuscany/sca/launcher/LauncherMain.java
Author: antelder
Date: Mon Nov 2 11:47:46 2009
New Revision: 831869
URL: http://svn.apache.org/viewvc?rev=831869&view=rev
Log:
Merge r831867 from trunk to m4 for using builtin defaults in the launcher if the default config file isn't found
Modified:
tuscany/branches/sca-java-2.0-M4/modules/launcher/ (props changed)
tuscany/branches/sca-java-2.0-M4/modules/launcher/src/main/java/org/apache/tuscany/sca/launcher/LauncherMain.java
Propchange: tuscany/branches/sca-java-2.0-M4/modules/launcher/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Nov 2 11:47:46 2009
@@ -0,0 +1,3 @@
+/tuscany/branches/sca-java-1.3/modules/launcher:671193
+/tuscany/branches/sca-java-1.x/modules/launcher:713805-714043
+/tuscany/java/sca/modules/launcher:694816-713804,831867
Modified: tuscany/branches/sca-java-2.0-M4/modules/launcher/src/main/java/org/apache/tuscany/sca/launcher/LauncherMain.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-2.0-M4/modules/launcher/src/main/java/org/apache/tuscany/sca/launcher/LauncherMain.java?rev=831869&r1=831868&r2=831869&view=diff
==============================================================================
--- tuscany/branches/sca-java-2.0-M4/modules/launcher/src/main/java/org/apache/tuscany/sca/launcher/LauncherMain.java (original)
+++ tuscany/branches/sca-java-2.0-M4/modules/launcher/src/main/java/org/apache/tuscany/sca/launcher/LauncherMain.java Mon Nov 2 11:47:46 2009
@@ -273,17 +273,18 @@
}
if (!f.exists()) {
- throw new FileNotFoundException(f.getName());
+// throw new FileNotFoundException(f.getName());
+ properties.put("mainClass", "[firstArgJarManifestMainClass]|org.apache.tuscany.sca.domain.node.DomainNodeMain");
+ } else {
+ try {
+ FileInputStream fis = new FileInputStream(f);
+ properties.load(fis);
+ fis.close();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
}
- try {
- FileInputStream fis = new FileInputStream(f);
- properties.load(fis);
- fis.close();
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
-
properties.put(LAUNCHER_ARGS, args);
return properties;