svn commit: r667711 - /incubator/tuscany/sandbox/sebastien/java/sca-node/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeProcessCollectionImpl.java

[js...@apache.org]

Author: jsdelfino
Date: Fri Jun 13 17:52:54 2008
New Revision: 667711

URL: http://svn.apache.org/viewvc?rev=667711&view=rev
Log:
Pass Tuscany path property to child node processes started by the domain manager.

Modified:
    incubator/tuscany/sandbox/sebastien/java/sca-node/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeProcessCollectionImpl.java

Modified: incubator/tuscany/sandbox/sebastien/java/sca-node/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeProcessCollectionImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/sandbox/sebastien/java/sca-node/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeProcessCollectionImpl.java?rev=667711&r1=667710&r2=667711&view=diff
==============================================================================
--- incubator/tuscany/sandbox/sebastien/java/sca-node/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeProcessCollectionImpl.java (original)
+++ incubator/tuscany/sandbox/sebastien/java/sca-node/modules/implementation-node-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/launcher/NodeProcessCollectionImpl.java Fri Jun 13 17:52:54 2008
@@ -200,6 +200,8 @@
      * Represent a child Java VM running an SCA node.
      */
     private static class SCANodeVM {
+        private static final String TUSCANY_PATH = "TUSCANY_PATH";
+        
         private String nodeName;
         private StringBuffer log;
         private Process process;
@@ -223,10 +225,28 @@
             Properties props = System.getProperties();
             String java = props.getProperty("java.home") + "/bin/java";
             String cp = props.getProperty("java.class.path");
+            String path = System.getenv(TUSCANY_PATH);
+            if (path == null) {
+                path = props.getProperty(TUSCANY_PATH);
+            }
             String main = NodeLauncher.class.getName();
-            final String[] command = new String[]{ java, "-cp", cp, main , nodeConfigurationURI};
 
-            logger.info("Starting " + "java " + main + " " + nodeConfigurationURI);
+            final List<String> command = new ArrayList<String>();
+            command.add(java);
+            command.add("-cp");
+            command.add(cp);
+            if (path != null) {
+                command.add("-D" + TUSCANY_PATH + "=" + path);
+            }
+            command.add(main);
+            command.add(nodeConfigurationURI);
+
+            StringBuffer buffer = new StringBuffer();
+            for (String c: command) {
+                buffer.append(' ');
+                buffer.append(c);
+            }
+            logger.info("Starting" + log);
             
             // Start the VM
             ProcessBuilder builder = new ProcessBuilder(command);