Merge r831867 from trunk to m4 for using builtin defaults in the launcher if the default config file isn't found

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@831869 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 10 insertions, 9 deletions

diff --git a/branches/sca-java-2.0-M4/modules/launcher/src/main/java/org/apache/tuscany/sca/launcher/LauncherMain.java b/branches/sca-java-2.0-M4/modules/launcher/src/main/java/org/apache/tuscany/sca/launcher/LauncherMain.java
index 71e90bf010..84affffc46 100644
--- a/branches/sca-java-2.0-M4/modules/launcher/src/main/java/org/apache/tuscany/sca/launcher/LauncherMain.java
+++ b/branches/sca-java-2.0-M4/modules/launcher/src/main/java/org/apache/tuscany/sca/launcher/LauncherMain.java
@@ -273,17 +273,18 @@ public class LauncherMain {
         }
         
         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;