From c896bebb0ca443ff66ec2d8c2a38e6d6a8d9a601 Mon Sep 17 00:00:00 2001 From: Giovanni Ciatto Date: Tue, 24 Mar 2020 15:22:20 +0100 Subject: [PATCH 1/2] fix kotlin api dependencies --- linda-core-presentation/build.gradle.kts | 3 +-- linda-core/build.gradle.kts | 2 +- linda-logic-client/build.gradle.kts | 3 +-- linda-logic-presentation/build.gradle.kts | 2 +- linda-logic/build.gradle.kts | 4 ++-- linda-remote-client/build.gradle.kts | 4 +--- linda-text-client/build.gradle.kts | 4 +--- linda-text-presentation/build.gradle.kts | 3 +-- linda-text/build.gradle.kts | 5 ++--- presentation/build.gradle.kts | 5 ++--- prologx/build.gradle.kts | 3 +-- test-utils/build.gradle.kts | 4 ++-- tusow-cli/build.gradle.kts | 7 ++++--- .../kotlin/it/unibo/coordination/linda/cli/Cli.kt | 14 ++++++++++++++ .../unibo/coordination/linda/cli/TusowCommand.kt | 10 ---------- tusow-full/build.gradle.kts | 2 ++ tusow-full/src/main/kotlin/TusowCli.kt | 6 ++++++ tusow-full/src/main/kotlin/TusowService.kt | 6 ++++++ tusow-service/build.gradle.kts | 4 ++-- utils/build.gradle.kts | 2 +- .../coordination/utils/events/EventListener.kt | 2 +- 21 files changed, 52 insertions(+), 43 deletions(-) create mode 100644 tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/Cli.kt create mode 100644 tusow-full/src/main/kotlin/TusowCli.kt create mode 100644 tusow-full/src/main/kotlin/TusowService.kt diff --git a/linda-core-presentation/build.gradle.kts b/linda-core-presentation/build.gradle.kts index e26b1a4..8586f0f 100644 --- a/linda-core-presentation/build.gradle.kts +++ b/linda-core-presentation/build.gradle.kts @@ -1,8 +1,7 @@ dependencies { api(project(":linda-core")) api(project(":presentation")) - - implementation(kotlin("stdlib-jdk8")) + api(kotlin("stdlib-jdk8")) testImplementation(Libs.junit) testImplementation(project(":test-utils")) diff --git a/linda-core/build.gradle.kts b/linda-core/build.gradle.kts index 2e92e5d..bff31f4 100644 --- a/linda-core/build.gradle.kts +++ b/linda-core/build.gradle.kts @@ -3,7 +3,7 @@ dependencies { api(Libs.slf4j_api) api(project(":utils")) - implementation(kotlin("stdlib-jdk8")) + api(kotlin("stdlib-jdk8")) testImplementation(Libs.junit) } diff --git a/linda-logic-client/build.gradle.kts b/linda-logic-client/build.gradle.kts index d4dacaf..ab22af1 100644 --- a/linda-logic-client/build.gradle.kts +++ b/linda-logic-client/build.gradle.kts @@ -2,12 +2,11 @@ dependencies { api(project(":linda-logic")) api(project(":linda-remote-client")) api(project(":linda-logic-presentation")) + api(kotlin("stdlib-jdk8")) api(Libs.vertx_web_client) - implementation(kotlin("stdlib-jdk8")) implementation(project(":prologx")) - testImplementation(Libs.junit) testImplementation(project(":tusow-service")) testImplementation(project(":linda-test")) diff --git a/linda-logic-presentation/build.gradle.kts b/linda-logic-presentation/build.gradle.kts index cf483d8..2ef56cc 100644 --- a/linda-logic-presentation/build.gradle.kts +++ b/linda-logic-presentation/build.gradle.kts @@ -1,9 +1,9 @@ dependencies { api(project(":linda-logic")) api(project(":linda-core-presentation")) + api(kotlin("stdlib-jdk8")) implementation(project(":prologx")) - implementation(kotlin("stdlib-jdk8")) testImplementation(Libs.junit) testImplementation(project(":test-utils")) diff --git a/linda-logic/build.gradle.kts b/linda-logic/build.gradle.kts index b962396..c9e96f5 100644 --- a/linda-logic/build.gradle.kts +++ b/linda-logic/build.gradle.kts @@ -1,10 +1,10 @@ dependencies { api(Libs.`2p_core`) api(project(":linda-core")) + api(project(":utils")) + api(kotlin("stdlib-jdk8")) - implementation(project(":utils")) implementation(project(":prologx")) - implementation(kotlin("stdlib-jdk8")) testImplementation(Libs.junit) testImplementation(project(":linda-test")) diff --git a/linda-remote-client/build.gradle.kts b/linda-remote-client/build.gradle.kts index 5e3dbc7..4888d54 100644 --- a/linda-remote-client/build.gradle.kts +++ b/linda-remote-client/build.gradle.kts @@ -2,9 +2,7 @@ dependencies { api(project(":linda-core")) api(project(":presentation")) api(Libs.vertx_web_client) - - implementation(kotlin("stdlib-jdk8")) - + api(kotlin("stdlib-jdk8")) testImplementation(Libs.junit) } \ No newline at end of file diff --git a/linda-text-client/build.gradle.kts b/linda-text-client/build.gradle.kts index 942e59f..cc47033 100644 --- a/linda-text-client/build.gradle.kts +++ b/linda-text-client/build.gradle.kts @@ -2,11 +2,9 @@ dependencies { api(project(":linda-text")) api(project(":linda-remote-client")) api(project(":linda-text-presentation")) + api(kotlin("stdlib-jdk8")) api(Libs.vertx_web_client) - implementation(kotlin("stdlib-jdk8")) - - testImplementation(Libs.junit) testImplementation(project(":tusow-service")) testImplementation(project(":linda-test")) diff --git a/linda-text-presentation/build.gradle.kts b/linda-text-presentation/build.gradle.kts index b6c49f2..a046b68 100644 --- a/linda-text-presentation/build.gradle.kts +++ b/linda-text-presentation/build.gradle.kts @@ -1,8 +1,7 @@ dependencies { api(project(":linda-text")) api(project(":linda-core-presentation")) - - implementation(kotlin("stdlib-jdk8")) + api(kotlin("stdlib-jdk8")) testImplementation(Libs.junit) } \ No newline at end of file diff --git a/linda-text/build.gradle.kts b/linda-text/build.gradle.kts index ad4c9d9..8fb4586 100644 --- a/linda-text/build.gradle.kts +++ b/linda-text/build.gradle.kts @@ -1,8 +1,7 @@ dependencies { api(project(":linda-core")) - - implementation(Libs.named_regexp) - implementation(kotlin("stdlib-jdk8")) + api(kotlin("stdlib-jdk8")) + api(Libs.named_regexp) testImplementation(Libs.junit) testImplementation(project(":linda-test")) diff --git a/presentation/build.gradle.kts b/presentation/build.gradle.kts index 3e58406..fde6b5e 100644 --- a/presentation/build.gradle.kts +++ b/presentation/build.gradle.kts @@ -3,11 +3,10 @@ dependencies { api(Libs.jackson_datatype_jsr310) api(Libs.jackson_dataformat_xml) api(Libs.jackson_dataformat_yaml) + api(kotlin("stdlib-jdk8")) + api(project(":utils")) - implementation(project(":utils")) implementation(project(":prologx")) - implementation(kotlin("stdlib-jdk8")) - testImplementation(Libs.junit) testImplementation(project(":test-utils")) diff --git a/prologx/build.gradle.kts b/prologx/build.gradle.kts index 07a35cb..d7dd255 100644 --- a/prologx/build.gradle.kts +++ b/prologx/build.gradle.kts @@ -5,8 +5,7 @@ val ktFreeCompilerArgs: String by project dependencies { api(Libs.`2p_presentation`) - - implementation(kotlin("stdlib-jdk8")) + api(kotlin("stdlib-jdk8")) testImplementation(Libs.junit) } \ No newline at end of file diff --git a/test-utils/build.gradle.kts b/test-utils/build.gradle.kts index 84a33fc..68c46d6 100644 --- a/test-utils/build.gradle.kts +++ b/test-utils/build.gradle.kts @@ -3,6 +3,6 @@ val junitVersion: String by project val ktFreeCompilerArgs: String by project dependencies { - implementation(Libs.junit) - implementation(kotlin("stdlib-jdk8")) + api(kotlin("stdlib-jdk8")) + api(Libs.junit) } \ No newline at end of file diff --git a/tusow-cli/build.gradle.kts b/tusow-cli/build.gradle.kts index abedaf5..1b6a21c 100644 --- a/tusow-cli/build.gradle.kts +++ b/tusow-cli/build.gradle.kts @@ -6,9 +6,10 @@ plugins { dependencies { api(project(":linda-logic-client")) api(project(":linda-text-client")) + api(kotlin("stdlib-jdk8")) + api(Libs.clikt) - implementation(Libs.clikt) - implementation(kotlin("stdlib-jdk8")) + implementation(Libs.logback_classic) testImplementation(Libs.junit) testImplementation(project(":tusow-service")) @@ -16,7 +17,7 @@ dependencies { testImplementation(project(":test-utils")) } -val mainClass = "it.unibo.coordination.linda.cli.TusowCommandKt" +val mainClass = "it.unibo.coordination.linda.cli.Cli" application { mainClassName = mainClass diff --git a/tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/Cli.kt b/tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/Cli.kt new file mode 100644 index 0000000..6bd8eeb --- /dev/null +++ b/tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/Cli.kt @@ -0,0 +1,14 @@ +package it.unibo.coordination.linda.cli + +object Cli { + @JvmStatic + fun main(args: Array) { + try { + TusowCommand().main(args) + System.exit(0) + } catch (e: Exception) { + e.printStackTrace() + System.exit(1) + } + } +} \ No newline at end of file diff --git a/tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/TusowCommand.kt b/tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/TusowCommand.kt index e62f575..94f5e65 100644 --- a/tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/TusowCommand.kt +++ b/tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/TusowCommand.kt @@ -16,14 +16,4 @@ class TusowCommand() : CliktCommand(name="tusow") { } override fun run() = Unit -} - -fun main(args: Array) { - try { - TusowCommand().main(args) - System.exit(0) - } catch (e: Exception) { - e.printStackTrace() - System.exit(1) - } } \ No newline at end of file diff --git a/tusow-full/build.gradle.kts b/tusow-full/build.gradle.kts index 7d5a48a..13f2e18 100644 --- a/tusow-full/build.gradle.kts +++ b/tusow-full/build.gradle.kts @@ -7,6 +7,8 @@ dependencies { .forEach { api(project(":$it")) } + + implementation(Libs.logback_classic) } tasks.getByName("shadowJar") { diff --git a/tusow-full/src/main/kotlin/TusowCli.kt b/tusow-full/src/main/kotlin/TusowCli.kt new file mode 100644 index 0000000..104d801 --- /dev/null +++ b/tusow-full/src/main/kotlin/TusowCli.kt @@ -0,0 +1,6 @@ +object TusowCli { + @JvmStatic + fun main(args: Array) { + it.unibo.coordination.linda.cli.Cli.main(args) + } +} \ No newline at end of file diff --git a/tusow-full/src/main/kotlin/TusowService.kt b/tusow-full/src/main/kotlin/TusowService.kt new file mode 100644 index 0000000..8c5bdb3 --- /dev/null +++ b/tusow-full/src/main/kotlin/TusowService.kt @@ -0,0 +1,6 @@ +object TusowService { + @JvmStatic + fun main(args: Array) { + it.unibo.coordination.tusow.Service.main(args) + } +} \ No newline at end of file diff --git a/tusow-service/build.gradle.kts b/tusow-service/build.gradle.kts index 44d4429..2345550 100644 --- a/tusow-service/build.gradle.kts +++ b/tusow-service/build.gradle.kts @@ -8,10 +8,11 @@ dependencies { api(project(":linda-logic-presentation")) api(project(":linda-text")) api(project(":linda-text-presentation")) + api(kotlin("stdlib-jdk8")) api(Libs.vertx_core) api(Libs.vertx_web) - runtimeOnly(Libs.logback_classic) + implementation(Libs.logback_classic) implementation(project(":prologx")) implementation(Libs.commons_cli) @@ -20,7 +21,6 @@ dependencies { implementation(Libs.jackson_dataformat_xml) implementation(Libs.jackson_dataformat_yaml) implementation(Libs.jool) - implementation(kotlin("stdlib-jdk8")) testImplementation(Libs.vertx_unit) testImplementation(Libs.junit) diff --git a/utils/build.gradle.kts b/utils/build.gradle.kts index 0fdf94a..e2db419 100644 --- a/utils/build.gradle.kts +++ b/utils/build.gradle.kts @@ -1,4 +1,4 @@ dependencies { - implementation(kotlin("stdlib-jdk8")) + api(kotlin("stdlib-jdk8")) testImplementation(Libs.junit) } \ No newline at end of file diff --git a/utils/src/main/kotlin/it/unibo/coordination/utils/events/EventListener.kt b/utils/src/main/kotlin/it/unibo/coordination/utils/events/EventListener.kt index 47eebf6..ced8618 100644 --- a/utils/src/main/kotlin/it/unibo/coordination/utils/events/EventListener.kt +++ b/utils/src/main/kotlin/it/unibo/coordination/utils/events/EventListener.kt @@ -1,3 +1,3 @@ package it.unibo.coordination.utils.events -typealias EventListener = (T) -> Any \ No newline at end of file +typealias EventListener = (T) -> Unit \ No newline at end of file From c61d08c40c27833d7f282bd56ab2493412e83681 Mon Sep 17 00:00:00 2001 From: Giovanni Ciatto Date: Tue, 24 Mar 2020 15:26:45 +0100 Subject: [PATCH 2/2] it.unibo.coordination.linda.cli -> it.unibo.coordination.tusow --- tusow-cli/build.gradle.kts | 2 +- .../coordination/{linda/cli => tusow}/AbsentCommand.kt | 6 +++--- .../{linda/cli => tusow}/AbstractObserveCommand.kt | 2 +- .../{linda/cli => tusow}/AbstractTupleSpaceCommand.kt | 6 +++--- .../{linda/cli => tusow}/AbstractUpdateCommand.kt | 2 +- .../it/unibo/coordination/{linda/cli => tusow}/Cli.kt | 2 +- .../unibo/coordination/{linda/cli => tusow}/CountCommand.kt | 2 +- .../unibo/coordination/{linda/cli => tusow}/GetCommand.kt | 2 +- .../unibo/coordination/{linda/cli => tusow}/ReadCommand.kt | 6 +++--- .../unibo/coordination/{linda/cli => tusow}/TakeCommand.kt | 6 +++--- .../unibo/coordination/{linda/cli => tusow}/TupleSpaceID.kt | 2 +- .../coordination/{linda/cli => tusow}/TupleSpaceTypes.kt | 2 +- .../unibo/coordination/{linda/cli => tusow}/TusowCommand.kt | 2 +- .../unibo/coordination/{linda/cli => tusow}/WriteCommand.kt | 2 +- tusow-full/src/main/kotlin/TusowCli.kt | 4 +++- 15 files changed, 25 insertions(+), 23 deletions(-) rename tusow-cli/src/main/kotlin/it/unibo/coordination/{linda/cli => tusow}/AbsentCommand.kt (93%) rename tusow-cli/src/main/kotlin/it/unibo/coordination/{linda/cli => tusow}/AbstractObserveCommand.kt (98%) rename tusow-cli/src/main/kotlin/it/unibo/coordination/{linda/cli => tusow}/AbstractTupleSpaceCommand.kt (95%) rename tusow-cli/src/main/kotlin/it/unibo/coordination/{linda/cli => tusow}/AbstractUpdateCommand.kt (98%) rename tusow-cli/src/main/kotlin/it/unibo/coordination/{linda/cli => tusow}/Cli.kt (86%) rename tusow-cli/src/main/kotlin/it/unibo/coordination/{linda/cli => tusow}/CountCommand.kt (96%) rename tusow-cli/src/main/kotlin/it/unibo/coordination/{linda/cli => tusow}/GetCommand.kt (97%) rename tusow-cli/src/main/kotlin/it/unibo/coordination/{linda/cli => tusow}/ReadCommand.kt (92%) rename tusow-cli/src/main/kotlin/it/unibo/coordination/{linda/cli => tusow}/TakeCommand.kt (92%) rename tusow-cli/src/main/kotlin/it/unibo/coordination/{linda/cli => tusow}/TupleSpaceID.kt (72%) rename tusow-cli/src/main/kotlin/it/unibo/coordination/{linda/cli => tusow}/TupleSpaceTypes.kt (56%) rename tusow-cli/src/main/kotlin/it/unibo/coordination/{linda/cli => tusow}/TusowCommand.kt (90%) rename tusow-cli/src/main/kotlin/it/unibo/coordination/{linda/cli => tusow}/WriteCommand.kt (98%) diff --git a/tusow-cli/build.gradle.kts b/tusow-cli/build.gradle.kts index 1b6a21c..3c6c4d5 100644 --- a/tusow-cli/build.gradle.kts +++ b/tusow-cli/build.gradle.kts @@ -17,7 +17,7 @@ dependencies { testImplementation(project(":test-utils")) } -val mainClass = "it.unibo.coordination.linda.cli.Cli" +val mainClass = "it.unibo.coordination.tusow.Cli" application { mainClassName = mainClass diff --git a/tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/AbsentCommand.kt b/tusow-cli/src/main/kotlin/it/unibo/coordination/tusow/AbsentCommand.kt similarity index 93% rename from tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/AbsentCommand.kt rename to tusow-cli/src/main/kotlin/it/unibo/coordination/tusow/AbsentCommand.kt index b8f0d1b..3431834 100644 --- a/tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/AbsentCommand.kt +++ b/tusow-cli/src/main/kotlin/it/unibo/coordination/tusow/AbsentCommand.kt @@ -1,12 +1,12 @@ -package it.unibo.coordination.linda.cli +package it.unibo.coordination.tusow -import it.unibo.coordination.linda.cli.TupleSpaceTypes.LOGIC -import it.unibo.coordination.linda.cli.TupleSpaceTypes.TEXT import it.unibo.coordination.linda.core.Match import it.unibo.coordination.linda.core.Template import it.unibo.coordination.linda.core.Tuple import it.unibo.coordination.linda.logic.LogicSpace import it.unibo.coordination.linda.text.TextualSpace +import it.unibo.coordination.tusow.TupleSpaceTypes.LOGIC +import it.unibo.coordination.tusow.TupleSpaceTypes.TEXT class AbsentCommand( epilog: String = "", diff --git a/tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/AbstractObserveCommand.kt b/tusow-cli/src/main/kotlin/it/unibo/coordination/tusow/AbstractObserveCommand.kt similarity index 98% rename from tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/AbstractObserveCommand.kt rename to tusow-cli/src/main/kotlin/it/unibo/coordination/tusow/AbstractObserveCommand.kt index be56276..4eea597 100644 --- a/tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/AbstractObserveCommand.kt +++ b/tusow-cli/src/main/kotlin/it/unibo/coordination/tusow/AbstractObserveCommand.kt @@ -1,4 +1,4 @@ -package it.unibo.coordination.linda.cli +package it.unibo.coordination.tusow import com.github.ajalt.clikt.parameters.arguments.argument import com.github.ajalt.clikt.parameters.options.flag diff --git a/tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/AbstractTupleSpaceCommand.kt b/tusow-cli/src/main/kotlin/it/unibo/coordination/tusow/AbstractTupleSpaceCommand.kt similarity index 95% rename from tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/AbstractTupleSpaceCommand.kt rename to tusow-cli/src/main/kotlin/it/unibo/coordination/tusow/AbstractTupleSpaceCommand.kt index 334e467..ad805f0 100644 --- a/tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/AbstractTupleSpaceCommand.kt +++ b/tusow-cli/src/main/kotlin/it/unibo/coordination/tusow/AbstractTupleSpaceCommand.kt @@ -1,4 +1,4 @@ -package it.unibo.coordination.linda.cli +package it.unibo.coordination.tusow import com.github.ajalt.clikt.core.CliktCommand import com.github.ajalt.clikt.parameters.options.default @@ -6,11 +6,11 @@ import com.github.ajalt.clikt.parameters.options.flag import com.github.ajalt.clikt.parameters.options.option import com.github.ajalt.clikt.parameters.types.enum import com.github.ajalt.clikt.parameters.types.int -import it.unibo.coordination.linda.cli.TupleSpaceTypes.LOGIC -import it.unibo.coordination.linda.cli.TupleSpaceTypes.TEXT import it.unibo.coordination.linda.core.TupleSpace import it.unibo.coordination.linda.logic.remote.RemoteLogicSpace import it.unibo.coordination.linda.text.remote.RemoteTextualSpace +import it.unibo.coordination.tusow.TupleSpaceTypes.LOGIC +import it.unibo.coordination.tusow.TupleSpaceTypes.TEXT import java.net.URL import java.util.concurrent.CompletableFuture import java.util.concurrent.ExecutionException diff --git a/tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/AbstractUpdateCommand.kt b/tusow-cli/src/main/kotlin/it/unibo/coordination/tusow/AbstractUpdateCommand.kt similarity index 98% rename from tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/AbstractUpdateCommand.kt rename to tusow-cli/src/main/kotlin/it/unibo/coordination/tusow/AbstractUpdateCommand.kt index 0904ff8..c22f8b1 100644 --- a/tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/AbstractUpdateCommand.kt +++ b/tusow-cli/src/main/kotlin/it/unibo/coordination/tusow/AbstractUpdateCommand.kt @@ -1,4 +1,4 @@ -package it.unibo.coordination.linda.cli +package it.unibo.coordination.tusow import com.github.ajalt.clikt.parameters.arguments.argument import com.github.ajalt.clikt.parameters.arguments.multiple diff --git a/tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/Cli.kt b/tusow-cli/src/main/kotlin/it/unibo/coordination/tusow/Cli.kt similarity index 86% rename from tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/Cli.kt rename to tusow-cli/src/main/kotlin/it/unibo/coordination/tusow/Cli.kt index 6bd8eeb..c6a72d8 100644 --- a/tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/Cli.kt +++ b/tusow-cli/src/main/kotlin/it/unibo/coordination/tusow/Cli.kt @@ -1,4 +1,4 @@ -package it.unibo.coordination.linda.cli +package it.unibo.coordination.tusow object Cli { @JvmStatic diff --git a/tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/CountCommand.kt b/tusow-cli/src/main/kotlin/it/unibo/coordination/tusow/CountCommand.kt similarity index 96% rename from tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/CountCommand.kt rename to tusow-cli/src/main/kotlin/it/unibo/coordination/tusow/CountCommand.kt index 9c77c86..af0f04c 100644 --- a/tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/CountCommand.kt +++ b/tusow-cli/src/main/kotlin/it/unibo/coordination/tusow/CountCommand.kt @@ -1,4 +1,4 @@ -package it.unibo.coordination.linda.cli +package it.unibo.coordination.tusow import it.unibo.coordination.linda.logic.LogicSpace import it.unibo.coordination.linda.text.TextualSpace diff --git a/tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/GetCommand.kt b/tusow-cli/src/main/kotlin/it/unibo/coordination/tusow/GetCommand.kt similarity index 97% rename from tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/GetCommand.kt rename to tusow-cli/src/main/kotlin/it/unibo/coordination/tusow/GetCommand.kt index 74b9dd9..1f7039c 100644 --- a/tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/GetCommand.kt +++ b/tusow-cli/src/main/kotlin/it/unibo/coordination/tusow/GetCommand.kt @@ -1,4 +1,4 @@ -package it.unibo.coordination.linda.cli +package it.unibo.coordination.tusow import it.unibo.coordination.linda.core.Tuple import it.unibo.coordination.linda.logic.LogicSpace diff --git a/tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/ReadCommand.kt b/tusow-cli/src/main/kotlin/it/unibo/coordination/tusow/ReadCommand.kt similarity index 92% rename from tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/ReadCommand.kt rename to tusow-cli/src/main/kotlin/it/unibo/coordination/tusow/ReadCommand.kt index f2b26ac..5318e2e 100644 --- a/tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/ReadCommand.kt +++ b/tusow-cli/src/main/kotlin/it/unibo/coordination/tusow/ReadCommand.kt @@ -1,9 +1,9 @@ -package it.unibo.coordination.linda.cli +package it.unibo.coordination.tusow -import it.unibo.coordination.linda.cli.TupleSpaceTypes.LOGIC -import it.unibo.coordination.linda.cli.TupleSpaceTypes.TEXT import it.unibo.coordination.linda.logic.LogicSpace import it.unibo.coordination.linda.text.TextualSpace +import it.unibo.coordination.tusow.TupleSpaceTypes.LOGIC +import it.unibo.coordination.tusow.TupleSpaceTypes.TEXT class ReadCommand( epilog: String = "", diff --git a/tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/TakeCommand.kt b/tusow-cli/src/main/kotlin/it/unibo/coordination/tusow/TakeCommand.kt similarity index 92% rename from tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/TakeCommand.kt rename to tusow-cli/src/main/kotlin/it/unibo/coordination/tusow/TakeCommand.kt index 6754e66..97f46b4 100644 --- a/tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/TakeCommand.kt +++ b/tusow-cli/src/main/kotlin/it/unibo/coordination/tusow/TakeCommand.kt @@ -1,9 +1,9 @@ -package it.unibo.coordination.linda.cli +package it.unibo.coordination.tusow -import it.unibo.coordination.linda.cli.TupleSpaceTypes.LOGIC -import it.unibo.coordination.linda.cli.TupleSpaceTypes.TEXT import it.unibo.coordination.linda.logic.LogicSpace import it.unibo.coordination.linda.text.TextualSpace +import it.unibo.coordination.tusow.TupleSpaceTypes.LOGIC +import it.unibo.coordination.tusow.TupleSpaceTypes.TEXT class TakeCommand( epilog: String = "", diff --git a/tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/TupleSpaceID.kt b/tusow-cli/src/main/kotlin/it/unibo/coordination/tusow/TupleSpaceID.kt similarity index 72% rename from tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/TupleSpaceID.kt rename to tusow-cli/src/main/kotlin/it/unibo/coordination/tusow/TupleSpaceID.kt index a2e619d..cf91959 100644 --- a/tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/TupleSpaceID.kt +++ b/tusow-cli/src/main/kotlin/it/unibo/coordination/tusow/TupleSpaceID.kt @@ -1,4 +1,4 @@ -package it.unibo.coordination.linda.cli +package it.unibo.coordination.tusow import java.net.URL diff --git a/tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/TupleSpaceTypes.kt b/tusow-cli/src/main/kotlin/it/unibo/coordination/tusow/TupleSpaceTypes.kt similarity index 56% rename from tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/TupleSpaceTypes.kt rename to tusow-cli/src/main/kotlin/it/unibo/coordination/tusow/TupleSpaceTypes.kt index d884dc4..3a8df5d 100644 --- a/tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/TupleSpaceTypes.kt +++ b/tusow-cli/src/main/kotlin/it/unibo/coordination/tusow/TupleSpaceTypes.kt @@ -1,4 +1,4 @@ -package it.unibo.coordination.linda.cli +package it.unibo.coordination.tusow enum class TupleSpaceTypes { LOGIC, diff --git a/tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/TusowCommand.kt b/tusow-cli/src/main/kotlin/it/unibo/coordination/tusow/TusowCommand.kt similarity index 90% rename from tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/TusowCommand.kt rename to tusow-cli/src/main/kotlin/it/unibo/coordination/tusow/TusowCommand.kt index 94f5e65..fd90eb9 100644 --- a/tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/TusowCommand.kt +++ b/tusow-cli/src/main/kotlin/it/unibo/coordination/tusow/TusowCommand.kt @@ -1,4 +1,4 @@ -package it.unibo.coordination.linda.cli +package it.unibo.coordination.tusow import com.github.ajalt.clikt.core.CliktCommand import com.github.ajalt.clikt.core.subcommands diff --git a/tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/WriteCommand.kt b/tusow-cli/src/main/kotlin/it/unibo/coordination/tusow/WriteCommand.kt similarity index 98% rename from tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/WriteCommand.kt rename to tusow-cli/src/main/kotlin/it/unibo/coordination/tusow/WriteCommand.kt index dd93883..705c503 100644 --- a/tusow-cli/src/main/kotlin/it/unibo/coordination/linda/cli/WriteCommand.kt +++ b/tusow-cli/src/main/kotlin/it/unibo/coordination/tusow/WriteCommand.kt @@ -1,4 +1,4 @@ -package it.unibo.coordination.linda.cli +package it.unibo.coordination.tusow import it.unibo.coordination.linda.logic.LogicSpace import it.unibo.coordination.linda.logic.LogicTuple diff --git a/tusow-full/src/main/kotlin/TusowCli.kt b/tusow-full/src/main/kotlin/TusowCli.kt index 104d801..e05763d 100644 --- a/tusow-full/src/main/kotlin/TusowCli.kt +++ b/tusow-full/src/main/kotlin/TusowCli.kt @@ -1,6 +1,8 @@ +import it.unibo.coordination.tusow.Cli + object TusowCli { @JvmStatic fun main(args: Array) { - it.unibo.coordination.linda.cli.Cli.main(args) + Cli.main(args) } } \ No newline at end of file