diff --git a/build.gradle.kts b/build.gradle.kts index 460e7c3..5a9a520 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,23 +4,23 @@ plugins { sourceSets { create("common") { - java.srcDirs("src/main/java/common", "src/main/java/common") + java.srcDir("common/main") } create("acq") { - java.srcDirs("src/main/java/acq", "src/main/java/acq") + java.srcDir("acq/main") } create("acs") { - java.srcDirs("src/main/java/acs", "src/main/java/acs") + java.srcDir("acs/main") } create("externalApp") { - java.srcDirs("src/main/java/externalApp", "src/main/java/externalApp") + java.srcDir("externalApp/main") } create("httpsServer") { - java.srcDirs("src/main/java/httpsServer", "src/main/java/httpsServer") + java.srcDir("httpServer/main") } } diff --git a/src/main/java/acq/src/main/java/acq/Main.java b/src/main/java/acq/acq/src/Main.java similarity index 75% rename from src/main/java/acq/src/main/java/acq/Main.java rename to src/main/java/acq/acq/src/Main.java index 84dc757..626968a 100644 --- a/src/main/java/acq/src/main/java/acq/Main.java +++ b/src/main/java/acq/acq/src/Main.java @@ -1,4 +1,4 @@ -package src.main.java.acq; +package acq.acq.src; public class Main { public static void main(String[] args) { diff --git a/src/main/java/acs/src/main/java/acs/Main.java b/src/main/java/acs/acs/src/Main.java similarity index 75% rename from src/main/java/acs/src/main/java/acs/Main.java rename to src/main/java/acs/acs/src/Main.java index 3ecfb9f..b72340c 100644 --- a/src/main/java/acs/src/main/java/acs/Main.java +++ b/src/main/java/acs/acs/src/Main.java @@ -1,4 +1,4 @@ -package src.main.java.acs; +package acs.acs.src; 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 deleted file mode 100644 index dea53d0..0000000 --- a/src/main/java/acs/module-info.java +++ /dev/null @@ -1,3 +0,0 @@ -module acs { - exports src.main.java.acs; -} \ No newline at end of file diff --git a/src/main/java/common/src/main/java/common/Logger.java b/src/main/java/common/common/src/logger/Logger.java similarity index 95% rename from src/main/java/common/src/main/java/common/Logger.java rename to src/main/java/common/common/src/logger/Logger.java index 7f827df..f16ec85 100644 --- a/src/main/java/common/src/main/java/common/Logger.java +++ b/src/main/java/common/common/src/logger/Logger.java @@ -1,4 +1,4 @@ -package src.main.java.common; +package common.common.src.logger; public class Logger { public static void displayInfo(String message){ diff --git a/src/main/java/common/src/main/java/common/SocketManager.java b/src/main/java/common/common/src/socket/SocketManager.java similarity index 94% rename from src/main/java/common/src/main/java/common/SocketManager.java rename to src/main/java/common/common/src/socket/SocketManager.java index 9ea39e2..1d17cf7 100644 --- a/src/main/java/common/src/main/java/common/SocketManager.java +++ b/src/main/java/common/common/src/socket/SocketManager.java @@ -1,4 +1,4 @@ -package src.main.java.common; +package common.common.src.socket; import java.io.BufferedReader; import java.io.IOException; diff --git a/src/main/java/common/module-info.java b/src/main/java/common/module-info.java deleted file mode 100644 index b649466..0000000 --- a/src/main/java/common/module-info.java +++ /dev/null @@ -1,3 +0,0 @@ -module common { - exports src.main.java.common; -} \ No newline at end of file diff --git a/src/main/java/externalApp/src/main/java/externalApp/Main.java b/src/main/java/externalApp/externalApp/src/Main.java similarity index 66% rename from src/main/java/externalApp/src/main/java/externalApp/Main.java rename to src/main/java/externalApp/externalApp/src/Main.java index 63d0533..12b2bcd 100644 --- a/src/main/java/externalApp/src/main/java/externalApp/Main.java +++ b/src/main/java/externalApp/externalApp/src/Main.java @@ -1,4 +1,4 @@ -package src.main.java.externalApp; +package externalApp.externalApp.src; public class Main { public static void main(String[] args) { diff --git a/src/main/java/externalApp/module-info.java b/src/main/java/externalApp/module-info.java deleted file mode 100644 index 521cbe6..0000000 --- a/src/main/java/externalApp/module-info.java +++ /dev/null @@ -1,3 +0,0 @@ -module externalAPP { - exports src.main.java.externalApp; -} \ No newline at end of file diff --git a/src/main/java/httpsServer/httpServer/src/Main.java b/src/main/java/httpsServer/httpServer/src/Main.java new file mode 100644 index 0000000..11a825e --- /dev/null +++ b/src/main/java/httpsServer/httpServer/src/Main.java @@ -0,0 +1,9 @@ +package httpsServer.httpServer.src; +import common.common.src.logger.Logger; + +public class Main { + public static void main(String[] args) { + System.out.println("Hello World!"); + Logger.displayInfo("Hello World!"); + } +} diff --git a/src/main/java/httpsServer/module-info.java b/src/main/java/httpsServer/module-info.java deleted file mode 100644 index 432d9ee..0000000 --- a/src/main/java/httpsServer/module-info.java +++ /dev/null @@ -1,4 +0,0 @@ -module httpServer { - requires common; - requires acs; -} \ No newline at end of file diff --git a/src/main/java/httpsServer/src/main/java/httpServer/Main.java b/src/main/java/httpsServer/src/main/java/httpServer/Main.java deleted file mode 100644 index 00376ec..0000000 --- a/src/main/java/httpsServer/src/main/java/httpServer/Main.java +++ /dev/null @@ -1,8 +0,0 @@ -package src.main.java.httpServer; - -public class Main { - public static void main(String[] args) { - System.out.println("Hello World!"); - - } -}