From 44fe670d0c02d64daf5f0da1816ac345e051d7ce Mon Sep 17 00:00:00 2001
From: Eugene Zhuravlev <jeka@intellij.com>
Date: Fri, 14 Oct 2011 22:55:21 +0200
Subject: [PATCH] cosmetics

---
 build/scripts/layouts.gant                                  | 5 +++++
 .../impl/src/com/intellij/compiler/JpsServerManager.java    | 2 +-
 .../src/org/jetbrains/jps/server/ClasspathBootstrap.java    | 6 ++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant
index afa7acd9f79d..3ebf080eb351 100644
--- a/build/scripts/layouts.gant
+++ b/build/scripts/layouts.gant
@@ -149,6 +149,11 @@ def layoutFull(String home, String targetDirectory, String patchedDescriptorDir
         module("notNull")
       }
 
+      jar("jps-server.jar") {
+        module("jps-builders")
+        module("jps-model")
+      }
+
       fileset(dir: "$home/lib", includesfile: "${home}/lib/required_for_dist.txt")
 
       fileset(dir: "$home/lib/src") {
diff --git a/java/compiler/impl/src/com/intellij/compiler/JpsServerManager.java b/java/compiler/impl/src/com/intellij/compiler/JpsServerManager.java
index db4d66f5e5b9..8b9489b54c6c 100644
--- a/java/compiler/impl/src/com/intellij/compiler/JpsServerManager.java
+++ b/java/compiler/impl/src/com/intellij/compiler/JpsServerManager.java
@@ -219,7 +219,7 @@ public class JpsServerManager implements ApplicationComponent{
     final Sdk projectJdk = JavaAwareProjectJdkTableImpl.getInstanceEx().getInternalJdk();
     final GeneralCommandLine cmdLine = new GeneralCommandLine();
     cmdLine.setExePath(((JavaSdkType)projectJdk.getSdkType()).getVMExecutablePath(projectJdk));
-    cmdLine.addParameter("-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5008");
+    //cmdLine.addParameter("-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5008");
     cmdLine.addParameter("-Xmx256m");
     cmdLine.addParameter("-classpath");
 
diff --git a/jps/jps-builders/src/org/jetbrains/jps/server/ClasspathBootstrap.java b/jps/jps-builders/src/org/jetbrains/jps/server/ClasspathBootstrap.java
index 5381394f8124..d255d1368d54 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/server/ClasspathBootstrap.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/server/ClasspathBootstrap.java
@@ -29,7 +29,9 @@ import org.objectweb.asm.ClassWriter;
 
 import java.io.File;
 import java.util.ArrayList;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Set;
 
 /**
  * @author Eugene Zhuravlev
@@ -42,7 +44,7 @@ public class ClasspathBootstrap {
   public static final String JPS_RUNTIME_PATH = "rt/jps-incremental";
 
   public static List<File> getApplicationClasspath() {
-    final List<File> cp = new ArrayList<File>();
+    final Set<File> cp = new LinkedHashSet<File>();
     cp.add(getResourcePath(Server.class));
     cp.add(getResourcePath(com.google.protobuf.Message.class)); // protobuf
     cp.add(getResourcePath(org.jboss.netty.bootstrap.Bootstrap.class)); // netty
@@ -80,7 +82,7 @@ public class ClasspathBootstrap {
     //    }
     //  }
     //}
-    return cp;
+    return new ArrayList<File>(cp);
   }
 
   private static File getResourcePath(Class aClass) {