From ebc616061da6f337626ee85e4282230aedfd748a Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Thu, 9 Apr 2020 17:49:33 +0200 Subject: [PATCH] HDDS-3340. Move Ozone Shell from ozone-manager to tools Closes #775 --- .../org/apache/hadoop/ozone/package-info.java | 21 ++++------------ .../intellij/runConfigurations/OzoneShell.xml | 6 ++--- hadoop-ozone/dist/src/shell/ozone/ozone | 8 +++---- .../TestOzoneDatanodeShell.java | 2 +- .../{ozShell => shell}/TestOzoneShellHA.java | 6 ++--- .../ozone/{ozShell => shell}/TestS3Shell.java | 4 ++-- .../apache/hadoop/ozone/web/package-info.java | 24 ------------------- .../apache/hadoop/ozone/shell}/Handler.java | 2 +- .../hadoop/ozone/shell}/ListOptions.java | 2 +- .../hadoop/ozone/shell}/OzoneAddress.java | 2 +- .../hadoop/ozone/shell}/OzoneShell.java | 10 ++++---- .../org/apache/hadoop/ozone/shell}/Shell.java | 2 +- .../hadoop/ozone/shell}/StoreTypeOption.java | 2 +- .../hadoop/ozone/shell}/acl/AclHandler.java | 8 +++---- .../hadoop/ozone/shell}/acl/AclOption.java | 2 +- .../ozone/shell}/acl/GetAclHandler.java | 2 +- .../hadoop/ozone/shell}/acl/package-info.java | 2 +- .../shell}/bucket/AddAclBucketHandler.java | 8 +++---- .../ozone/shell}/bucket/BucketCommands.java | 4 ++-- .../ozone/shell}/bucket/BucketHandler.java | 6 ++--- .../hadoop/ozone/shell}/bucket/BucketUri.java | 6 ++--- .../shell}/bucket/CreateBucketHandler.java | 4 ++-- .../shell}/bucket/DeleteBucketHandler.java | 4 ++-- .../shell}/bucket/GetAclBucketHandler.java | 8 +++---- .../shell}/bucket/InfoBucketHandler.java | 4 ++-- .../shell}/bucket/ListBucketHandler.java | 8 +++---- .../shell}/bucket/RemoveAclBucketHandler.java | 8 +++---- .../shell}/bucket/SetAclBucketHandler.java | 8 +++---- .../ozone/shell}/bucket/package-info.java | 2 +- .../ozone/shell}/keys/AddAclKeyHandler.java | 8 +++---- .../ozone/shell}/keys/DeleteKeyHandler.java | 4 ++-- .../ozone/shell}/keys/GetAclKeyHandler.java | 8 +++---- .../ozone/shell}/keys/GetKeyHandler.java | 4 ++-- .../ozone/shell}/keys/InfoKeyHandler.java | 4 ++-- .../hadoop/ozone/shell}/keys/KeyCommands.java | 4 ++-- .../hadoop/ozone/shell}/keys/KeyHandler.java | 6 ++--- .../hadoop/ozone/shell}/keys/KeyUri.java | 6 ++--- .../ozone/shell}/keys/ListKeyHandler.java | 8 +++---- .../ozone/shell}/keys/PutKeyHandler.java | 4 ++-- .../shell}/keys/RemoveAclKeyHandler.java | 8 +++---- .../ozone/shell}/keys/RenameKeyHandler.java | 6 ++--- .../ozone/shell}/keys/SetAclKeyHandler.java | 8 +++---- .../ozone/shell}/keys/package-info.java | 2 +- .../hadoop/ozone/shell}/package-info.java | 2 +- .../ozone/shell}/s3/GetS3SecretHandler.java | 4 ++-- .../ozone/shell}/s3/S3BucketMapping.java | 4 ++-- .../hadoop/ozone/shell}/s3/S3Handler.java | 6 ++--- .../hadoop/ozone/shell}/s3/S3Shell.java | 4 ++-- .../hadoop/ozone/shell}/s3/package-info.java | 2 +- .../shell}/token/CancelTokenHandler.java | 6 ++--- .../ozone/shell}/token/GetTokenHandler.java | 8 +++---- .../ozone/shell}/token/PrintTokenHandler.java | 2 +- .../ozone/shell}/token/RenewTokenHandler.java | 6 ++--- .../ozone/shell}/token/RenewerOption.java | 2 +- .../ozone/shell}/token/TokenCommands.java | 4 ++-- .../ozone/shell}/token/TokenOption.java | 2 +- .../ozone/shell}/token/package-info.java | 2 +- .../shell}/volume/AddAclVolumeHandler.java | 8 +++---- .../shell}/volume/CreateVolumeHandler.java | 4 ++-- .../shell}/volume/DeleteVolumeHandler.java | 4 ++-- .../shell}/volume/GetAclVolumeHandler.java | 8 +++---- .../shell}/volume/InfoVolumeHandler.java | 4 ++-- .../shell}/volume/ListVolumeHandler.java | 10 ++++---- .../shell}/volume/RemoveAclVolumeHandler.java | 8 +++---- .../shell}/volume/SetAclVolumeHandler.java | 8 +++---- .../shell}/volume/UpdateVolumeHandler.java | 4 ++-- .../ozone/shell}/volume/VolumeCommands.java | 4 ++-- .../ozone/shell}/volume/VolumeHandler.java | 6 ++--- .../hadoop/ozone/shell}/volume/VolumeUri.java | 6 ++--- .../ozone/shell}/volume/package-info.java | 2 +- .../hadoop/ozone/shell}/TestOzoneAddress.java | 2 +- .../hadoop/ozone/shell}/package-info.java | 2 +- 72 files changed, 176 insertions(+), 213 deletions(-) rename hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/{ozShell => shell}/TestOzoneDatanodeShell.java (99%) rename hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/{ozShell => shell}/TestOzoneShellHA.java (98%) rename hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/{ozShell => shell}/TestS3Shell.java (98%) delete mode 100644 hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/package-info.java rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/Handler.java (98%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/ListOptions.java (97%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/OzoneAddress.java (99%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/OzoneShell.java (86%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/Shell.java (97%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/StoreTypeOption.java (97%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/acl/AclHandler.java (90%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/acl/AclOption.java (98%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/acl/GetAclHandler.java (96%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/acl/package-info.java (94%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/bucket/AddAclBucketHandler.java (86%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/bucket/BucketCommands.java (95%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/bucket/BucketHandler.java (87%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/bucket/BucketUri.java (90%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/bucket/CreateBucketHandler.java (96%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/bucket/DeleteBucketHandler.java (93%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/bucket/GetAclBucketHandler.java (83%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/bucket/InfoBucketHandler.java (92%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/bucket/ListBucketHandler.java (89%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/bucket/RemoveAclBucketHandler.java (87%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/bucket/SetAclBucketHandler.java (86%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/bucket/package-info.java (94%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/keys/AddAclKeyHandler.java (86%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/keys/DeleteKeyHandler.java (94%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/keys/GetAclKeyHandler.java (83%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/keys/GetKeyHandler.java (96%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/keys/InfoKeyHandler.java (95%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/keys/KeyCommands.java (95%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/keys/KeyHandler.java (87%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/keys/KeyUri.java (90%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/keys/ListKeyHandler.java (91%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/keys/PutKeyHandler.java (97%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/keys/RemoveAclKeyHandler.java (87%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/keys/RenameKeyHandler.java (92%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/keys/SetAclKeyHandler.java (86%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/keys/package-info.java (94%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/package-info.java (95%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/s3/GetS3SecretHandler.java (93%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/s3/S3BucketMapping.java (95%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/s3/S3Handler.java (91%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/s3/S3Shell.java (94%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/s3/package-info.java (94%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/token/CancelTokenHandler.java (92%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/token/GetTokenHandler.java (91%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/token/PrintTokenHandler.java (96%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/token/RenewTokenHandler.java (92%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/token/RenewerOption.java (96%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/token/TokenCommands.java (95%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/token/TokenOption.java (97%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/token/package-info.java (94%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/volume/AddAclVolumeHandler.java (86%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/volume/CreateVolumeHandler.java (95%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/volume/DeleteVolumeHandler.java (92%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/volume/GetAclVolumeHandler.java (83%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/volume/InfoVolumeHandler.java (92%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/volume/ListVolumeHandler.java (91%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/volume/RemoveAclVolumeHandler.java (87%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/volume/SetAclVolumeHandler.java (86%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/volume/UpdateVolumeHandler.java (94%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/volume/VolumeCommands.java (95%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/volume/VolumeHandler.java (87%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/volume/VolumeUri.java (90%) rename hadoop-ozone/{ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell => tools/src/main/java/org/apache/hadoop/ozone/shell}/volume/package-info.java (94%) rename hadoop-ozone/{ozone-manager/src/test/java/org/apache/hadoop/ozone/web/ozShell => tools/src/test/java/org/apache/hadoop/ozone/shell}/TestOzoneAddress.java (98%) rename hadoop-ozone/{ozone-manager/src/test/java/org/apache/hadoop/ozone/web/ozShell => tools/src/test/java/org/apache/hadoop/ozone/shell}/package-info.java (94%) diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/package-info.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/package-info.java index db399db25ab..2e4d8b8db31 100644 --- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/package-info.java +++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/package-info.java @@ -1,4 +1,4 @@ -/** +/* * 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 @@ -15,21 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.ozone; /** - This package contains class that support ozone implementation on the datanode - side. - - Main parts of ozone on datanode are: - - 1. REST Interface - This code lives under the web directory and listens to the - WebHDFS port. - - 2. Datanode container classes: This support persistence of ozone objects on - datanode. These classes live under container directory. - - 3. Client and Shell: We also support a ozone REST client lib, they are under - web/client and web/ozShell. - + * This package contains class that support ozone implementation on the datanode + * side. Datanode container classes support persistence of ozone objects on + * datanode. These classes live under container directory. */ +package org.apache.hadoop.ozone; diff --git a/hadoop-ozone/dev-support/intellij/runConfigurations/OzoneShell.xml b/hadoop-ozone/dev-support/intellij/runConfigurations/OzoneShell.xml index 2d0bf803edc..32a0a4c1de7 100644 --- a/hadoop-ozone/dev-support/intellij/runConfigurations/OzoneShell.xml +++ b/hadoop-ozone/dev-support/intellij/runConfigurations/OzoneShell.xml @@ -16,8 +16,8 @@ --> - - \ No newline at end of file + diff --git a/hadoop-ozone/dist/src/shell/ozone/ozone b/hadoop-ozone/dist/src/shell/ozone/ozone index 4ec68d084bc..e7ee3d4de10 100755 --- a/hadoop-ozone/dist/src/shell/ozone/ozone +++ b/hadoop-ozone/dist/src/shell/ozone/ozone @@ -145,15 +145,15 @@ function ozonecmd_case OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-ozone-manager" ;; sh | shell) - HADOOP_CLASSNAME=org.apache.hadoop.ozone.web.ozShell.OzoneShell + HADOOP_CLASSNAME=org.apache.hadoop.ozone.shell.OzoneShell HDFS_OM_SH_OPTS="${HDFS_OM_SH_OPTS} -Dhadoop.log.file=ozone-shell.log -Dlog4j.configuration=file:${ozone_shell_log4j}" HADOOP_OPTS="${HADOOP_OPTS} ${HDFS_OM_SH_OPTS}" - OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-ozone-manager" + OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-tools" ;; s3) - HADOOP_CLASSNAME=org.apache.hadoop.ozone.web.ozShell.s3.S3Shell - OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-ozone-manager" + HADOOP_CLASSNAME=org.apache.hadoop.ozone.shell.s3.S3Shell + OZONE_RUN_ARTIFACT_NAME="hadoop-ozone-tools" ;; scm) HADOOP_SUBCMD_SUPPORTDAEMONIZATION="true" diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ozShell/TestOzoneDatanodeShell.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneDatanodeShell.java similarity index 99% rename from hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ozShell/TestOzoneDatanodeShell.java rename to hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneDatanodeShell.java index 740baec4fa7..45101366903 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ozShell/TestOzoneDatanodeShell.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneDatanodeShell.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.ozone.ozShell; +package org.apache.hadoop.ozone.shell; import static org.junit.Assert.fail; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ozShell/TestOzoneShellHA.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneShellHA.java similarity index 98% rename from hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ozShell/TestOzoneShellHA.java rename to hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneShellHA.java index 1c35d5b6915..caf9c69112b 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ozShell/TestOzoneShellHA.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneShellHA.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.ozone.ozShell; +package org.apache.hadoop.ozone.shell; import com.google.common.base.Strings; import org.apache.hadoop.fs.FileUtil; @@ -26,9 +26,7 @@ import org.apache.hadoop.ozone.OzoneConsts; import org.apache.hadoop.ozone.om.OMConfigKeys; import org.apache.hadoop.ozone.om.OzoneManager; -import org.apache.hadoop.ozone.web.ozShell.OzoneShell; -import org.apache.hadoop.ozone.web.ozShell.Shell; -import org.apache.hadoop.ozone.web.ozShell.s3.S3Shell; +import org.apache.hadoop.ozone.shell.s3.S3Shell; import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.test.GenericTestUtils; import org.junit.After; diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ozShell/TestS3Shell.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestS3Shell.java similarity index 98% rename from hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ozShell/TestS3Shell.java rename to hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestS3Shell.java index 63c62696142..72cf91b9909 100644 --- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/ozShell/TestS3Shell.java +++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/shell/TestS3Shell.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.ozone.ozShell; +package org.apache.hadoop.ozone.shell; import com.google.common.base.Strings; import org.apache.hadoop.fs.FileUtil; @@ -27,7 +27,7 @@ import org.apache.hadoop.ozone.client.rpc.RpcClient; import org.apache.hadoop.ozone.om.exceptions.OMException; import org.apache.hadoop.ozone.om.helpers.ServiceInfo; -import org.apache.hadoop.ozone.web.ozShell.s3.S3Shell; +import org.apache.hadoop.ozone.shell.s3.S3Shell; import org.apache.hadoop.test.GenericTestUtils; import org.junit.After; import org.junit.AfterClass; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/package-info.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/package-info.java deleted file mode 100644 index 1a7275c3d66..00000000000 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/package-info.java +++ /dev/null @@ -1,24 +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.hadoop.ozone.web; - -/** - * This package contains generic class for the internal http server - * and REST interfaces. - */ diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/Handler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/Handler.java similarity index 98% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/Handler.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/Handler.java index 549b93ed075..15eca19ad20 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/Handler.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/Handler.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell; +package org.apache.hadoop.ozone.shell; import java.io.IOException; import java.io.PrintStream; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/ListOptions.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/ListOptions.java similarity index 97% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/ListOptions.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/ListOptions.java index 215e23bfec3..4baf4f5abd2 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/ListOptions.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/ListOptions.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell; +package org.apache.hadoop.ozone.shell; import picocli.CommandLine; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/OzoneAddress.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/OzoneAddress.java similarity index 99% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/OzoneAddress.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/OzoneAddress.java index 3750804e550..1d753287cf0 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/OzoneAddress.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/OzoneAddress.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell; +package org.apache.hadoop.ozone.shell; import java.io.IOException; import java.io.PrintStream; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/OzoneShell.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/OzoneShell.java similarity index 86% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/OzoneShell.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/OzoneShell.java index b97d7322eae..4cedd4a9da3 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/OzoneShell.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/OzoneShell.java @@ -15,14 +15,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell; +package org.apache.hadoop.ozone.shell; import org.apache.hadoop.hdds.cli.HddsVersionProvider; import org.apache.hadoop.hdds.tracing.TracingUtil; -import org.apache.hadoop.ozone.web.ozShell.bucket.BucketCommands; -import org.apache.hadoop.ozone.web.ozShell.keys.KeyCommands; -import org.apache.hadoop.ozone.web.ozShell.token.TokenCommands; -import org.apache.hadoop.ozone.web.ozShell.volume.VolumeCommands; +import org.apache.hadoop.ozone.shell.bucket.BucketCommands; +import org.apache.hadoop.ozone.shell.keys.KeyCommands; +import org.apache.hadoop.ozone.shell.token.TokenCommands; +import org.apache.hadoop.ozone.shell.volume.VolumeCommands; import io.opentracing.Scope; import io.opentracing.util.GlobalTracer; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/Shell.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/Shell.java similarity index 97% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/Shell.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/Shell.java index d64a35f3545..0c71dc82cf3 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/Shell.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/Shell.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell; +package org.apache.hadoop.ozone.shell; import org.apache.hadoop.hdds.cli.GenericCli; import org.apache.hadoop.ozone.om.exceptions.OMException; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/StoreTypeOption.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/StoreTypeOption.java similarity index 97% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/StoreTypeOption.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/StoreTypeOption.java index 7b73ba8a92a..8fbab644c0e 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/StoreTypeOption.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/StoreTypeOption.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell; +package org.apache.hadoop.ozone.shell; import org.apache.hadoop.ozone.security.acl.OzoneObj; import picocli.CommandLine; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/acl/AclHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/acl/AclHandler.java similarity index 90% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/acl/AclHandler.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/acl/AclHandler.java index a90bc5133c5..50db64b3ed5 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/acl/AclHandler.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/acl/AclHandler.java @@ -15,14 +15,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.acl; +package org.apache.hadoop.ozone.shell.acl; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.security.acl.OzoneObj; -import org.apache.hadoop.ozone.web.ozShell.Handler; -import org.apache.hadoop.ozone.web.ozShell.OzoneAddress; +import org.apache.hadoop.ozone.shell.OzoneAddress; +import org.apache.hadoop.ozone.shell.StoreTypeOption; +import org.apache.hadoop.ozone.shell.Handler; -import org.apache.hadoop.ozone.web.ozShell.StoreTypeOption; import picocli.CommandLine; import java.io.IOException; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/acl/AclOption.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/acl/AclOption.java similarity index 98% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/acl/AclOption.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/acl/AclOption.java index 33e3dacc32f..aa1675d28eb 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/acl/AclOption.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/acl/AclOption.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.acl; +package org.apache.hadoop.ozone.shell.acl; import com.google.common.collect.ImmutableList; import org.apache.hadoop.ozone.OzoneAcl; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/acl/GetAclHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/acl/GetAclHandler.java similarity index 96% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/acl/GetAclHandler.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/acl/GetAclHandler.java index c43fff597fb..e4ee15307ce 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/acl/GetAclHandler.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/acl/GetAclHandler.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.acl; +package org.apache.hadoop.ozone.shell.acl; import org.apache.hadoop.ozone.OzoneAcl; import org.apache.hadoop.ozone.client.OzoneClient; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/acl/package-info.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/acl/package-info.java similarity index 94% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/acl/package-info.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/acl/package-info.java index 34fb598de8f..e569522b640 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/acl/package-info.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/acl/package-info.java @@ -20,4 +20,4 @@ /** * Helpers for ACL commands. */ -package org.apache.hadoop.ozone.web.ozShell.acl; +package org.apache.hadoop.ozone.shell.acl; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/AddAclBucketHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/AddAclBucketHandler.java similarity index 86% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/AddAclBucketHandler.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/AddAclBucketHandler.java index 47ac9bc028e..90bd2f22508 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/AddAclBucketHandler.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/AddAclBucketHandler.java @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.bucket; +package org.apache.hadoop.ozone.shell.bucket; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.security.acl.OzoneObj; -import org.apache.hadoop.ozone.web.ozShell.OzoneAddress; -import org.apache.hadoop.ozone.web.ozShell.acl.AclHandler; -import org.apache.hadoop.ozone.web.ozShell.acl.AclOption; +import org.apache.hadoop.ozone.shell.OzoneAddress; +import org.apache.hadoop.ozone.shell.acl.AclHandler; +import org.apache.hadoop.ozone.shell.acl.AclOption; import picocli.CommandLine; import java.io.IOException; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/BucketCommands.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/BucketCommands.java similarity index 95% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/BucketCommands.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/BucketCommands.java index ba1ef8ceab4..ea4ec709623 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/BucketCommands.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/BucketCommands.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.bucket; +package org.apache.hadoop.ozone.shell.bucket; import java.util.concurrent.Callable; @@ -24,7 +24,7 @@ import org.apache.hadoop.hdds.cli.HddsVersionProvider; import org.apache.hadoop.hdds.cli.MissingSubcommandException; import org.apache.hadoop.hdds.conf.OzoneConfiguration; -import org.apache.hadoop.ozone.web.ozShell.Shell; +import org.apache.hadoop.ozone.shell.Shell; import picocli.CommandLine.Command; import picocli.CommandLine.ParentCommand; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/BucketHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/BucketHandler.java similarity index 87% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/BucketHandler.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/BucketHandler.java index 991690e3eae..eb496c95517 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/BucketHandler.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/BucketHandler.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.bucket; +package org.apache.hadoop.ozone.shell.bucket; -import org.apache.hadoop.ozone.web.ozShell.Handler; -import org.apache.hadoop.ozone.web.ozShell.OzoneAddress; +import org.apache.hadoop.ozone.shell.Handler; +import org.apache.hadoop.ozone.shell.OzoneAddress; import picocli.CommandLine; /** diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/BucketUri.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/BucketUri.java similarity index 90% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/BucketUri.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/BucketUri.java index c4d638e25fe..9a1c62d0af0 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/BucketUri.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/BucketUri.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.bucket; +package org.apache.hadoop.ozone.shell.bucket; import org.apache.hadoop.ozone.client.OzoneClientException; -import org.apache.hadoop.ozone.web.ozShell.OzoneAddress; -import org.apache.hadoop.ozone.web.ozShell.Shell; +import org.apache.hadoop.ozone.shell.Shell; +import org.apache.hadoop.ozone.shell.OzoneAddress; import picocli.CommandLine; /** diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/CreateBucketHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/CreateBucketHandler.java similarity index 96% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/CreateBucketHandler.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/CreateBucketHandler.java index 4bdeeaf4010..901c1e352cd 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/CreateBucketHandler.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/CreateBucketHandler.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.bucket; +package org.apache.hadoop.ozone.shell.bucket; import org.apache.hadoop.hdds.protocol.StorageType; import org.apache.hadoop.ozone.OzoneConsts; @@ -23,7 +23,7 @@ import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.client.OzoneVolume; -import org.apache.hadoop.ozone.web.ozShell.OzoneAddress; +import org.apache.hadoop.ozone.shell.OzoneAddress; import picocli.CommandLine.Command; import picocli.CommandLine.Option; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/DeleteBucketHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/DeleteBucketHandler.java similarity index 93% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/DeleteBucketHandler.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/DeleteBucketHandler.java index fa7eb18547b..a8eeee93e16 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/DeleteBucketHandler.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/DeleteBucketHandler.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.bucket; +package org.apache.hadoop.ozone.shell.bucket; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.client.OzoneVolume; -import org.apache.hadoop.ozone.web.ozShell.OzoneAddress; +import org.apache.hadoop.ozone.shell.OzoneAddress; import picocli.CommandLine.Command; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/GetAclBucketHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/GetAclBucketHandler.java similarity index 83% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/GetAclBucketHandler.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/GetAclBucketHandler.java index 7d091e80bef..a9a2d811995 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/GetAclBucketHandler.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/GetAclBucketHandler.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.bucket; +package org.apache.hadoop.ozone.shell.bucket; -import org.apache.hadoop.ozone.web.ozShell.OzoneAddress; -import org.apache.hadoop.ozone.web.ozShell.acl.AclHandler; -import org.apache.hadoop.ozone.web.ozShell.acl.GetAclHandler; +import org.apache.hadoop.ozone.shell.OzoneAddress; +import org.apache.hadoop.ozone.shell.acl.AclHandler; +import org.apache.hadoop.ozone.shell.acl.GetAclHandler; import picocli.CommandLine; /** diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/InfoBucketHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/InfoBucketHandler.java similarity index 92% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/InfoBucketHandler.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/InfoBucketHandler.java index f8f098c4ec9..e9ae5f97965 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/InfoBucketHandler.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/InfoBucketHandler.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.bucket; +package org.apache.hadoop.ozone.shell.bucket; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; -import org.apache.hadoop.ozone.web.ozShell.OzoneAddress; +import org.apache.hadoop.ozone.shell.OzoneAddress; import picocli.CommandLine.Command; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/ListBucketHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/ListBucketHandler.java similarity index 89% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/ListBucketHandler.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/ListBucketHandler.java index 5a08956f7bb..6c01af3e9ae 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/ListBucketHandler.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/ListBucketHandler.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.bucket; +package org.apache.hadoop.ozone.shell.bucket; import java.io.IOException; import java.util.Iterator; @@ -24,10 +24,10 @@ import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.client.OzoneVolume; -import org.apache.hadoop.ozone.web.ozShell.ListOptions; -import org.apache.hadoop.ozone.web.ozShell.OzoneAddress; +import org.apache.hadoop.ozone.shell.ListOptions; +import org.apache.hadoop.ozone.shell.OzoneAddress; +import org.apache.hadoop.ozone.shell.volume.VolumeHandler; -import org.apache.hadoop.ozone.web.ozShell.volume.VolumeHandler; import picocli.CommandLine; import picocli.CommandLine.Command; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/RemoveAclBucketHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/RemoveAclBucketHandler.java similarity index 87% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/RemoveAclBucketHandler.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/RemoveAclBucketHandler.java index 20bb8f113fa..97a3938413d 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/RemoveAclBucketHandler.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/RemoveAclBucketHandler.java @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.bucket; +package org.apache.hadoop.ozone.shell.bucket; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.security.acl.OzoneObj; -import org.apache.hadoop.ozone.web.ozShell.OzoneAddress; -import org.apache.hadoop.ozone.web.ozShell.acl.AclHandler; -import org.apache.hadoop.ozone.web.ozShell.acl.AclOption; +import org.apache.hadoop.ozone.shell.OzoneAddress; +import org.apache.hadoop.ozone.shell.acl.AclHandler; +import org.apache.hadoop.ozone.shell.acl.AclOption; import picocli.CommandLine; import java.io.IOException; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/SetAclBucketHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/SetAclBucketHandler.java similarity index 86% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/SetAclBucketHandler.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/SetAclBucketHandler.java index aa11c762c6d..5b6045122ac 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/SetAclBucketHandler.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/SetAclBucketHandler.java @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.bucket; +package org.apache.hadoop.ozone.shell.bucket; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.security.acl.OzoneObj; -import org.apache.hadoop.ozone.web.ozShell.OzoneAddress; -import org.apache.hadoop.ozone.web.ozShell.acl.AclHandler; -import org.apache.hadoop.ozone.web.ozShell.acl.AclOption; +import org.apache.hadoop.ozone.shell.OzoneAddress; +import org.apache.hadoop.ozone.shell.acl.AclHandler; +import org.apache.hadoop.ozone.shell.acl.AclOption; import picocli.CommandLine; import java.io.IOException; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/package-info.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/package-info.java similarity index 94% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/package-info.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/package-info.java index 2ab0f098f75..7a971e93c5b 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/bucket/package-info.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/bucket/package-info.java @@ -20,4 +20,4 @@ /** * Commands for Ozone buckets. */ -package org.apache.hadoop.ozone.web.ozShell.bucket; +package org.apache.hadoop.ozone.shell.bucket; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/AddAclKeyHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/AddAclKeyHandler.java similarity index 86% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/AddAclKeyHandler.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/AddAclKeyHandler.java index 9b0788f66b3..ae18efd4abd 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/AddAclKeyHandler.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/AddAclKeyHandler.java @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.keys; +package org.apache.hadoop.ozone.shell.keys; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.security.acl.OzoneObj; -import org.apache.hadoop.ozone.web.ozShell.OzoneAddress; -import org.apache.hadoop.ozone.web.ozShell.acl.AclHandler; -import org.apache.hadoop.ozone.web.ozShell.acl.AclOption; +import org.apache.hadoop.ozone.shell.OzoneAddress; +import org.apache.hadoop.ozone.shell.acl.AclHandler; +import org.apache.hadoop.ozone.shell.acl.AclOption; import picocli.CommandLine; import java.io.IOException; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/DeleteKeyHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/DeleteKeyHandler.java similarity index 94% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/DeleteKeyHandler.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/DeleteKeyHandler.java index a89129d238a..a62ad836e0e 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/DeleteKeyHandler.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/DeleteKeyHandler.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.keys; +package org.apache.hadoop.ozone.shell.keys; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.client.OzoneClientException; import org.apache.hadoop.ozone.client.OzoneVolume; -import org.apache.hadoop.ozone.web.ozShell.OzoneAddress; +import org.apache.hadoop.ozone.shell.OzoneAddress; import picocli.CommandLine.Command; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/GetAclKeyHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/GetAclKeyHandler.java similarity index 83% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/GetAclKeyHandler.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/GetAclKeyHandler.java index 86e6d2e059f..8b89d7a6888 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/GetAclKeyHandler.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/GetAclKeyHandler.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.keys; +package org.apache.hadoop.ozone.shell.keys; -import org.apache.hadoop.ozone.web.ozShell.OzoneAddress; -import org.apache.hadoop.ozone.web.ozShell.acl.AclHandler; -import org.apache.hadoop.ozone.web.ozShell.acl.GetAclHandler; +import org.apache.hadoop.ozone.shell.OzoneAddress; +import org.apache.hadoop.ozone.shell.acl.AclHandler; +import org.apache.hadoop.ozone.shell.acl.GetAclHandler; import picocli.CommandLine; /** diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/GetKeyHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/GetKeyHandler.java similarity index 96% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/GetKeyHandler.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/GetKeyHandler.java index f107672689d..c87f8da3836 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/GetKeyHandler.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/GetKeyHandler.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.keys; +package org.apache.hadoop.ozone.shell.keys; import java.io.File; import java.io.FileInputStream; @@ -31,7 +31,7 @@ import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.client.OzoneClientException; import org.apache.hadoop.ozone.client.OzoneVolume; -import org.apache.hadoop.ozone.web.ozShell.OzoneAddress; +import org.apache.hadoop.ozone.shell.OzoneAddress; import org.apache.commons.codec.digest.DigestUtils; import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_CHUNK_SIZE_DEFAULT; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/InfoKeyHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/InfoKeyHandler.java similarity index 95% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/InfoKeyHandler.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/InfoKeyHandler.java index a1e8b694be6..5cfc1e8f5a0 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/InfoKeyHandler.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/InfoKeyHandler.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.keys; +package org.apache.hadoop.ozone.shell.keys; import org.apache.hadoop.ozone.OzoneConsts; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.client.OzoneKeyDetails; import org.apache.hadoop.ozone.client.OzoneVolume; -import org.apache.hadoop.ozone.web.ozShell.OzoneAddress; +import org.apache.hadoop.ozone.shell.OzoneAddress; import picocli.CommandLine.Command; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/KeyCommands.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/KeyCommands.java similarity index 95% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/KeyCommands.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/KeyCommands.java index 4de97c57f2f..bc429626045 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/KeyCommands.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/KeyCommands.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.keys; +package org.apache.hadoop.ozone.shell.keys; import java.util.concurrent.Callable; @@ -24,7 +24,7 @@ import org.apache.hadoop.hdds.cli.HddsVersionProvider; import org.apache.hadoop.hdds.cli.MissingSubcommandException; import org.apache.hadoop.hdds.conf.OzoneConfiguration; -import org.apache.hadoop.ozone.web.ozShell.Shell; +import org.apache.hadoop.ozone.shell.Shell; import picocli.CommandLine.Command; import picocli.CommandLine.ParentCommand; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/KeyHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/KeyHandler.java similarity index 87% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/KeyHandler.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/KeyHandler.java index 0b5eb93c6cd..861540c2f99 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/KeyHandler.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/KeyHandler.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.keys; +package org.apache.hadoop.ozone.shell.keys; -import org.apache.hadoop.ozone.web.ozShell.Handler; -import org.apache.hadoop.ozone.web.ozShell.OzoneAddress; +import org.apache.hadoop.ozone.shell.OzoneAddress; +import org.apache.hadoop.ozone.shell.Handler; import picocli.CommandLine; /** diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/KeyUri.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/KeyUri.java similarity index 90% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/KeyUri.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/KeyUri.java index af8ce683e2d..b2caf0d4779 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/KeyUri.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/KeyUri.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.keys; +package org.apache.hadoop.ozone.shell.keys; import org.apache.hadoop.ozone.client.OzoneClientException; -import org.apache.hadoop.ozone.web.ozShell.OzoneAddress; -import org.apache.hadoop.ozone.web.ozShell.Shell; +import org.apache.hadoop.ozone.shell.Shell; +import org.apache.hadoop.ozone.shell.OzoneAddress; import picocli.CommandLine; /** diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/ListKeyHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/ListKeyHandler.java similarity index 91% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/ListKeyHandler.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/ListKeyHandler.java index cb85b23cc74..00d04fb62f2 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/ListKeyHandler.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/ListKeyHandler.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.keys; +package org.apache.hadoop.ozone.shell.keys; import java.io.IOException; import java.util.Iterator; @@ -26,10 +26,10 @@ import org.apache.hadoop.ozone.client.OzoneClientException; import org.apache.hadoop.ozone.client.OzoneKey; import org.apache.hadoop.ozone.client.OzoneVolume; -import org.apache.hadoop.ozone.web.ozShell.ListOptions; -import org.apache.hadoop.ozone.web.ozShell.OzoneAddress; +import org.apache.hadoop.ozone.shell.ListOptions; +import org.apache.hadoop.ozone.shell.OzoneAddress; +import org.apache.hadoop.ozone.shell.bucket.BucketHandler; -import org.apache.hadoop.ozone.web.ozShell.bucket.BucketHandler; import picocli.CommandLine; import picocli.CommandLine.Command; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/PutKeyHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/PutKeyHandler.java similarity index 97% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/PutKeyHandler.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/PutKeyHandler.java index 7ee5b0f46eb..2b2de5d2bcc 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/PutKeyHandler.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/PutKeyHandler.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.keys; +package org.apache.hadoop.ozone.shell.keys; import java.io.File; import java.io.FileInputStream; @@ -35,7 +35,7 @@ import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.client.OzoneClientException; import org.apache.hadoop.ozone.client.OzoneVolume; -import org.apache.hadoop.ozone.web.ozShell.OzoneAddress; +import org.apache.hadoop.ozone.shell.OzoneAddress; import org.apache.commons.codec.digest.DigestUtils; import static org.apache.hadoop.hdds.scm.ScmConfigKeys.OZONE_SCM_CHUNK_SIZE_DEFAULT; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/RemoveAclKeyHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/RemoveAclKeyHandler.java similarity index 87% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/RemoveAclKeyHandler.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/RemoveAclKeyHandler.java index 37097317eb5..57cf1221c63 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/RemoveAclKeyHandler.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/RemoveAclKeyHandler.java @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.keys; +package org.apache.hadoop.ozone.shell.keys; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.security.acl.OzoneObj; -import org.apache.hadoop.ozone.web.ozShell.OzoneAddress; -import org.apache.hadoop.ozone.web.ozShell.acl.AclHandler; -import org.apache.hadoop.ozone.web.ozShell.acl.AclOption; +import org.apache.hadoop.ozone.shell.OzoneAddress; +import org.apache.hadoop.ozone.shell.acl.AclHandler; +import org.apache.hadoop.ozone.shell.acl.AclOption; import picocli.CommandLine; import java.io.IOException; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/RenameKeyHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/RenameKeyHandler.java similarity index 92% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/RenameKeyHandler.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/RenameKeyHandler.java index d2499d33ceb..f71ac094faf 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/RenameKeyHandler.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/RenameKeyHandler.java @@ -15,15 +15,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.keys; +package org.apache.hadoop.ozone.shell.keys; import org.apache.hadoop.ozone.client.OzoneBucket; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.client.OzoneClientException; import org.apache.hadoop.ozone.client.OzoneVolume; -import org.apache.hadoop.ozone.web.ozShell.OzoneAddress; +import org.apache.hadoop.ozone.shell.OzoneAddress; +import org.apache.hadoop.ozone.shell.bucket.BucketHandler; -import org.apache.hadoop.ozone.web.ozShell.bucket.BucketHandler; import picocli.CommandLine.Command; import picocli.CommandLine.Parameters; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/SetAclKeyHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/SetAclKeyHandler.java similarity index 86% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/SetAclKeyHandler.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/SetAclKeyHandler.java index 2026d990ef2..8d042d3e629 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/SetAclKeyHandler.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/SetAclKeyHandler.java @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.keys; +package org.apache.hadoop.ozone.shell.keys; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.security.acl.OzoneObj; -import org.apache.hadoop.ozone.web.ozShell.OzoneAddress; -import org.apache.hadoop.ozone.web.ozShell.acl.AclHandler; -import org.apache.hadoop.ozone.web.ozShell.acl.AclOption; +import org.apache.hadoop.ozone.shell.OzoneAddress; +import org.apache.hadoop.ozone.shell.acl.AclHandler; +import org.apache.hadoop.ozone.shell.acl.AclOption; import picocli.CommandLine; import java.io.IOException; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/package-info.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/package-info.java similarity index 94% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/package-info.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/package-info.java index 1737fa12f59..a7626bab1cb 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/keys/package-info.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/keys/package-info.java @@ -20,4 +20,4 @@ /** * Commands for Ozone keys. */ -package org.apache.hadoop.ozone.web.ozShell.keys; +package org.apache.hadoop.ozone.shell.keys; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/package-info.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/package-info.java similarity index 95% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/package-info.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/package-info.java index d7313bd2d78..dc2d7ab12e5 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/package-info.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/package-info.java @@ -19,4 +19,4 @@ /** A simple CLI to work against Ozone. **/ -package org.apache.hadoop.ozone.web.ozShell; +package org.apache.hadoop.ozone.shell; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/s3/GetS3SecretHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/s3/GetS3SecretHandler.java similarity index 93% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/s3/GetS3SecretHandler.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/s3/GetS3SecretHandler.java index fc7bd0c5c5f..cb129937a41 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/s3/GetS3SecretHandler.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/s3/GetS3SecretHandler.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.s3; +package org.apache.hadoop.ozone.shell.s3; import org.apache.hadoop.ozone.client.OzoneClient; -import org.apache.hadoop.ozone.web.ozShell.OzoneAddress; +import org.apache.hadoop.ozone.shell.OzoneAddress; import org.apache.hadoop.security.UserGroupInformation; import picocli.CommandLine.Command; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/s3/S3BucketMapping.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/s3/S3BucketMapping.java similarity index 95% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/s3/S3BucketMapping.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/s3/S3BucketMapping.java index f8b896cb883..db2ac7dfe63 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/s3/S3BucketMapping.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/s3/S3BucketMapping.java @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.s3; +package org.apache.hadoop.ozone.shell.s3; import org.apache.hadoop.ozone.OzoneConsts; import org.apache.hadoop.ozone.client.ObjectStore; import org.apache.hadoop.ozone.client.OzoneClient; -import org.apache.hadoop.ozone.web.ozShell.OzoneAddress; +import org.apache.hadoop.ozone.shell.OzoneAddress; import picocli.CommandLine.Command; import picocli.CommandLine.Parameters; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/s3/S3Handler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/s3/S3Handler.java similarity index 91% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/s3/S3Handler.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/s3/S3Handler.java index 7c5354dd320..34e3b9afa82 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/s3/S3Handler.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/s3/S3Handler.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.s3; +package org.apache.hadoop.ozone.shell.s3; import java.io.IOException; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.client.OzoneClientException; -import org.apache.hadoop.ozone.web.ozShell.Handler; -import org.apache.hadoop.ozone.web.ozShell.OzoneAddress; +import org.apache.hadoop.ozone.shell.OzoneAddress; +import org.apache.hadoop.ozone.shell.Handler; import picocli.CommandLine; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/s3/S3Shell.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/s3/S3Shell.java similarity index 94% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/s3/S3Shell.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/s3/S3Shell.java index 73f5d533b19..b8f3e6f2329 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/s3/S3Shell.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/s3/S3Shell.java @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.s3; +package org.apache.hadoop.ozone.shell.s3; import io.opentracing.Scope; import io.opentracing.util.GlobalTracer; import org.apache.hadoop.hdds.tracing.TracingUtil; -import org.apache.hadoop.ozone.web.ozShell.Shell; +import org.apache.hadoop.ozone.shell.Shell; import picocli.CommandLine.Command; /** diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/s3/package-info.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/s3/package-info.java similarity index 94% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/s3/package-info.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/s3/package-info.java index 079ef189c56..9a5eac717fc 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/s3/package-info.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/s3/package-info.java @@ -18,4 +18,4 @@ /** * S3 commands for Ozone. */ -package org.apache.hadoop.ozone.web.ozShell.s3; +package org.apache.hadoop.ozone.shell.s3; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/token/CancelTokenHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/token/CancelTokenHandler.java similarity index 92% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/token/CancelTokenHandler.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/token/CancelTokenHandler.java index fd81917dc0c..c5be1c96281 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/token/CancelTokenHandler.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/token/CancelTokenHandler.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.token; +package org.apache.hadoop.ozone.shell.token; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.client.OzoneClientException; import org.apache.hadoop.ozone.client.OzoneClientFactory; import org.apache.hadoop.ozone.security.OzoneTokenIdentifier; -import org.apache.hadoop.ozone.web.ozShell.Handler; -import org.apache.hadoop.ozone.web.ozShell.OzoneAddress; +import org.apache.hadoop.ozone.shell.OzoneAddress; +import org.apache.hadoop.ozone.shell.Handler; import org.apache.hadoop.security.token.Token; import picocli.CommandLine; import picocli.CommandLine.Command; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/token/GetTokenHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/token/GetTokenHandler.java similarity index 91% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/token/GetTokenHandler.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/token/GetTokenHandler.java index ae6ad60ba3b..dfc2f31e9b3 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/token/GetTokenHandler.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/token/GetTokenHandler.java @@ -16,15 +16,15 @@ * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.token; +package org.apache.hadoop.ozone.shell.token; import org.apache.hadoop.io.Text; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.client.OzoneClientException; import org.apache.hadoop.ozone.security.OzoneTokenIdentifier; -import org.apache.hadoop.ozone.web.ozShell.Handler; -import org.apache.hadoop.ozone.web.ozShell.OzoneAddress; -import org.apache.hadoop.ozone.web.ozShell.Shell; +import org.apache.hadoop.ozone.shell.OzoneAddress; +import org.apache.hadoop.ozone.shell.Handler; +import org.apache.hadoop.ozone.shell.Shell; import org.apache.hadoop.security.token.Token; import picocli.CommandLine; import picocli.CommandLine.Command; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/token/PrintTokenHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/token/PrintTokenHandler.java similarity index 96% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/token/PrintTokenHandler.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/token/PrintTokenHandler.java index adb55c624b0..632a9d27748 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/token/PrintTokenHandler.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/token/PrintTokenHandler.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.token; +package org.apache.hadoop.ozone.shell.token; import org.apache.hadoop.hdds.server.JsonUtils; import org.apache.hadoop.ozone.security.OzoneTokenIdentifier; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/token/RenewTokenHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/token/RenewTokenHandler.java similarity index 92% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/token/RenewTokenHandler.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/token/RenewTokenHandler.java index e1c9fd6d213..db71e0f9e5e 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/token/RenewTokenHandler.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/token/RenewTokenHandler.java @@ -16,14 +16,14 @@ * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.token; +package org.apache.hadoop.ozone.shell.token; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.client.OzoneClientException; import org.apache.hadoop.ozone.client.OzoneClientFactory; import org.apache.hadoop.ozone.security.OzoneTokenIdentifier; -import org.apache.hadoop.ozone.web.ozShell.Handler; -import org.apache.hadoop.ozone.web.ozShell.OzoneAddress; +import org.apache.hadoop.ozone.shell.Handler; +import org.apache.hadoop.ozone.shell.OzoneAddress; import org.apache.hadoop.security.token.Token; import picocli.CommandLine; import picocli.CommandLine.Command; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/token/RenewerOption.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/token/RenewerOption.java similarity index 96% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/token/RenewerOption.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/token/RenewerOption.java index d66098a1f55..67b8e33bd1b 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/token/RenewerOption.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/token/RenewerOption.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.token; +package org.apache.hadoop.ozone.shell.token; import org.apache.commons.lang3.StringUtils; import org.apache.hadoop.security.UserGroupInformation; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/token/TokenCommands.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/token/TokenCommands.java similarity index 95% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/token/TokenCommands.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/token/TokenCommands.java index 445cf7a7727..e0836caa189 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/token/TokenCommands.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/token/TokenCommands.java @@ -16,13 +16,13 @@ * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.token; +package org.apache.hadoop.ozone.shell.token; import org.apache.hadoop.hdds.cli.GenericParentCommand; import org.apache.hadoop.hdds.cli.HddsVersionProvider; import org.apache.hadoop.hdds.cli.MissingSubcommandException; import org.apache.hadoop.hdds.conf.OzoneConfiguration; -import org.apache.hadoop.ozone.web.ozShell.Shell; +import org.apache.hadoop.ozone.shell.Shell; import picocli.CommandLine.Command; import picocli.CommandLine.ParentCommand; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/token/TokenOption.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/token/TokenOption.java similarity index 97% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/token/TokenOption.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/token/TokenOption.java index d46aa3958ae..61d479bb36e 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/token/TokenOption.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/token/TokenOption.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.token; +package org.apache.hadoop.ozone.shell.token; import org.apache.hadoop.ozone.security.OzoneTokenIdentifier; import org.apache.hadoop.security.token.Token; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/token/package-info.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/token/package-info.java similarity index 94% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/token/package-info.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/token/package-info.java index bd51669465b..a05c27a388f 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/token/package-info.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/token/package-info.java @@ -19,4 +19,4 @@ /** Ozone delegation token commands. **/ -package org.apache.hadoop.ozone.web.ozShell.token; +package org.apache.hadoop.ozone.shell.token; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/AddAclVolumeHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/AddAclVolumeHandler.java similarity index 86% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/AddAclVolumeHandler.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/AddAclVolumeHandler.java index 73006e1c0c3..94f44b25efd 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/AddAclVolumeHandler.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/AddAclVolumeHandler.java @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.volume; +package org.apache.hadoop.ozone.shell.volume; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.security.acl.OzoneObj; -import org.apache.hadoop.ozone.web.ozShell.OzoneAddress; -import org.apache.hadoop.ozone.web.ozShell.acl.AclHandler; -import org.apache.hadoop.ozone.web.ozShell.acl.AclOption; +import org.apache.hadoop.ozone.shell.OzoneAddress; +import org.apache.hadoop.ozone.shell.acl.AclHandler; +import org.apache.hadoop.ozone.shell.acl.AclOption; import picocli.CommandLine; import java.io.IOException; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/CreateVolumeHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/CreateVolumeHandler.java similarity index 95% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/CreateVolumeHandler.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/CreateVolumeHandler.java index 20d2c602fc1..cbeb92a68f2 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/CreateVolumeHandler.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/CreateVolumeHandler.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.volume; +package org.apache.hadoop.ozone.shell.volume; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.client.OzoneVolume; import org.apache.hadoop.ozone.client.VolumeArgs; -import org.apache.hadoop.ozone.web.ozShell.OzoneAddress; +import org.apache.hadoop.ozone.shell.OzoneAddress; import org.apache.hadoop.security.UserGroupInformation; import picocli.CommandLine.Command; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/DeleteVolumeHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/DeleteVolumeHandler.java similarity index 92% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/DeleteVolumeHandler.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/DeleteVolumeHandler.java index a7fa982fa1d..29f9e39132e 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/DeleteVolumeHandler.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/DeleteVolumeHandler.java @@ -16,10 +16,10 @@ * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.volume; +package org.apache.hadoop.ozone.shell.volume; import org.apache.hadoop.ozone.client.OzoneClient; -import org.apache.hadoop.ozone.web.ozShell.OzoneAddress; +import org.apache.hadoop.ozone.shell.OzoneAddress; import picocli.CommandLine.Command; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/GetAclVolumeHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/GetAclVolumeHandler.java similarity index 83% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/GetAclVolumeHandler.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/GetAclVolumeHandler.java index 3bdafc17620..2deb25a77a0 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/GetAclVolumeHandler.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/GetAclVolumeHandler.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.volume; +package org.apache.hadoop.ozone.shell.volume; -import org.apache.hadoop.ozone.web.ozShell.OzoneAddress; -import org.apache.hadoop.ozone.web.ozShell.acl.AclHandler; -import org.apache.hadoop.ozone.web.ozShell.acl.GetAclHandler; +import org.apache.hadoop.ozone.shell.OzoneAddress; +import org.apache.hadoop.ozone.shell.acl.AclHandler; +import org.apache.hadoop.ozone.shell.acl.GetAclHandler; import picocli.CommandLine; /** diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/InfoVolumeHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/InfoVolumeHandler.java similarity index 92% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/InfoVolumeHandler.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/InfoVolumeHandler.java index 047613a1724..db689fac199 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/InfoVolumeHandler.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/InfoVolumeHandler.java @@ -16,11 +16,11 @@ * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.volume; +package org.apache.hadoop.ozone.shell.volume; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.client.OzoneVolume; -import org.apache.hadoop.ozone.web.ozShell.OzoneAddress; +import org.apache.hadoop.ozone.shell.OzoneAddress; import picocli.CommandLine.Command; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/ListVolumeHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/ListVolumeHandler.java similarity index 91% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/ListVolumeHandler.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/ListVolumeHandler.java index adcb9f470c1..78f0e4f3056 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/ListVolumeHandler.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/ListVolumeHandler.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.volume; +package org.apache.hadoop.ozone.shell.volume; import java.io.IOException; import java.util.Iterator; @@ -24,10 +24,10 @@ import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.client.OzoneClientException; import org.apache.hadoop.ozone.client.OzoneVolume; -import org.apache.hadoop.ozone.web.ozShell.Handler; -import org.apache.hadoop.ozone.web.ozShell.ListOptions; -import org.apache.hadoop.ozone.web.ozShell.OzoneAddress; -import org.apache.hadoop.ozone.web.ozShell.Shell; +import org.apache.hadoop.ozone.shell.ListOptions; +import org.apache.hadoop.ozone.shell.OzoneAddress; +import org.apache.hadoop.ozone.shell.Shell; +import org.apache.hadoop.ozone.shell.Handler; import org.apache.hadoop.security.UserGroupInformation; import picocli.CommandLine; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/RemoveAclVolumeHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/RemoveAclVolumeHandler.java similarity index 87% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/RemoveAclVolumeHandler.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/RemoveAclVolumeHandler.java index fccc5955e6c..32b6c43690d 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/RemoveAclVolumeHandler.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/RemoveAclVolumeHandler.java @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.volume; +package org.apache.hadoop.ozone.shell.volume; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.security.acl.OzoneObj; -import org.apache.hadoop.ozone.web.ozShell.OzoneAddress; -import org.apache.hadoop.ozone.web.ozShell.acl.AclHandler; -import org.apache.hadoop.ozone.web.ozShell.acl.AclOption; +import org.apache.hadoop.ozone.shell.OzoneAddress; +import org.apache.hadoop.ozone.shell.acl.AclHandler; +import org.apache.hadoop.ozone.shell.acl.AclOption; import picocli.CommandLine; import java.io.IOException; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/SetAclVolumeHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/SetAclVolumeHandler.java similarity index 86% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/SetAclVolumeHandler.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/SetAclVolumeHandler.java index 58098e5e4d9..54555acdb28 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/SetAclVolumeHandler.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/SetAclVolumeHandler.java @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.volume; +package org.apache.hadoop.ozone.shell.volume; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.security.acl.OzoneObj; -import org.apache.hadoop.ozone.web.ozShell.OzoneAddress; -import org.apache.hadoop.ozone.web.ozShell.acl.AclHandler; -import org.apache.hadoop.ozone.web.ozShell.acl.AclOption; +import org.apache.hadoop.ozone.shell.OzoneAddress; +import org.apache.hadoop.ozone.shell.acl.AclHandler; +import org.apache.hadoop.ozone.shell.acl.AclOption; import picocli.CommandLine; import java.io.IOException; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/UpdateVolumeHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/UpdateVolumeHandler.java similarity index 94% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/UpdateVolumeHandler.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/UpdateVolumeHandler.java index 0f7fae7ada5..c8e4e760bc8 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/UpdateVolumeHandler.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/UpdateVolumeHandler.java @@ -16,12 +16,12 @@ * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.volume; +package org.apache.hadoop.ozone.shell.volume; import org.apache.hadoop.hdds.client.OzoneQuota; import org.apache.hadoop.ozone.client.OzoneClient; import org.apache.hadoop.ozone.client.OzoneVolume; -import org.apache.hadoop.ozone.web.ozShell.OzoneAddress; +import org.apache.hadoop.ozone.shell.OzoneAddress; import picocli.CommandLine.Command; import picocli.CommandLine.Option; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/VolumeCommands.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/VolumeCommands.java similarity index 95% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/VolumeCommands.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/VolumeCommands.java index 833457bcbef..1b05b48555c 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/VolumeCommands.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/VolumeCommands.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.volume; +package org.apache.hadoop.ozone.shell.volume; import java.util.concurrent.Callable; @@ -24,7 +24,7 @@ import org.apache.hadoop.hdds.cli.HddsVersionProvider; import org.apache.hadoop.hdds.cli.MissingSubcommandException; import org.apache.hadoop.hdds.conf.OzoneConfiguration; -import org.apache.hadoop.ozone.web.ozShell.Shell; +import org.apache.hadoop.ozone.shell.Shell; import picocli.CommandLine.Command; import picocli.CommandLine.ParentCommand; diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/VolumeHandler.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/VolumeHandler.java similarity index 87% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/VolumeHandler.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/VolumeHandler.java index f36573c93a0..b435e754f00 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/VolumeHandler.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/VolumeHandler.java @@ -15,10 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.volume; +package org.apache.hadoop.ozone.shell.volume; -import org.apache.hadoop.ozone.web.ozShell.Handler; -import org.apache.hadoop.ozone.web.ozShell.OzoneAddress; +import org.apache.hadoop.ozone.shell.Handler; +import org.apache.hadoop.ozone.shell.OzoneAddress; import picocli.CommandLine; /** diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/VolumeUri.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/VolumeUri.java similarity index 90% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/VolumeUri.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/VolumeUri.java index dbeead3f4e7..32581254150 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/VolumeUri.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/VolumeUri.java @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell.volume; +package org.apache.hadoop.ozone.shell.volume; import org.apache.hadoop.ozone.client.OzoneClientException; -import org.apache.hadoop.ozone.web.ozShell.OzoneAddress; -import org.apache.hadoop.ozone.web.ozShell.Shell; +import org.apache.hadoop.ozone.shell.OzoneAddress; +import org.apache.hadoop.ozone.shell.Shell; import picocli.CommandLine; /** diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/package-info.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/package-info.java similarity index 94% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/package-info.java rename to hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/package-info.java index 66599f293b3..d5cdc9b0c74 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/web/ozShell/volume/package-info.java +++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/volume/package-info.java @@ -20,4 +20,4 @@ /** * Commands for Ozone volumes. */ -package org.apache.hadoop.ozone.web.ozShell.volume; \ No newline at end of file +package org.apache.hadoop.ozone.shell.volume; \ No newline at end of file diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/web/ozShell/TestOzoneAddress.java b/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneAddress.java similarity index 98% rename from hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/web/ozShell/TestOzoneAddress.java rename to hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneAddress.java index 7ae052059be..3ab866c4985 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/web/ozShell/TestOzoneAddress.java +++ b/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/shell/TestOzoneAddress.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell; +package org.apache.hadoop.ozone.shell; import java.io.IOException; import java.util.Arrays; diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/web/ozShell/package-info.java b/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/shell/package-info.java similarity index 94% rename from hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/web/ozShell/package-info.java rename to hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/shell/package-info.java index 80c19858549..a7c89d8ec17 100644 --- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/web/ozShell/package-info.java +++ b/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/shell/package-info.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.ozone.web.ozShell; +package org.apache.hadoop.ozone.shell; /** * Tests for ozone shell.. */