diff --git a/build.gradle.kts b/build.gradle.kts index 8f17e2f..460e7c3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,11 +4,11 @@ plugins { sourceSets { create("common") { - java.srcDir("src/main/java/common") + java.srcDirs("src/main/java/common", "src/main/java/common") } create("acq") { - java.srcDirs("src/main/java/common", "src/main/java/acq") + java.srcDirs("src/main/java/acq", "src/main/java/acq") } create("acs") { @@ -16,11 +16,11 @@ sourceSets { } create("externalApp") { - java.srcDirs("src/main/java/common", "src/main/java/externalApp") + java.srcDirs("src/main/java/externalApp", "src/main/java/externalApp") } create("httpsServer") { - java.srcDirs("src/main/java/common", "src/main/java/httpsServer") + java.srcDirs("src/main/java/httpsServer", "src/main/java/httpsServer") } } diff --git a/src/main/java/acq/acq/Main.java b/src/main/java/acq/src/main/java/acq/Main.java similarity index 75% rename from src/main/java/acq/acq/Main.java rename to src/main/java/acq/src/main/java/acq/Main.java index 4e3c793..84dc757 100644 --- a/src/main/java/acq/acq/Main.java +++ b/src/main/java/acq/src/main/java/acq/Main.java @@ -1,4 +1,4 @@ -package acq; +package src.main.java.acq; public class Main { public static void main(String[] args) { diff --git a/src/main/java/acs/module-info.java b/src/main/java/acs/module-info.java new file mode 100644 index 0000000..dea53d0 --- /dev/null +++ b/src/main/java/acs/module-info.java @@ -0,0 +1,3 @@ +module acs { + exports src.main.java.acs; +} \ No newline at end of file diff --git a/src/main/java/acs/acs/Main.java b/src/main/java/acs/src/main/java/acs/Main.java similarity index 75% rename from src/main/java/acs/acs/Main.java rename to src/main/java/acs/src/main/java/acs/Main.java index f0b3b2f..3ecfb9f 100644 --- a/src/main/java/acs/acs/Main.java +++ b/src/main/java/acs/src/main/java/acs/Main.java @@ -1,4 +1,4 @@ -package acs; +package src.main.java.acs; public class Main { public static void main(String[] args) { diff --git a/src/main/java/common/module-info.java b/src/main/java/common/module-info.java new file mode 100644 index 0000000..b649466 --- /dev/null +++ b/src/main/java/common/module-info.java @@ -0,0 +1,3 @@ +module common { + exports src.main.java.common; +} \ No newline at end of file diff --git a/src/main/java/common/common/Logger.java b/src/main/java/common/src/main/java/common/Logger.java similarity index 95% rename from src/main/java/common/common/Logger.java rename to src/main/java/common/src/main/java/common/Logger.java index d8218c9..7f827df 100644 --- a/src/main/java/common/common/Logger.java +++ b/src/main/java/common/src/main/java/common/Logger.java @@ -1,4 +1,4 @@ -package common; +package src.main.java.common; public class Logger { public static void displayInfo(String message){ diff --git a/src/main/java/common/common/SocketManager.java b/src/main/java/common/src/main/java/common/SocketManager.java similarity index 94% rename from src/main/java/common/common/SocketManager.java rename to src/main/java/common/src/main/java/common/SocketManager.java index b4b4113..9ea39e2 100644 --- a/src/main/java/common/common/SocketManager.java +++ b/src/main/java/common/src/main/java/common/SocketManager.java @@ -1,4 +1,4 @@ -package common; +package src.main.java.common; import java.io.BufferedReader; import java.io.IOException; diff --git a/src/main/java/externalApp/module-info.java b/src/main/java/externalApp/module-info.java new file mode 100644 index 0000000..521cbe6 --- /dev/null +++ b/src/main/java/externalApp/module-info.java @@ -0,0 +1,3 @@ +module externalAPP { + exports src.main.java.externalApp; +} \ No newline at end of file diff --git a/src/main/java/externalApp/externalApp/Main.java b/src/main/java/externalApp/src/main/java/externalApp/Main.java similarity index 68% rename from src/main/java/externalApp/externalApp/Main.java rename to src/main/java/externalApp/src/main/java/externalApp/Main.java index 78b033d..63d0533 100644 --- a/src/main/java/externalApp/externalApp/Main.java +++ b/src/main/java/externalApp/src/main/java/externalApp/Main.java @@ -1,4 +1,4 @@ -package externalApp; +package src.main.java.externalApp; public class Main { public static void main(String[] args) { diff --git a/src/main/java/httpsServer/module-info.java b/src/main/java/httpsServer/module-info.java new file mode 100644 index 0000000..432d9ee --- /dev/null +++ b/src/main/java/httpsServer/module-info.java @@ -0,0 +1,4 @@ +module httpServer { + requires common; + requires acs; +} \ No newline at end of file diff --git a/src/main/java/httpsServer/httpsServer/Main.java b/src/main/java/httpsServer/src/main/java/httpServer/Main.java similarity index 77% rename from src/main/java/httpsServer/httpsServer/Main.java rename to src/main/java/httpsServer/src/main/java/httpServer/Main.java index ae6f35f..00376ec 100644 --- a/src/main/java/httpsServer/httpsServer/Main.java +++ b/src/main/java/httpsServer/src/main/java/httpServer/Main.java @@ -1,7 +1,8 @@ -package httpsServer; +package src.main.java.httpServer; public class Main { public static void main(String[] args) { System.out.println("Hello World!"); + } }