This is an automated email from the ASF dual-hosted git repository.
sk0x50 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 a1172c844f IGNITE-20335 Move IgniteRunner class into internal package
(#2567)
a1172c844f is described below
commit a1172c844f1760dfea89d59113773d09faaa553f
Author: Slava Koptilin <[email protected]>
AuthorDate: Mon Sep 11 19:19:50 2023 +0300
IGNITE-20335 Move IgniteRunner class into internal package (#2567)
---
modules/runner/build.gradle | 2 +-
.../org/apache/ignite/internal/component/ItRestAddressReportTest.java | 2 +-
.../java/org/apache/ignite/internal/runner/app/IgniteRunnerTest.java | 3 +--
.../main/java/org/apache/ignite/{ => internal}/app/IgniteRunner.java | 3 +--
packaging/build.gradle | 2 +-
packaging/db/build.gradle | 4 ++--
6 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/modules/runner/build.gradle b/modules/runner/build.gradle
index 35795f4331..40fea9ac27 100644
--- a/modules/runner/build.gradle
+++ b/modules/runner/build.gradle
@@ -220,7 +220,7 @@ integrationTest {
jar {
manifest {
attributes(
- 'Main-Class': 'org.apache.ignite.app.IgniteRunner'
+ 'Main-Class': 'org.apache.ignite.internal.app.IgniteRunner'
)
}
}
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/component/ItRestAddressReportTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/component/ItRestAddressReportTest.java
index 23f07deb2d..1e41ed74bb 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/component/ItRestAddressReportTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/component/ItRestAddressReportTest.java
@@ -33,8 +33,8 @@ import java.util.concurrent.CompletableFuture;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgnitionManager;
import org.apache.ignite.InitParameters;
-import org.apache.ignite.app.IgniteRunner;
import org.apache.ignite.internal.IgniteIntegrationTest;
+import org.apache.ignite.internal.app.IgniteRunner;
import org.apache.ignite.internal.runner.app.IgniteRunnerTest;
import org.apache.ignite.internal.testframework.TestIgnitionManager;
import org.apache.ignite.internal.testframework.WorkDirectory;
diff --git
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/IgniteRunnerTest.java
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/IgniteRunnerTest.java
index 950a91eed7..543f8c6a8f 100644
---
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/IgniteRunnerTest.java
+++
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/runner/app/IgniteRunnerTest.java
@@ -26,8 +26,8 @@ import java.util.concurrent.CompletableFuture;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgnitionManager;
import org.apache.ignite.InitParameters;
-import org.apache.ignite.app.IgniteRunner;
import org.apache.ignite.internal.IgniteIntegrationTest;
+import org.apache.ignite.internal.app.IgniteRunner;
import org.apache.ignite.internal.testframework.WorkDirectory;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
@@ -46,7 +46,6 @@ public class IgniteRunnerTest extends IgniteIntegrationTest {
IgnitionManager.stop(NODE_NAME);
}
- /** TODO: Replace this test by full integration test on the cli side
IGNITE-15097. */
@Test
public void smokeTestArgs() throws Exception {
Path configPath =
Path.of(IgniteRunnerTest.class.getResource("/ignite-config.json").toURI());
diff --git
a/modules/runner/src/main/java/org/apache/ignite/app/IgniteRunner.java
b/modules/runner/src/main/java/org/apache/ignite/internal/app/IgniteRunner.java
similarity index 96%
rename from modules/runner/src/main/java/org/apache/ignite/app/IgniteRunner.java
rename to
modules/runner/src/main/java/org/apache/ignite/internal/app/IgniteRunner.java
index fdfd036676..13d94aad70 100644
--- a/modules/runner/src/main/java/org/apache/ignite/app/IgniteRunner.java
+++
b/modules/runner/src/main/java/org/apache/ignite/internal/app/IgniteRunner.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.ignite.app;
+package org.apache.ignite.internal.app;
import java.nio.file.Path;
import java.util.concurrent.Callable;
@@ -23,7 +23,6 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgnitionManager;
-import org.apache.ignite.internal.app.EnvironmentDefaultValueProvider;
import picocli.CommandLine;
import picocli.CommandLine.Command;
import picocli.CommandLine.Option;
diff --git a/packaging/build.gradle b/packaging/build.gradle
index 17ac134c73..65622aa260 100644
--- a/packaging/build.gradle
+++ b/packaging/build.gradle
@@ -67,7 +67,7 @@ def tokens = [
CONF_DIR : '${IGNITE_HOME}/etc',
LIB_DIR : '${IGNITE_HOME}/lib',
APP_JAR :
"${project(':ignite-runner').name}-${project(':ignite-runner').version}.jar".toString(),
- MAIN_CLASS : 'org.apache.ignite.app.IgniteRunner',
+ MAIN_CLASS : 'org.apache.ignite.internal.app.IgniteRunner',
BOOTSTRAP_FILE_NAME : 'bootstrap-functions.sh',
SETUP_JAVA_FILE_NAME: 'setup-java.sh'
]
diff --git a/packaging/db/build.gradle b/packaging/db/build.gradle
index eeee9c613c..55e34a5335 100644
--- a/packaging/db/build.gradle
+++ b/packaging/db/build.gradle
@@ -61,7 +61,7 @@ def tokens = [
PACKAGE_NAME : 'ignite3-db',
PRODUCT_DISPLAY_NAME: 'Apache Ignite',
APP_JAR :
"${project(':ignite-runner').name}-${project(':ignite-runner').version}.jar".toString(),
- MAIN_CLASS : 'org.apache.ignite.app.IgniteRunner',
+ MAIN_CLASS : 'org.apache.ignite.internal.app.IgniteRunner',
VARS_FILE_NAME : 'vars.env',
BOOTSTRAP_FILE_NAME : 'bootstrap-functions.sh',
SETUP_JAVA_FILE_NAME: 'setup-java.sh'
@@ -270,7 +270,7 @@ setupBuilder {
// Actually a classpath
mainJar = "lib\\*"
- mainClass = "org.apache.ignite.app.IgniteRunner"
+ mainClass = "org.apache.ignite.internal.app.IgniteRunner"
licenseFile = "$rootDir/LICENSE"
