diff --git a/InnaIrcBot.iml b/InnaIrcBot.iml index e1b5c72..de13f4c 100644 --- a/InnaIrcBot.iml +++ b/InnaIrcBot.iml @@ -1,16 +1,19 @@ - - - + + + + - - - + + + + + - - + + \ No newline at end of file diff --git a/LICENSE b/LICENSE.txt similarity index 100% rename from LICENSE rename to LICENSE.txt diff --git a/src/InnaIrcBot/README.md b/README.md similarity index 97% rename from src/InnaIrcBot/README.md rename to README.md index 491c846..5619745 100644 --- a/src/InnaIrcBot/README.md +++ b/README.md @@ -39,5 +39,5 @@ Used libraries: - [ ] Docker(+compose) package - [ ] Flood tracker - [ ] Deep configuration files validation -- [ ] Maven or Gradle build +- [x] Maven ~~or Gradle~~ build - [ ] ncurses-like or/and GUI configuration files (server/chanel setting) editor diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..6614cd2 --- /dev/null +++ b/pom.xml @@ -0,0 +1,71 @@ + + + + 4.0.0 + loper + InnaIrcBot + 0.1-SNAPSHOT + + jar + InnaIrcBot + + UTF-8 + + + + org.xerial + sqlite-jdbc + 3.23.1 + compile + + + com.google.code.gson + gson + 2.8.5 + compile + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.8 + 1.8 + + + **/Temporary/* + + + + + + org.apache.maven.plugins + maven-assembly-plugin + 2.5.3 + + + + + InnaIrcBot.BotStart + + + + + jar-with-dependencies + + + + + make-assembly + package + + single + + + + + + + \ No newline at end of file diff --git a/src/InnaIrcBot/lib/gson-2.8.5.jar b/src/InnaIrcBot/lib/gson-2.8.5.jar deleted file mode 100644 index 0d5baf3..0000000 Binary files a/src/InnaIrcBot/lib/gson-2.8.5.jar and /dev/null differ diff --git a/src/InnaIrcBot/lib/sqlite-jdbc-3.23.1.jar b/src/InnaIrcBot/lib/sqlite-jdbc-3.23.1.jar deleted file mode 100644 index ce81d03..0000000 Binary files a/src/InnaIrcBot/lib/sqlite-jdbc-3.23.1.jar and /dev/null differ diff --git a/src/InnaIrcBot/BotStart.java b/src/main/java/InnaIrcBot/BotStart.java similarity index 82% rename from src/InnaIrcBot/BotStart.java rename to src/main/java/InnaIrcBot/BotStart.java index 518d6cd..36e9858 100644 --- a/src/InnaIrcBot/BotStart.java +++ b/src/main/java/InnaIrcBot/BotStart.java @@ -6,9 +6,7 @@ * */ package InnaIrcBot; -import InnaIrcBot.Config.StorageFile; import InnaIrcBot.Config.StorageReader; -import InnaIrcBot.ProvidersConsumers.DataProvider; public class BotStart { //TODO: Steam link, flood control, kikbana @@ -33,8 +31,8 @@ public class BotStart { else { System.out.println("Usage:\n" +" \t-c, --configuration [ ...]\tRead Config\n" - +"\t-g, --generate\t[name.config]\t\t\t\t\t\t\tGenerate Config\n" - +"\t-v, --version\t\t\t\t\t\t\t\t\t\t\tGet application version"); + +"\t-g, --generate\t[name.config]\t\t\t\tGenerate Config\n" + +"\t-v, --version\t\t\t\t\t\tGet application version"); } } } \ No newline at end of file diff --git a/src/InnaIrcBot/Commanders/ChanelCommander.java b/src/main/java/InnaIrcBot/Commanders/ChanelCommander.java similarity index 100% rename from src/InnaIrcBot/Commanders/ChanelCommander.java rename to src/main/java/InnaIrcBot/Commanders/ChanelCommander.java diff --git a/src/InnaIrcBot/Commanders/JoinFloodHandler.java b/src/main/java/InnaIrcBot/Commanders/JoinFloodHandler.java similarity index 100% rename from src/InnaIrcBot/Commanders/JoinFloodHandler.java rename to src/main/java/InnaIrcBot/Commanders/JoinFloodHandler.java diff --git a/src/InnaIrcBot/Commanders/PrivateMsgCommander.java b/src/main/java/InnaIrcBot/Commanders/PrivateMsgCommander.java similarity index 100% rename from src/InnaIrcBot/Commanders/PrivateMsgCommander.java rename to src/main/java/InnaIrcBot/Commanders/PrivateMsgCommander.java diff --git a/src/InnaIrcBot/Config/StorageFile.java b/src/main/java/InnaIrcBot/Config/StorageFile.java similarity index 100% rename from src/InnaIrcBot/Config/StorageFile.java rename to src/main/java/InnaIrcBot/Config/StorageFile.java diff --git a/src/InnaIrcBot/Config/StorageReader.java b/src/main/java/InnaIrcBot/Config/StorageReader.java similarity index 100% rename from src/InnaIrcBot/Config/StorageReader.java rename to src/main/java/InnaIrcBot/Config/StorageReader.java diff --git a/src/InnaIrcBot/Connections.java b/src/main/java/InnaIrcBot/Connections.java similarity index 100% rename from src/InnaIrcBot/Connections.java rename to src/main/java/InnaIrcBot/Connections.java diff --git a/src/InnaIrcBot/GlobalData.java b/src/main/java/InnaIrcBot/GlobalData.java similarity index 100% rename from src/InnaIrcBot/GlobalData.java rename to src/main/java/InnaIrcBot/GlobalData.java diff --git a/src/InnaIrcBot/LogDriver/BotDriver.java b/src/main/java/InnaIrcBot/LogDriver/BotDriver.java similarity index 100% rename from src/InnaIrcBot/LogDriver/BotDriver.java rename to src/main/java/InnaIrcBot/LogDriver/BotDriver.java diff --git a/src/InnaIrcBot/LogDriver/BotFilesWorker.java b/src/main/java/InnaIrcBot/LogDriver/BotFilesWorker.java similarity index 100% rename from src/InnaIrcBot/LogDriver/BotFilesWorker.java rename to src/main/java/InnaIrcBot/LogDriver/BotFilesWorker.java diff --git a/src/InnaIrcBot/LogDriver/BotSQLiteWorker.java b/src/main/java/InnaIrcBot/LogDriver/BotSQLiteWorker.java similarity index 100% rename from src/InnaIrcBot/LogDriver/BotSQLiteWorker.java rename to src/main/java/InnaIrcBot/LogDriver/BotSQLiteWorker.java diff --git a/src/InnaIrcBot/LogDriver/BotZeroWorker.java b/src/main/java/InnaIrcBot/LogDriver/BotZeroWorker.java similarity index 100% rename from src/InnaIrcBot/LogDriver/BotZeroWorker.java rename to src/main/java/InnaIrcBot/LogDriver/BotZeroWorker.java diff --git a/src/InnaIrcBot/LogDriver/Worker.java b/src/main/java/InnaIrcBot/LogDriver/Worker.java similarity index 100% rename from src/InnaIrcBot/LogDriver/Worker.java rename to src/main/java/InnaIrcBot/LogDriver/Worker.java diff --git a/src/InnaIrcBot/ProvidersConsumers/ChanConsumer.java b/src/main/java/InnaIrcBot/ProvidersConsumers/ChanConsumer.java similarity index 100% rename from src/InnaIrcBot/ProvidersConsumers/ChanConsumer.java rename to src/main/java/InnaIrcBot/ProvidersConsumers/ChanConsumer.java diff --git a/src/InnaIrcBot/ProvidersConsumers/DataProvider.java b/src/main/java/InnaIrcBot/ProvidersConsumers/DataProvider.java similarity index 100% rename from src/InnaIrcBot/ProvidersConsumers/DataProvider.java rename to src/main/java/InnaIrcBot/ProvidersConsumers/DataProvider.java diff --git a/src/InnaIrcBot/ProvidersConsumers/StreamProvider.java b/src/main/java/InnaIrcBot/ProvidersConsumers/StreamProvider.java similarity index 100% rename from src/InnaIrcBot/ProvidersConsumers/StreamProvider.java rename to src/main/java/InnaIrcBot/ProvidersConsumers/StreamProvider.java diff --git a/src/InnaIrcBot/ProvidersConsumers/SystemConsumer.java b/src/main/java/InnaIrcBot/ProvidersConsumers/SystemConsumer.java similarity index 100% rename from src/InnaIrcBot/ProvidersConsumers/SystemConsumer.java rename to src/main/java/InnaIrcBot/ProvidersConsumers/SystemConsumer.java diff --git a/src/InnaIrcBot/ReconnectControl.java b/src/main/java/InnaIrcBot/ReconnectControl.java similarity index 100% rename from src/InnaIrcBot/ReconnectControl.java rename to src/main/java/InnaIrcBot/ReconnectControl.java diff --git a/src/test/DriverTest.java b/src/main/java/Temporary/DriverTest.java similarity index 98% rename from src/test/DriverTest.java rename to src/main/java/Temporary/DriverTest.java index 13b5dc5..29b9c82 100644 --- a/src/test/DriverTest.java +++ b/src/main/java/Temporary/DriverTest.java @@ -1,3 +1,5 @@ +package Temporary; + import InnaIrcBot.LogDriver.BotDriver; import InnaIrcBot.LogDriver.Worker; diff --git a/src/test/ReconnectControlTest.java b/src/main/java/Temporary/ReconnectControlTest.java similarity index 96% rename from src/test/ReconnectControlTest.java rename to src/main/java/Temporary/ReconnectControlTest.java index ef05cf6..2f65543 100644 --- a/src/test/ReconnectControlTest.java +++ b/src/main/java/Temporary/ReconnectControlTest.java @@ -1,3 +1,5 @@ +package Temporary; + import InnaIrcBot.ReconnectControl; import com.sun.org.apache.regexp.internal.RE; diff --git a/src/test/StorageFileTest.java b/src/main/java/Temporary/StorageFileTest.java similarity index 96% rename from src/test/StorageFileTest.java rename to src/main/java/Temporary/StorageFileTest.java index 89330a4..a047f0c 100644 --- a/src/test/StorageFileTest.java +++ b/src/main/java/Temporary/StorageFileTest.java @@ -1,3 +1,5 @@ +package Temporary; + import InnaIrcBot.Config.StorageFile; public class StorageFileTest { diff --git a/src/test/StorageReaderTest.java b/src/main/java/Temporary/StorageReaderTest.java similarity index 94% rename from src/test/StorageReaderTest.java rename to src/main/java/Temporary/StorageReaderTest.java index bcc22d1..8e579e8 100644 --- a/src/test/StorageReaderTest.java +++ b/src/main/java/Temporary/StorageReaderTest.java @@ -1,3 +1,5 @@ +package Temporary; + import InnaIrcBot.Config.StorageFile; import InnaIrcBot.Config.StorageReader; diff --git a/src/test/brokenJoinFloodHandlerTest.java b/src/main/java/Temporary/brokenJoinFloodHandlerTest.java similarity index 97% rename from src/test/brokenJoinFloodHandlerTest.java rename to src/main/java/Temporary/brokenJoinFloodHandlerTest.java index 78a5777..8bb8457 100644 --- a/src/test/brokenJoinFloodHandlerTest.java +++ b/src/main/java/Temporary/brokenJoinFloodHandlerTest.java @@ -1,3 +1,5 @@ +package Temporary; + import InnaIrcBot.Commanders.JoinFloodHandler; import java.time.LocalDateTime;