From 3645806edc41915a0411b9c9a62fa14f39383d7c Mon Sep 17 00:00:00 2001 From: ljacqu Date: Tue, 3 May 2016 20:24:34 +0200 Subject: [PATCH] Move tools folder into test folder - Classes still won't be present in JAR but classes will be automatically compiled by Maven inside of the test scope, facilitating the execution of tool tasks --- src/test/java/tools/README.md | 6 ++++++ src/{ => test/java}/tools/ToolsRunner.java | 8 +++++--- src/{ => test/java}/tools/bathelpers/README.md | 0 .../java}/tools/bathelpers/analyze_project.bat | 0 .../java}/tools/bathelpers/build_project.bat | 0 src/{ => test/java}/tools/bathelpers/list_files.bat | 0 src/{ => test/java}/tools/bathelpers/move_plugin.bat | 0 src/{ => test/java}/tools/bathelpers/quick_build.bat | 0 src/{ => test/java}/tools/bathelpers/run_server.bat | 0 src/{ => test/java}/tools/bathelpers/setvars.bat | 0 .../java}/tools/commands/CommandPageCreater.java | 12 ++++++------ src/{ => test/java}/tools/commands/commands.tpl.md | 0 src/{ => test/java}/tools/docs/UpdateDocsTask.java | 10 +++++----- .../hashmethods/EncryptionMethodInfoGatherer.java | 2 +- .../hashmethods/HashAlgorithmsDescriptionTask.java | 12 ++++++------ .../java}/tools/hashmethods/MethodDescription.java | 2 +- .../java}/tools/hashmethods/hash_algorithms.tpl.md | 0 .../java}/tools/messages/MessageFileVerifier.java | 4 ++-- src/{ => test/java}/tools/messages/README.md | 0 .../java}/tools/messages/VerifyMessagesTask.java | 6 +++--- .../translation/AuthMeYamlConfiguration.java | 2 +- .../messages/translation/ExportMessagesTask.java | 6 +++--- .../messages/translation/ImportMessagesTask.java | 12 ++++++------ .../tools/messages/translation/LanguageExport.java | 2 +- .../tools/messages/translation/MessageExport.java | 2 +- .../messages/translation/WriteAllExportsTask.java | 6 +++--- .../translation/export/export-is-written-here | 0 .../tools/permissions/PermissionNodesGatherer.java | 6 +++--- .../tools/permissions/PermissionsListWriter.java | 12 ++++++------ src/{ => test/java}/tools/permissions/README.md | 0 .../java}/tools/permissions/permission_nodes.tpl.md | 0 .../java}/tools/shhelpers/analyze_project.sh | 0 src/{ => test/java}/tools/shhelpers/build_project.sh | 0 src/{ => test/java}/tools/shhelpers/list_files.sh | 0 src/{ => test/java}/tools/shhelpers/move_plugin.sh | 0 src/{ => test/java}/tools/shhelpers/quick_build.sh | 0 src/{ => test/java}/tools/shhelpers/run_server.sh | 0 src/{ => test/java}/tools/shhelpers/setvars.sh | 0 .../java}/tools/shhelpers/sort_file_content.sh | 0 src/{ => test/java}/tools/utils/FileUtils.java | 2 +- src/{ => test/java}/tools/utils/TagReplacer.java | 6 +++--- src/{ => test/java}/tools/utils/TagValue.java | 2 +- src/{ => test/java}/tools/utils/TagValueHolder.java | 4 ++-- src/{ => test/java}/tools/utils/ToolTask.java | 2 +- src/{ => test/java}/tools/utils/ToolsConstants.java | 4 ++-- src/tools/README.md | 3 --- 46 files changed, 69 insertions(+), 64 deletions(-) create mode 100644 src/test/java/tools/README.md rename src/{ => test/java}/tools/ToolsRunner.java (97%) rename src/{ => test/java}/tools/bathelpers/README.md (100%) rename src/{ => test/java}/tools/bathelpers/analyze_project.bat (100%) rename src/{ => test/java}/tools/bathelpers/build_project.bat (100%) rename src/{ => test/java}/tools/bathelpers/list_files.bat (100%) rename src/{ => test/java}/tools/bathelpers/move_plugin.bat (100%) rename src/{ => test/java}/tools/bathelpers/quick_build.bat (100%) rename src/{ => test/java}/tools/bathelpers/run_server.bat (100%) rename src/{ => test/java}/tools/bathelpers/setvars.bat (100%) rename src/{ => test/java}/tools/commands/CommandPageCreater.java (93%) rename src/{ => test/java}/tools/commands/commands.tpl.md (100%) rename src/{ => test/java}/tools/docs/UpdateDocsTask.java (86%) rename src/{ => test/java}/tools/hashmethods/EncryptionMethodInfoGatherer.java (99%) rename src/{ => test/java}/tools/hashmethods/HashAlgorithmsDescriptionTask.java (93%) rename src/{ => test/java}/tools/hashmethods/MethodDescription.java (98%) rename src/{ => test/java}/tools/hashmethods/hash_algorithms.tpl.md (100%) rename src/{ => test/java}/tools/messages/MessageFileVerifier.java (99%) rename src/{ => test/java}/tools/messages/README.md (100%) rename src/{ => test/java}/tools/messages/VerifyMessagesTask.java (98%) rename src/{ => test/java}/tools/messages/translation/AuthMeYamlConfiguration.java (98%) rename src/{ => test/java}/tools/messages/translation/ExportMessagesTask.java (97%) rename src/{ => test/java}/tools/messages/translation/ImportMessagesTask.java (95%) rename src/{ => test/java}/tools/messages/translation/LanguageExport.java (91%) rename src/{ => test/java}/tools/messages/translation/MessageExport.java (93%) rename src/{ => test/java}/tools/messages/translation/WriteAllExportsTask.java (92%) rename src/{ => test/java}/tools/messages/translation/export/export-is-written-here (100%) rename src/{ => test/java}/tools/permissions/PermissionNodesGatherer.java (97%) rename src/{ => test/java}/tools/permissions/PermissionsListWriter.java (93%) rename src/{ => test/java}/tools/permissions/README.md (100%) rename src/{ => test/java}/tools/permissions/permission_nodes.tpl.md (100%) rename src/{ => test/java}/tools/shhelpers/analyze_project.sh (100%) rename src/{ => test/java}/tools/shhelpers/build_project.sh (100%) rename src/{ => test/java}/tools/shhelpers/list_files.sh (100%) rename src/{ => test/java}/tools/shhelpers/move_plugin.sh (100%) rename src/{ => test/java}/tools/shhelpers/quick_build.sh (100%) rename src/{ => test/java}/tools/shhelpers/run_server.sh (100%) rename src/{ => test/java}/tools/shhelpers/setvars.sh (100%) rename src/{ => test/java}/tools/shhelpers/sort_file_content.sh (100%) rename src/{ => test/java}/tools/utils/FileUtils.java (98%) rename src/{ => test/java}/tools/utils/TagReplacer.java (97%) rename src/{ => test/java}/tools/utils/TagValue.java (97%) rename src/{ => test/java}/tools/utils/TagValueHolder.java (90%) rename src/{ => test/java}/tools/utils/ToolTask.java (96%) rename src/{ => test/java}/tools/utils/ToolsConstants.java (82%) delete mode 100644 src/tools/README.md diff --git a/src/test/java/tools/README.md b/src/test/java/tools/README.md new file mode 100644 index 000000000..012405cf1 --- /dev/null +++ b/src/test/java/tools/README.md @@ -0,0 +1,6 @@ +# About the _tools_ Folder + +This _tools_ folder provides helpers and extended tests useful during the development of AuthMe. +This folder is not included during the build of AuthMe and does not contain unit tests. + +Run the `ToolsRunner` class to perform a task. diff --git a/src/tools/ToolsRunner.java b/src/test/java/tools/ToolsRunner.java similarity index 97% rename from src/tools/ToolsRunner.java rename to src/test/java/tools/ToolsRunner.java index d920b23f6..54e66b195 100644 --- a/src/tools/ToolsRunner.java +++ b/src/test/java/tools/ToolsRunner.java @@ -1,5 +1,7 @@ -import utils.ToolTask; -import utils.ToolsConstants; +package tools; + +import tools.utils.ToolTask; +import tools.utils.ToolsConstants; import java.io.File; import java.lang.reflect.Constructor; @@ -108,7 +110,7 @@ public final class ToolsRunner { } String filePath = file.getPath(); - String className = filePath + String className = "tools." + filePath .substring(ToolsConstants.TOOLS_SOURCE_ROOT.length(), filePath.length() - 5) .replace(File.separator, "."); try { diff --git a/src/tools/bathelpers/README.md b/src/test/java/tools/bathelpers/README.md similarity index 100% rename from src/tools/bathelpers/README.md rename to src/test/java/tools/bathelpers/README.md diff --git a/src/tools/bathelpers/analyze_project.bat b/src/test/java/tools/bathelpers/analyze_project.bat similarity index 100% rename from src/tools/bathelpers/analyze_project.bat rename to src/test/java/tools/bathelpers/analyze_project.bat diff --git a/src/tools/bathelpers/build_project.bat b/src/test/java/tools/bathelpers/build_project.bat similarity index 100% rename from src/tools/bathelpers/build_project.bat rename to src/test/java/tools/bathelpers/build_project.bat diff --git a/src/tools/bathelpers/list_files.bat b/src/test/java/tools/bathelpers/list_files.bat similarity index 100% rename from src/tools/bathelpers/list_files.bat rename to src/test/java/tools/bathelpers/list_files.bat diff --git a/src/tools/bathelpers/move_plugin.bat b/src/test/java/tools/bathelpers/move_plugin.bat similarity index 100% rename from src/tools/bathelpers/move_plugin.bat rename to src/test/java/tools/bathelpers/move_plugin.bat diff --git a/src/tools/bathelpers/quick_build.bat b/src/test/java/tools/bathelpers/quick_build.bat similarity index 100% rename from src/tools/bathelpers/quick_build.bat rename to src/test/java/tools/bathelpers/quick_build.bat diff --git a/src/tools/bathelpers/run_server.bat b/src/test/java/tools/bathelpers/run_server.bat similarity index 100% rename from src/tools/bathelpers/run_server.bat rename to src/test/java/tools/bathelpers/run_server.bat diff --git a/src/tools/bathelpers/setvars.bat b/src/test/java/tools/bathelpers/setvars.bat similarity index 100% rename from src/tools/bathelpers/setvars.bat rename to src/test/java/tools/bathelpers/setvars.bat diff --git a/src/tools/commands/CommandPageCreater.java b/src/test/java/tools/commands/CommandPageCreater.java similarity index 93% rename from src/tools/commands/CommandPageCreater.java rename to src/test/java/tools/commands/CommandPageCreater.java index 3369b906f..f74090652 100644 --- a/src/tools/commands/CommandPageCreater.java +++ b/src/test/java/tools/commands/CommandPageCreater.java @@ -1,15 +1,15 @@ -package commands; +package tools.commands; import fr.xephi.authme.command.CommandArgumentDescription; import fr.xephi.authme.command.CommandDescription; import fr.xephi.authme.command.CommandPermissions; import fr.xephi.authme.command.CommandUtils; import fr.xephi.authme.permission.PermissionNode; -import utils.FileUtils; -import utils.TagValue.NestedTagValue; -import utils.TagValueHolder; -import utils.ToolTask; -import utils.ToolsConstants; +import tools.utils.FileUtils; +import tools.utils.TagValue.NestedTagValue; +import tools.utils.TagValueHolder; +import tools.utils.ToolTask; +import tools.utils.ToolsConstants; import java.util.Collection; import java.util.HashSet; diff --git a/src/tools/commands/commands.tpl.md b/src/test/java/tools/commands/commands.tpl.md similarity index 100% rename from src/tools/commands/commands.tpl.md rename to src/test/java/tools/commands/commands.tpl.md diff --git a/src/tools/docs/UpdateDocsTask.java b/src/test/java/tools/docs/UpdateDocsTask.java similarity index 86% rename from src/tools/docs/UpdateDocsTask.java rename to src/test/java/tools/docs/UpdateDocsTask.java index ccd0ed1b5..df03b921d 100644 --- a/src/tools/docs/UpdateDocsTask.java +++ b/src/test/java/tools/docs/UpdateDocsTask.java @@ -1,10 +1,10 @@ -package docs; +package tools.docs; import com.google.common.collect.ImmutableSet; -import commands.CommandPageCreater; -import hashmethods.HashAlgorithmsDescriptionTask; -import permissions.PermissionsListWriter; -import utils.ToolTask; +import tools.commands.CommandPageCreater; +import tools.hashmethods.HashAlgorithmsDescriptionTask; +import tools.permissions.PermissionsListWriter; +import tools.utils.ToolTask; import java.util.Scanner; import java.util.Set; diff --git a/src/tools/hashmethods/EncryptionMethodInfoGatherer.java b/src/test/java/tools/hashmethods/EncryptionMethodInfoGatherer.java similarity index 99% rename from src/tools/hashmethods/EncryptionMethodInfoGatherer.java rename to src/test/java/tools/hashmethods/EncryptionMethodInfoGatherer.java index d56e370d0..47bb8bd6f 100644 --- a/src/tools/hashmethods/EncryptionMethodInfoGatherer.java +++ b/src/test/java/tools/hashmethods/EncryptionMethodInfoGatherer.java @@ -1,4 +1,4 @@ -package hashmethods; +package tools.hashmethods; import fr.xephi.authme.security.HashAlgorithm; import fr.xephi.authme.security.crypts.EncryptionMethod; diff --git a/src/tools/hashmethods/HashAlgorithmsDescriptionTask.java b/src/test/java/tools/hashmethods/HashAlgorithmsDescriptionTask.java similarity index 93% rename from src/tools/hashmethods/HashAlgorithmsDescriptionTask.java rename to src/test/java/tools/hashmethods/HashAlgorithmsDescriptionTask.java index 6d1a57ed1..e62f5b3d2 100644 --- a/src/tools/hashmethods/HashAlgorithmsDescriptionTask.java +++ b/src/test/java/tools/hashmethods/HashAlgorithmsDescriptionTask.java @@ -1,11 +1,11 @@ -package hashmethods; +package tools.hashmethods; import fr.xephi.authme.security.HashAlgorithm; -import utils.FileUtils; -import utils.TagValue.NestedTagValue; -import utils.TagValueHolder; -import utils.ToolTask; -import utils.ToolsConstants; +import tools.utils.FileUtils; +import tools.utils.TagValue.NestedTagValue; +import tools.utils.TagValueHolder; +import tools.utils.ToolTask; +import tools.utils.ToolsConstants; import java.util.Map; import java.util.Scanner; diff --git a/src/tools/hashmethods/MethodDescription.java b/src/test/java/tools/hashmethods/MethodDescription.java similarity index 98% rename from src/tools/hashmethods/MethodDescription.java rename to src/test/java/tools/hashmethods/MethodDescription.java index 45aaf448e..587654679 100644 --- a/src/tools/hashmethods/MethodDescription.java +++ b/src/test/java/tools/hashmethods/MethodDescription.java @@ -1,4 +1,4 @@ -package hashmethods; +package tools.hashmethods; import fr.xephi.authme.security.crypts.EncryptionMethod; import fr.xephi.authme.security.crypts.description.SaltType; diff --git a/src/tools/hashmethods/hash_algorithms.tpl.md b/src/test/java/tools/hashmethods/hash_algorithms.tpl.md similarity index 100% rename from src/tools/hashmethods/hash_algorithms.tpl.md rename to src/test/java/tools/hashmethods/hash_algorithms.tpl.md diff --git a/src/tools/messages/MessageFileVerifier.java b/src/test/java/tools/messages/MessageFileVerifier.java similarity index 99% rename from src/tools/messages/MessageFileVerifier.java rename to src/test/java/tools/messages/MessageFileVerifier.java index 68e07ea40..1157284f1 100644 --- a/src/tools/messages/MessageFileVerifier.java +++ b/src/test/java/tools/messages/MessageFileVerifier.java @@ -1,4 +1,4 @@ -package messages; +package tools.messages; import com.google.common.base.Predicate; import com.google.common.collect.HashMultimap; @@ -8,7 +8,7 @@ import fr.xephi.authme.output.MessageKey; import fr.xephi.authme.util.StringUtils; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; -import utils.FileUtils; +import tools.utils.FileUtils; import java.io.File; import java.util.ArrayList; diff --git a/src/tools/messages/README.md b/src/test/java/tools/messages/README.md similarity index 100% rename from src/tools/messages/README.md rename to src/test/java/tools/messages/README.md diff --git a/src/tools/messages/VerifyMessagesTask.java b/src/test/java/tools/messages/VerifyMessagesTask.java similarity index 98% rename from src/tools/messages/VerifyMessagesTask.java rename to src/test/java/tools/messages/VerifyMessagesTask.java index 28b42b719..c4415e034 100644 --- a/src/tools/messages/VerifyMessagesTask.java +++ b/src/test/java/tools/messages/VerifyMessagesTask.java @@ -1,11 +1,11 @@ -package messages; +package tools.messages; import com.google.common.collect.Multimap; import fr.xephi.authme.util.StringUtils; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; -import utils.ToolTask; -import utils.ToolsConstants; +import tools.utils.ToolTask; +import tools.utils.ToolsConstants; import java.io.File; import java.util.ArrayList; diff --git a/src/tools/messages/translation/AuthMeYamlConfiguration.java b/src/test/java/tools/messages/translation/AuthMeYamlConfiguration.java similarity index 98% rename from src/tools/messages/translation/AuthMeYamlConfiguration.java rename to src/test/java/tools/messages/translation/AuthMeYamlConfiguration.java index f8724dff0..21564b577 100644 --- a/src/tools/messages/translation/AuthMeYamlConfiguration.java +++ b/src/test/java/tools/messages/translation/AuthMeYamlConfiguration.java @@ -1,4 +1,4 @@ -package messages.translation; +package tools.messages.translation; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/src/tools/messages/translation/ExportMessagesTask.java b/src/test/java/tools/messages/translation/ExportMessagesTask.java similarity index 97% rename from src/tools/messages/translation/ExportMessagesTask.java rename to src/test/java/tools/messages/translation/ExportMessagesTask.java index c281696b5..672dac398 100644 --- a/src/tools/messages/translation/ExportMessagesTask.java +++ b/src/test/java/tools/messages/translation/ExportMessagesTask.java @@ -1,4 +1,4 @@ -package messages.translation; +package tools.messages.translation; import com.google.common.io.CharStreams; import com.google.gson.Gson; @@ -6,8 +6,8 @@ import fr.xephi.authme.output.MessageKey; import fr.xephi.authme.util.StringUtils; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; -import utils.ToolTask; -import utils.ToolsConstants; +import tools.utils.ToolTask; +import tools.utils.ToolsConstants; import java.io.File; import java.io.IOException; diff --git a/src/tools/messages/translation/ImportMessagesTask.java b/src/test/java/tools/messages/translation/ImportMessagesTask.java similarity index 95% rename from src/tools/messages/translation/ImportMessagesTask.java rename to src/test/java/tools/messages/translation/ImportMessagesTask.java index 1edcdf04b..320edb019 100644 --- a/src/tools/messages/translation/ImportMessagesTask.java +++ b/src/test/java/tools/messages/translation/ImportMessagesTask.java @@ -1,15 +1,15 @@ -package messages.translation; +package tools.messages.translation; import com.google.common.io.Resources; import com.google.gson.Gson; import fr.xephi.authme.output.MessageKey; -import messages.MessageFileVerifier; -import messages.VerifyMessagesTask; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; -import utils.FileUtils; -import utils.ToolTask; -import utils.ToolsConstants; +import tools.messages.MessageFileVerifier; +import tools.messages.VerifyMessagesTask; +import tools.utils.FileUtils; +import tools.utils.ToolTask; +import tools.utils.ToolsConstants; import java.io.File; import java.io.IOException; diff --git a/src/tools/messages/translation/LanguageExport.java b/src/test/java/tools/messages/translation/LanguageExport.java similarity index 91% rename from src/tools/messages/translation/LanguageExport.java rename to src/test/java/tools/messages/translation/LanguageExport.java index 3be0fa448..c15a54bde 100644 --- a/src/tools/messages/translation/LanguageExport.java +++ b/src/test/java/tools/messages/translation/LanguageExport.java @@ -1,4 +1,4 @@ -package messages.translation; +package tools.messages.translation; import java.util.Collections; import java.util.List; diff --git a/src/tools/messages/translation/MessageExport.java b/src/test/java/tools/messages/translation/MessageExport.java similarity index 93% rename from src/tools/messages/translation/MessageExport.java rename to src/test/java/tools/messages/translation/MessageExport.java index da2c08743..270c460db 100644 --- a/src/tools/messages/translation/MessageExport.java +++ b/src/test/java/tools/messages/translation/MessageExport.java @@ -1,4 +1,4 @@ -package messages.translation; +package tools.messages.translation; import fr.xephi.authme.util.StringUtils; diff --git a/src/tools/messages/translation/WriteAllExportsTask.java b/src/test/java/tools/messages/translation/WriteAllExportsTask.java similarity index 92% rename from src/tools/messages/translation/WriteAllExportsTask.java rename to src/test/java/tools/messages/translation/WriteAllExportsTask.java index 413943d40..f5f3825bc 100644 --- a/src/tools/messages/translation/WriteAllExportsTask.java +++ b/src/test/java/tools/messages/translation/WriteAllExportsTask.java @@ -1,9 +1,9 @@ -package messages.translation; +package tools.messages.translation; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; -import utils.FileUtils; -import utils.ToolsConstants; +import tools.utils.FileUtils; +import tools.utils.ToolsConstants; import java.io.File; import java.util.Scanner; diff --git a/src/tools/messages/translation/export/export-is-written-here b/src/test/java/tools/messages/translation/export/export-is-written-here similarity index 100% rename from src/tools/messages/translation/export/export-is-written-here rename to src/test/java/tools/messages/translation/export/export-is-written-here diff --git a/src/tools/permissions/PermissionNodesGatherer.java b/src/test/java/tools/permissions/PermissionNodesGatherer.java similarity index 97% rename from src/tools/permissions/PermissionNodesGatherer.java rename to src/test/java/tools/permissions/PermissionNodesGatherer.java index bfde6c872..58b5df4e3 100644 --- a/src/tools/permissions/PermissionNodesGatherer.java +++ b/src/test/java/tools/permissions/PermissionNodesGatherer.java @@ -1,11 +1,11 @@ -package permissions; +package tools.permissions; import fr.xephi.authme.permission.AdminPermission; import fr.xephi.authme.permission.PermissionNode; import fr.xephi.authme.permission.PlayerPermission; import fr.xephi.authme.permission.PlayerStatePermission; -import utils.FileUtils; -import utils.ToolsConstants; +import tools.utils.FileUtils; +import tools.utils.ToolsConstants; import java.util.EnumSet; import java.util.HashMap; diff --git a/src/tools/permissions/PermissionsListWriter.java b/src/test/java/tools/permissions/PermissionsListWriter.java similarity index 93% rename from src/tools/permissions/PermissionsListWriter.java rename to src/test/java/tools/permissions/PermissionsListWriter.java index dc16cea22..79522d9d7 100644 --- a/src/tools/permissions/PermissionsListWriter.java +++ b/src/test/java/tools/permissions/PermissionsListWriter.java @@ -1,10 +1,10 @@ -package permissions; +package tools.permissions; -import utils.FileUtils; -import utils.TagValue.NestedTagValue; -import utils.TagValueHolder; -import utils.ToolTask; -import utils.ToolsConstants; +import tools.utils.FileUtils; +import tools.utils.TagValue.NestedTagValue; +import tools.utils.TagValueHolder; +import tools.utils.ToolTask; +import tools.utils.ToolsConstants; import java.util.Map; import java.util.Scanner; diff --git a/src/tools/permissions/README.md b/src/test/java/tools/permissions/README.md similarity index 100% rename from src/tools/permissions/README.md rename to src/test/java/tools/permissions/README.md diff --git a/src/tools/permissions/permission_nodes.tpl.md b/src/test/java/tools/permissions/permission_nodes.tpl.md similarity index 100% rename from src/tools/permissions/permission_nodes.tpl.md rename to src/test/java/tools/permissions/permission_nodes.tpl.md diff --git a/src/tools/shhelpers/analyze_project.sh b/src/test/java/tools/shhelpers/analyze_project.sh similarity index 100% rename from src/tools/shhelpers/analyze_project.sh rename to src/test/java/tools/shhelpers/analyze_project.sh diff --git a/src/tools/shhelpers/build_project.sh b/src/test/java/tools/shhelpers/build_project.sh similarity index 100% rename from src/tools/shhelpers/build_project.sh rename to src/test/java/tools/shhelpers/build_project.sh diff --git a/src/tools/shhelpers/list_files.sh b/src/test/java/tools/shhelpers/list_files.sh similarity index 100% rename from src/tools/shhelpers/list_files.sh rename to src/test/java/tools/shhelpers/list_files.sh diff --git a/src/tools/shhelpers/move_plugin.sh b/src/test/java/tools/shhelpers/move_plugin.sh similarity index 100% rename from src/tools/shhelpers/move_plugin.sh rename to src/test/java/tools/shhelpers/move_plugin.sh diff --git a/src/tools/shhelpers/quick_build.sh b/src/test/java/tools/shhelpers/quick_build.sh similarity index 100% rename from src/tools/shhelpers/quick_build.sh rename to src/test/java/tools/shhelpers/quick_build.sh diff --git a/src/tools/shhelpers/run_server.sh b/src/test/java/tools/shhelpers/run_server.sh similarity index 100% rename from src/tools/shhelpers/run_server.sh rename to src/test/java/tools/shhelpers/run_server.sh diff --git a/src/tools/shhelpers/setvars.sh b/src/test/java/tools/shhelpers/setvars.sh similarity index 100% rename from src/tools/shhelpers/setvars.sh rename to src/test/java/tools/shhelpers/setvars.sh diff --git a/src/tools/shhelpers/sort_file_content.sh b/src/test/java/tools/shhelpers/sort_file_content.sh similarity index 100% rename from src/tools/shhelpers/sort_file_content.sh rename to src/test/java/tools/shhelpers/sort_file_content.sh diff --git a/src/tools/utils/FileUtils.java b/src/test/java/tools/utils/FileUtils.java similarity index 98% rename from src/tools/utils/FileUtils.java rename to src/test/java/tools/utils/FileUtils.java index 853965e93..dbf400371 100644 --- a/src/tools/utils/FileUtils.java +++ b/src/test/java/tools/utils/FileUtils.java @@ -1,4 +1,4 @@ -package utils; +package tools.utils; import java.io.IOException; import java.nio.charset.Charset; diff --git a/src/tools/utils/TagReplacer.java b/src/test/java/tools/utils/TagReplacer.java similarity index 97% rename from src/tools/utils/TagReplacer.java rename to src/test/java/tools/utils/TagReplacer.java index 5efe4c8b6..9b5a74bb8 100644 --- a/src/tools/utils/TagReplacer.java +++ b/src/test/java/tools/utils/TagReplacer.java @@ -1,7 +1,7 @@ -package utils; +package tools.utils; -import utils.TagValue.NestedTagValue; -import utils.TagValue.TextTagValue; +import tools.utils.TagValue.NestedTagValue; +import tools.utils.TagValue.TextTagValue; import java.util.Date; import java.util.Map; diff --git a/src/tools/utils/TagValue.java b/src/test/java/tools/utils/TagValue.java similarity index 97% rename from src/tools/utils/TagValue.java rename to src/test/java/tools/utils/TagValue.java index 7ca66b3d6..ad73a816d 100644 --- a/src/tools/utils/TagValue.java +++ b/src/test/java/tools/utils/TagValue.java @@ -1,4 +1,4 @@ -package utils; +package tools.utils; import java.util.ArrayList; import java.util.List; diff --git a/src/tools/utils/TagValueHolder.java b/src/test/java/tools/utils/TagValueHolder.java similarity index 90% rename from src/tools/utils/TagValueHolder.java rename to src/test/java/tools/utils/TagValueHolder.java index e2bd09b09..838628307 100644 --- a/src/tools/utils/TagValueHolder.java +++ b/src/test/java/tools/utils/TagValueHolder.java @@ -1,6 +1,6 @@ -package utils; +package tools.utils; -import utils.TagValue.TextTagValue; +import tools.utils.TagValue.TextTagValue; import java.util.HashMap; import java.util.Map; diff --git a/src/tools/utils/ToolTask.java b/src/test/java/tools/utils/ToolTask.java similarity index 96% rename from src/tools/utils/ToolTask.java rename to src/test/java/tools/utils/ToolTask.java index 56a2a7886..d5cec1527 100644 --- a/src/tools/utils/ToolTask.java +++ b/src/test/java/tools/utils/ToolTask.java @@ -1,4 +1,4 @@ -package utils; +package tools.utils; import java.util.Scanner; diff --git a/src/tools/utils/ToolsConstants.java b/src/test/java/tools/utils/ToolsConstants.java similarity index 82% rename from src/tools/utils/ToolsConstants.java rename to src/test/java/tools/utils/ToolsConstants.java index 504a1be79..84ad7fadf 100644 --- a/src/tools/utils/ToolsConstants.java +++ b/src/test/java/tools/utils/ToolsConstants.java @@ -1,4 +1,4 @@ -package utils; +package tools.utils; /** * Constants for the src/tools folder. @@ -12,7 +12,7 @@ public final class ToolsConstants { public static final String MAIN_RESOURCES_ROOT = "src/main/resources/"; - public static final String TOOLS_SOURCE_ROOT = "src/tools/"; + public static final String TOOLS_SOURCE_ROOT = "src/test/java/tools/"; public static final String DOCS_FOLDER = "docs/"; diff --git a/src/tools/README.md b/src/tools/README.md deleted file mode 100644 index b61dabead..000000000 --- a/src/tools/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# About src/tools -This _tools_ folder provides helpers and extended tests useful during the development of AuthMe. -This folder is not included during the build of AuthMe.