Refactor CompilerConfiguration: keys -> Content roots

Represent classpath roots and java source roots as separate entities

compiler/tests/org/jetbrains/kotlin/asJava/LightClassAnnotationsTest.java

@@ -21,7 +21,6 @@ import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiModifierList;
 import com.intellij.psi.search.GlobalSearchScope;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.kotlin.cli.jvm.JVMConfigurationKeys;
 import org.jetbrains.kotlin.config.CompilerConfiguration;
 import org.jetbrains.kotlin.test.JetTestUtils;
 
@@ -29,6 +28,8 @@ import java.io.File;
 import java.util.Collections;
 import java.util.List;
 
+import static org.jetbrains.kotlin.cli.jvm.config.ConfigPackage.addJvmClasspathRoot;
+
 public class LightClassAnnotationsTest extends KotlinAsJavaTestBase {
     private final File testDir = new File("compiler/testData/asJava/annotations");
 
@@ -39,7 +40,7 @@ public class LightClassAnnotationsTest extends KotlinAsJavaTestBase {
 
     @Override
     protected void extraConfiguration(@NotNull CompilerConfiguration configuration) {
-        configuration.add(JVMConfigurationKeys.CLASSPATH_KEY, JetTestUtils.getAnnotationsJar());
+        addJvmClasspathRoot(configuration, JetTestUtils.getAnnotationsJar());
     }
 
     public void testExtraAnnotations() throws Exception {