HDDS-5829 [HTTPFSGW] Move to org.apache.ozone package from org.apache.hadoop. (#2743)

Author: dombizita

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)

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>

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

…oop/fs/http/client/HttpFSFileSystem.java …one/fs/http/client/HttpFSFileSystem.javahadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/client/HttpFSFileSystem.java renamed to hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/client/HttpFSFileSystem.java hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/client/HttpFSFileSystem.java renamed to 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.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;

…e/hadoop/fs/http/client/HttpFSUtils.java …he/ozone/fs/http/client/HttpFSUtils.javahadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/client/HttpFSUtils.java renamed to hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/client/HttpFSUtils.java hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/client/HttpFSUtils.java renamed to 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;

…op/fs/http/client/HttpsFSFileSystem.java …ne/fs/http/client/HttpsFSFileSystem.javahadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/client/HttpsFSFileSystem.java renamed to hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/client/HttpsFSFileSystem.java hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/client/HttpsFSFileSystem.java renamed to 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.

…/hadoop/fs/http/client/package-info.java …e/ozone/fs/http/client/package-info.javahadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/client/package-info.java renamed to hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/client/package-info.java hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/client/package-info.java renamed to 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;
+package org.apache.ozone.fs.http.client;

…server/CheckUploadContentTypeFilter.java …server/CheckUploadContentTypeFilter.javahadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/server/CheckUploadContentTypeFilter.java renamed to hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/CheckUploadContentTypeFilter.java hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/server/CheckUploadContentTypeFilter.java renamed to 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;

…/hadoop/fs/http/server/FSOperations.java …e/ozone/fs/http/server/FSOperations.javahadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/server/FSOperations.java renamed to hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/FSOperations.java hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/server/FSOperations.java renamed to 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.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.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;

…p/server/HttpFSAuthenticationFilter.java …p/server/HttpFSAuthenticationFilter.javahadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/server/HttpFSAuthenticationFilter.java renamed to hadoop-ozone/httpfsgateway/src/main/java/org/apache/ozone/fs/http/server/HttpFSAuthenticationFilter.java hadoop-ozone/httpfsgateway/src/main/java/org/apache/hadoop/fs/http/server/HttpFSAuthenticationFilter.java renamed to 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;