From 1dd5bf130520fe33e3ea51d8829769e70a86bd7d Mon Sep 17 00:00:00 2001
From: Eugene Zhuravlev <jeka@intellij.com>
Date: Thu, 17 Nov 2011 12:46:14 +0100
Subject: [PATCH] start jps server with "awt headless" property and classpath
 logging

---
 .../impl/src/com/intellij/compiler/JpsServerManager.java  | 8 ++++----
 jps/jps-builders/src/org/jetbrains/jps/server/Server.java | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/java/compiler/impl/src/com/intellij/compiler/JpsServerManager.java b/java/compiler/impl/src/com/intellij/compiler/JpsServerManager.java
index e5b7c8efec51..7ce7e49df6d9 100644
--- a/java/compiler/impl/src/com/intellij/compiler/JpsServerManager.java
+++ b/java/compiler/impl/src/com/intellij/compiler/JpsServerManager.java
@@ -318,18 +318,18 @@ public class JpsServerManager implements ApplicationComponent{
     cmdLine.addParameter("-ea");
     cmdLine.addParameter("-XX:MaxPermSize=150m");
     cmdLine.addParameter("-XX:ReservedCodeCacheSize=64m");
+    cmdLine.addParameter("-Djava.awt.headless=true");
     // todo: get xmx value from settings
     if (SystemInfo.is64Bit) {
-      cmdLine.addParameter("-Xmx1024m");
+      cmdLine.addParameter("-Xmx700m");
     }
     else {
       cmdLine.addParameter("-Xmx512m");
     }
 
     // debugging
-    cmdLine.addParameter("-XX:+HeapDumpOnOutOfMemoryError");
-    cmdLine.addParameter("-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5008");
-
+    //cmdLine.addParameter("-XX:+HeapDumpOnOutOfMemoryError");
+    //cmdLine.addParameter("-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5008");
 
     // javac's VM should use the same default locale that IDEA uses in order for javac to print messages in 'correct' language
     final String lang = System.getProperty("user.language");
diff --git a/jps/jps-builders/src/org/jetbrains/jps/server/Server.java b/jps/jps-builders/src/org/jetbrains/jps/server/Server.java
index 5bc798764f8e..62f45a0d6c8a 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/server/Server.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/server/Server.java
@@ -25,7 +25,7 @@ import java.util.concurrent.Executors;
 public class Server {
   public static final int DEFAULT_SERVER_PORT = 7777;
   private static final int MAX_SIMULTANEOUS_BUILD_SESSIONS = Math.max(2, Runtime.getRuntime().availableProcessors());
-  public static final String SERVER_SUCCESS_START_MESSAGE = "JPS Server started successfully. Listening on port port: ";
+  public static final String SERVER_SUCCESS_START_MESSAGE = "JPS Server started successfully. Listening on port: ";
   public static final String SERVER_ERROR_START_MESSAGE = "Error starting JPS Server: ";
 
   private final ChannelGroup myAllOpenChannels = new DefaultChannelGroup("jps-server");
@@ -97,6 +97,7 @@ public class Server {
           server.stop();
         }
       });
+      System.out.println("Server classpath: " + System.getProperty("java.class.path"));
       System.err.println(SERVER_SUCCESS_START_MESSAGE + port);
     }
     catch (Throwable e) {