Rename package jet -> kotlin in ide-compiler-runner

org.jetbrains.jet.compiler.runner -> org.jetbrains.kotlin.compilerRunner
org.jetbrains.jet.compiler -> org.jetbrains.kotlin.config

ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/ArgumentUtils.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.compiler.runner;
+package org.jetbrains.kotlin.compilerRunner;
 
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.Function;

ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/CompilerEnvironment.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.compiler.runner;
+package org.jetbrains.kotlin.compilerRunner;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.cli.common.messages.MessageCollector;
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.preloading.ClassCondition;
 import static org.jetbrains.jet.cli.common.messages.CompilerMessageLocation.NO_LOCATION;
 import static org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.ERROR;
 
-public final class CompilerEnvironment {
+public class CompilerEnvironment {
     @NotNull
     public static CompilerEnvironment getEnvironmentFor(
             @NotNull KotlinPaths kotlinPaths,

ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/CompilerOutputParser.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.compiler.runner;
+package org.jetbrains.kotlin.compilerRunner;
 
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.util.containers.ContainerUtil;

ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerConstants.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.compiler.runner;
+package org.jetbrains.kotlin.compilerRunner;
 
 public class CompilerRunnerConstants {
     public static final String KOTLIN_COMPILER_NAME = "Kotlin";

ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/CompilerRunnerUtil.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.compiler.runner;
+package org.jetbrains.kotlin.compilerRunner;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/KotlinCompilerRunner.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.compiler.runner;
+package org.jetbrains.kotlin.compilerRunner;
 
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.ArrayUtil;
@@ -30,7 +30,7 @@ import org.jetbrains.jet.cli.common.arguments.K2JSCompilerArguments;
 import org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments;
 import org.jetbrains.jet.cli.common.messages.MessageCollector;
 import org.jetbrains.jet.cli.common.messages.MessageCollectorUtil;
-import org.jetbrains.jet.compiler.CompilerSettings;
+import org.jetbrains.kotlin.config.CompilerSettings;
 
 import java.io.*;
 import java.util.Collection;

ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/OutputItemsCollector.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.compiler.runner;
+package org.jetbrains.kotlin.compilerRunner;
 
 import java.io.File;
 import java.util.Collection;

ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/OutputItemsCollectorImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.compiler.runner;
+package org.jetbrains.kotlin.compilerRunner;
 
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;

ide-compiler-runner/src/org/jetbrains/kotlin/compilerRunner/SimpleOutputItem.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.compiler.runner;
+package org.jetbrains.kotlin.compilerRunner;
 
 import org.jetbrains.annotations.NotNull;
 

ide-compiler-runner/src/org/jetbrains/kotlin/config/CompilerSettings.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.compiler
+package org.jetbrains.kotlin.config
 
 public class CompilerSettings {
     public var additionalArguments: String = DEFAULT_ADDITIONAL_ARGUMENTS

ide-compiler-runner/src/org/jetbrains/kotlin/config/SettingConstants.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2013 JetBrains s.r.o.
+ * Copyright 2010-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.jetbrains.jet.compiler;
+package org.jetbrains.kotlin.config;
 
 import static com.intellij.openapi.components.StoragePathMacros.PROJECT_CONFIG_DIR;
 

idea/src/org/jetbrains/jet/plugin/compiler/JetCompilerManager.java

@@ -38,8 +38,8 @@ import java.io.PrintStream;
 import java.io.PrintWriter;
 import java.util.Set;
 
-import static org.jetbrains.jet.compiler.runner.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX;
+import static org.jetbrains.kotlin.compilerRunner.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX;
-import static org.jetbrains.jet.compiler.runner.CompilerRunnerConstants.KOTLIN_COMPILER_NAME;
+import static org.jetbrains.kotlin.compilerRunner.CompilerRunnerConstants.KOTLIN_COMPILER_NAME;
 
 public class JetCompilerManager implements ProjectComponent {
     private static final Logger LOG = Logger.getInstance(JetCompilerManager.class);

idea/src/org/jetbrains/jet/plugin/compiler/configuration/Kotlin2JsCompilerArgumentsHolder.java

@@ -21,8 +21,8 @@ import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.cli.common.arguments.K2JSCompilerArguments;
 
-import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_PATH;
+import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_PATH;
-import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_TO_JS_COMPILER_ARGUMENTS_SECTION;
+import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_TO_JS_COMPILER_ARGUMENTS_SECTION;
 
 @State(
     name = KOTLIN_TO_JS_COMPILER_ARGUMENTS_SECTION,

idea/src/org/jetbrains/jet/plugin/compiler/configuration/Kotlin2JvmCompilerArgumentsHolder.java

@@ -21,8 +21,8 @@ import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments;
 
-import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_PATH;
+import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_PATH;
-import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_TO_JVM_COMPILER_ARGUMENTS_SECTION;
+import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_TO_JVM_COMPILER_ARGUMENTS_SECTION;
 
 @State(
     name = KOTLIN_TO_JVM_COMPILER_ARGUMENTS_SECTION,

idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCommonCompilerArgumentsHolder.java

@@ -21,8 +21,8 @@ import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments;
 
-import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMMON_COMPILER_ARGUMENTS_SECTION;
+import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMMON_COMPILER_ARGUMENTS_SECTION;
-import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_PATH;
+import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_PATH;
 
 @State(
     name = KOTLIN_COMMON_COMPILER_ARGUMENTS_SECTION,

idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCompilerConfigurableTab.java

@@ -32,8 +32,8 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments;
 import org.jetbrains.jet.cli.common.arguments.K2JSCompilerArguments;
-import org.jetbrains.jet.compiler.CompilerSettings;
 import org.jetbrains.jet.plugin.JetBundle;
+import org.jetbrains.kotlin.config.CompilerSettings;
 
 import javax.swing.*;
 import javax.swing.event.ChangeEvent;

idea/src/org/jetbrains/jet/plugin/compiler/configuration/KotlinCompilerSettings.java

@@ -19,10 +19,10 @@ package org.jetbrains.jet.plugin.compiler.configuration;
 import com.intellij.openapi.components.*;
 import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.compiler.CompilerSettings;
+import org.jetbrains.kotlin.config.CompilerSettings;
 
-import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_SECTION;
+import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_PATH;
-import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_PATH;
+import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_SECTION;
 
 @State(
     name = KOTLIN_COMPILER_SETTINGS_SECTION,

jps-plugin/src/org/jetbrains/kotlin/jps/JpsKotlinCompilerSettings.java

@@ -20,11 +20,11 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments;
 import org.jetbrains.jet.cli.common.arguments.K2JSCompilerArguments;
 import org.jetbrains.jet.cli.common.arguments.K2JVMCompilerArguments;
-import org.jetbrains.jet.compiler.CompilerSettings;
 import org.jetbrains.jps.model.JpsElementChildRole;
 import org.jetbrains.jps.model.JpsProject;
 import org.jetbrains.jps.model.ex.JpsElementBase;
 import org.jetbrains.jps.model.ex.JpsElementChildRoleBase;
+import org.jetbrains.kotlin.config.CompilerSettings;
 
 public class JpsKotlinCompilerSettings extends JpsElementBase<JpsKotlinCompilerSettings> {
     static final JpsElementChildRole<JpsKotlinCompilerSettings> ROLE = JpsElementChildRoleBase.create("Kotlin Compiler Settings");

jps-plugin/src/org/jetbrains/kotlin/jps/build/KotlinBuilder.kt

@@ -23,9 +23,9 @@ import org.jetbrains.jet.cli.common.KotlinVersion
 import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation
 import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity
 import org.jetbrains.jet.cli.common.messages.MessageCollector
-import org.jetbrains.jet.compiler.runner.CompilerEnvironment
+import org.jetbrains.kotlin.compilerRunner.CompilerEnvironment
-import org.jetbrains.jet.compiler.runner.CompilerRunnerConstants
+import org.jetbrains.kotlin.compilerRunner.CompilerRunnerConstants
-import org.jetbrains.jet.compiler.runner.OutputItemsCollectorImpl
+import org.jetbrains.kotlin.compilerRunner.OutputItemsCollectorImpl
 import org.jetbrains.jet.config.Services
 import org.jetbrains.jet.config.IncrementalCompilation
 import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings
@@ -43,9 +43,9 @@ import java.io.File
 import java.util.*
 import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation.NO_LOCATION
 import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity.*
-import org.jetbrains.jet.compiler.runner.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX
+import org.jetbrains.kotlin.compilerRunner.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX
-import org.jetbrains.jet.compiler.runner.KotlinCompilerRunner.runK2JsCompiler
+import org.jetbrains.kotlin.compilerRunner.KotlinCompilerRunner.runK2JsCompiler
-import org.jetbrains.jet.compiler.runner.KotlinCompilerRunner.runK2JvmCompiler
+import org.jetbrains.kotlin.compilerRunner.KotlinCompilerRunner.runK2JvmCompiler
 import org.jetbrains.jet.utils.keysToMap
 import org.jetbrains.jps.incremental.ModuleLevelBuilder.ExitCode.*
 import com.intellij.openapi.diagnostic.Logger
@@ -54,7 +54,7 @@ import org.jetbrains.jps.builders.java.JavaBuilderUtil
 import com.intellij.util.containers.MultiMap
 import org.jetbrains.jet.cli.common.arguments.CommonCompilerArguments
 import org.jetbrains.jps.model.JpsProject
-import org.jetbrains.jet.compiler.runner.SimpleOutputItem
+import org.jetbrains.kotlin.compilerRunner.SimpleOutputItem
 import org.jetbrains.jet.utils.LibraryUtils
 
 public class KotlinBuilder : ModuleLevelBuilder(BuilderCategory.SOURCE_PROCESSOR) {

jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JsCompilerArgumentsSerializer.java

@@ -24,8 +24,8 @@ import org.jetbrains.jps.model.JpsProject;
 import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer;
 import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings;
 
-import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE;
+import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE;
-import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_TO_JS_COMPILER_ARGUMENTS_SECTION;
+import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_TO_JS_COMPILER_ARGUMENTS_SECTION;
 
 class Kotlin2JsCompilerArgumentsSerializer extends JpsProjectExtensionSerializer {
     Kotlin2JsCompilerArgumentsSerializer() {

jps-plugin/src/org/jetbrains/kotlin/jps/model/Kotlin2JvmCompilerArgumentsSerializer.java

@@ -24,8 +24,8 @@ import org.jetbrains.jps.model.JpsProject;
 import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer;
 import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings;
 
-import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE;
+import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE;
-import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_TO_JVM_COMPILER_ARGUMENTS_SECTION;
+import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_TO_JVM_COMPILER_ARGUMENTS_SECTION;
 
 class Kotlin2JvmCompilerArgumentsSerializer extends JpsProjectExtensionSerializer {
     Kotlin2JvmCompilerArgumentsSerializer() {

jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCommonCompilerArgumentsSerializer.java

@@ -24,8 +24,8 @@ import org.jetbrains.jps.model.JpsProject;
 import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer;
 import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings;
 
-import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMMON_COMPILER_ARGUMENTS_SECTION;
+import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMMON_COMPILER_ARGUMENTS_SECTION;
-import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE;
+import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE;
 
 class KotlinCommonCompilerArgumentsSerializer extends JpsProjectExtensionSerializer {
     KotlinCommonCompilerArgumentsSerializer() {

jps-plugin/src/org/jetbrains/kotlin/jps/model/KotlinCompilerSettingsSerializer.java

@@ -19,13 +19,13 @@ package org.jetbrains.kotlin.jps.model;
 import com.intellij.util.xmlb.XmlSerializer;
 import org.jdom.Element;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.compiler.CompilerSettings;
 import org.jetbrains.jps.model.JpsProject;
 import org.jetbrains.jps.model.serialization.JpsProjectExtensionSerializer;
+import org.jetbrains.kotlin.config.CompilerSettings;
 import org.jetbrains.kotlin.jps.JpsKotlinCompilerSettings;
 
-import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE;
+import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_FILE;
-import static org.jetbrains.jet.compiler.SettingConstants.KOTLIN_COMPILER_SETTINGS_SECTION;
+import static org.jetbrains.kotlin.config.SettingConstants.KOTLIN_COMPILER_SETTINGS_SECTION;
 
 class KotlinCompilerSettingsSerializer extends JpsProjectExtensionSerializer {
     KotlinCompilerSettingsSerializer() {