This is an automated email from the ASF dual-hosted git repository. nicoloboschi pushed a commit to branch branch-2.11 in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit f7874ab141e4f5bb0c15ad44035639b4af4e9f1a Author: Nicolò Boschi <[email protected]> AuthorDate: Fri Sep 2 21:55:14 2022 +0200 [improve][cli] CLI extensions: rename default location to 'cliextensions' (#17435) (cherry picked from commit 57560bfb40566edfcb3dac3d4ea0e33f97589fa9) --- pulsar-client-tools-test/pom.xml | 4 ++-- .../test/java/org/apache/pulsar/admin/cli/PulsarAdminToolTest.java | 2 +- .../apache/pulsar/admin/cli/utils/CustomCommandFactoryProvider.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pulsar-client-tools-test/pom.xml b/pulsar-client-tools-test/pom.xml index 07881400f45..ac4c5c90d3a 100644 --- a/pulsar-client-tools-test/pom.xml +++ b/pulsar-client-tools-test/pom.xml @@ -126,8 +126,8 @@ <configuration> <target> <echo>copy filters</echo> - <mkdir dir="${project.build.outputDirectory}/cliExtensions" /> - <copy verbose="true" file="${basedir}/../pulsar-client-tools-customcommand-example/target/customCommands-nar.nar" tofile="${project.build.outputDirectory}/cliExtensions/customCommands-nar.nar" /> + <mkdir dir="${project.build.outputDirectory}/cliextensions" /> + <copy verbose="true" file="${basedir}/../pulsar-client-tools-customcommand-example/target/customCommands-nar.nar" tofile="${project.build.outputDirectory}/cliextensions/customCommands-nar.nar" /> </target> </configuration> </execution> diff --git a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/PulsarAdminToolTest.java b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/PulsarAdminToolTest.java index 4bbb443278d..24842b9e11a 100644 --- a/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/PulsarAdminToolTest.java +++ b/pulsar-client-tools-test/src/test/java/org/apache/pulsar/admin/cli/PulsarAdminToolTest.java @@ -2314,7 +2314,7 @@ public class PulsarAdminToolTest { private static String runCustomCommand(String[] args) throws Exception { File narFile = new File(PulsarAdminTool.class.getClassLoader() - .getResource("cliExtensions/customCommands-nar.nar").getFile()); + .getResource("cliextensions/customCommands-nar.nar").getFile()); log.info("NAR FILE is {}", narFile); PulsarAdminBuilder builder = mock(PulsarAdminBuilder.class); diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/utils/CustomCommandFactoryProvider.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/utils/CustomCommandFactoryProvider.java index 34155efd4a5..7aa581ef7e0 100644 --- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/utils/CustomCommandFactoryProvider.java +++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/utils/CustomCommandFactoryProvider.java @@ -55,7 +55,7 @@ public class CustomCommandFactoryProvider { return result; } - String directory = conf.getProperty("cliExtensionsDirectory", "cliExtensions"); + String directory = conf.getProperty("cliExtensionsDirectory", "cliextensions"); String narExtractionDirectory = NarClassLoader.DEFAULT_NAR_EXTRACTION_DIR; CustomCommandFactoryDefinitions definitions = searchForCustomCommandFactories(directory, narExtractionDirectory);
