Refactor script resolving interface

- return Future from resovler
- pack script contents data to a separate interface
 -extend script dependencies with additional scripts property
 - minor renames and moves

compiler/tests/org/jetbrains/kotlin/scripts/ScriptTest2.kt

@@ -34,6 +34,7 @@ import org.junit.Assert
 import org.junit.Test
 import java.io.File
 import java.net.URLClassLoader
+import java.util.concurrent.Future
 import kotlin.reflect.KClass
 
 // TODO: the contetnts of this file should go into ScriptTest.kt and replace appropriate xml-based functionality,
@@ -118,28 +119,27 @@ class ScriptTest2 {
     }
 }
 
-class TestKotlinScriptDependenciesResolver : AnnotationBasedScriptDependenciesResolver {
+class TestKotlinScriptDependenciesResolver : ScriptDependenciesResolverEx {
 
     private val kotlinPaths by lazy { PathUtil.getKotlinPathsForCompiler() }
 
     @AcceptedAnnotations(DependsOn::class)
-    override fun resolve(scriptFile: File?,
-                         annotations: Iterable<Annotation>,
+    override fun resolve(script: ScriptContents,
                          environment: Map<String, Any?>?,
                          previousDependencies: KotlinScriptExternalDependencies?
-    ): KotlinScriptExternalDependencies?
+    ): Future<KotlinScriptExternalDependencies>?
     {
-        val cp = annotations.flatMap {
+        val cp = script.annotations.flatMap {
             when (it) {
                 is DependsOn -> listOf(if (it.path == "@{runtime}") kotlinPaths.runtimePath else File(it.path))
                 is InvalidScriptResolverAnnotation -> throw Exception("Invalid annotation ${it.name}", it.error)
                 else -> throw Exception("Unknown annotation ${it.javaClass}")
             }
         }
-        return object : KotlinScriptExternalDependencies {
+        return makeNullableFakeFuture(object : KotlinScriptExternalDependencies {
             override val classpath: Iterable<File> = classpathFromClassloader() + cp
             override val imports: Iterable<String> = listOf("org.jetbrains.kotlin.scripts.DependsOn")
-        }
+        })
     }
 
     private fun classpathFromClassloader(): List<File> =