You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vk...@apache.org on 2020/12/24 19:25:35 UTC
[ignite-3] branch main updated: IGNITE-13899 Fix project structure,
remove demo modules (#16)
This is an automated email from the ASF dual-hosted git repository.
vkulichenko pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push:
new 728b91f IGNITE-13899 Fix project structure, remove demo modules (#16)
728b91f is described below
commit 728b91f2d98067aaa2b30d98ce2e579b203bed85
Author: Kirill Gusakov <kg...@gmail.com>
AuthorDate: Thu Dec 24 22:25:29 2020 +0300
IGNITE-13899 Fix project structure, remove demo modules (#16)
---
modules/{cli-demo => }/cli-common/pom.xml | 19 ++++-
.../apache/ignite/cli/common/IgniteCommand.java | 0
.../demo-module-all/demo-module-cli/pom.xml | 55 -------------
.../ignite/snapshot/cli/SnapshotCommand.java | 65 ----------------
.../org.apache.ignite.cli.common.IgniteCommand | 1 -
.../cli-demo/demo-module-all/demo-module/pom.xml | 34 --------
.../org/apache/ignite/snapshot/IgniteSnapshot.java | 25 ------
modules/cli-demo/demo-module-all/pom.xml | 56 --------------
modules/cli-demo/pom.xml | 90 ----------------------
modules/{cli-demo => }/cli/ignite.sh | 0
modules/{cli-demo => }/cli/pom.xml | 23 ++++--
.../progressbar/IgniteProgressBarRenderer.java | 0
.../apache/ignite/cli/CliPathsConfigLoader.java | 0
.../java/org/apache/ignite/cli/CliVersionInfo.java | 0
.../java/org/apache/ignite/cli/CommandFactory.java | 0
.../java/org/apache/ignite/cli/ErrorHandler.java | 0
.../org/apache/ignite/cli/HelpFactoryImpl.java | 0
.../org/apache/ignite/cli/IgniteCLIException.java | 0
.../java/org/apache/ignite/cli/IgniteCliApp.java | 0
.../java/org/apache/ignite/cli/IgnitePaths.java | 0
.../org/apache/ignite/cli/IgniteProgressBar.java | 0
.../org/apache/ignite/cli/InteractiveWrapper.java | 0
.../src/main/java/org/apache/ignite/cli/Table.java | 0
.../org/apache/ignite/cli/VersionProvider.java | 0
.../ignite/cli/builtins/SystemPathResolver.java | 0
.../cli/builtins/config/ConfigurationClient.java | 0
.../cli/builtins/config/HttpClientFactory.java | 0
.../cli/builtins/init/InitIgniteCommand.java | 0
.../cli/builtins/module/MavenArtifactResolver.java | 0
.../cli/builtins/module/MavenCoordinates.java | 0
.../ignite/cli/builtins/module/ModuleManager.java | 0
.../ignite/cli/builtins/module/ModuleStorage.java | 0
.../ignite/cli/builtins/module/ResolveResult.java | 0
.../builtins/module/StandardModuleDefinition.java | 0
.../ignite/cli/builtins/node/NodeManager.java | 0
.../org/apache/ignite/cli/spec/CategorySpec.java | 0
.../org/apache/ignite/cli/spec/CommandSpec.java | 0
.../apache/ignite/cli/spec/ConfigCommandSpec.java | 0
.../org/apache/ignite/cli/spec/IgniteCliSpec.java | 0
.../ignite/cli/spec/InitIgniteCommandSpec.java | 0
.../apache/ignite/cli/spec/ModuleCommandSpec.java | 0
.../apache/ignite/cli/spec/NodeCommandSpec.java | 0
.../org/apache/ignite/cli/spec/SpecAdapter.java | 0
.../cli/src/main/resources/builtin_modules.conf | 0
.../cli/src/main/resources/default-config.xml | 0
.../cli/src/main/resources/logback.xml | 0
.../src/main}/resources/version.properties | 0
.../apache/ignite/cli/IgniteCliInterfaceTest.java | 6 +-
.../cli/builtins/init/InitIgniteCommandTest.java | 0
.../cli/src/test/resources/builtin_modules.conf | 8 +-
.../cli/src/test/resources/logback-test.xml | 0
.../src/test}/resources/version.properties | 0
pom.xml | 3 +-
53 files changed, 39 insertions(+), 346 deletions(-)
diff --git a/modules/cli-demo/cli-common/pom.xml b/modules/cli-common/pom.xml
similarity index 72%
rename from modules/cli-demo/cli-common/pom.xml
rename to modules/cli-common/pom.xml
index add7fab..a0799cc 100644
--- a/modules/cli-demo/cli-common/pom.xml
+++ b/modules/cli-common/pom.xml
@@ -19,15 +19,26 @@
<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
- <artifactId>ignite-cli-demo</artifactId>
<groupId>org.apache.ignite</groupId>
- <version>3.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <artifactId>apache-ignite</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>ignite-cli-common</artifactId>
+ <!-- Must be changed together with ignite-runner module version fix -->
+ <version>3.0-SNAPSHOT</version>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.1</version>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/modules/cli-demo/cli-common/src/main/java/org/apache/ignite/cli/common/IgniteCommand.java b/modules/cli-common/src/main/java/org/apache/ignite/cli/common/IgniteCommand.java
similarity index 100%
rename from modules/cli-demo/cli-common/src/main/java/org/apache/ignite/cli/common/IgniteCommand.java
rename to modules/cli-common/src/main/java/org/apache/ignite/cli/common/IgniteCommand.java
diff --git a/modules/cli-demo/demo-module-all/demo-module-cli/pom.xml b/modules/cli-demo/demo-module-all/demo-module-cli/pom.xml
deleted file mode 100644
index 5904b10..0000000
--- a/modules/cli-demo/demo-module-all/demo-module-cli/pom.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>ignite-cli-demo</artifactId>
- <groupId>org.apache.ignite</groupId>
- <version>3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>ignite-demo-module-cli</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.ignite</groupId>
- <artifactId>ignite-cli-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>info.picocli</groupId>
- <artifactId>picocli</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <resources>
- <resource>
- <directory>src/main/resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- </build>
-
-
-</project>
diff --git a/modules/cli-demo/demo-module-all/demo-module-cli/src/main/java/org/apache/ignite/snapshot/cli/SnapshotCommand.java b/modules/cli-demo/demo-module-all/demo-module-cli/src/main/java/org/apache/ignite/snapshot/cli/SnapshotCommand.java
deleted file mode 100644
index 9b1316c..0000000
--- a/modules/cli-demo/demo-module-all/demo-module-cli/src/main/java/org/apache/ignite/snapshot/cli/SnapshotCommand.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.snapshot.cli;
-
-import org.apache.ignite.cli.common.IgniteCommand;
-import picocli.CommandLine;
-
-@CommandLine.Command(
- name = "snapshot",
- description = "Snapshots management",
- subcommands = {
- SnapshotCommand.CreateSnashotCommand.class,
- SnapshotCommand.CancelSnapshotCommand.class}
-)
-public class SnapshotCommand implements IgniteCommand, Runnable {
-
- @CommandLine.Spec CommandLine.Model.CommandSpec spec;
-
- @Override public void run() {
- spec.commandLine().usage(spec.commandLine().getOut());
- }
-
- @CommandLine.Command(
- name = "create",
- description = "Create snapshot"
- )
- public static class CreateSnashotCommand implements Runnable {
-
- @CommandLine.Spec CommandLine.Model.CommandSpec spec;
-
- @Override public void run() {
- spec.commandLine().getOut().println("Create snapshot command was executed");
- }
- }
-
-
- @CommandLine.Command(
- name = "cancel",
- description = "Cancel snapshot"
- )
- public static class CancelSnapshotCommand implements Runnable {
-
- @CommandLine.Spec CommandLine.Model.CommandSpec spec;
-
- @Override public void run() {
- spec.commandLine().getOut().println("Cancel snapshot command was executed");
- }
-
- }
-}
diff --git a/modules/cli-demo/demo-module-all/demo-module-cli/src/main/resources/META-INF/services/org.apache.ignite.cli.common.IgniteCommand b/modules/cli-demo/demo-module-all/demo-module-cli/src/main/resources/META-INF/services/org.apache.ignite.cli.common.IgniteCommand
deleted file mode 100644
index d916aa9..0000000
--- a/modules/cli-demo/demo-module-all/demo-module-cli/src/main/resources/META-INF/services/org.apache.ignite.cli.common.IgniteCommand
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.ignite.snapshot.cli.SnapshotCommand
\ No newline at end of file
diff --git a/modules/cli-demo/demo-module-all/demo-module/pom.xml b/modules/cli-demo/demo-module-all/demo-module/pom.xml
deleted file mode 100644
index c4ea834..0000000
--- a/modules/cli-demo/demo-module-all/demo-module/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>ignite-cli-demo</artifactId>
- <groupId>org.apache.ignite</groupId>
- <version>3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>ignite-demo-module</artifactId>
- <name>ignite-demo-module</name>
-
-
-</project>
diff --git a/modules/cli-demo/demo-module-all/demo-module/src/main/java/org/apache/ignite/snapshot/IgniteSnapshot.java b/modules/cli-demo/demo-module-all/demo-module/src/main/java/org/apache/ignite/snapshot/IgniteSnapshot.java
deleted file mode 100644
index a885054..0000000
--- a/modules/cli-demo/demo-module-all/demo-module/src/main/java/org/apache/ignite/snapshot/IgniteSnapshot.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.snapshot;
-
-public class IgniteSnapshot {
-
- static {
- System.out.println("Snapshot module loaded");
- }
-}
diff --git a/modules/cli-demo/demo-module-all/pom.xml b/modules/cli-demo/demo-module-all/pom.xml
deleted file mode 100644
index 1f63a6d..0000000
--- a/modules/cli-demo/demo-module-all/pom.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!--
- POM file.
--->
-<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.ignite</groupId>
- <artifactId>ignite-cli-demo</artifactId>
- <version>3.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>ignite-demo-module-all</artifactId>
- <version>3.0-SNAPSHOT</version>
- <url>http://ignite.apache.org</url>
- <name>ignite-demo-module-all</name>
- <packaging>pom</packaging>
-
- <modules>
- <module>demo-module-cli</module>
- <module>demo-module</module>
- </modules>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.ignite</groupId>
- <artifactId>ignite-demo-module</artifactId>
- <version>3.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.ignite</groupId>
- <artifactId>ignite-demo-module-cli</artifactId>
- <version>3.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
-</project>
diff --git a/modules/cli-demo/pom.xml b/modules/cli-demo/pom.xml
deleted file mode 100644
index c5236ca..0000000
--- a/modules/cli-demo/pom.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
-<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <groupId>org.apache.ignite</groupId>
- <artifactId>ignite-cli-demo</artifactId>
- <version>3.0-SNAPSHOT</version>
- <url>http://ignite.apache.org</url>
- <packaging>pom</packaging>
- <name>ignite-cli-demo</name>
-
- <modules>
- <module>cli-common</module>
- <module>cli</module>
- <module>demo-module-all</module>
- </modules>
-
- <properties>
- <micronaut.version>2.1.3</micronaut.version>
- <picocli.version>4.5.2</picocli.version>
- </properties>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>info.picocli</groupId>
- <artifactId>picocli</artifactId>
- <version>${picocli.version}</version>
- </dependency>
- <dependency>
- <groupId>io.micronaut</groupId>
- <artifactId>micronaut-inject-java</artifactId>
- <version>${micronaut.version}</version>
- </dependency>
- <dependency>
- <groupId>io.micronaut</groupId>
- <artifactId>micronaut-core</artifactId>
- <version>${micronaut.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <!-- annotationProcessorPaths requires maven-compiler-plugin version 3.5 or higher -->
- <version>3.8.1</version>
- <configuration>
- <source>11</source>
- <target>11</target>
- <annotationProcessorPaths>
- <path>
- <groupId>io.micronaut</groupId>
- <artifactId>micronaut-inject-java</artifactId>
- <version>${micronaut.version}</version>
- </path>
- <path>
- <groupId>info.picocli</groupId>
- <artifactId>picocli-codegen</artifactId>
- <version>4.5.2</version>
- </path>
- </annotationProcessorPaths>
- <compilerArgs>
- <arg>-Aproject=${project.groupId}/${project.artifactId}</arg>
- </compilerArgs>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/modules/cli-demo/cli/ignite.sh b/modules/cli/ignite.sh
similarity index 100%
rename from modules/cli-demo/cli/ignite.sh
rename to modules/cli/ignite.sh
diff --git a/modules/cli-demo/cli/pom.xml b/modules/cli/pom.xml
similarity index 94%
rename from modules/cli-demo/cli/pom.xml
rename to modules/cli/pom.xml
index 4c1b786..ad090db 100644
--- a/modules/cli-demo/cli/pom.xml
+++ b/modules/cli/pom.xml
@@ -25,11 +25,18 @@
<parent>
<groupId>org.apache.ignite</groupId>
- <artifactId>ignite-cli-demo</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <artifactId>apache-ignite</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
</parent>
- <artifactId>ignite</artifactId>
+ <artifactId>ignite-cli</artifactId>
+ <!-- Must be changed together with ignite-runner module version fix -->
+ <version>3.0-SNAPSHOT</version>
+
+ <properties>
+ <micronaut.version>2.1.2</micronaut.version>
+ <picocli.version>4.5.2</picocli.version>
+ </properties>
<dependencies>
<dependency>
@@ -65,6 +72,7 @@
<dependency>
<groupId>info.picocli</groupId>
<artifactId>picocli</artifactId>
+ <version>${picocli.version}</version>
</dependency>
<dependency>
<groupId>org.jetbrains</groupId>
@@ -86,18 +94,16 @@
<dependency>
<groupId>io.micronaut.test</groupId>
<artifactId>micronaut-test-junit5</artifactId>
- <version>2.1.1</version>
+ <version>2.3.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.micronaut</groupId>
<artifactId>micronaut-inject-java</artifactId>
+ <version>${micronaut.version}</version>
</dependency>
- <dependency>
- <groupId>io.micronaut</groupId>
- <artifactId>micronaut-core</artifactId>
- </dependency>
+
<dependency>
<groupId>com.typesafe</groupId>
<artifactId>config</artifactId>
@@ -151,6 +157,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.1</version>
<configuration>
<!-- Uncomment to enable incremental compilation -->
<!-- <useIncrementalCompilation>false</useIncrementalCompilation> -->
diff --git a/modules/cli-demo/cli/src/main/java/me/tongfei/progressbar/IgniteProgressBarRenderer.java b/modules/cli/src/main/java/me/tongfei/progressbar/IgniteProgressBarRenderer.java
similarity index 100%
rename from modules/cli-demo/cli/src/main/java/me/tongfei/progressbar/IgniteProgressBarRenderer.java
rename to modules/cli/src/main/java/me/tongfei/progressbar/IgniteProgressBarRenderer.java
diff --git a/modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/CliPathsConfigLoader.java b/modules/cli/src/main/java/org/apache/ignite/cli/CliPathsConfigLoader.java
similarity index 100%
rename from modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/CliPathsConfigLoader.java
rename to modules/cli/src/main/java/org/apache/ignite/cli/CliPathsConfigLoader.java
diff --git a/modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/CliVersionInfo.java b/modules/cli/src/main/java/org/apache/ignite/cli/CliVersionInfo.java
similarity index 100%
rename from modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/CliVersionInfo.java
rename to modules/cli/src/main/java/org/apache/ignite/cli/CliVersionInfo.java
diff --git a/modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/CommandFactory.java b/modules/cli/src/main/java/org/apache/ignite/cli/CommandFactory.java
similarity index 100%
rename from modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/CommandFactory.java
rename to modules/cli/src/main/java/org/apache/ignite/cli/CommandFactory.java
diff --git a/modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/ErrorHandler.java b/modules/cli/src/main/java/org/apache/ignite/cli/ErrorHandler.java
similarity index 100%
rename from modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/ErrorHandler.java
rename to modules/cli/src/main/java/org/apache/ignite/cli/ErrorHandler.java
diff --git a/modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/HelpFactoryImpl.java b/modules/cli/src/main/java/org/apache/ignite/cli/HelpFactoryImpl.java
similarity index 100%
rename from modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/HelpFactoryImpl.java
rename to modules/cli/src/main/java/org/apache/ignite/cli/HelpFactoryImpl.java
diff --git a/modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/IgniteCLIException.java b/modules/cli/src/main/java/org/apache/ignite/cli/IgniteCLIException.java
similarity index 100%
rename from modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/IgniteCLIException.java
rename to modules/cli/src/main/java/org/apache/ignite/cli/IgniteCLIException.java
diff --git a/modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/IgniteCliApp.java b/modules/cli/src/main/java/org/apache/ignite/cli/IgniteCliApp.java
similarity index 100%
rename from modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/IgniteCliApp.java
rename to modules/cli/src/main/java/org/apache/ignite/cli/IgniteCliApp.java
diff --git a/modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/IgnitePaths.java b/modules/cli/src/main/java/org/apache/ignite/cli/IgnitePaths.java
similarity index 100%
rename from modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/IgnitePaths.java
rename to modules/cli/src/main/java/org/apache/ignite/cli/IgnitePaths.java
diff --git a/modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/IgniteProgressBar.java b/modules/cli/src/main/java/org/apache/ignite/cli/IgniteProgressBar.java
similarity index 100%
rename from modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/IgniteProgressBar.java
rename to modules/cli/src/main/java/org/apache/ignite/cli/IgniteProgressBar.java
diff --git a/modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/InteractiveWrapper.java b/modules/cli/src/main/java/org/apache/ignite/cli/InteractiveWrapper.java
similarity index 100%
rename from modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/InteractiveWrapper.java
rename to modules/cli/src/main/java/org/apache/ignite/cli/InteractiveWrapper.java
diff --git a/modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/Table.java b/modules/cli/src/main/java/org/apache/ignite/cli/Table.java
similarity index 100%
rename from modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/Table.java
rename to modules/cli/src/main/java/org/apache/ignite/cli/Table.java
diff --git a/modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/VersionProvider.java b/modules/cli/src/main/java/org/apache/ignite/cli/VersionProvider.java
similarity index 100%
rename from modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/VersionProvider.java
rename to modules/cli/src/main/java/org/apache/ignite/cli/VersionProvider.java
diff --git a/modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/builtins/SystemPathResolver.java b/modules/cli/src/main/java/org/apache/ignite/cli/builtins/SystemPathResolver.java
similarity index 100%
rename from modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/builtins/SystemPathResolver.java
rename to modules/cli/src/main/java/org/apache/ignite/cli/builtins/SystemPathResolver.java
diff --git a/modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/builtins/config/ConfigurationClient.java b/modules/cli/src/main/java/org/apache/ignite/cli/builtins/config/ConfigurationClient.java
similarity index 100%
rename from modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/builtins/config/ConfigurationClient.java
rename to modules/cli/src/main/java/org/apache/ignite/cli/builtins/config/ConfigurationClient.java
diff --git a/modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/builtins/config/HttpClientFactory.java b/modules/cli/src/main/java/org/apache/ignite/cli/builtins/config/HttpClientFactory.java
similarity index 100%
rename from modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/builtins/config/HttpClientFactory.java
rename to modules/cli/src/main/java/org/apache/ignite/cli/builtins/config/HttpClientFactory.java
diff --git a/modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/builtins/init/InitIgniteCommand.java b/modules/cli/src/main/java/org/apache/ignite/cli/builtins/init/InitIgniteCommand.java
similarity index 100%
rename from modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/builtins/init/InitIgniteCommand.java
rename to modules/cli/src/main/java/org/apache/ignite/cli/builtins/init/InitIgniteCommand.java
diff --git a/modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/builtins/module/MavenArtifactResolver.java b/modules/cli/src/main/java/org/apache/ignite/cli/builtins/module/MavenArtifactResolver.java
similarity index 100%
rename from modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/builtins/module/MavenArtifactResolver.java
rename to modules/cli/src/main/java/org/apache/ignite/cli/builtins/module/MavenArtifactResolver.java
diff --git a/modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/builtins/module/MavenCoordinates.java b/modules/cli/src/main/java/org/apache/ignite/cli/builtins/module/MavenCoordinates.java
similarity index 100%
rename from modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/builtins/module/MavenCoordinates.java
rename to modules/cli/src/main/java/org/apache/ignite/cli/builtins/module/MavenCoordinates.java
diff --git a/modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/builtins/module/ModuleManager.java b/modules/cli/src/main/java/org/apache/ignite/cli/builtins/module/ModuleManager.java
similarity index 100%
rename from modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/builtins/module/ModuleManager.java
rename to modules/cli/src/main/java/org/apache/ignite/cli/builtins/module/ModuleManager.java
diff --git a/modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/builtins/module/ModuleStorage.java b/modules/cli/src/main/java/org/apache/ignite/cli/builtins/module/ModuleStorage.java
similarity index 100%
rename from modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/builtins/module/ModuleStorage.java
rename to modules/cli/src/main/java/org/apache/ignite/cli/builtins/module/ModuleStorage.java
diff --git a/modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/builtins/module/ResolveResult.java b/modules/cli/src/main/java/org/apache/ignite/cli/builtins/module/ResolveResult.java
similarity index 100%
rename from modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/builtins/module/ResolveResult.java
rename to modules/cli/src/main/java/org/apache/ignite/cli/builtins/module/ResolveResult.java
diff --git a/modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/builtins/module/StandardModuleDefinition.java b/modules/cli/src/main/java/org/apache/ignite/cli/builtins/module/StandardModuleDefinition.java
similarity index 100%
rename from modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/builtins/module/StandardModuleDefinition.java
rename to modules/cli/src/main/java/org/apache/ignite/cli/builtins/module/StandardModuleDefinition.java
diff --git a/modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/builtins/node/NodeManager.java b/modules/cli/src/main/java/org/apache/ignite/cli/builtins/node/NodeManager.java
similarity index 100%
rename from modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/builtins/node/NodeManager.java
rename to modules/cli/src/main/java/org/apache/ignite/cli/builtins/node/NodeManager.java
diff --git a/modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/spec/CategorySpec.java b/modules/cli/src/main/java/org/apache/ignite/cli/spec/CategorySpec.java
similarity index 100%
rename from modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/spec/CategorySpec.java
rename to modules/cli/src/main/java/org/apache/ignite/cli/spec/CategorySpec.java
diff --git a/modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/spec/CommandSpec.java b/modules/cli/src/main/java/org/apache/ignite/cli/spec/CommandSpec.java
similarity index 100%
rename from modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/spec/CommandSpec.java
rename to modules/cli/src/main/java/org/apache/ignite/cli/spec/CommandSpec.java
diff --git a/modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/spec/ConfigCommandSpec.java b/modules/cli/src/main/java/org/apache/ignite/cli/spec/ConfigCommandSpec.java
similarity index 100%
rename from modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/spec/ConfigCommandSpec.java
rename to modules/cli/src/main/java/org/apache/ignite/cli/spec/ConfigCommandSpec.java
diff --git a/modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/spec/IgniteCliSpec.java b/modules/cli/src/main/java/org/apache/ignite/cli/spec/IgniteCliSpec.java
similarity index 100%
rename from modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/spec/IgniteCliSpec.java
rename to modules/cli/src/main/java/org/apache/ignite/cli/spec/IgniteCliSpec.java
diff --git a/modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/spec/InitIgniteCommandSpec.java b/modules/cli/src/main/java/org/apache/ignite/cli/spec/InitIgniteCommandSpec.java
similarity index 100%
rename from modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/spec/InitIgniteCommandSpec.java
rename to modules/cli/src/main/java/org/apache/ignite/cli/spec/InitIgniteCommandSpec.java
diff --git a/modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/spec/ModuleCommandSpec.java b/modules/cli/src/main/java/org/apache/ignite/cli/spec/ModuleCommandSpec.java
similarity index 100%
rename from modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/spec/ModuleCommandSpec.java
rename to modules/cli/src/main/java/org/apache/ignite/cli/spec/ModuleCommandSpec.java
diff --git a/modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/spec/NodeCommandSpec.java b/modules/cli/src/main/java/org/apache/ignite/cli/spec/NodeCommandSpec.java
similarity index 100%
rename from modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/spec/NodeCommandSpec.java
rename to modules/cli/src/main/java/org/apache/ignite/cli/spec/NodeCommandSpec.java
diff --git a/modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/spec/SpecAdapter.java b/modules/cli/src/main/java/org/apache/ignite/cli/spec/SpecAdapter.java
similarity index 100%
rename from modules/cli-demo/cli/src/main/java/org/apache/ignite/cli/spec/SpecAdapter.java
rename to modules/cli/src/main/java/org/apache/ignite/cli/spec/SpecAdapter.java
diff --git a/modules/cli-demo/cli/src/main/resources/builtin_modules.conf b/modules/cli/src/main/resources/builtin_modules.conf
similarity index 100%
rename from modules/cli-demo/cli/src/main/resources/builtin_modules.conf
rename to modules/cli/src/main/resources/builtin_modules.conf
diff --git a/modules/cli-demo/cli/src/main/resources/default-config.xml b/modules/cli/src/main/resources/default-config.xml
similarity index 100%
rename from modules/cli-demo/cli/src/main/resources/default-config.xml
rename to modules/cli/src/main/resources/default-config.xml
diff --git a/modules/cli-demo/cli/src/main/resources/logback.xml b/modules/cli/src/main/resources/logback.xml
similarity index 100%
rename from modules/cli-demo/cli/src/main/resources/logback.xml
rename to modules/cli/src/main/resources/logback.xml
diff --git a/modules/cli-demo/cli/src/test/resources/version.properties b/modules/cli/src/main/resources/version.properties
similarity index 100%
rename from modules/cli-demo/cli/src/test/resources/version.properties
rename to modules/cli/src/main/resources/version.properties
diff --git a/modules/cli-demo/cli/src/test/java/org/apache/ignite/cli/IgniteCliInterfaceTest.java b/modules/cli/src/test/java/org/apache/ignite/cli/IgniteCliInterfaceTest.java
similarity index 99%
rename from modules/cli-demo/cli/src/test/java/org/apache/ignite/cli/IgniteCliInterfaceTest.java
rename to modules/cli/src/test/java/org/apache/ignite/cli/IgniteCliInterfaceTest.java
index 692c050..7703307 100644
--- a/modules/cli-demo/cli/src/test/java/org/apache/ignite/cli/IgniteCliInterfaceTest.java
+++ b/modules/cli/src/test/java/org/apache/ignite/cli/IgniteCliInterfaceTest.java
@@ -120,7 +120,7 @@ public class IgniteCliInterfaceTest {
}
@Test
- @DisplayName("add demo-module")
+ @DisplayName("add test-module")
void addBuiltinModule() {
doNothing().when(moduleManager).addModule(any(), any(), any());
@@ -129,8 +129,8 @@ public class IgniteCliInterfaceTest {
when(cliPathsConfigLoader.loadIgnitePathsOrThrowError()).thenReturn(paths);
var exitCode =
- commandLine(applicationContext).execute("module add demo-module".split(" "));
- verify(moduleManager).addModule("demo-module", paths, Collections.emptyList());
+ commandLine(applicationContext).execute("module add test-module".split(" "));
+ verify(moduleManager).addModule("test-module", paths, Collections.emptyList());
assertEquals(0, exitCode);
}
diff --git a/modules/cli-demo/cli/src/test/java/org/apache/ignite/cli/builtins/init/InitIgniteCommandTest.java b/modules/cli/src/test/java/org/apache/ignite/cli/builtins/init/InitIgniteCommandTest.java
similarity index 100%
rename from modules/cli-demo/cli/src/test/java/org/apache/ignite/cli/builtins/init/InitIgniteCommandTest.java
rename to modules/cli/src/test/java/org/apache/ignite/cli/builtins/init/InitIgniteCommandTest.java
diff --git a/modules/cli-demo/cli/src/test/resources/builtin_modules.conf b/modules/cli/src/test/resources/builtin_modules.conf
similarity index 51%
rename from modules/cli-demo/cli/src/test/resources/builtin_modules.conf
rename to modules/cli/src/test/resources/builtin_modules.conf
index 0cde1d2..2dfbd6a 100644
--- a/modules/cli-demo/cli/src/test/resources/builtin_modules.conf
+++ b/modules/cli/src/test/resources/builtin_modules.conf
@@ -5,9 +5,9 @@ modules : {
cli-artifacts: []
},
- ignite-demo-cli {
- description: "Demo Ignite module with additional cli command 'snapshot'",
- artifacts: ["mvn:org.apache.ignite:ignite-demo-module"],
- cli-artifacts: ["mvn:org.apache.ignite:ignite-demo-module-cli"]
+ ignite-test-cli {
+ description: "Test Ignite module",
+ artifacts: ["mvn:org.apache.ignite:ignite-test-module"],
+ cli-artifacts: ["mvn:org.apache.ignite:ignite-test-module-cli"]
}
}
\ No newline at end of file
diff --git a/modules/cli-demo/cli/src/test/resources/logback-test.xml b/modules/cli/src/test/resources/logback-test.xml
similarity index 100%
rename from modules/cli-demo/cli/src/test/resources/logback-test.xml
rename to modules/cli/src/test/resources/logback-test.xml
diff --git a/modules/cli-demo/cli/src/main/resources/version.properties b/modules/cli/src/test/resources/version.properties
similarity index 100%
rename from modules/cli-demo/cli/src/main/resources/version.properties
rename to modules/cli/src/test/resources/version.properties
diff --git a/pom.xml b/pom.xml
index 9e93eef..557eb44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,6 +41,7 @@
<module>modules/configuration</module>
<module>modules/configuration-annotation-processor</module>
<module>modules/ignite-runner</module>
- <module>modules/cli-demo</module>
+ <module>modules/cli-common</module>
+ <module>modules/cli</module>
</modules>
</project>