Add import topology (#393)

* add a the posibility to import and export topogies in JSON format

* fix web-runner integration, there were several bugs and mismatches between new implementations in OpenDC  and the UI

1 files changed, 5 insertions, 4 deletions

diff --git a/opendc-web/opendc-web-runner/build.gradle.kts b/opendc-web/opendc-web-runner/build.gradle.kts
index 97328324..a02030d9 100644
--- a/opendc-web/opendc-web-runner/build.gradle.kts
+++ b/opendc-web/opendc-web-runner/build.gradle.kts
@@ -24,7 +24,7 @@ description = "Experiment runner for OpenDC"
 
 // Build configuration
 plugins {
-    `kotlin-library-conventions`
+    `kotlin-conventions`
     distribution
 }
 
@@ -67,11 +67,11 @@ dependencies {
 }
 
 val createCli by tasks.creating(CreateStartScripts::class) {
-    dependsOn(cliJar)
+    dependsOn(cliJar, tasks.jar)
 
     applicationName = "opendc-runner"
-    mainClass.set("org.opendc.web.runner.cli.MainKt")
-    classpath = cliJar.outputs.files + cliRuntimeClasspath
+    mainClass.set("org.opendc.web.runner.MainKt")
+    classpath = tasks.jar.get().outputs.files + cliJar.outputs.files + cliRuntimeClasspath
     outputDir = project.layout.buildDirectory.get().asFile.resolve("scripts")
 }
 
@@ -83,6 +83,7 @@ distributions {
             }
 
             into("lib") {
+                from(tasks.jar)
                 from(cliJar)
                 from(cliRuntimeClasspath) // Also includes main classpath
             }