This is an automated email from the ASF dual-hosted git repository.
pifta pushed a commit to branch HDDS-5447-httpfs
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/HDDS-5447-httpfs by this push:
new b0236e1 HDDS-5829 [HTTPFSGW] Move to org.apache.ozone package from
org.apache.hadoop. (#2743)
b0236e1 is described below
commit b0236e19769fbdb7ef13bd9bba896b7ef8c0cfdc
Author: dombizita <[email protected]>
AuthorDate: Tue Oct 19 19:09:12 2021 +0200
HDDS-5829 [HTTPFSGW] Move to org.apache.ozone package from
org.apache.hadoop. (#2743)
---
hadoop-ozone/dist/src/shell/ozone/ozone | 2 +-
.../dev-support/findbugsExcludeFile.xml | 8 +--
.../src/main/conf/httpfs-log4j.properties | 4 +-
.../fs/http/client/HttpFSFileSystem.java | 4 +-
.../fs/http/client/HttpFSUtils.java | 2 +-
.../fs/http/client/HttpsFSFileSystem.java | 2 +-
.../fs/http/client/package-info.java | 2 +-
.../http/server/CheckUploadContentTypeFilter.java | 4 +-
.../fs/http/server/FSOperations.java | 8 +--
.../fs/http/server/HttpFSAuthenticationFilter.java | 4 +-
.../fs/http/server/HttpFSExceptionProvider.java | 6 +-
.../fs/http/server/HttpFSParametersProvider.java | 27 ++++----
.../fs/http/server/HttpFSReleaseFilter.java | 6 +-
.../fs/http/server/HttpFSServer.java | 78 +++++++++++-----------
.../fs/http/server/HttpFSServerWebApp.java | 10 +--
.../fs/http/server/HttpFSServerWebServer.java | 2 +-
.../{hadoop => ozone}/fs/http/server/JsonUtil.java | 2 +-
.../http/server/metrics/HttpFSServerMetrics.java | 2 +-
.../fs/http/server/metrics/package-info.java | 2 +-
.../fs/http/server/package-info.java | 2 +-
.../hdfs/web/WebHdfsConstants.java | 2 +-
.../{hadoop => ozone}/hdfs/web/package-info.java | 2 +-
.../lib/lang/RunnableCallable.java | 4 +-
.../{hadoop => ozone}/lib/lang/XException.java | 4 +-
.../{hadoop => ozone}/lib/lang/package-info.java | 2 +-
.../{hadoop => ozone}/lib/server/BaseService.java | 4 +-
.../{hadoop => ozone}/lib/server/Server.java | 6 +-
.../lib/server/ServerException.java | 4 +-
.../{hadoop => ozone}/lib/server/Service.java | 2 +-
.../lib/server/ServiceException.java | 4 +-
.../{hadoop => ozone}/lib/server/package-info.java | 2 +-
.../lib/service/FileSystemAccess.java | 2 +-
.../lib/service/FileSystemAccessException.java | 4 +-
.../{hadoop => ozone}/lib/service/Groups.java | 2 +-
.../lib/service/Instrumentation.java | 2 +-
.../{hadoop => ozone}/lib/service/Scheduler.java | 2 +-
.../service/hadoop/FileSystemAccessService.java | 18 ++---
.../lib/service/hadoop/package-info.java | 2 +-
.../instrumentation/InstrumentationService.java | 10 +--
.../lib/service/instrumentation/package-info.java | 2 +-
.../lib/service/package-info.java | 2 +-
.../lib/service/scheduler/SchedulerService.java | 16 ++---
.../lib/service/scheduler/package-info.java | 2 +-
.../lib/service/security/GroupsService.java | 10 +--
.../lib/service/security/package-info.java | 2 +-
.../lib/servlet/FileSystemReleaseFilter.java | 4 +-
.../lib/servlet/HostnameFilter.java | 2 +-
.../{hadoop => ozone}/lib/servlet/MDCFilter.java | 2 +-
.../lib/servlet/ServerWebApp.java | 6 +-
.../lib/servlet/package-info.java | 2 +-
.../apache/{hadoop => ozone}/lib/util/Check.java | 2 +-
.../lib/util/ConfigurationUtils.java | 2 +-
.../{hadoop => ozone}/lib/util/package-info.java | 2 +-
.../{hadoop => ozone}/lib/wsrs/BooleanParam.java | 2 +-
.../{hadoop => ozone}/lib/wsrs/ByteParam.java | 2 +-
.../{hadoop => ozone}/lib/wsrs/EnumParam.java | 2 +-
.../{hadoop => ozone}/lib/wsrs/EnumSetParam.java | 2 +-
.../lib/wsrs/ExceptionProvider.java | 2 +-
.../lib/wsrs/InputStreamEntity.java | 8 +--
.../{hadoop => ozone}/lib/wsrs/IntegerParam.java | 2 +-
.../lib/wsrs/JSONMapProvider.java | 2 +-
.../{hadoop => ozone}/lib/wsrs/JSONProvider.java | 2 +-
.../{hadoop => ozone}/lib/wsrs/LongParam.java | 2 +-
.../apache/{hadoop => ozone}/lib/wsrs/Param.java | 2 +-
.../{hadoop => ozone}/lib/wsrs/Parameters.java | 2 +-
.../lib/wsrs/ParametersProvider.java | 2 +-
.../{hadoop => ozone}/lib/wsrs/ShortParam.java | 2 +-
.../{hadoop => ozone}/lib/wsrs/StringParam.java | 2 +-
.../{hadoop => ozone}/lib/wsrs/package-info.java | 2 +-
.../src/main/resources/httpfs-default.xml | 8 +--
.../main/resources/webapps/webhdfs/WEB-INF/web.xml | 14 ++--
.../httpfsgateway/src/main/webapp/WEB-INF/web.xml | 14 ++--
72 files changed, 193 insertions(+), 192 deletions(-)
diff --git a/hadoop-ozone/dist/src/shell/ozone/ozone
b/hadoop-ozone/dist/src/shell/ozone/ozone
index 3403aee..3892847 100755
--- a/hadoop-ozone/dist/src/shell/ozone/ozone
+++ b/hadoop-ozone/dist/src/shell/ozone/ozone
@@ -190,7 +190,7 @@ function ozonecmd_case
httpfs)
OZONE_SUBCMD_SUPPORTDAEMONIZATION="true"
OZONE_OPTS="${OZONE_OPTS} -Dhttpfs.home.dir=${OZONE_HOME}
-Dhttpfs.config.dir=${OZONE_CONF_DIR} -Dhttpfs.log.dir=${OZONE_HOME}/log
-Dhttpfs.temp.dir=${OZONE_HOME}/temp"
- OZONE_CLASSNAME='org.apache.hadoop.fs.http.server.HttpFSServerWebServer'
+ OZONE_CLASSNAME='org.apache.ozone.fs.http.server.HttpFSServerWebServer'
OZONE_RUN_ARTIFACT_NAME="ozone-httpfsgateway"
;;
csi)
diff --git a/hadoop-ozone/httpfsgateway/dev-support/findbugsExcludeFile.xml
b/hadoop-ozone/httpfsgateway/dev-support/findbugsExcludeFile.xml
index 5497fd5..c55b1d9 100644
--- a/hadoop-ozone/httpfsgateway/dev-support/findbugsExcludeFile.xml
+++ b/hadoop-ozone/httpfsgateway/dev-support/findbugsExcludeFile.xml
@@ -16,22 +16,22 @@
-->
<FindBugsFilter>
<Match>
- <Class
name="org.apache.hadoop.lib.service.instrumentation.InstrumentationService" />
+ <Class
name="org.apache.ozone.lib.service.instrumentation.InstrumentationService" />
<Method name="getToAdd" />
<Bug pattern="UL_UNRELEASED_LOCK" />
</Match>
<Match>
- <Class name="org.apache.hadoop.fs.http.server.HttpFSServerWebApp" />
+ <Class name="org.apache.ozone.fs.http.server.HttpFSServerWebApp" />
<Method name="destroy" />
<Bug pattern="ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD" />
</Match>
<Match>
- <Class name="org.apache.hadoop.lib.servlet.ServerWebApp" />
+ <Class name="org.apache.ozone.lib.servlet.ServerWebApp" />
<Field name="authority" />
<Bug pattern="IS2_INCONSISTENT_SYNC" />
</Match>
<Match>
- <Class name="org.apache.hadoop.lib.service.hadoop.FileSystemAccessService"
/>
+ <Class name="org.apache.ozone.lib.service.hadoop.FileSystemAccessService"
/>
<Method name="closeFileSystem" />
<Bug pattern="NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE" />
</Match>
diff --git a/hadoop-ozone/httpfsgateway/src/main/conf/httpfs-log4j.properties
b/hadoop-ozone/httpfsgateway/src/main/conf/httpfs-log4j.properties
index 284a819..1d19733 100644
--- a/hadoop-ozone/httpfsgateway/src/main/conf/httpfs-log4j.properties
+++ b/hadoop-ozone/httpfsgateway/src/main/conf/httpfs-log4j.properties
@@ -31,5 +31,5 @@
log4j.appender.httpfsaudit.layout.ConversionPattern=%d{ISO8601} %5p [%X{hostname
log4j.logger.httpfsaudit=INFO, httpfsaudit
-log4j.logger.org.apache.hadoop.fs.http.server=INFO, httpfs
-log4j.logger.org.apache.hadoop.lib=INFO, httpfs
+log4j.logger.org.apache.ozone.fs.http.server=INFO, httpfs
+log4j.logger.org.apache.ozone.lib=INFO, httpfs
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/client/HttpFSFileSystem.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/client/HttpFSFileSystem.java
similarity index 99%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/client/HttpFSFileSystem.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/client/HttpFSFileSystem.java
index dd213f3..c084c8c 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/client/HttpFSFileSystem.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/client/HttpFSFileSystem.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.hadoop.fs.http.client;
+package org.apache.ozone.fs.http.client;
import java.util.ArrayList;
import java.util.Arrays;
@@ -54,7 +54,7 @@ import org.apache.hadoop.hdfs.protocol.HdfsFileStatus;
import org.apache.hadoop.hdfs.protocol.SnapshotDiffReport;
import org.apache.hadoop.hdfs.protocol.SnapshottableDirectoryStatus;
import org.apache.hadoop.hdfs.web.JsonUtilClient;
-import org.apache.hadoop.lib.wsrs.EnumSetParam;
+import org.apache.ozone.lib.wsrs.EnumSetParam;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.token.Token;
import org.apache.hadoop.security.token.TokenIdentifier;
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/client/HttpFSUtils.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/client/HttpFSUtils.java
similarity index 99%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/client/HttpFSUtils.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/client/HttpFSUtils.java
index 92df36b..0bd6224 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/client/HttpFSUtils.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/client/HttpFSUtils.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.hadoop.fs.http.client;
+package org.apache.ozone.fs.http.client;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.fs.Path;
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/client/HttpsFSFileSystem.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/client/HttpsFSFileSystem.java
similarity index 96%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/client/HttpsFSFileSystem.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/client/HttpsFSFileSystem.java
index 0a2e08d..406db23 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/client/HttpsFSFileSystem.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/client/HttpsFSFileSystem.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.hadoop.fs.http.client;
+package org.apache.ozone.fs.http.client;
/**
* <p>HttpFSServer implementation of the FileSystemAccess FileSystem for SSL.
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/client/package-info.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/client/package-info.java
similarity index 95%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/client/package-info.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/client/package-info.java
index 9e35030..b407448 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/client/package-info.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/client/package-info.java
@@ -18,4 +18,4 @@
/**
* HttpFS filesystem implementations.
*/
-package org.apache.hadoop.fs.http.client;
\ No newline at end of file
+package org.apache.ozone.fs.http.client;
\ No newline at end of file
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/server/CheckUploadContentTypeFilter.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/CheckUploadContentTypeFilter.java
similarity index 97%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/server/CheckUploadContentTypeFilter.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/CheckUploadContentTypeFilter.java
index a512f93..42a9329 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/server/CheckUploadContentTypeFilter.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/CheckUploadContentTypeFilter.java
@@ -16,11 +16,11 @@
* limitations under the License.
*/
-package org.apache.hadoop.fs.http.server;
+package org.apache.ozone.fs.http.server;
import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.fs.http.client.HttpFSFileSystem;
+import org.apache.ozone.fs.http.client.HttpFSFileSystem;
import org.apache.hadoop.util.StringUtils;
import javax.servlet.Filter;
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/server/FSOperations.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/FSOperations.java
similarity index 99%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/server/FSOperations.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/FSOperations.java
index 3ea17ae..1b2cdd1 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/server/FSOperations.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/FSOperations.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.hadoop.fs.http.server;
+package org.apache.ozone.fs.http.server;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
@@ -33,8 +33,8 @@ import org.apache.hadoop.fs.QuotaUsage;
import org.apache.hadoop.fs.StorageType;
import org.apache.hadoop.fs.XAttrCodec;
import org.apache.hadoop.fs.XAttrSetFlag;
-import org.apache.hadoop.fs.http.client.HttpFSFileSystem;
-import org.apache.hadoop.fs.http.client.HttpFSFileSystem.FILETYPE;
+import org.apache.ozone.fs.http.client.HttpFSFileSystem;
+import org.apache.ozone.fs.http.client.HttpFSFileSystem.FILETYPE;
import org.apache.hadoop.fs.permission.AclEntry;
import org.apache.hadoop.fs.permission.AclStatus;
import org.apache.hadoop.fs.permission.FsAction;
@@ -46,7 +46,7 @@ import org.apache.hadoop.hdfs.protocol.HdfsConstants;
import org.apache.hadoop.hdfs.protocol.HdfsFileStatus;
import org.apache.hadoop.hdfs.protocol.SnapshotDiffReport;
import org.apache.hadoop.hdfs.protocol.SnapshottableDirectoryStatus;
-import org.apache.hadoop.lib.service.FileSystemAccess;
+import org.apache.ozone.lib.service.FileSystemAccess;
import org.apache.hadoop.util.StringUtils;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/server/HttpFSAuthenticationFilter.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/HttpFSAuthenticationFilter.java
similarity index 98%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/server/HttpFSAuthenticationFilter.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/HttpFSAuthenticationFilter.java
index 56d0862..554c491 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/server/HttpFSAuthenticationFilter.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/HttpFSAuthenticationFilter.java
@@ -15,11 +15,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.hadoop.fs.http.server;
+package org.apache.ozone.fs.http.server;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hdfs.web.WebHdfsConstants;
+import org.apache.ozone.hdfs.web.WebHdfsConstants;
import org.apache.hadoop.security.authentication.server.AuthenticationFilter;
import
org.apache.hadoop.security.authentication.util.RandomSignerSecretProvider;
import org.apache.hadoop.security.authentication.util.SignerSecretProvider;
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/server/HttpFSExceptionProvider.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/HttpFSExceptionProvider.java
similarity index 96%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/server/HttpFSExceptionProvider.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/HttpFSExceptionProvider.java
index 8cce1d0..7cbf81d 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/server/HttpFSExceptionProvider.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/HttpFSExceptionProvider.java
@@ -16,12 +16,12 @@
* limitations under the License.
*/
-package org.apache.hadoop.fs.http.server;
+package org.apache.ozone.fs.http.server;
import com.sun.jersey.api.container.ContainerException;
import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.lib.service.FileSystemAccessException;
-import org.apache.hadoop.lib.wsrs.ExceptionProvider;
+import org.apache.ozone.lib.service.FileSystemAccessException;
+import org.apache.ozone.lib.wsrs.ExceptionProvider;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.MDC;
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/server/HttpFSParametersProvider.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/HttpFSParametersProvider.java
similarity index 96%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/server/HttpFSParametersProvider.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/HttpFSParametersProvider.java
index 2e7b1c3..5278a2d 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/server/HttpFSParametersProvider.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/HttpFSParametersProvider.java
@@ -15,24 +15,25 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.hadoop.fs.http.server;
+package org.apache.ozone.fs.http.server;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.fs.XAttrCodec;
import org.apache.hadoop.fs.XAttrSetFlag;
-import org.apache.hadoop.fs.http.client.HttpFSFileSystem;
-import org.apache.hadoop.fs.http.client.HttpFSFileSystem.Operation;
+import org.apache.ozone.fs.http.client.HttpFSFileSystem;
+import org.apache.ozone.fs.http.client.HttpFSFileSystem.Operation;
import org.apache.hadoop.hdfs.client.HdfsClientConfigKeys;
-import org.apache.hadoop.lib.service.FileSystemAccess;
-import org.apache.hadoop.lib.wsrs.BooleanParam;
-import org.apache.hadoop.lib.wsrs.EnumParam;
-import org.apache.hadoop.lib.wsrs.EnumSetParam;
-import org.apache.hadoop.lib.wsrs.LongParam;
-import org.apache.hadoop.lib.wsrs.Param;
-import org.apache.hadoop.lib.wsrs.ParametersProvider;
-import org.apache.hadoop.lib.wsrs.ShortParam;
-import org.apache.hadoop.lib.wsrs.StringParam;
+import org.apache.ozone.lib.service.FileSystemAccess;
+import org.apache.ozone.lib.wsrs.BooleanParam;
+import org.apache.ozone.lib.wsrs.EnumParam;
+import org.apache.ozone.lib.wsrs.EnumSetParam;
+import org.apache.ozone.lib.wsrs.LongParam;
+import org.apache.ozone.lib.wsrs.Param;
+import org.apache.ozone.lib.wsrs.ParametersProvider;
+import org.apache.ozone.lib.wsrs.ShortParam;
+import org.apache.ozone.lib.wsrs.StringParam;
import org.apache.hadoop.util.StringUtils;
+
import javax.ws.rs.ext.Provider;
import java.util.HashMap;
import java.util.Map;
@@ -94,7 +95,7 @@ public class HttpFSParametersProvider extends
ParametersProvider {
XAttrValueParam.class,
XAttrSetFlagParam.class});
PARAMS_DEF.put(Operation.REMOVEXATTR, new Class[]{XAttrNameParam.class});
- PARAMS_DEF.put(Operation.GETXATTRS,
+ PARAMS_DEF.put(Operation.GETXATTRS,
new Class[]{XAttrNameParam.class, XAttrEncodingParam.class});
PARAMS_DEF.put(Operation.LISTXATTRS, new Class[]{});
PARAMS_DEF.put(Operation.LISTSTATUS_BATCH,
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/server/HttpFSReleaseFilter.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/HttpFSReleaseFilter.java
similarity index 89%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/server/HttpFSReleaseFilter.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/HttpFSReleaseFilter.java
index 318b4d0..19b2dca 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/server/HttpFSReleaseFilter.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/HttpFSReleaseFilter.java
@@ -16,11 +16,11 @@
* limitations under the License.
*/
-package org.apache.hadoop.fs.http.server;
+package org.apache.ozone.fs.http.server;
import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.lib.service.FileSystemAccess;
-import org.apache.hadoop.lib.servlet.FileSystemReleaseFilter;
+import org.apache.ozone.lib.service.FileSystemAccess;
+import org.apache.ozone.lib.servlet.FileSystemReleaseFilter;
/**
* Filter that releases FileSystemAccess filesystem instances upon HTTP request
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServer.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/HttpFSServer.java
similarity index 94%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServer.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/HttpFSServer.java
index 2b34a14..c4b3300 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServer.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/HttpFSServer.java
@@ -16,53 +16,53 @@
* limitations under the License.
*/
-package org.apache.hadoop.fs.http.server;
+package org.apache.ozone.fs.http.server;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.XAttrCodec;
import org.apache.hadoop.fs.XAttrSetFlag;
-import org.apache.hadoop.fs.http.client.HttpFSFileSystem;
-import org.apache.hadoop.fs.http.client.HttpFSUtils;
-import
org.apache.hadoop.fs.http.server.HttpFSParametersProvider.AccessTimeParam;
-import
org.apache.hadoop.fs.http.server.HttpFSParametersProvider.AclPermissionParam;
-import
org.apache.hadoop.fs.http.server.HttpFSParametersProvider.BlockSizeParam;
-import org.apache.hadoop.fs.http.server.HttpFSParametersProvider.DataParam;
-import
org.apache.hadoop.fs.http.server.HttpFSParametersProvider.DestinationParam;
-import org.apache.hadoop.fs.http.server.HttpFSParametersProvider.ECPolicyParam;
-import org.apache.hadoop.fs.http.server.HttpFSParametersProvider.FilterParam;
-import org.apache.hadoop.fs.http.server.HttpFSParametersProvider.FsActionParam;
-import org.apache.hadoop.fs.http.server.HttpFSParametersProvider.GroupParam;
-import org.apache.hadoop.fs.http.server.HttpFSParametersProvider.LenParam;
-import
org.apache.hadoop.fs.http.server.HttpFSParametersProvider.ModifiedTimeParam;
-import
org.apache.hadoop.fs.http.server.HttpFSParametersProvider.NewLengthParam;
-import
org.apache.hadoop.fs.http.server.HttpFSParametersProvider.NoRedirectParam;
-import org.apache.hadoop.fs.http.server.HttpFSParametersProvider.OffsetParam;
-import
org.apache.hadoop.fs.http.server.HttpFSParametersProvider.OldSnapshotNameParam;
-import
org.apache.hadoop.fs.http.server.HttpFSParametersProvider.OperationParam;
-import
org.apache.hadoop.fs.http.server.HttpFSParametersProvider.OverwriteParam;
-import org.apache.hadoop.fs.http.server.HttpFSParametersProvider.OwnerParam;
-import
org.apache.hadoop.fs.http.server.HttpFSParametersProvider.PermissionParam;
-import
org.apache.hadoop.fs.http.server.HttpFSParametersProvider.PolicyNameParam;
-import
org.apache.hadoop.fs.http.server.HttpFSParametersProvider.RecursiveParam;
-import
org.apache.hadoop.fs.http.server.HttpFSParametersProvider.ReplicationParam;
-import org.apache.hadoop.fs.http.server.HttpFSParametersProvider.SourcesParam;
-import
org.apache.hadoop.fs.http.server.HttpFSParametersProvider.UnmaskedPermissionParam;
-import
org.apache.hadoop.fs.http.server.HttpFSParametersProvider.SnapshotNameParam;
-import
org.apache.hadoop.fs.http.server.HttpFSParametersProvider.XAttrEncodingParam;
-import
org.apache.hadoop.fs.http.server.HttpFSParametersProvider.XAttrNameParam;
-import
org.apache.hadoop.fs.http.server.HttpFSParametersProvider.XAttrSetFlagParam;
-import
org.apache.hadoop.fs.http.server.HttpFSParametersProvider.XAttrValueParam;
+import org.apache.ozone.fs.http.client.HttpFSFileSystem;
+import org.apache.ozone.fs.http.client.HttpFSUtils;
+import
org.apache.ozone.fs.http.server.HttpFSParametersProvider.AccessTimeParam;
+import
org.apache.ozone.fs.http.server.HttpFSParametersProvider.AclPermissionParam;
+import org.apache.ozone.fs.http.server.HttpFSParametersProvider.BlockSizeParam;
+import org.apache.ozone.fs.http.server.HttpFSParametersProvider.DataParam;
+import
org.apache.ozone.fs.http.server.HttpFSParametersProvider.DestinationParam;
+import org.apache.ozone.fs.http.server.HttpFSParametersProvider.ECPolicyParam;
+import org.apache.ozone.fs.http.server.HttpFSParametersProvider.FilterParam;
+import org.apache.ozone.fs.http.server.HttpFSParametersProvider.FsActionParam;
+import org.apache.ozone.fs.http.server.HttpFSParametersProvider.GroupParam;
+import org.apache.ozone.fs.http.server.HttpFSParametersProvider.LenParam;
+import
org.apache.ozone.fs.http.server.HttpFSParametersProvider.ModifiedTimeParam;
+import org.apache.ozone.fs.http.server.HttpFSParametersProvider.NewLengthParam;
+import
org.apache.ozone.fs.http.server.HttpFSParametersProvider.NoRedirectParam;
+import org.apache.ozone.fs.http.server.HttpFSParametersProvider.OffsetParam;
+import
org.apache.ozone.fs.http.server.HttpFSParametersProvider.OldSnapshotNameParam;
+import org.apache.ozone.fs.http.server.HttpFSParametersProvider.OperationParam;
+import org.apache.ozone.fs.http.server.HttpFSParametersProvider.OverwriteParam;
+import org.apache.ozone.fs.http.server.HttpFSParametersProvider.OwnerParam;
+import
org.apache.ozone.fs.http.server.HttpFSParametersProvider.PermissionParam;
+import
org.apache.ozone.fs.http.server.HttpFSParametersProvider.PolicyNameParam;
+import org.apache.ozone.fs.http.server.HttpFSParametersProvider.RecursiveParam;
+import
org.apache.ozone.fs.http.server.HttpFSParametersProvider.ReplicationParam;
+import org.apache.ozone.fs.http.server.HttpFSParametersProvider.SourcesParam;
+import
org.apache.ozone.fs.http.server.HttpFSParametersProvider.UnmaskedPermissionParam;
+import
org.apache.ozone.fs.http.server.HttpFSParametersProvider.SnapshotNameParam;
+import
org.apache.ozone.fs.http.server.HttpFSParametersProvider.XAttrEncodingParam;
+import org.apache.ozone.fs.http.server.HttpFSParametersProvider.XAttrNameParam;
+import
org.apache.ozone.fs.http.server.HttpFSParametersProvider.XAttrSetFlagParam;
+import
org.apache.ozone.fs.http.server.HttpFSParametersProvider.XAttrValueParam;
import org.apache.hadoop.fs.permission.FsAction;
import org.apache.hadoop.http.JettyUtils;
-import org.apache.hadoop.lib.service.FileSystemAccess;
-import org.apache.hadoop.lib.service.FileSystemAccessException;
-import org.apache.hadoop.lib.service.Groups;
-import org.apache.hadoop.lib.service.Instrumentation;
-import org.apache.hadoop.lib.servlet.FileSystemReleaseFilter;
-import org.apache.hadoop.lib.wsrs.InputStreamEntity;
-import org.apache.hadoop.lib.wsrs.Parameters;
+import org.apache.ozone.lib.service.FileSystemAccess;
+import org.apache.ozone.lib.service.FileSystemAccessException;
+import org.apache.ozone.lib.service.Groups;
+import org.apache.ozone.lib.service.Instrumentation;
+import org.apache.ozone.lib.servlet.FileSystemReleaseFilter;
+import org.apache.ozone.lib.wsrs.InputStreamEntity;
+import org.apache.ozone.lib.wsrs.Parameters;
import org.apache.hadoop.security.UserGroupInformation;
import
org.apache.hadoop.security.token.delegation.web.HttpUserGroupInformation;
import org.json.simple.JSONObject;
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServerWebApp.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/HttpFSServerWebApp.java
similarity index 94%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServerWebApp.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/HttpFSServerWebApp.java
index 12a6ac7..043be2e 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServerWebApp.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/HttpFSServerWebApp.java
@@ -16,15 +16,15 @@
* limitations under the License.
*/
-package org.apache.hadoop.fs.http.server;
+package org.apache.ozone.fs.http.server;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
-import org.apache.hadoop.fs.http.server.metrics.HttpFSServerMetrics;
-import org.apache.hadoop.lib.server.ServerException;
-import org.apache.hadoop.lib.service.FileSystemAccess;
-import org.apache.hadoop.lib.servlet.ServerWebApp;
+import org.apache.ozone.fs.http.server.metrics.HttpFSServerMetrics;
+import org.apache.ozone.lib.server.ServerException;
+import org.apache.ozone.lib.service.FileSystemAccess;
+import org.apache.ozone.lib.servlet.ServerWebApp;
import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
import org.apache.hadoop.util.JvmPauseMonitor;
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServerWebServer.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/HttpFSServerWebServer.java
similarity index 99%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServerWebServer.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/HttpFSServerWebServer.java
index 97769e4..fd48a0c 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/server/HttpFSServerWebServer.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/HttpFSServerWebServer.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.hadoop.fs.http.server;
+package org.apache.ozone.fs.http.server;
import static org.apache.hadoop.util.StringUtils.startupShutdownMessage;
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/server/JsonUtil.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/JsonUtil.java
similarity index 99%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/server/JsonUtil.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/JsonUtil.java
index 219e3bb..4dc7e91 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/server/JsonUtil.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/JsonUtil.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.hadoop.fs.http.server;
+package org.apache.ozone.fs.http.server;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.hadoop.fs.*;
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/server/metrics/HttpFSServerMetrics.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/metrics/HttpFSServerMetrics.java
similarity index 98%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/server/metrics/HttpFSServerMetrics.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/metrics/HttpFSServerMetrics.java
index 00ebbad..a2ba1cc 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/server/metrics/HttpFSServerMetrics.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/metrics/HttpFSServerMetrics.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.hadoop.fs.http.server.metrics;
+package org.apache.ozone.fs.http.server.metrics;
import static org.apache.hadoop.metrics2.impl.MsInfo.SessionId;
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/server/metrics/package-info.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/metrics/package-info.java
similarity index 90%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/server/metrics/package-info.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/metrics/package-info.java
index 7009222..edd4d34 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/server/metrics/package-info.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/metrics/package-info.java
@@ -20,7 +20,7 @@
*/
@InterfaceAudience.Public
@InterfaceStability.Evolving
-package org.apache.hadoop.fs.http.server.metrics;
+package org.apache.ozone.fs.http.server.metrics;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
\ No newline at end of file
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/server/package-info.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/package-info.java
similarity index 95%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/server/package-info.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/package-info.java
index 361991d..445ca35 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/server/package-info.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/package-info.java
@@ -18,4 +18,4 @@
/**
* Basic server implementations for the HttpFS.
*/
-package org.apache.hadoop.fs.http.server;
\ No newline at end of file
+package org.apache.ozone.fs.http.server;
\ No newline at end of file
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsConstants.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/hdfs/web/WebHdfsConstants.java
similarity index 97%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsConstants.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/hdfs/web/WebHdfsConstants.java
index 4286653..4671626 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsConstants.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/hdfs/web/WebHdfsConstants.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.hadoop.hdfs.web;
+package org.apache.ozone.hdfs.web;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.hdfs.protocol.HdfsFileStatus;
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/hdfs/web/package-info.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/hdfs/web/package-info.java
similarity index 96%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/hdfs/web/package-info.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/hdfs/web/package-info.java
index 66a5432..0619042 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/hdfs/web/package-info.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/hdfs/web/package-info.java
@@ -18,4 +18,4 @@
/**
* Webhdfs implementations.
*/
-package org.apache.hadoop.hdfs.web;
\ No newline at end of file
+package org.apache.ozone.hdfs.web;
\ No newline at end of file
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/lang/RunnableCallable.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/lang/RunnableCallable.java
similarity index 97%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/lang/RunnableCallable.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/lang/RunnableCallable.java
index 5e4bb4c..b5d4dce 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/lang/RunnableCallable.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/lang/RunnableCallable.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.hadoop.lib.lang;
+package org.apache.ozone.lib.lang;
import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.lib.util.Check;
+import org.apache.ozone.lib.util.Check;
import java.util.concurrent.Callable;
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/lang/XException.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/lang/XException.java
similarity index 98%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/lang/XException.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/lang/XException.java
index 92a9d40..015818a 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/lang/XException.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/lang/XException.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.hadoop.lib.lang;
+package org.apache.ozone.lib.lang;
import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.lib.util.Check;
+import org.apache.ozone.lib.util.Check;
import java.text.MessageFormat;
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/lang/package-info.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/lang/package-info.java
similarity index 96%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/lang/package-info.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/lang/package-info.java
index 45e164f..89fe3a6 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/lang/package-info.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/lang/package-info.java
@@ -18,4 +18,4 @@
/**
* Basic functionalities.
*/
-package org.apache.hadoop.lib.lang;
\ No newline at end of file
+package org.apache.ozone.lib.lang;
\ No newline at end of file
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/server/BaseService.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/server/BaseService.java
similarity index 98%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/server/BaseService.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/server/BaseService.java
index dec7322..0ae6382 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/server/BaseService.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/server/BaseService.java
@@ -16,11 +16,11 @@
* limitations under the License.
*/
-package org.apache.hadoop.lib.server;
+package org.apache.ozone.lib.server;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.lib.util.ConfigurationUtils;
+import org.apache.ozone.lib.util.ConfigurationUtils;
import java.util.Map;
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/server/Server.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/server/Server.java
similarity index 99%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/server/Server.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/server/Server.java
index df93389..0323d34 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/server/Server.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/server/Server.java
@@ -16,13 +16,13 @@
* limitations under the License.
*/
-package org.apache.hadoop.lib.server;
+package org.apache.ozone.lib.server;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.ConfigRedactor;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.lib.util.Check;
-import org.apache.hadoop.lib.util.ConfigurationUtils;
+import org.apache.ozone.lib.util.Check;
+import org.apache.ozone.lib.util.ConfigurationUtils;
import org.apache.hadoop.util.StringUtils;
import org.apache.log4j.LogManager;
import org.apache.log4j.PropertyConfigurator;
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/server/ServerException.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/server/ServerException.java
similarity index 97%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/server/ServerException.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/server/ServerException.java
index 3ebda02..d89b6ce 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/server/ServerException.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/server/ServerException.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.hadoop.lib.server;
+package org.apache.ozone.lib.server;
import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.lib.lang.XException;
+import org.apache.ozone.lib.lang.XException;
/**
* Exception thrown by the {@link Server} class.
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/server/Service.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/server/Service.java
similarity index 98%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/server/Service.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/server/Service.java
index 82eb663..e3557e1 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/server/Service.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/server/Service.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.hadoop.lib.server;
+package org.apache.ozone.lib.server;
import org.apache.hadoop.classification.InterfaceAudience;
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/server/ServiceException.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/server/ServiceException.java
similarity index 94%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/server/ServiceException.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/server/ServiceException.java
index 44f7114..a23c58a 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/server/ServiceException.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/server/ServiceException.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.hadoop.lib.server;
+package org.apache.ozone.lib.server;
import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.lib.lang.XException;
+import org.apache.ozone.lib.lang.XException;
/**
* Exception thrown by {@link Service} implementations.
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/server/package-info.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/server/package-info.java
similarity index 95%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/server/package-info.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/server/package-info.java
index 4428625..d684336 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/server/package-info.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/server/package-info.java
@@ -18,4 +18,4 @@
/**
* Basic server implementations.
*/
-package org.apache.hadoop.lib.server;
\ No newline at end of file
+package org.apache.ozone.lib.server;
\ No newline at end of file
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/service/FileSystemAccess.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/service/FileSystemAccess.java
similarity index 97%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/service/FileSystemAccess.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/service/FileSystemAccess.java
index 99891e7..a6ec139 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/service/FileSystemAccess.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/service/FileSystemAccess.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.hadoop.lib.service;
+package org.apache.ozone.lib.service;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/service/FileSystemAccessException.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/service/FileSystemAccessException.java
similarity index 95%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/service/FileSystemAccessException.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/service/FileSystemAccessException.java
index a6e1a37..3e662d7 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/service/FileSystemAccessException.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/service/FileSystemAccessException.java
@@ -16,10 +16,10 @@
* limitations under the License.
*/
-package org.apache.hadoop.lib.service;
+package org.apache.ozone.lib.service;
import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.lib.lang.XException;
+import org.apache.ozone.lib.lang.XException;
/**
* Exception thrown when filesystem access problem.
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/service/Groups.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/service/Groups.java
similarity index 96%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/service/Groups.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/service/Groups.java
index 8ae095f..1733a88 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/service/Groups.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/service/Groups.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.hadoop.lib.service;
+package org.apache.ozone.lib.service;
import org.apache.hadoop.classification.InterfaceAudience;
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/service/Instrumentation.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/service/Instrumentation.java
similarity index 97%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/service/Instrumentation.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/service/Instrumentation.java
index 2259950..e896bfe 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/service/Instrumentation.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/service/Instrumentation.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.hadoop.lib.service;
+package org.apache.ozone.lib.service;
import org.apache.hadoop.classification.InterfaceAudience;
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/service/Scheduler.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/service/Scheduler.java
similarity index 97%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/service/Scheduler.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/service/Scheduler.java
index 725ffcf..102550f 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/service/Scheduler.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/service/Scheduler.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.hadoop.lib.service;
+package org.apache.ozone.lib.service;
import org.apache.hadoop.classification.InterfaceAudience;
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/service/hadoop/FileSystemAccessService.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/service/hadoop/FileSystemAccessService.java
similarity index 97%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/service/hadoop/FileSystemAccessService.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/service/hadoop/FileSystemAccessService.java
index 365f8c3..8e38ff7 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/service/hadoop/FileSystemAccessService.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/service/hadoop/FileSystemAccessService.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.hadoop.lib.service.hadoop;
+package org.apache.ozone.lib.service.hadoop;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
@@ -24,14 +24,14 @@ import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.permission.FsPermission;
-import org.apache.hadoop.lib.server.BaseService;
-import org.apache.hadoop.lib.server.ServiceException;
-import org.apache.hadoop.lib.service.FileSystemAccess;
-import org.apache.hadoop.lib.service.FileSystemAccessException;
-import org.apache.hadoop.lib.service.Instrumentation;
-import org.apache.hadoop.lib.service.Scheduler;
-import org.apache.hadoop.lib.util.Check;
-import org.apache.hadoop.lib.util.ConfigurationUtils;
+import org.apache.ozone.lib.server.BaseService;
+import org.apache.ozone.lib.server.ServiceException;
+import org.apache.ozone.lib.service.FileSystemAccess;
+import org.apache.ozone.lib.service.FileSystemAccessException;
+import org.apache.ozone.lib.service.Instrumentation;
+import org.apache.ozone.lib.service.Scheduler;
+import org.apache.ozone.lib.util.Check;
+import org.apache.ozone.lib.util.ConfigurationUtils;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.util.StringUtils;
import org.apache.hadoop.util.VersionInfo;
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/service/hadoop/package-info.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/service/hadoop/package-info.java
similarity index 94%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/service/hadoop/package-info.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/service/hadoop/package-info.java
index 0e3490d..b61ad88 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/service/hadoop/package-info.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/service/hadoop/package-info.java
@@ -18,4 +18,4 @@
/**
* Hadoop service providers.
*/
-package org.apache.hadoop.lib.service.hadoop;
\ No newline at end of file
+package org.apache.ozone.lib.service.hadoop;
\ No newline at end of file
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/service/instrumentation/InstrumentationService.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/service/instrumentation/InstrumentationService.java
similarity index 97%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/service/instrumentation/InstrumentationService.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/service/instrumentation/InstrumentationService.java
index 2bfb46e..a97edef 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/service/instrumentation/InstrumentationService.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/service/instrumentation/InstrumentationService.java
@@ -16,13 +16,13 @@
* limitations under the License.
*/
-package org.apache.hadoop.lib.service.instrumentation;
+package org.apache.ozone.lib.service.instrumentation;
import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.lib.server.BaseService;
-import org.apache.hadoop.lib.server.ServiceException;
-import org.apache.hadoop.lib.service.Instrumentation;
-import org.apache.hadoop.lib.service.Scheduler;
+import org.apache.ozone.lib.server.BaseService;
+import org.apache.ozone.lib.server.ServiceException;
+import org.apache.ozone.lib.service.Instrumentation;
+import org.apache.ozone.lib.service.Scheduler;
import org.apache.hadoop.util.Time;
import org.json.simple.JSONAware;
import org.json.simple.JSONObject;
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/service/instrumentation/package-info.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/service/instrumentation/package-info.java
similarity index 94%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/service/instrumentation/package-info.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/service/instrumentation/package-info.java
index a0b3370..90557bf 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/service/instrumentation/package-info.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/service/instrumentation/package-info.java
@@ -18,4 +18,4 @@
/**
* Instrumentation service package.
*/
-package org.apache.hadoop.lib.service.instrumentation;
\ No newline at end of file
+package org.apache.ozone.lib.service.instrumentation;
\ No newline at end of file
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/service/package-info.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/service/package-info.java
similarity index 95%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/service/package-info.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/service/package-info.java
index 7da0ed2..623f202 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/service/package-info.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/service/package-info.java
@@ -18,4 +18,4 @@
/**
* HttpFS server internal service definitions.
*/
-package org.apache.hadoop.lib.service;
\ No newline at end of file
+package org.apache.ozone.lib.service;
\ No newline at end of file
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/service/scheduler/SchedulerService.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/service/scheduler/SchedulerService.java
similarity index 92%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/service/scheduler/SchedulerService.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/service/scheduler/SchedulerService.java
index e593b9d..57fb0c7 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/service/scheduler/SchedulerService.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/service/scheduler/SchedulerService.java
@@ -16,16 +16,16 @@
* limitations under the License.
*/
-package org.apache.hadoop.lib.service.scheduler;
+package org.apache.ozone.lib.service.scheduler;
import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.lib.lang.RunnableCallable;
-import org.apache.hadoop.lib.server.BaseService;
-import org.apache.hadoop.lib.server.Server;
-import org.apache.hadoop.lib.server.ServiceException;
-import org.apache.hadoop.lib.service.Instrumentation;
-import org.apache.hadoop.lib.service.Scheduler;
-import org.apache.hadoop.lib.util.Check;
+import org.apache.ozone.lib.lang.RunnableCallable;
+import org.apache.ozone.lib.server.BaseService;
+import org.apache.ozone.lib.server.Server;
+import org.apache.ozone.lib.server.ServiceException;
+import org.apache.ozone.lib.service.Instrumentation;
+import org.apache.ozone.lib.service.Scheduler;
+import org.apache.ozone.lib.util.Check;
import org.apache.hadoop.util.Time;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/service/scheduler/package-info.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/service/scheduler/package-info.java
similarity index 94%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/service/scheduler/package-info.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/service/scheduler/package-info.java
index 4e03609..0101766 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/service/scheduler/package-info.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/service/scheduler/package-info.java
@@ -18,4 +18,4 @@
/**
* Scheduler service.
*/
-package org.apache.hadoop.lib.service.scheduler;
\ No newline at end of file
+package org.apache.ozone.lib.service.scheduler;
\ No newline at end of file
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/service/security/GroupsService.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/service/security/GroupsService.java
similarity index 87%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/service/security/GroupsService.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/service/security/GroupsService.java
index f1ac1a7..5d76dd1 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/service/security/GroupsService.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/service/security/GroupsService.java
@@ -16,14 +16,14 @@
* limitations under the License.
*/
-package org.apache.hadoop.lib.service.security;
+package org.apache.ozone.lib.service.security;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.lib.server.BaseService;
-import org.apache.hadoop.lib.server.ServiceException;
-import org.apache.hadoop.lib.service.Groups;
-import org.apache.hadoop.lib.util.ConfigurationUtils;
+import org.apache.ozone.lib.server.BaseService;
+import org.apache.ozone.lib.server.ServiceException;
+import org.apache.ozone.lib.service.Groups;
+import org.apache.ozone.lib.util.ConfigurationUtils;
import java.io.IOException;
import java.util.List;
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/service/security/package-info.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/service/security/package-info.java
similarity index 94%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/service/security/package-info.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/service/security/package-info.java
index dd65378..aa72f80 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/service/security/package-info.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/service/security/package-info.java
@@ -18,4 +18,4 @@
/**
* Security service implementation package.
*/
-package org.apache.hadoop.lib.service.security;
\ No newline at end of file
+package org.apache.ozone.lib.service.security;
\ No newline at end of file
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/servlet/FileSystemReleaseFilter.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/servlet/FileSystemReleaseFilter.java
similarity index 97%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/servlet/FileSystemReleaseFilter.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/servlet/FileSystemReleaseFilter.java
index 9fcc9b7..707ab53 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/servlet/FileSystemReleaseFilter.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/servlet/FileSystemReleaseFilter.java
@@ -16,11 +16,11 @@
* limitations under the License.
*/
-package org.apache.hadoop.lib.servlet;
+package org.apache.ozone.lib.servlet;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.fs.FileSystem;
-import org.apache.hadoop.lib.service.FileSystemAccess;
+import org.apache.ozone.lib.service.FileSystemAccess;
import javax.servlet.Filter;
import javax.servlet.FilterChain;
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/servlet/HostnameFilter.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/servlet/HostnameFilter.java
similarity index 98%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/servlet/HostnameFilter.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/servlet/HostnameFilter.java
index d03fa08..3a0076a 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/servlet/HostnameFilter.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/servlet/HostnameFilter.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.hadoop.lib.servlet;
+package org.apache.ozone.lib.servlet;
import org.apache.hadoop.classification.InterfaceAudience;
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/servlet/MDCFilter.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/servlet/MDCFilter.java
similarity index 98%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/servlet/MDCFilter.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/servlet/MDCFilter.java
index fbf11cc..362f126 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/servlet/MDCFilter.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/servlet/MDCFilter.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.hadoop.lib.servlet;
+package org.apache.ozone.lib.servlet;
import org.apache.hadoop.classification.InterfaceAudience;
import org.slf4j.MDC;
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/servlet/ServerWebApp.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/servlet/ServerWebApp.java
similarity index 98%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/servlet/ServerWebApp.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/servlet/ServerWebApp.java
index 7a40325..bdbcc9d 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/servlet/ServerWebApp.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/servlet/ServerWebApp.java
@@ -16,13 +16,13 @@
* limitations under the License.
*/
-package org.apache.hadoop.lib.servlet;
+package org.apache.ozone.lib.servlet;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.lib.server.Server;
-import org.apache.hadoop.lib.server.ServerException;
import
org.apache.ratis.thirdparty.com.google.common.annotations.VisibleForTesting;
+import org.apache.ozone.lib.server.Server;
+import org.apache.ozone.lib.server.ServerException;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/servlet/package-info.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/servlet/package-info.java
similarity index 95%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/servlet/package-info.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/servlet/package-info.java
index e1c53ce..4b3fe78 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/servlet/package-info.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/servlet/package-info.java
@@ -18,4 +18,4 @@
/**
* Servlet implementation details.
*/
-package org.apache.hadoop.lib.servlet;
\ No newline at end of file
+package org.apache.ozone.lib.servlet;
\ No newline at end of file
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/util/Check.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/util/Check.java
similarity index 99%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/util/Check.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/util/Check.java
index cc36f99..e26bf2e 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/util/Check.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/util/Check.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.hadoop.lib.util;
+package org.apache.ozone.lib.util;
import org.apache.hadoop.classification.InterfaceAudience;
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/util/ConfigurationUtils.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/util/ConfigurationUtils.java
similarity index 98%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/util/ConfigurationUtils.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/util/ConfigurationUtils.java
index 337a627..02489e5 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/util/ConfigurationUtils.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/util/ConfigurationUtils.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.hadoop.lib.util;
+package org.apache.ozone.lib.util;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/util/package-info.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/util/package-info.java
similarity index 95%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/util/package-info.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/util/package-info.java
index 4544392..accba21 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/util/package-info.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/util/package-info.java
@@ -18,4 +18,4 @@
/**
* Utilities.
*/
-package org.apache.hadoop.lib.util;
\ No newline at end of file
+package org.apache.ozone.lib.util;
\ No newline at end of file
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/BooleanParam.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/BooleanParam.java
similarity index 97%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/BooleanParam.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/BooleanParam.java
index d0c4235..1898b33 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/BooleanParam.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/BooleanParam.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.hadoop.lib.wsrs;
+package org.apache.ozone.lib.wsrs;
import org.apache.hadoop.classification.InterfaceAudience;
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/ByteParam.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/ByteParam.java
similarity index 97%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/ByteParam.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/ByteParam.java
index a75d6c4..6ef3123 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/ByteParam.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/ByteParam.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.hadoop.lib.wsrs;
+package org.apache.ozone.lib.wsrs;
import org.apache.hadoop.classification.InterfaceAudience;
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/EnumParam.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/EnumParam.java
similarity index 97%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/EnumParam.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/EnumParam.java
index 0883741..ad5703b 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/EnumParam.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/EnumParam.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.hadoop.lib.wsrs;
+package org.apache.ozone.lib.wsrs;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.util.StringUtils;
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/EnumSetParam.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/EnumSetParam.java
similarity index 98%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/EnumSetParam.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/EnumSetParam.java
index 63e2569..554f967 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/EnumSetParam.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/EnumSetParam.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.hadoop.lib.wsrs;
+package org.apache.ozone.lib.wsrs;
import java.util.Arrays;
import java.util.EnumSet;
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/ExceptionProvider.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/ExceptionProvider.java
similarity index 98%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/ExceptionProvider.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/ExceptionProvider.java
index 4ddc8fd..f21bf10 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/ExceptionProvider.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/ExceptionProvider.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.hadoop.lib.wsrs;
+package org.apache.ozone.lib.wsrs;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.util.HttpExceptionUtils;
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/InputStreamEntity.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/InputStreamEntity.java
similarity index 89%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/InputStreamEntity.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/InputStreamEntity.java
index 7bb8647..13390c2 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/InputStreamEntity.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/InputStreamEntity.java
@@ -16,12 +16,12 @@
* limitations under the License.
*/
-package org.apache.hadoop.lib.wsrs;
+package org.apache.ozone.lib.wsrs;
import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.fs.http.server.FSOperations;
-import org.apache.hadoop.fs.http.server.HttpFSServerWebApp;
-import org.apache.hadoop.fs.http.server.metrics.HttpFSServerMetrics;
+import org.apache.ozone.fs.http.server.FSOperations;
+import org.apache.ozone.fs.http.server.HttpFSServerWebApp;
+import org.apache.ozone.fs.http.server.metrics.HttpFSServerMetrics;
import org.apache.hadoop.io.IOUtils;
import javax.ws.rs.core.StreamingOutput;
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/IntegerParam.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/IntegerParam.java
similarity index 97%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/IntegerParam.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/IntegerParam.java
index 31916dd..fd4e26f 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/IntegerParam.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/IntegerParam.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.hadoop.lib.wsrs;
+package org.apache.ozone.lib.wsrs;
import org.apache.hadoop.classification.InterfaceAudience;
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/JSONMapProvider.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/JSONMapProvider.java
similarity index 98%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/JSONMapProvider.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/JSONMapProvider.java
index 2c2107c..61c3cb4 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/JSONMapProvider.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/JSONMapProvider.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.hadoop.lib.wsrs;
+package org.apache.ozone.lib.wsrs;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.http.JettyUtils;
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/JSONProvider.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/JSONProvider.java
similarity index 98%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/JSONProvider.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/JSONProvider.java
index 0105199..44a0c78 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/JSONProvider.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/JSONProvider.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.hadoop.lib.wsrs;
+package org.apache.ozone.lib.wsrs;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.http.JettyUtils;
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/LongParam.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/LongParam.java
similarity index 97%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/LongParam.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/LongParam.java
index 9417ac6..7a79670 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/LongParam.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/LongParam.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.hadoop.lib.wsrs;
+package org.apache.ozone.lib.wsrs;
import org.apache.hadoop.classification.InterfaceAudience;
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/Param.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/Param.java
similarity index 98%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/Param.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/Param.java
index 55c0e39..5e558e6 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/Param.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/Param.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.hadoop.lib.wsrs;
+package org.apache.ozone.lib.wsrs;
import org.apache.hadoop.classification.InterfaceAudience;
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/Parameters.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/Parameters.java
similarity index 98%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/Parameters.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/Parameters.java
index 989b507..b810d18 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/Parameters.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/Parameters.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.hadoop.lib.wsrs;
+package org.apache.ozone.lib.wsrs;
import org.apache.hadoop.classification.InterfaceAudience;
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/ParametersProvider.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/ParametersProvider.java
similarity index 99%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/ParametersProvider.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/ParametersProvider.java
index 3ddac81..d930af2 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/ParametersProvider.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/ParametersProvider.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.hadoop.lib.wsrs;
+package org.apache.ozone.lib.wsrs;
import com.sun.jersey.api.core.HttpContext;
import com.sun.jersey.core.spi.component.ComponentContext;
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/ShortParam.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/ShortParam.java
similarity index 97%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/ShortParam.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/ShortParam.java
index 8750c08..e11c851 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/ShortParam.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/ShortParam.java
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.hadoop.lib.wsrs;
+package org.apache.ozone.lib.wsrs;
import org.apache.hadoop.classification.InterfaceAudience;
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/StringParam.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/StringParam.java
similarity index 98%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/StringParam.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/StringParam.java
index 3da2ae3..2a3f9b2 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/StringParam.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/StringParam.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.hadoop.lib.wsrs;
+package org.apache.ozone.lib.wsrs;
import org.apache.hadoop.classification.InterfaceAudience;
diff --git
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/package-info.java
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/package-info.java
similarity index 95%
rename from
hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/package-info.java
rename to
hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/package-info.java
index 73fa747..9fe61ab 100644
---
a/hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/lib/wsrs/package-info.java
+++
b/hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/lib/wsrs/package-info.java
@@ -18,4 +18,4 @@
/**
* JAX-RS components.
*/
-package org.apache.hadoop.lib.wsrs;
\ No newline at end of file
+package org.apache.ozone.lib.wsrs;
\ No newline at end of file
diff --git a/hadoop-ozone/httpfsgateway/src/main/resources/httpfs-default.xml
b/hadoop-ozone/httpfsgateway/src/main/resources/httpfs-default.xml
index 869e4e5..b695ea7 100644
--- a/hadoop-ozone/httpfsgateway/src/main/resources/httpfs-default.xml
+++ b/hadoop-ozone/httpfsgateway/src/main/resources/httpfs-default.xml
@@ -110,10 +110,10 @@
<property>
<name>httpfs.services</name>
<value>
- org.apache.hadoop.lib.service.instrumentation.InstrumentationService,
- org.apache.hadoop.lib.service.scheduler.SchedulerService,
- org.apache.hadoop.lib.service.security.GroupsService,
- org.apache.hadoop.lib.service.hadoop.FileSystemAccessService
+ org.apache.ozone.lib.service.instrumentation.InstrumentationService,
+ org.apache.ozone.lib.service.scheduler.SchedulerService,
+ org.apache.ozone.lib.service.security.GroupsService,
+ org.apache.ozone.lib.service.hadoop.FileSystemAccessService
</value>
<description>
Services used by the httpfs server.
diff --git
a/hadoop-ozone/httpfsgateway/src/main/resources/webapps/webhdfs/WEB-INF/web.xml
b/hadoop-ozone/httpfsgateway/src/main/resources/webapps/webhdfs/WEB-INF/web.xml
index 3da9a5c..130a1a7 100644
---
a/hadoop-ozone/httpfsgateway/src/main/resources/webapps/webhdfs/WEB-INF/web.xml
+++
b/hadoop-ozone/httpfsgateway/src/main/resources/webapps/webhdfs/WEB-INF/web.xml
@@ -15,7 +15,7 @@
<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee";>
<listener>
-
<listener-class>org.apache.hadoop.fs.http.server.HttpFSServerWebApp</listener-class>
+
<listener-class>org.apache.ozone.fs.http.server.HttpFSServerWebApp</listener-class>
</listener>
<servlet>
@@ -23,7 +23,7 @@
<servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
<init-param>
<param-name>com.sun.jersey.config.property.packages</param-name>
-
<param-value>org.apache.hadoop.fs.http.server,org.apache.hadoop.lib.wsrs</param-value>
+
<param-value>org.apache.ozone.fs.http.server,org.apache.ozone.lib.wsrs</param-value>
</init-param>
<!-- Enables detailed Jersey request/response logging -->
@@ -47,27 +47,27 @@
<filter>
<filter-name>authFilter</filter-name>
-
<filter-class>org.apache.hadoop.fs.http.server.HttpFSAuthenticationFilter</filter-class>
+
<filter-class>org.apache.ozone.fs.http.server.HttpFSAuthenticationFilter</filter-class>
</filter>
<filter>
<filter-name>MDCFilter</filter-name>
- <filter-class>org.apache.hadoop.lib.servlet.MDCFilter</filter-class>
+ <filter-class>org.apache.ozone.lib.servlet.MDCFilter</filter-class>
</filter>
<filter>
<filter-name>hostnameFilter</filter-name>
- <filter-class>org.apache.hadoop.lib.servlet.HostnameFilter</filter-class>
+ <filter-class>org.apache.ozone.lib.servlet.HostnameFilter</filter-class>
</filter>
<filter>
<filter-name>checkUploadContentType</filter-name>
-
<filter-class>org.apache.hadoop.fs.http.server.CheckUploadContentTypeFilter</filter-class>
+
<filter-class>org.apache.ozone.fs.http.server.CheckUploadContentTypeFilter</filter-class>
</filter>
<filter>
<filter-name>fsReleaseFilter</filter-name>
-
<filter-class>org.apache.hadoop.fs.http.server.HttpFSReleaseFilter</filter-class>
+
<filter-class>org.apache.ozone.fs.http.server.HttpFSReleaseFilter</filter-class>
</filter>
<filter-mapping>
diff --git a/hadoop-ozone/httpfsgateway/src/main/webapp/WEB-INF/web.xml
b/hadoop-ozone/httpfsgateway/src/main/webapp/WEB-INF/web.xml
index 4c0b3ae..d6cb046 100644
--- a/hadoop-ozone/httpfsgateway/src/main/webapp/WEB-INF/web.xml
+++ b/hadoop-ozone/httpfsgateway/src/main/webapp/WEB-INF/web.xml
@@ -15,7 +15,7 @@
<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee";>
<listener>
-
<listener-class>org.apache.hadoop.fs.http.server.HttpFSServerWebApp</listener-class>
+
<listener-class>org.apache.ozone.fs.http.server.HttpFSServerWebApp</listener-class>
</listener>
<servlet>
@@ -23,7 +23,7 @@
<servlet-class>com.sun.jersey.spi.container.servlet.ServletContainer</servlet-class>
<init-param>
<param-name>com.sun.jersey.config.property.packages</param-name>
-
<param-value>org.apache.hadoop.fs.http.server,org.apache.hadoop.lib.wsrs</param-value>
+
<param-value>org.apache.ozone.fs.http.server,org.apache.ozone.lib.wsrs</param-value>
</init-param>
<!-- Enables detailed Jersey request/response logging -->
@@ -47,27 +47,27 @@
<filter>
<filter-name>authFilter</filter-name>
-
<filter-class>org.apache.hadoop.fs.http.server.HttpFSAuthenticationFilter</filter-class>
+
<filter-class>org.apache.ozone.fs.http.server.HttpFSAuthenticationFilter</filter-class>
</filter>
<filter>
<filter-name>MDCFilter</filter-name>
- <filter-class>org.apache.hadoop.lib.servlet.MDCFilter</filter-class>
+ <filter-class>org.apache.ozone.lib.servlet.MDCFilter</filter-class>
</filter>
<filter>
<filter-name>hostnameFilter</filter-name>
- <filter-class>org.apache.hadoop.lib.servlet.HostnameFilter</filter-class>
+ <filter-class>org.apache.ozone.lib.servlet.HostnameFilter</filter-class>
</filter>
<filter>
<filter-name>checkUploadContentType</filter-name>
-
<filter-class>org.apache.hadoop.fs.http.server.CheckUploadContentTypeFilter</filter-class>
+
<filter-class>org.apache.ozone.fs.http.server.CheckUploadContentTypeFilter</filter-class>
</filter>
<filter>
<filter-name>fsReleaseFilter</filter-name>
-
<filter-class>org.apache.hadoop.fs.http.server.HttpFSReleaseFilter</filter-class>
+
<filter-class>org.apache.ozone.fs.http.server.HttpFSReleaseFilter</filter-class>
</filter>
<filter-mapping>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
