separate compile-time and runtime dependencies for jps server; fix scrambling

java/compiler/compile-server/src/org/jetbrains/jpsservice/Bootstrap.java

@@ -28,14 +28,18 @@ import java.util.List;
  */
 public class Bootstrap {
 
+  public static final String JPS_RUNTIME_PATH = "rt/jps-incremental";
+
   public static List<File> buildServerProcessClasspath() {
     final List<File> cp = new ArrayList<File>();
     cp.add(getResourcePath(Server.class));
     cp.add(getResourcePath(com.google.protobuf.Message.class));
     cp.add(getResourcePath(org.jboss.netty.bootstrap.Bootstrap.class));
-    final File jpsJar = getResourcePath(Facade.class);
-    final File parentFile = jpsJar.getParentFile();
-    final File[] files = parentFile.listFiles();
+    final File jpsFacadeJar = getResourcePath(Facade.class);
+    cp.add(jpsFacadeJar);
+
+    final File jpsRuntime = new File(jpsFacadeJar.getParentFile(), JPS_RUNTIME_PATH);
+    final File[] files = jpsRuntime.listFiles();
     if (files != null) {
       for (File file : files) {
         final String name = file.getName();

java/compiler/impl/src/com/intellij/compiler/JpsServerManager.java

@@ -185,7 +185,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=5007");
+    //cmdLine.addParameter("-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5007");
     cmdLine.addParameter("-Xmx256m");
     cmdLine.addParameter("-classpath");
 

lib/required_for_dist.txt

@@ -44,4 +44,4 @@ xstream.jar
 swingx-core-1.6.2.jar
 netty-3.2.5.Final.jar
 protobuf-2.3.0.jar
-
+jps-facade.jar

lib/rt/required_for_dist.txt

@@ -8,4 +8,3 @@ jps-incremental/jps.jar
 jps-incremental/jps-gwt.jar
 jps-incremental/jps-javaee.jar
 jps-incremental/jps-jpa.jar
-jps-incremental/jps-facade.jar