svn commit: r1344738 - /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java

[rm...@apache.org]

Author: rmannibucau
Date: Thu May 31 14:20:02 2012
New Revision: 1344738

URL: http://svn.apache.org/viewvc?rev=1344738&view=rev
Log:
TOMEE-211 start in tomee maven plugin wait tomee shutdown to shutdown the jvm running tomee - update remoteserver to be able to use javaw

Modified:
    openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java

Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java?rev=1344738&r1=1344737&r2=1344738&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/RemoteServer.java Thu May 31 14:20:02 2012
@@ -131,6 +131,11 @@ public class RemoteServer {
                 //File openejbJar = new File(lib, "openejb-core-" + version + ".jar");
 
                 String java = new File(System.getProperty("java.home"), "bin/java").getAbsolutePath();
+                final boolean isWindows = System.getProperty("os.name", "unknown").toLowerCase().startsWith("windows");
+                if (isWindows && "start".equals(cmd) && options.get("server.windows.fork", false)) {
+                    // to fork
+                    java = new File(System.getProperty("java.home"), "bin/javaw").getAbsolutePath();
+                }
 
                 //DMB: If you don't use an array, you get problems with jar paths containing spaces
                 // the command won't parse correctly
@@ -276,15 +281,6 @@ public class RemoteServer {
                     System.out.println(Join.join("\n", args));
                 }
 
-                final boolean isWindows = System.getProperty("os.name", "unknown").toLowerCase().startsWith("windows");
-                if (isWindows && "start".equals(cmd) && options.get("server.windows.fork", false)) {
-                    // to fork
-                    final List<String> winList = new ArrayList<String>();
-                    winList.add("cmd");
-                    winList.add("/c");
-                    winList.addAll(Arrays.asList(args));
-                    args = winList.toArray(new String[winList.size()]);
-                }
                 server = Runtime.getRuntime().exec(args);
 
                 Pipe.pipe(server);