Renamed all tools modules into cli modules

Mokamint-chain · Mar 5, 2024 · 2648420 · 2648420
1 parent d5419e6
commit 2648420
Show file tree

Hide file tree

Showing 50 changed files with 117 additions and 117 deletions.
diff --git a/io-mokamint-miner-tools/mokamint-miner → io-mokamint-miner-cli/mokamint-miner b/io-mokamint-miner-tools/mokamint-miner → io-mokamint-miner-cli/mokamint-miner
@@ -15,4 +15,4 @@ DIR="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )"
 
 DIR=$DIR"/.."
 
-java --module-path $DIR/modules/explicit:$DIR/modules/automatic --class-path $DIR"/modules/unnamed/*" --module io.mokamint.miner.tools/io.mokamint.miner.tools.MokamintMiner "$@"
+java --module-path $DIR/modules/explicit:$DIR/modules/automatic --class-path $DIR"/modules/unnamed/*" --module io.mokamint.miner.cli/io.mokamint.miner.cli.MokamintMiner "$@"
diff --git a/io-mokamint-miner-tools/mokamint-miner.bat → io-mokamint-miner-cli/mokamint-miner.bat b/io-mokamint-miner-tools/mokamint-miner.bat → io-mokamint-miner-cli/mokamint-miner.bat
@@ -2,4 +2,4 @@
 set SOURCE=%~dp0
 set DIR=%SOURCE%
 
-java --module-path "%DIR%modules\explicit";"%DIR%modules\automatic" --class-path "%DIR%modules\unnamed\*" --module io.mokamint.miner.tools/io.mokamint.miner.tools.MokamintMiner %*
+java --module-path "%DIR%modules\explicit";"%DIR%modules\automatic" --class-path "%DIR%modules\unnamed\*" --module io.mokamint.miner.cli/io.mokamint.miner.cli.MokamintMiner %*
diff --git a/io-mokamint-miner-tools/pom.xml → io-mokamint-miner-cli/pom.xml b/io-mokamint-miner-tools/pom.xml → io-mokamint-miner-cli/pom.xml
@@ -1,8 +1,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>io-mokamint-miner-tools</artifactId>
-  <name>io-mokamint-miner-tools</name>
+  <artifactId>io-mokamint-miner-cli</artifactId>
+  <name>io-mokamint-miner-cli</name>
   <packaging>jar</packaging>
   <version>${mokamint.version}</version>
   <description>This module implements a command-line tool for working with Mokamint miners.</description>

diff --git a/...o/mokamint/miner/tools/MokamintMiner.java → .../io/mokamint/miner/cli/MokamintMiner.java b/...o/mokamint/miner/tools/MokamintMiner.java → .../io/mokamint/miner/cli/MokamintMiner.java
@@ -14,18 +14,18 @@
 limitations under the License.
 */
 
-package io.mokamint.miner.tools;
+package io.mokamint.miner.cli;
 
 import io.mokamint.cli.AbstractTool;
-import io.mokamint.miner.tools.internal.Start;
+import io.mokamint.miner.cli.internal.Start;
 import picocli.CommandLine.Command;
 
 /**
  * A command-line interface for working with Mokamint miners.
  * 
  * This class is meant to be run from the parent directory, after building the project, with this command-line:
  * 
- * java --module-path modules/explicit:modules/automatic --class-path "modules/unnamed/*" --module io.mokamint.miner.tools/io.mokamint.miner.tools.MokamintMiner
+ * java --module-path modules/explicit:modules/automatic --class-path "modules/unnamed/*" --module io.mokamint.miner.cli/io.mokamint.miner.cli.MokamintMiner
  */
 @Command(
 	name = "mokamint-miner",

diff --git a/.../mokamint/miner/tools/internal/Start.java → ...io/mokamint/miner/cli/internal/Start.java b/.../mokamint/miner/tools/internal/Start.java → ...io/mokamint/miner/cli/internal/Start.java
@@ -14,7 +14,7 @@
 limitations under the License.
 */
 
-package io.mokamint.miner.tools.internal;
+package io.mokamint.miner.cli.internal;
 
 import java.io.BufferedReader;
 import java.io.IOException;

diff --git a/...iner-tools/src/main/java/module-info.java → ...-miner-cli/src/main/java/module-info.java b/...iner-tools/src/main/java/module-info.java → ...-miner-cli/src/main/java/module-info.java
@@ -17,9 +17,9 @@
 /**
  * This module implements a command-line tool for working with Mokamint miners.
  */
-module io.mokamint.miner.tools {
-	exports io.mokamint.miner.tools;
-    opens io.mokamint.miner.tools.internal to info.picocli; // for injecting CLI options
+module io.mokamint.miner.cli {
+	exports io.mokamint.miner.cli;
+    opens io.mokamint.miner.cli.internal to info.picocli; // for injecting CLI options
 
     requires io.mokamint.miner.local;
     requires io.mokamint.miner.service;

diff --git a/...ols/src/main/resources/logging.properties → ...cli/src/main/resources/logging.properties b/...ols/src/main/resources/logging.properties → ...cli/src/main/resources/logging.properties
diff --git a/io-mokamint-node-tools/config.toml → io-mokamint-node-cli/config.toml b/io-mokamint-node-tools/config.toml → io-mokamint-node-cli/config.toml
diff --git a/io-mokamint-node-tools/mokamint-node → io-mokamint-node-cli/mokamint-node b/io-mokamint-node-tools/mokamint-node → io-mokamint-node-cli/mokamint-node
@@ -15,4 +15,4 @@ DIR="$( cd -P "$( dirname "$SOURCE" )" >/dev/null 2>&1 && pwd )"
 
 DIR=$DIR"/.."
 
-java --add-modules org.glassfish.tyrus.container.grizzly.server --module-path $DIR/modules/explicit:$DIR/modules/automatic --class-path $DIR"/modules/unnamed/*" --module io.mokamint.node.tools/io.mokamint.node.tools.MokamintNode "$@"
+java --add-modules org.glassfish.tyrus.container.grizzly.server --module-path $DIR/modules/explicit:$DIR/modules/automatic --class-path $DIR"/modules/unnamed/*" --module io.mokamint.node.cli/io.mokamint.node.cli.MokamintNode "$@"
diff --git a/io-mokamint-node-cli/mokamint-node.bat b/io-mokamint-node-cli/mokamint-node.bat
@@ -0,0 +1,5 @@
+@echo off
+set SOURCE=%~dp0
+set DIR=%SOURCE%
+
+java --add-modules org.glassfish.tyrus.container.grizzly.server --module-path "%DIR%modules\explicit";"%DIR%modules\automatic" --class-path "%DIR%modules\unnamed\*" --module io.mokamint.node.cli/io.mokamint.node.cli.MokamintNode %*
diff --git a/io-mokamint-node-tools/pom.xml → io-mokamint-node-cli/pom.xml b/io-mokamint-node-tools/pom.xml → io-mokamint-node-cli/pom.xml
@@ -1,8 +1,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>io-mokamint-node-tools</artifactId>
-  <name>io-mokamint-node-tools</name>
+  <artifactId>io-mokamint-node-cli</artifactId>
+  <name>io-mokamint-node-cli</name>
   <packaging>jar</packaging>
   <version>${mokamint.version}</version>
   <description>This module implements a command-line tool for controlling Mokamint nodes.</description>

diff --git a/.../io/mokamint/node/tools/MokamintNode.java → ...va/io/mokamint/node/cli/MokamintNode.java b/.../io/mokamint/node/tools/MokamintNode.java → ...va/io/mokamint/node/cli/MokamintNode.java
@@ -14,27 +14,27 @@
 limitations under the License.
 */
 
-package io.mokamint.node.tools;
+package io.mokamint.node.cli;
 
 import io.mokamint.cli.AbstractTool;
-import io.mokamint.node.tools.internal.Chain;
-import io.mokamint.node.tools.internal.Config;
-import io.mokamint.node.tools.internal.Info;
-import io.mokamint.node.tools.internal.Keys;
-import io.mokamint.node.tools.internal.Mempool;
-import io.mokamint.node.tools.internal.Miners;
-import io.mokamint.node.tools.internal.Peers;
-import io.mokamint.node.tools.internal.Start;
-import io.mokamint.node.tools.internal.Tasks;
-import io.mokamint.node.tools.internal.Transactions;
+import io.mokamint.node.cli.internal.Chain;
+import io.mokamint.node.cli.internal.Config;
+import io.mokamint.node.cli.internal.Info;
+import io.mokamint.node.cli.internal.Keys;
+import io.mokamint.node.cli.internal.Mempool;
+import io.mokamint.node.cli.internal.Miners;
+import io.mokamint.node.cli.internal.Peers;
+import io.mokamint.node.cli.internal.Start;
+import io.mokamint.node.cli.internal.Tasks;
+import io.mokamint.node.cli.internal.Transactions;
 import picocli.CommandLine.Command;
 
 /**
  * A command-line interface for controlling Mokamint nodes.
  * 
  * This class is meant to be run from the parent directory, after building the project, with this command-line:
  * 
- * java --module-path modules/explicit:modules/automatic --class-path "modules/unnamed/*" --module io.mokamint.node.tools/io.mokamint.node.tools.MokamintNode
+ * java --module-path modules/explicit:modules/automatic --class-path "modules/unnamed/*" --module io.mokamint.node.cli/io.mokamint.node.cli.MokamintNode
  */
 @Command(
 	name = "mokamint-node",

diff --git a/...ools/internal/AbstractFullRpcCommand.java → .../cli/internal/AbstractFullRpcCommand.java b/...ools/internal/AbstractFullRpcCommand.java → .../cli/internal/AbstractFullRpcCommand.java
@@ -14,7 +14,7 @@
 limitations under the License.
 */
 
-package io.mokamint.node.tools.internal;
+package io.mokamint.node.cli.internal;
 
 import java.net.URI;
 import java.util.logging.Logger;

diff --git a/...ls/internal/AbstractPublicRpcCommand.java → ...li/internal/AbstractPublicRpcCommand.java b/...ls/internal/AbstractPublicRpcCommand.java → ...li/internal/AbstractPublicRpcCommand.java
@@ -14,7 +14,7 @@
 limitations under the License.
 */
 
-package io.mokamint.node.tools.internal;
+package io.mokamint.node.cli.internal;
 
 import java.net.URI;
 

diff --git a/...nternal/AbstractRestrictedRpcCommand.java → ...nternal/AbstractRestrictedRpcCommand.java b/...nternal/AbstractRestrictedRpcCommand.java → ...nternal/AbstractRestrictedRpcCommand.java
@@ -14,7 +14,7 @@
 limitations under the License.
 */
 
-package io.mokamint.node.tools.internal;
+package io.mokamint.node.cli.internal;
 
 import java.net.URI;
 

diff --git a/...de/tools/internal/AbstractRpcCommand.java → ...node/cli/internal/AbstractRpcCommand.java b/...de/tools/internal/AbstractRpcCommand.java → ...node/cli/internal/AbstractRpcCommand.java
@@ -14,7 +14,7 @@
 limitations under the License.
 */
 
-package io.mokamint.node.tools.internal;
+package io.mokamint.node.cli.internal;
 
 import java.io.IOException;
 import java.net.URI;

diff --git a/...o/mokamint/node/tools/internal/Chain.java → .../io/mokamint/node/cli/internal/Chain.java b/...o/mokamint/node/tools/internal/Chain.java → .../io/mokamint/node/cli/internal/Chain.java
@@ -14,11 +14,11 @@
 limitations under the License.
 */
 
-package io.mokamint.node.tools.internal;
+package io.mokamint.node.cli.internal;
 
-import io.mokamint.node.tools.internal.chain.Info;
-import io.mokamint.node.tools.internal.chain.List;
-import io.mokamint.node.tools.internal.chain.Show;
+import io.mokamint.node.cli.internal.chain.Info;
+import io.mokamint.node.cli.internal.chain.List;
+import io.mokamint.node.cli.internal.chain.Show;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.HelpCommand;
 

diff --git a/.../mokamint/node/tools/internal/Config.java → ...io/mokamint/node/cli/internal/Config.java b/.../mokamint/node/tools/internal/Config.java → ...io/mokamint/node/cli/internal/Config.java
@@ -14,9 +14,9 @@
 limitations under the License.
 */
 
-package io.mokamint.node.tools.internal;
+package io.mokamint.node.cli.internal;
 
-import io.mokamint.node.tools.internal.config.Show;
+import io.mokamint.node.cli.internal.config.Show;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.HelpCommand;
 

diff --git a/...node/tools/internal/EmptyApplication.java → ...t/node/cli/internal/EmptyApplication.java b/...node/tools/internal/EmptyApplication.java → ...t/node/cli/internal/EmptyApplication.java
@@ -14,7 +14,7 @@
 limitations under the License.
 */
 
-package io.mokamint.node.tools.internal;
+package io.mokamint.node.cli.internal;
 
 import java.time.LocalDateTime;
 import java.util.concurrent.atomic.AtomicInteger;

diff --git a/...io/mokamint/node/tools/internal/Info.java → ...a/io/mokamint/node/cli/internal/Info.java b/...io/mokamint/node/tools/internal/Info.java → ...a/io/mokamint/node/cli/internal/Info.java
@@ -14,7 +14,7 @@
 limitations under the License.
 */
 
-package io.mokamint.node.tools.internal;
+package io.mokamint.node.cli.internal;
 
 import java.util.concurrent.TimeoutException;
 

diff --git a/...io/mokamint/node/tools/internal/Keys.java → ...a/io/mokamint/node/cli/internal/Keys.java b/...io/mokamint/node/tools/internal/Keys.java → ...a/io/mokamint/node/cli/internal/Keys.java
@@ -14,10 +14,10 @@
 limitations under the License.
 */
 
-package io.mokamint.node.tools.internal;
+package io.mokamint.node.cli.internal;
 
-import io.mokamint.node.tools.internal.keys.Create;
-import io.mokamint.node.tools.internal.keys.Show;
+import io.mokamint.node.cli.internal.keys.Create;
+import io.mokamint.node.cli.internal.keys.Show;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.HelpCommand;
 

diff --git a/...mokamint/node/tools/internal/Mempool.java → ...o/mokamint/node/cli/internal/Mempool.java b/...mokamint/node/tools/internal/Mempool.java → ...o/mokamint/node/cli/internal/Mempool.java
@@ -14,10 +14,10 @@
 limitations under the License.
 */
 
-package io.mokamint.node.tools.internal;
+package io.mokamint.node.cli.internal;
 
-import io.mokamint.node.tools.internal.mempool.Info;
-import io.mokamint.node.tools.internal.mempool.List;
+import io.mokamint.node.cli.internal.mempool.Info;
+import io.mokamint.node.cli.internal.mempool.List;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.HelpCommand;
 

diff --git a/.../mokamint/node/tools/internal/Miners.java → ...io/mokamint/node/cli/internal/Miners.java b/.../mokamint/node/tools/internal/Miners.java → ...io/mokamint/node/cli/internal/Miners.java
@@ -14,11 +14,11 @@
 limitations under the License.
 */
 
-package io.mokamint.node.tools.internal;
+package io.mokamint.node.cli.internal;
 
-import io.mokamint.node.tools.internal.miners.Add;
-import io.mokamint.node.tools.internal.miners.List;
-import io.mokamint.node.tools.internal.miners.Remove;
+import io.mokamint.node.cli.internal.miners.Add;
+import io.mokamint.node.cli.internal.miners.List;
+import io.mokamint.node.cli.internal.miners.Remove;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.HelpCommand;
 

diff --git a/...o/mokamint/node/tools/internal/Peers.java → .../io/mokamint/node/cli/internal/Peers.java b/...o/mokamint/node/tools/internal/Peers.java → .../io/mokamint/node/cli/internal/Peers.java
@@ -14,11 +14,11 @@
 limitations under the License.
 */
 
-package io.mokamint.node.tools.internal;
+package io.mokamint.node.cli.internal;
 
-import io.mokamint.node.tools.internal.peers.Add;
-import io.mokamint.node.tools.internal.peers.List;
-import io.mokamint.node.tools.internal.peers.Remove;
+import io.mokamint.node.cli.internal.peers.Add;
+import io.mokamint.node.cli.internal.peers.List;
+import io.mokamint.node.cli.internal.peers.Remove;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.HelpCommand;
 

diff --git a/...ls/internal/SignatureOptionConverter.java → ...li/internal/SignatureOptionConverter.java b/...ls/internal/SignatureOptionConverter.java → ...li/internal/SignatureOptionConverter.java
@@ -14,7 +14,7 @@
 limitations under the License.
 */
 
-package io.mokamint.node.tools.internal;
+package io.mokamint.node.cli.internal;
 
 import java.security.NoSuchAlgorithmException;
 

diff --git a/...o/mokamint/node/tools/internal/Start.java → .../io/mokamint/node/cli/internal/Start.java b/...o/mokamint/node/tools/internal/Start.java → .../io/mokamint/node/cli/internal/Start.java
@@ -14,7 +14,7 @@
 limitations under the License.
 */
 
-package io.mokamint.node.tools.internal;
+package io.mokamint.node.cli.internal;
 
 import java.io.BufferedReader;
 import java.io.FileNotFoundException;

diff --git a/...o/mokamint/node/tools/internal/Tasks.java → .../io/mokamint/node/cli/internal/Tasks.java b/...o/mokamint/node/tools/internal/Tasks.java → .../io/mokamint/node/cli/internal/Tasks.java
@@ -14,9 +14,9 @@
 limitations under the License.
 */
 
-package io.mokamint.node.tools.internal;
+package io.mokamint.node.cli.internal;
 
-import io.mokamint.node.tools.internal.tasks.List;
+import io.mokamint.node.cli.internal.tasks.List;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.HelpCommand;
 

diff --git a/...int/node/tools/internal/Transactions.java → ...amint/node/cli/internal/Transactions.java b/...int/node/tools/internal/Transactions.java → ...amint/node/cli/internal/Transactions.java
@@ -14,11 +14,11 @@
 limitations under the License.
 */
 
-package io.mokamint.node.tools.internal;
+package io.mokamint.node.cli.internal;
 
-import io.mokamint.node.tools.internal.transactions.Add;
-import io.mokamint.node.tools.internal.transactions.Find;
-import io.mokamint.node.tools.internal.transactions.Show;
+import io.mokamint.node.cli.internal.transactions.Add;
+import io.mokamint.node.cli.internal.transactions.Find;
+import io.mokamint.node.cli.internal.transactions.Show;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.HelpCommand;
 

diff --git a/...amint/node/tools/internal/chain/Info.java → ...okamint/node/cli/internal/chain/Info.java b/...amint/node/tools/internal/chain/Info.java → ...okamint/node/cli/internal/chain/Info.java
@@ -14,16 +14,16 @@
 limitations under the License.
 */
 
-package io.mokamint.node.tools.internal.chain;
+package io.mokamint.node.cli.internal.chain;
 
 import java.util.concurrent.TimeoutException;
 
 import io.mokamint.cli.CommandException;
 import io.mokamint.node.ChainInfos;
 import io.mokamint.node.api.DatabaseException;
 import io.mokamint.node.api.NodeException;
+import io.mokamint.node.cli.internal.AbstractPublicRpcCommand;
 import io.mokamint.node.remote.api.RemotePublicNode;
-import io.mokamint.node.tools.internal.AbstractPublicRpcCommand;
 import jakarta.websocket.EncodeException;
 import picocli.CommandLine.Command;
 

diff --git a/...amint/node/tools/internal/chain/List.java → ...okamint/node/cli/internal/chain/List.java b/...amint/node/tools/internal/chain/List.java → ...okamint/node/cli/internal/chain/List.java
@@ -14,7 +14,7 @@
 limitations under the License.
 */
 
-package io.mokamint.node.tools.internal.chain;
+package io.mokamint.node.cli.internal.chain;
 
 import java.security.NoSuchAlgorithmException;
 import java.time.LocalDateTime;
@@ -32,8 +32,8 @@
 import io.mokamint.node.api.GenesisBlockDescription;
 import io.mokamint.node.api.NodeException;
 import io.mokamint.node.api.NonGenesisBlockDescription;
+import io.mokamint.node.cli.internal.AbstractPublicRpcCommand;
 import io.mokamint.node.remote.api.RemotePublicNode;
-import io.mokamint.node.tools.internal.AbstractPublicRpcCommand;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Help.Ansi;
 import picocli.CommandLine.Option;

diff --git a/...amint/node/tools/internal/chain/Show.java → ...okamint/node/cli/internal/chain/Show.java b/...amint/node/tools/internal/chain/Show.java → ...okamint/node/cli/internal/chain/Show.java
@@ -14,7 +14,7 @@
 limitations under the License.
 */
 
-package io.mokamint.node.tools.internal.chain;
+package io.mokamint.node.cli.internal.chain;
 
 import java.security.NoSuchAlgorithmException;
 import java.util.Optional;
@@ -30,8 +30,8 @@
 import io.mokamint.node.api.DatabaseException;
 import io.mokamint.node.api.GenesisBlockDescription;
 import io.mokamint.node.api.NodeException;
+import io.mokamint.node.cli.internal.AbstractPublicRpcCommand;
 import io.mokamint.node.remote.api.RemotePublicNode;
-import io.mokamint.node.tools.internal.AbstractPublicRpcCommand;
 import jakarta.websocket.EncodeException;
 import picocli.CommandLine.ArgGroup;
 import picocli.CommandLine.Command;

diff --git a/...mint/node/tools/internal/config/Show.java → ...kamint/node/cli/internal/config/Show.java b/...mint/node/tools/internal/config/Show.java → ...kamint/node/cli/internal/config/Show.java
@@ -14,15 +14,15 @@
 limitations under the License.
 */
 
-package io.mokamint.node.tools.internal.config;
+package io.mokamint.node.cli.internal.config;
 
 import java.util.concurrent.TimeoutException;
 
 import io.mokamint.cli.CommandException;
 import io.mokamint.node.ConsensusConfigBuilders;
 import io.mokamint.node.api.NodeException;
+import io.mokamint.node.cli.internal.AbstractPublicRpcCommand;
 import io.mokamint.node.remote.api.RemotePublicNode;
-import io.mokamint.node.tools.internal.AbstractPublicRpcCommand;
 import jakarta.websocket.EncodeException;
 import picocli.CommandLine.Command;