Fixed code outside main project which was broken after refactoring.

compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompilerArguments.java

@@ -162,4 +162,8 @@ public class K2JVMCompilerArguments extends CompilerArguments {
     public void setTags(boolean tags) {
         this.tags = tags;
     }
+
+    public void setNoStdlib(boolean noStdlib) {
+        this.noStdlib = noStdlib;
+    }
 }

compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/CompileEnvironmentUtil.java

@@ -27,6 +27,7 @@ import jet.modules.Module;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.jet.cli.common.messages.MessageCollector;
+import org.jetbrains.jet.cli.jvm.JVMConfigurationKeys;
 import org.jetbrains.jet.codegen.BuiltinToJavaTypesMapping;
 import org.jetbrains.jet.codegen.ClassFileFactory;
 import org.jetbrains.jet.codegen.GeneratedClassLoader;
@@ -141,6 +142,7 @@ public class CompileEnvironmentUtil {
             }
         };
         CompilerConfiguration configuration = new CompilerConfiguration();
+        configuration.putUserData(JVMConfigurationKeys.CLASSPATH_KEY, new File[]{PathUtil.getDefaultRuntimePath()});
         JetCoreEnvironment scriptEnvironment = JetCoreEnvironment.createCoreEnvironmentForJVM(disposable, configuration);
         scriptEnvironment.addSources(moduleScriptFile);
 

libraries/tools/kdoc/src/test/kotlin/test/kotlin/kdoc/KDocTest.kt

@@ -33,7 +33,7 @@ class KDocTest {
         sourceDirs.add("../../kotlin-jdbc/src/main/kotlin")
         args.setSourceDirs(sourceDirs)
         args.setOutputDir("target/classes-stdlib")
-        args.setMode("stdlib")
+        args.setNoStdlib(true)
         args.setClasspath("../runtime/target/kotlin-runtime-0.1-SNAPSHOT.jar${File.pathSeparator}../../lib/junit-4.9.jar")
 
         val config = args.docConfig

libraries/tools/kdoc/src/test/kotlin/test/kotlin/psiUtilsTest.kt

@@ -1,23 +1,23 @@
 package test.kotlin
 
+import java.util.List
+import org.jetbrains.jet.cli.jvm.JVMConfigurationKeys
 import org.jetbrains.jet.cli.jvm.compiler.JetCoreEnvironment
-import org.junit.Before
+import org.jetbrains.jet.config.CompilerConfiguration
 import org.jetbrains.jet.internal.com.intellij.openapi.Disposable
-import org.jetbrains.jet.lang.resolve.java.CompilerDependencies
-import org.jetbrains.jet.lang.resolve.java.CompilerSpecialMode
-import org.junit.After
 import org.jetbrains.jet.internal.com.intellij.openapi.util.Disposer
-import org.junit.Test
-import org.jetbrains.jet.plugin.JetLanguage
-import org.jetbrains.jet.internal.com.intellij.testFramework.LightVirtualFile
 import org.jetbrains.jet.internal.com.intellij.openapi.vfs.CharsetToolkit
-import org.jetbrains.jet.internal.com.intellij.psi.PsiFile
-import org.jetbrains.jet.lang.psi.JetFile
 import org.jetbrains.jet.internal.com.intellij.psi.PsiFileFactory
 import org.jetbrains.jet.internal.com.intellij.psi.impl.PsiFileFactoryImpl
+import org.jetbrains.jet.internal.com.intellij.testFramework.LightVirtualFile
+import org.jetbrains.jet.lang.psi.JetFile
+import org.jetbrains.jet.plugin.JetLanguage
+import org.jetbrains.jet.utils.PathUtil
 import org.jetbrains.kotlin.doc.highlighter2.splitPsi
+import org.junit.After
 import org.junit.Assert
-import java.util.List
+import org.junit.Before
+import org.junit.Test
 
 class PsiUtilsTest {
 
@@ -32,8 +32,9 @@ class PsiUtilsTest {
     fun before() {
         System.setProperty("java.awt.headless", "true")
 
-        val compilerDependencies = CompilerDependencies.compilerDependenciesForProduction(CompilerSpecialMode.JDK_HEADERS)
+        val configuration = CompilerConfiguration()
-        environment = JetCoreEnvironment(rootDisposable, compilerDependencies)
+        configuration.putUserData(JVMConfigurationKeys.CLASSPATH_KEY, array(PathUtil.findRtJar()))
+        environment = JetCoreEnvironment(rootDisposable, configuration)
     }
 
     [After]

libraries/tools/kotlin-maven-plugin/src/main/java/org/jetbrains/kotlin/maven/KotlinCompileMojoBase.java

@@ -165,7 +165,7 @@ public abstract class KotlinCompileMojoBase extends AbstractMojo {
     protected void configureBaseCompilerArguments(Log log, K2JVMCompilerArguments arguments, String module,
                                                   List<String> sources, List<String> classpath, String output) throws MojoExecutionException {
         // don't include runtime, it should be in maven dependencies
-        arguments.mode = "stdlib";
+        arguments.noStdlib = true;
 
         final ArrayList<String> classpathList = new ArrayList<String>();
 
@@ -205,8 +205,9 @@ public abstract class KotlinCompileMojoBase extends AbstractMojo {
         log.info("Classes directory is " + output);
         arguments.setOutputDir(output);
 
-        arguments.jdkAnnotations = getJdkAnnotations().getPath();
+        arguments.noJdkAnnotations = true;
-        log.debug("Using jdk annotations from " + arguments.jdkAnnotations);
+        arguments.annotations = getJdkAnnotations().getPath();
+        log.debug("Using jdk annotations from " + arguments.annotations);
     }
 
     // TODO: Make a better runtime detection or get rid of it entirely