From a76ecbb75bcafbcf9ccc4c59853db2e66a435036 Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Mon, 10 Jun 2013 15:26:37 +0400
Subject: [PATCH] external build: removed usages of constants from BuildMain
 class from the IDE process to avoid incorrect initialization of loggers

---
 .../src/com/intellij/compiler/server/BuildManager.java    | 8 +++-----
 .../src/org/jetbrains/jps/api/BuildParametersKeys.java    | 8 ++++++++
 .../src/org/jetbrains/jps/cmdline/BuildMain.java          | 3 ---
 .../src/org/jetbrains/jps/cmdline/BuildSession.java       | 2 +-
 4 files changed, 12 insertions(+), 9 deletions(-)
 create mode 100644 jps/jps-builders/src/org/jetbrains/jps/api/BuildParametersKeys.java

diff --git a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
index 9139b750c25b..a9ad726ab623 100644
--- a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
+++ b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
@@ -92,10 +92,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
 import org.jetbrains.ide.PooledThreadExecutor;
-import org.jetbrains.jps.api.CmdlineProtoUtil;
-import org.jetbrains.jps.api.CmdlineRemoteProto;
-import org.jetbrains.jps.api.GlobalOptions;
-import org.jetbrains.jps.api.RequestFuture;
+import org.jetbrains.jps.api.*;
 import org.jetbrains.jps.cmdline.BuildMain;
 import org.jetbrains.jps.cmdline.ClasspathBootstrap;
 import org.jetbrains.jps.incremental.Utils;
@@ -121,6 +118,7 @@ import static org.jetbrains.jps.api.CmdlineRemoteProto.Message.ControllerMessage
  */
 public class BuildManager implements ApplicationComponent{
   public static final Key<Boolean> ALLOW_AUTOMAKE = Key.create("_allow_automake_when_process_is_active_");
+  private static final Key<String> FORCE_MODEL_LOADING_PARAMETER = Key.create(BuildParametersKeys.FORCE_MODEL_LOADING);
 
   private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.server.BuildManager");
   private static final String COMPILER_PROCESS_JDK_PROPERTY = "compiler.process.jdk";
@@ -365,7 +363,7 @@ public class BuildManager implements ApplicationComponent{
   }
 
   public static void forceModelLoading(CompileContext context) {
-    context.getCompileScope().putUserData(BuildMain.FORCE_MODEL_LOADING_PARAMETER, Boolean.TRUE.toString());
+    context.getCompileScope().putUserData(FORCE_MODEL_LOADING_PARAMETER, Boolean.TRUE.toString());
   }
 
   public void clearState(Project project) {
diff --git a/jps/jps-builders/src/org/jetbrains/jps/api/BuildParametersKeys.java b/jps/jps-builders/src/org/jetbrains/jps/api/BuildParametersKeys.java
new file mode 100644
index 000000000000..3621bd00e726
--- /dev/null
+++ b/jps/jps-builders/src/org/jetbrains/jps/api/BuildParametersKeys.java
@@ -0,0 +1,8 @@
+package org.jetbrains.jps.api;
+
+/**
+ * @author nik
+ */
+public interface BuildParametersKeys {
+  String FORCE_MODEL_LOADING = "_force_model_loading";
+}
diff --git a/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildMain.java b/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildMain.java
index 829df7ee782d..0bc21076a6c9 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildMain.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildMain.java
@@ -16,7 +16,6 @@
 package org.jetbrains.jps.cmdline;
 
 import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import org.apache.log4j.Level;
@@ -47,8 +46,6 @@ import java.util.UUID;
  *         Date: 4/16/12
  */
 public class BuildMain {
-  public static final Key<String> FORCE_MODEL_LOADING_PARAMETER = Key.create("_force_model_loading");
-
   private static final String LOG_CONFIG_FILE_NAME = "build-log.xml";
   private static final String LOG_FILE_NAME = "build.log";
   private static final String DEFAULT_LOGGER_CONFIG = "defaultLogConfig.xml";
diff --git a/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildSession.java b/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildSession.java
index 519edbcfdf29..b841e323d119 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildSession.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/cmdline/BuildSession.java
@@ -95,7 +95,7 @@ final class BuildSession implements Runnable, CanceledStatus {
     }
     myInitialFSDelta = delta;
     JpsModelLoaderImpl loader = new JpsModelLoaderImpl(myProjectPath, globalOptionsPath, null);
-    myForceModelLoading = Boolean.parseBoolean(builderParams.get(BuildMain.FORCE_MODEL_LOADING_PARAMETER.toString()));
+    myForceModelLoading = Boolean.parseBoolean(builderParams.get(BuildParametersKeys.FORCE_MODEL_LOADING));
     myBuildRunner = new BuildRunner(loader, filePaths, builderParams);
   }