This is an automated email from the ASF dual-hosted git repository.
smolnar82 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git
The following commit(s) were added to refs/heads/master by this push:
new 67fb0778c KNOX-1608: Remove gateway-adapter module (#1263)
67fb0778c is described below
commit 67fb0778c6e375319aa4023b03a2bf0656d639b1
Author: Arun <[email protected]>
AuthorDate: Thu Jul 2 00:47:01 2026 +0530
KNOX-1608: Remove gateway-adapter module (#1263)
---
.../workflows/build/conf/topologies/knoxldap.xml | 2 +-
.../main/resources/build-tools/spotbugs-filter.xml | 5 -
gateway-adapter/pom.xml | 117 ---------------------
.../gateway/audit/log4j/layout/AuditLayout.java | 36 -------
.../hadoop/gateway/dispatch/DefaultDispatch.java | 94 -----------------
.../hadoop/gateway/dispatch/NiFiDispatch.java | 49 ---------
.../hadoop/gateway/dispatch/NiFiHaDispatch.java | 53 ----------
.../gateway/dispatch/PassAllHeadersDispatch.java | 28 -----
.../dispatch/PassAllHeadersNoEncodingDispatch.java | 29 -----
.../hadoopauth/filter/HadoopAuthFilter.java | 37 -------
.../apache/hadoop/gateway/hbase/HBaseDispatch.java | 28 -----
.../hdfs/dispatch/HdfsHttpClientDispatch.java | 51 ---------
.../gateway/hdfs/dispatch/WebHdfsHaDispatch.java | 54 ----------
.../apache/hadoop/gateway/hive/HiveDispatch.java | 34 ------
.../apache/hadoop/gateway/hive/HiveHaDispatch.java | 38 -------
.../federation/jwt/filter/JWTFederationFilter.java | 39 -------
.../jwt/filter/SSOCookieFederationFilter.java | 52 ---------
.../hadoop/gateway/rm/dispatch/RMHaDispatch.java | 31 ------
.../hadoop/gateway/rm/dispatch/RMUIHaDispatch.java | 33 ------
.../gateway/shirorealm/KnoxLdapContextFactory.java | 41 --------
.../hadoop/gateway/shirorealm/KnoxLdapRealm.java | 99 -----------------
.../hadoop/gateway/shirorealm/KnoxPamRealm.java | 49 ---------
.../apache/hadoop/gateway/storm/StormDispatch.java | 28 -----
.../apache/hadoop/gateway/topology/Service.java | 28 -----
.../apache/hadoop/gateway/topology/Topology.java | 31 ------
.../org/apache/hadoop/gateway/util/RegExUtils.java | 28 -----
.../src/main/resources/META-INF/launcher.cfg | 17 ---
.../gateway/shirorealm/KnoxLdapRealmTest.java | 105 ------------------
.../gateway/shirorealm/KnoxPamRealmTest.java | 72 -------------
.../provider-config-wizard/ldap-provider-config.ts | 4 +-
gateway-release/pom.xml | 4 -
.../simple/ProviderConfigurationParserTest.java | 12 +--
.../topology/xml/TopologyRulesModuleTest.java | 4 +-
.../topology-with-dispatch-parameters.xml | 2 +-
.../topology-with-dispatch.xml | 2 +-
.../services/elasticsearch/1.0.0/service.xml | 2 +-
.../hadoop/xml/HadoopXmlResourceParserTest.java | 2 +-
.../src/test/resources/testDelete.xml | 2 +-
.../src/test/resources/testDescriptor.xml | 2 +-
pom.xml | 6 --
40 files changed, 17 insertions(+), 1333 deletions(-)
diff --git a/.github/workflows/build/conf/topologies/knoxldap.xml
b/.github/workflows/build/conf/topologies/knoxldap.xml
index 659c31c84..884e8bc5e 100644
--- a/.github/workflows/build/conf/topologies/knoxldap.xml
+++ b/.github/workflows/build/conf/topologies/knoxldap.xml
@@ -27,7 +27,7 @@ limitations under the License.
</param>
<param>
<name>main.ldapRealm</name>
-
<value>org.apache.hadoop.gateway.shirorealm.KnoxLdapRealm</value>
+
<value>org.apache.knox.gateway.shirorealm.KnoxLdapRealm</value>
</param>
<param>
<name>main.ldapRealm.userDnTemplate</name>
diff --git a/build-tools/src/main/resources/build-tools/spotbugs-filter.xml
b/build-tools/src/main/resources/build-tools/spotbugs-filter.xml
index 1af440809..fb4d7857d 100644
--- a/build-tools/src/main/resources/build-tools/spotbugs-filter.xml
+++ b/build-tools/src/main/resources/build-tools/spotbugs-filter.xml
@@ -70,11 +70,6 @@ limitations under the License.
<Class name="org.apache.knox.gateway.shell.jdbc.KnoxLine" />
<Bug pattern="SQL_INJECTION_JDBC" />
</Match>
-
- <Match>
- <Class name="~org.apache.hadoop.gateway..*" />
- <Bug pattern="NM_SAME_SIMPLE_NAME_AS_SUPERCLASS" />
- </Match>
<Match>
<Class
name="org.apache.knox.gateway.performance.test.PerformanceTestConfiguration" />
diff --git a/gateway-adapter/pom.xml b/gateway-adapter/pom.xml
deleted file mode 100644
index ce50cccd1..000000000
--- a/gateway-adapter/pom.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>gateway</artifactId>
- <groupId>org.apache.knox</groupId>
- <version>3.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>gateway-adapter</artifactId>
- <name>gateway-adapter</name>
- <description>Adapter for old package structure to ensure
compatibility.</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.knox</groupId>
- <artifactId>gateway-util-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.knox</groupId>
- <artifactId>gateway-util-launcher</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.knox</groupId>
- <artifactId>gateway-provider-ha</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.knox</groupId>
- <artifactId>gateway-spi</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.knox</groupId>
- <artifactId>gateway-test-utils</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.knox</groupId>
- <artifactId>gateway-provider-security-shiro</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.knox</groupId>
- <artifactId>gateway-service-webhdfs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.knox</groupId>
- <artifactId>gateway-provider-security-jwt</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.knox</groupId>
- <artifactId>gateway-provider-security-hadoopauth</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.knox</groupId>
- <artifactId>gateway-service-hbase</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.knox</groupId>
- <artifactId>gateway-service-hive</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.knox</groupId>
- <artifactId>gateway-service-nifi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.knox</groupId>
- <artifactId>gateway-service-rm</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.knox</groupId>
- <artifactId>gateway-service-storm</artifactId>
- </dependency>
-
- <dependency>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- </dependency>
- </dependencies>
-</project>
diff --git
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/audit/log4j/layout/AuditLayout.java
b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/audit/log4j/layout/AuditLayout.java
deleted file mode 100644
index d88386cfc..000000000
---
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/audit/log4j/layout/AuditLayout.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
under
- * the License.
- */
-package org.apache.hadoop.gateway.audit.log4j.layout;
-
-import java.nio.charset.StandardCharsets;
-
-/**
- * An adapter class that delegate calls to {@link
org.apache.knox.gateway.audit.log4j.layout.AuditLayout}
- * for backwards compatibility with package structure.
- *
- * @since 0.14.0
- * @deprecated Use {@link
org.apache.knox.gateway.audit.log4j.layout.AuditLayout}
- */
-@Deprecated
-public class AuditLayout extends
org.apache.knox.gateway.audit.log4j.layout.AuditLayout {
- /**
- * Create an instance
- */
- public AuditLayout() {
- super(StandardCharsets.UTF_8);
- }
-}
diff --git
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/dispatch/DefaultDispatch.java
b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/dispatch/DefaultDispatch.java
deleted file mode 100644
index f9afa23cc..000000000
---
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/dispatch/DefaultDispatch.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
under
- * the License.
- */
-package org.apache.hadoop.gateway.dispatch;
-
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.methods.HttpUriRequest;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.io.InputStream;
-
-/**
- * An adapter class that delegate calls to {@link
org.apache.knox.gateway.dispatch.DefaultDispatch}
- * for backwards compatibility with package structure.
- *
- * @since 0.14.0
- * @deprecated Use {@link org.apache.knox.gateway.dispatch.DefaultDispatch}
- */
-@Deprecated
-public class DefaultDispatch extends
org.apache.knox.gateway.dispatch.DefaultDispatch {
- @Override
- protected int getReplayBufferSize() {
- return super.getReplayBufferSize();
- }
-
- @Override
- protected void setReplayBufferSize(int size) {
- super.setReplayBufferSize(size);
- }
-
- @Override
- protected int getReplayBufferSizeInBytes() {
- return super.getReplayBufferSizeInBytes();
- }
-
- @Override
- protected void setReplayBufferSizeInBytes(int size) {
- super.setReplayBufferSizeInBytes(size);
- }
-
- @Override
- protected void executeRequest(HttpUriRequest outboundRequest,
- HttpServletRequest inboundRequest, HttpServletResponse outboundResponse)
- throws IOException {
- super.executeRequest(outboundRequest, inboundRequest, outboundResponse);
- }
-
- @Override
- protected HttpResponse executeOutboundRequest(HttpUriRequest outboundRequest)
- throws IOException {
- return super.executeOutboundRequest(outboundRequest);
- }
-
- @Override
- protected void writeOutboundResponse(HttpUriRequest outboundRequest,
- HttpServletRequest inboundRequest, HttpServletResponse outboundResponse,
- HttpResponse inboundResponse) throws IOException {
- super.writeOutboundResponse(outboundRequest, inboundRequest,
- outboundResponse, inboundResponse);
- }
-
- @Override
- protected void closeInboundResponse(HttpResponse response, InputStream
stream)
- throws IOException {
- super.closeInboundResponse(response, stream);
- }
-
- @Override
- protected void addCredentialsToRequest(HttpUriRequest outboundRequest) {
- super.addCredentialsToRequest(outboundRequest);
- }
-
- @Override
- protected HttpEntity createRequestEntity(HttpServletRequest request)
- throws IOException {
- return super.createRequestEntity(request);
- }
-}
diff --git
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/dispatch/NiFiDispatch.java
b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/dispatch/NiFiDispatch.java
deleted file mode 100644
index 2e11ea5af..000000000
---
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/dispatch/NiFiDispatch.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
under
- * the License.
- */
-package org.apache.hadoop.gateway.dispatch;
-
-import org.apache.http.HttpResponse;
-import org.apache.http.client.methods.HttpUriRequest;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-/**
- * An adapter class that delegate calls to {@link
org.apache.knox.gateway.dispatch.NiFiDispatch}
- * for backwards compatibility with package structure.
- *
- * @since 0.14.0
- * @deprecated Use {@link org.apache.knox.gateway.dispatch.NiFiDispatch}
- */
-@Deprecated
-public class NiFiDispatch extends
org.apache.knox.gateway.dispatch.NiFiDispatch {
- @Override
- protected void executeRequest(HttpUriRequest outboundRequest,
- HttpServletRequest inboundRequest, HttpServletResponse outboundResponse)
- throws IOException {
- super.executeRequest(outboundRequest, inboundRequest, outboundResponse);
- }
-
- @Override
- protected void writeOutboundResponse(HttpUriRequest outboundRequest,
- HttpServletRequest inboundRequest, HttpServletResponse outboundResponse,
- HttpResponse inboundResponse) throws IOException {
- super.writeOutboundResponse(outboundRequest, inboundRequest,
- outboundResponse, inboundResponse);
- }
-}
diff --git
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/dispatch/NiFiHaDispatch.java
b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/dispatch/NiFiHaDispatch.java
deleted file mode 100644
index 996636d49..000000000
---
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/dispatch/NiFiHaDispatch.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
under
- * the License.
- */
-package org.apache.hadoop.gateway.dispatch;
-
-import org.apache.http.HttpResponse;
-import org.apache.http.client.methods.HttpUriRequest;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-/**
- * An adapter class that delegate calls to {@link
org.apache.knox.gateway.dispatch.NiFiHaDispatch}
- * for backwards compatibility with package structure.
- *
- * @since 0.14.0
- * @deprecated Use {@link org.apache.knox.gateway.dispatch.NiFiHaDispatch}
- */
-@Deprecated
-public class NiFiHaDispatch extends
org.apache.knox.gateway.dispatch.NiFiHaDispatch {
- public NiFiHaDispatch() {
- super();
- }
-
- @Override
- protected void executeRequest(HttpUriRequest outboundRequest,
- HttpServletRequest inboundRequest, HttpServletResponse outboundResponse)
- throws IOException {
- super.executeRequest(outboundRequest, inboundRequest, outboundResponse);
- }
-
- @Override
- protected void writeOutboundResponse(HttpUriRequest outboundRequest,
- HttpServletRequest inboundRequest, HttpServletResponse outboundResponse,
- HttpResponse inboundResponse) throws IOException {
- super.writeOutboundResponse(outboundRequest, inboundRequest,
- outboundResponse, inboundResponse);
- }
-}
diff --git
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/dispatch/PassAllHeadersDispatch.java
b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/dispatch/PassAllHeadersDispatch.java
deleted file mode 100644
index 56016ed86..000000000
---
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/dispatch/PassAllHeadersDispatch.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
under
- * the License.
- */
-package org.apache.hadoop.gateway.dispatch;
-
-/**
- * An adapter class that delegate calls to {@link
org.apache.knox.gateway.dispatch.PassAllHeadersDispatch}
- * for backwards compatibility with package structure.
- *
- * @since 0.14.0
- * @deprecated Use {@link
org.apache.knox.gateway.dispatch.PassAllHeadersDispatch}
- */
-@Deprecated
-public class PassAllHeadersDispatch extends
org.apache.knox.gateway.dispatch.PassAllHeadersDispatch {
-}
diff --git
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/dispatch/PassAllHeadersNoEncodingDispatch.java
b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/dispatch/PassAllHeadersNoEncodingDispatch.java
deleted file mode 100644
index f429e984d..000000000
---
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/dispatch/PassAllHeadersNoEncodingDispatch.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
under
- * the License.
- */
-package org.apache.hadoop.gateway.dispatch;
-
-/**
- * An adapter class that delegate calls to {@link
org.apache.knox.gateway.dispatch.PassAllHeadersNoEncodingDispatch}
- * for backwards compatibility with package structure.
- *
- * @since 0.14.0
- * @deprecated Use {@link
org.apache.knox.gateway.dispatch.PassAllHeadersNoEncodingDispatch}
- */
-@Deprecated
-public class PassAllHeadersNoEncodingDispatch
- extends org.apache.knox.gateway.dispatch.PassAllHeadersNoEncodingDispatch {
-}
diff --git
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/hadoopauth/filter/HadoopAuthFilter.java
b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/hadoopauth/filter/HadoopAuthFilter.java
deleted file mode 100644
index 17d07552d..000000000
---
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/hadoopauth/filter/HadoopAuthFilter.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
under
- * the License.
- */
-package org.apache.hadoop.gateway.hadoopauth.filter;
-
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import java.util.Properties;
-
-/**
- * An adapter class that delegate calls to {@link
org.apache.knox.gateway.hadoopauth.filter.HadoopAuthFilter}
- * for backwards compatibility with package structure.
- *
- * @since 0.14.0
- * @deprecated Use {@link
org.apache.knox.gateway.hadoopauth.filter.HadoopAuthFilter}
- */
-@Deprecated
-public class HadoopAuthFilter extends
org.apache.knox.gateway.hadoopauth.filter.HadoopAuthFilter {
- @Override
- protected Properties getConfiguration(String configPrefix,
- FilterConfig filterConfig) throws ServletException {
- return super.getConfiguration(configPrefix, filterConfig);
- }
-}
diff --git
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/hbase/HBaseDispatch.java
b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/hbase/HBaseDispatch.java
deleted file mode 100644
index 605b31d65..000000000
---
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/hbase/HBaseDispatch.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
under
- * the License.
- */
-package org.apache.hadoop.gateway.hbase;
-
-/**
- * An adapter class that delegate calls to {@link
org.apache.knox.gateway.hbase.HBaseDispatch}
- * for backwards compatibility with package structure.
- *
- * @since 0.14.0
- * @deprecated Use {@link org.apache.knox.gateway.hbase.HBaseDispatch}
- */
-@Deprecated
-public class HBaseDispatch extends org.apache.knox.gateway.hbase.HBaseDispatch
{
-}
diff --git
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/hdfs/dispatch/HdfsHttpClientDispatch.java
b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/hdfs/dispatch/HdfsHttpClientDispatch.java
deleted file mode 100644
index 49a164512..000000000
---
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/hdfs/dispatch/HdfsHttpClientDispatch.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
under
- * the License.
- */
-package org.apache.hadoop.gateway.hdfs.dispatch;
-
-import org.apache.http.HttpEntity;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-
-/**
- * An adapter class that delegate calls to {@link
org.apache.knox.gateway.hdfs.dispatch.HdfsHttpClientDispatch}
- * for backwards compatibility with package structure.
- *
- * @since 0.14.0
- * @deprecated Use {@link
org.apache.knox.gateway.hdfs.dispatch.HdfsHttpClientDispatch}
- */
-@Deprecated
-public class HdfsHttpClientDispatch extends
org.apache.knox.gateway.hdfs.dispatch.HdfsHttpClientDispatch {
- public HdfsHttpClientDispatch() throws ServletException {
- super();
- }
-
- /**
- * This method ensures that the request InputStream is not acquired
- * prior to a dispatch to a component such as a namenode that doesn't
- * the request body. The side effect of this is that the client does
- * not get a 100 continue from Knox which will trigger the client to
- * send the entire payload before redirect to the target component
- * like a datanode and have to send it again.
- */
- @Override
- protected HttpEntity createRequestEntity(HttpServletRequest request)
- throws IOException {
- return super.createRequestEntity(request);
- }
-}
diff --git
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/hdfs/dispatch/WebHdfsHaDispatch.java
b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/hdfs/dispatch/WebHdfsHaDispatch.java
deleted file mode 100644
index 43cb25116..000000000
---
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/hdfs/dispatch/WebHdfsHaDispatch.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
under
- * the License.
- */
-package org.apache.hadoop.gateway.hdfs.dispatch;
-
-import org.apache.http.HttpResponse;
-import org.apache.http.client.methods.HttpUriRequest;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-/**
- * An adapter class that delegate calls to {@link
org.apache.knox.gateway.hdfs.dispatch.WebHdfsHaDispatch}
- * for backwards compatibility with package structure.
- *
- * @since 0.14.0
- * @deprecated Use {@link
org.apache.knox.gateway.hdfs.dispatch.WebHdfsHaDispatch}
- */
-@Deprecated
-public class WebHdfsHaDispatch extends
org.apache.knox.gateway.hdfs.dispatch.WebHdfsHaDispatch {
- public WebHdfsHaDispatch() throws ServletException {
- super();
- }
-
- @Override
- protected void executeRequest(HttpUriRequest outboundRequest,
- HttpServletRequest inboundRequest, HttpServletResponse outboundResponse)
- throws IOException {
- super.executeRequest(outboundRequest, inboundRequest, outboundResponse);
- }
-
- @Override
- protected void writeOutboundResponse(HttpUriRequest outboundRequest,
- HttpServletRequest inboundRequest, HttpServletResponse outboundResponse,
- HttpResponse inboundResponse) throws IOException {
- super.writeOutboundResponse(outboundRequest, inboundRequest,
- outboundResponse, inboundResponse);
- }
-}
diff --git
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/hive/HiveDispatch.java
b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/hive/HiveDispatch.java
deleted file mode 100644
index f9a01352b..000000000
---
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/hive/HiveDispatch.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
under
- * the License.
- */
-package org.apache.hadoop.gateway.hive;
-
-import org.apache.http.client.methods.HttpUriRequest;
-
-/**
- * An adapter class that delegate calls to {@link
org.apache.knox.gateway.hive.HiveDispatch}
- * for backwards compatibility with package structure.
- *
- * @since 0.14.0
- * @deprecated Use {@link org.apache.knox.gateway.hive.HiveDispatch}
- */
-@Deprecated
-public class HiveDispatch extends org.apache.knox.gateway.hive.HiveDispatch {
- @Override
- protected void addCredentialsToRequest(HttpUriRequest request) {
- super.addCredentialsToRequest(request);
- }
-}
diff --git
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/hive/HiveHaDispatch.java
b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/hive/HiveHaDispatch.java
deleted file mode 100644
index e7b2fbc75..000000000
---
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/hive/HiveHaDispatch.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
under
- * the License.
- */
-package org.apache.hadoop.gateway.hive;
-
-import org.apache.http.client.methods.HttpUriRequest;
-
-/**
- * An adapter class that delegate calls to {@link
org.apache.knox.gateway.hive.HiveHaDispatch}
- * for backwards compatibility with package structure.
- *
- * @since 0.14.0
- * @deprecated Use {@link org.apache.knox.gateway.hive.HiveHaDispatch}
- */
-@Deprecated
-public class HiveHaDispatch extends
org.apache.knox.gateway.hive.HiveHaDispatch {
- public HiveHaDispatch() {
- super();
- }
-
- @Override
- protected void addCredentialsToRequest(HttpUriRequest request) {
- super.addCredentialsToRequest(request);
- }
-}
diff --git
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/provider/federation/jwt/filter/JWTFederationFilter.java
b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/provider/federation/jwt/filter/JWTFederationFilter.java
deleted file mode 100644
index e01fb7fb4..000000000
---
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/provider/federation/jwt/filter/JWTFederationFilter.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
under
- * the License.
- */
-package org.apache.hadoop.gateway.provider.federation.jwt.filter;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-/**
- * An adapter class that delegate calls to
- * {@link
org.apache.knox.gateway.provider.federation.jwt.filter.JWTFederationFilter} for
backwards
- * compatibility with package structure.
- *
- * @since 0.14.0
- * @deprecated Use {@link
org.apache.knox.gateway.provider.federation.jwt.filter.JWTFederationFilter}
- */
-@Deprecated
-public class JWTFederationFilter extends
org.apache.knox.gateway.provider.federation.jwt.filter.JWTFederationFilter {
- @Override
- protected void handleValidationError(HttpServletRequest request,
- HttpServletResponse response, int status, String error)
- throws IOException {
- super.handleValidationError(request, response, status, error);
- }
-}
diff --git
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/provider/federation/jwt/filter/SSOCookieFederationFilter.java
b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/provider/federation/jwt/filter/SSOCookieFederationFilter.java
deleted file mode 100644
index d4e434072..000000000
---
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/provider/federation/jwt/filter/SSOCookieFederationFilter.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
under
- * the License.
- */
-package org.apache.hadoop.gateway.provider.federation.jwt.filter;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-
-/**
- * An adapter class that delegate calls to
- * {@link
org.apache.knox.gateway.provider.federation.jwt.filter.SSOCookieFederationFilter}
for backwards
- * compatibility with package structure.
- *
- * @since 0.14.0
- * @deprecated Use {@link
org.apache.knox.gateway.provider.federation.jwt.filter.SSOCookieFederationFilter}
- */
-@Deprecated
-public class SSOCookieFederationFilter
- extends
org.apache.knox.gateway.provider.federation.jwt.filter.SSOCookieFederationFilter
{
- @Override
- protected void handleValidationError(HttpServletRequest request,
- HttpServletResponse response, int status, String error)
- throws IOException {
- super.handleValidationError(request, response, status, error);
- }
-
- /**
- * Create the URL to be used for authentication of the user in the absence of
- * a JWT token within the incoming request.
- *
- * @param request for getting the original request URL
- * @return url to use as login url for redirect
- */
- @Override
- protected String constructLoginURL(HttpServletRequest request) {
- return super.constructLoginURL(request);
- }
-}
diff --git
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/rm/dispatch/RMHaDispatch.java
b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/rm/dispatch/RMHaDispatch.java
deleted file mode 100644
index a6e090050..000000000
---
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/rm/dispatch/RMHaDispatch.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
under
- * the License.
- */
-package org.apache.hadoop.gateway.rm.dispatch;
-
-/**
- * An adapter class that delegate calls to {@link
org.apache.knox.gateway.rm.dispatch.RMHaDispatch}
- * for backwards compatibility with package structure.
- *
- * @since 0.14.0
- * @deprecated Use {@link org.apache.knox.gateway.rm.dispatch.RMHaDispatch}
- */
-@Deprecated
-public class RMHaDispatch extends
org.apache.knox.gateway.rm.dispatch.RMHaDispatch {
- public RMHaDispatch() {
- super();
- }
-}
diff --git
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/rm/dispatch/RMUIHaDispatch.java
b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/rm/dispatch/RMUIHaDispatch.java
deleted file mode 100644
index 63fcf44ed..000000000
---
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/rm/dispatch/RMUIHaDispatch.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
under
- * the License.
- */
-package org.apache.hadoop.gateway.rm.dispatch;
-
-import javax.servlet.ServletException;
-
-/**
- * An adapter class that delegate calls to {@link
org.apache.knox.gateway.rm.dispatch.RMUIHaDispatch}
- * for backwards compatibility with package structure.
- *
- * @since 0.14.0
- * @deprecated Use {@link org.apache.knox.gateway.rm.dispatch.RMUIHaDispatch}
- */
-@Deprecated
-public class RMUIHaDispatch extends
org.apache.knox.gateway.rm.dispatch.RMUIHaDispatch {
- public RMUIHaDispatch() throws ServletException {
- super();
- }
-}
diff --git
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxLdapContextFactory.java
b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxLdapContextFactory.java
deleted file mode 100644
index 2b432a43b..000000000
---
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxLdapContextFactory.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
under
- * the License.
- */
-package org.apache.hadoop.gateway.shirorealm;
-
-import javax.naming.NamingException;
-import javax.naming.ldap.LdapContext;
-import java.util.Hashtable;
-
-/**
- * An adapter class that delegate calls to {@link
org.apache.knox.gateway.shirorealm.KnoxLdapContextFactory}
- * for backwards compatibility with package structure.
- *
- * @since 0.14.0
- * @deprecated Use {@link
org.apache.knox.gateway.shirorealm.KnoxLdapContextFactory}
- */
-@Deprecated
-public class KnoxLdapContextFactory extends
org.apache.knox.gateway.shirorealm.KnoxLdapContextFactory {
- public KnoxLdapContextFactory() {
- super();
- }
-
- @Override
- protected LdapContext createLdapContext(Hashtable env)
- throws NamingException {
- return super.createLdapContext(env);
- }
-}
diff --git
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxLdapRealm.java
b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxLdapRealm.java
deleted file mode 100644
index 6fef6b44f..000000000
---
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxLdapRealm.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
under
- * the License.
- */
-package org.apache.hadoop.gateway.shirorealm;
-
-import org.apache.shiro.authc.AuthenticationException;
-import org.apache.shiro.authc.AuthenticationInfo;
-import org.apache.shiro.authc.AuthenticationToken;
-import org.apache.shiro.authz.AuthorizationInfo;
-import org.apache.shiro.realm.ldap.LdapContextFactory;
-import org.apache.shiro.subject.PrincipalCollection;
-
-import javax.naming.NamingException;
-import javax.naming.ldap.LdapContext;
-
-/**
- * An adapter class that delegate calls to {@link
org.apache.knox.gateway.shirorealm.KnoxLdapRealm}
- * for backwards compatibility with package structure.
- *
- * @since 0.14.0
- * @deprecated Use {@link org.apache.knox.gateway.shirorealm.KnoxLdapRealm}
- */
-@Deprecated
-public class KnoxLdapRealm extends
org.apache.knox.gateway.shirorealm.KnoxLdapRealm {
- public KnoxLdapRealm() {
- super();
- }
-
- @Override
- protected AuthenticationInfo doGetAuthenticationInfo(
- AuthenticationToken token) throws AuthenticationException {
- return super.doGetAuthenticationInfo(token);
- }
-
- /**
- * Get groups from LDAP.
- *
- * @param principals the principals of the Subject whose
- * AuthenticationInfo should be queried from the
- * LDAP server.
- * @param ldapContextFactory factory used to retrieve LDAP connections.
- * @return an {@link AuthorizationInfo} instance containing information
- * retrieved from the LDAP server.
- * @throws NamingException if any LDAP errors occur during the search.
- */
- @Override
- protected AuthorizationInfo queryForAuthorizationInfo(
- PrincipalCollection principals, LdapContextFactory ldapContextFactory)
- throws NamingException {
- return super.queryForAuthorizationInfo(principals, ldapContextFactory);
- }
-
- /**
- * Returns the LDAP User Distinguished Name (DN) to use when acquiring an
- * {@link LdapContext LdapContext} from the {@link LdapContextFactory}.
- *
- * If the the {@link #getUserDnTemplate() userDnTemplate} property has been
- * set, this implementation will construct the User DN by substituting the
- * specified {@code principal} into the configured template. If the {@link
- * #getUserDnTemplate() userDnTemplate} has not been set, the method argument
- * will be returned directly (indicating that the submitted authentication
- * token principal <em>is</em> the User DN).
- *
- * @param principal the principal to substitute into the configured {@link
- * #getUserDnTemplate() userDnTemplate}.
- * @return the constructed User DN to use at runtime when acquiring an {@link
- * LdapContext}.
- * @throws IllegalArgumentException if the method argument is null or empty
- * @throws IllegalStateException if the {@link #getUserDnTemplate
- * userDnTemplate} has not been set.
- * @see LdapContextFactory#getLdapContext(Object, Object)
- */
- @Override
- protected String getUserDn(String principal)
- throws IllegalArgumentException, IllegalStateException {
- return super.getUserDn(principal);
- }
-
- @Override
- protected AuthenticationInfo createAuthenticationInfo(
- AuthenticationToken token, Object ldapPrincipal, Object ldapCredentials,
- LdapContext ldapContext) throws NamingException {
- return super.createAuthenticationInfo(token, ldapPrincipal,
ldapCredentials,
- ldapContext);
- }
-}
diff --git
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxPamRealm.java
b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxPamRealm.java
deleted file mode 100644
index f96eb8b22..000000000
---
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/shirorealm/KnoxPamRealm.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
under
- * the License.
- */
-package org.apache.hadoop.gateway.shirorealm;
-
-import org.apache.shiro.authc.AuthenticationException;
-import org.apache.shiro.authc.AuthenticationInfo;
-import org.apache.shiro.authc.AuthenticationToken;
-import org.apache.shiro.authz.AuthorizationInfo;
-import org.apache.shiro.subject.PrincipalCollection;
-
-/**
- * An adapter class that delegate calls to {@link
org.apache.knox.gateway.shirorealm.KnoxPamRealm}
- * for backwards compatibility with package structure.
- *
- * @since 0.14.0
- * @deprecated Use {@link org.apache.knox.gateway.shirorealm.KnoxPamRealm}
- */
-@Deprecated
-public class KnoxPamRealm extends
org.apache.knox.gateway.shirorealm.KnoxPamRealm {
- public KnoxPamRealm() {
- super();
- }
-
- @Override
- protected AuthenticationInfo doGetAuthenticationInfo(
- AuthenticationToken token) throws AuthenticationException {
- return super.doGetAuthenticationInfo(token);
- }
-
- @Override
- protected AuthorizationInfo doGetAuthorizationInfo(
- PrincipalCollection principals) {
- return super.doGetAuthorizationInfo(principals);
- }
-}
diff --git
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/storm/StormDispatch.java
b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/storm/StormDispatch.java
deleted file mode 100644
index 7e1f28ad9..000000000
---
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/storm/StormDispatch.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
under
- * the License.
- */
-package org.apache.hadoop.gateway.storm;
-
-/**
- * An adapter class that delegate calls to {@link
org.apache.knox.gateway.storm.StormDispatch}
- * for backwards compatibility with package structure.
- *
- * @since 0.14.0
- * @deprecated Use {@link org.apache.knox.gateway.storm.StormDispatch}
- */
-@Deprecated
-public class StormDispatch extends org.apache.knox.gateway.storm.StormDispatch
{
-}
diff --git
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/topology/Service.java
b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/topology/Service.java
deleted file mode 100644
index 0dfb3fbaa..000000000
---
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/topology/Service.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
under
- * the License.
- */
-package org.apache.hadoop.gateway.topology;
-
-/**
- * An adapter class that delegate calls to {@link
org.apache.knox.gateway.topology.Service}
- * for backwards compatibility with package structure.
- *
- * @since 0.14.0
- * @deprecated Use {@link org.apache.knox.gateway.topology.Service}
- */
-@Deprecated
-public class Service extends org.apache.knox.gateway.topology.Service {
-}
diff --git
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/topology/Topology.java
b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/topology/Topology.java
deleted file mode 100644
index 749840188..000000000
---
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/topology/Topology.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
under
- * the License.
- */
-package org.apache.hadoop.gateway.topology;
-
-/**
- * An adapter class that delegate calls to {@link
org.apache.knox.gateway.topology.Topology}
- * for backwards compatibility with package structure.
- *
- * @since 0.14.0
- * @deprecated Use {@link org.apache.knox.gateway.topology.Topology}
- */
-@Deprecated
-public class Topology extends org.apache.knox.gateway.topology.Topology {
- public Topology() {
- super();
- }
-}
diff --git
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/util/RegExUtils.java
b/gateway-adapter/src/main/java/org/apache/hadoop/gateway/util/RegExUtils.java
deleted file mode 100644
index 3f0296814..000000000
---
a/gateway-adapter/src/main/java/org/apache/hadoop/gateway/util/RegExUtils.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
under
- * the License.
- */
-package org.apache.hadoop.gateway.util;
-
-/**
- * An adapter class that delegate calls to {@link
org.apache.knox.gateway.util.RegExUtils}
- * for backwards compatibility with package structure.
- *
- * @since 0.14.0
- * @deprecated Use {@link org.apache.knox.gateway.util.RegExUtils}
- */
-@Deprecated
-public class RegExUtils extends org.apache.knox.gateway.util.RegExUtils {
-}
diff --git a/gateway-adapter/src/main/resources/META-INF/launcher.cfg
b/gateway-adapter/src/main/resources/META-INF/launcher.cfg
deleted file mode 100644
index a9ffee502..000000000
--- a/gateway-adapter/src/main/resources/META-INF/launcher.cfg
+++ /dev/null
@@ -1,17 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-main.class = org.apache.knox.gateway.security.ldap.SimpleLdapDirectoryServer
-class.path = ../lib/*.jar;../dep/*.jar;../ext;../ext/*.jar
-log4j.configurationFile=${launcher.dir}/../conf/${launcher.name}-log4j2.xml
diff --git
a/gateway-adapter/src/test/java/org/apache/hadoop/gateway/shirorealm/KnoxLdapRealmTest.java
b/gateway-adapter/src/test/java/org/apache/hadoop/gateway/shirorealm/KnoxLdapRealmTest.java
deleted file mode 100644
index 8be53aae4..000000000
---
a/gateway-adapter/src/test/java/org/apache/hadoop/gateway/shirorealm/KnoxLdapRealmTest.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.hadoop.gateway.shirorealm;
-
-import org.junit.Test;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-
-@SuppressWarnings("deprecation")
-public class KnoxLdapRealmTest {
- @Test
- public void setGetSearchBase() {
- KnoxLdapRealm realm = new KnoxLdapRealm();
- realm.setSearchBase("dc=hadoop,dc=apache,dc=org");
- assertEquals("dc=hadoop,dc=apache,dc=org", realm.getSearchBase());
- }
-
- @Test
- public void setGetGroupObjectClass() {
- KnoxLdapRealm realm = new KnoxLdapRealm();
- realm.setGroupObjectClass("groupOfMembers");
- assertEquals("groupOfMembers", realm.getGroupObjectClass());
- }
-
- @Test
- public void setGetUniqueMemberAttribute() {
- KnoxLdapRealm realm = new KnoxLdapRealm();
- realm.setMemberAttribute("member");
- assertEquals("member", realm.getMemberAttribute());
- }
-
- @Test
- public void setGetUserSearchAttributeName() {
- KnoxLdapRealm realm = new KnoxLdapRealm();
- realm.setUserSearchAttributeName("uid");
- assertEquals("uid", realm.getUserSearchAttributeName());
- }
-
- @Test
- public void setGetUserObjectClass() {
- KnoxLdapRealm realm = new KnoxLdapRealm();
- realm.setUserObjectClass("inetuser");
- assertEquals("inetuser", realm.getUserObjectClass());
- }
-
- @Test
- public void setGetUserSearchBase() {
- KnoxLdapRealm realm = new KnoxLdapRealm();
- realm.setSearchBase("dc=example,dc=com");
- realm.setUserSearchBase("dc=knox,dc=example,dc=com");
- assertEquals(realm.getUserSearchBase(), "dc=knox,dc=example,dc=com");
- }
-
- @Test
- public void setGetGroupSearchBase() {
- KnoxLdapRealm realm = new KnoxLdapRealm();
- realm.setSearchBase("dc=example,dc=com");
- realm.setGroupSearchBase("dc=knox,dc=example,dc=com");
- assertEquals("dc=knox,dc=example,dc=com", realm.getGroupSearchBase());
- }
-
- @Test
- public void verifyDefaultUserSearchAttributeName() {
- KnoxLdapRealm realm = new KnoxLdapRealm();
- assertNull(realm.getUserSearchAttributeName());
- }
-
- @Test
- public void verifyDefaultGetUserObjectClass() {
- KnoxLdapRealm realm = new KnoxLdapRealm();
- assertEquals("person", realm.getUserObjectClass());
- }
-
- @Test
- public void verifyDefaultUserSearchBase() {
- KnoxLdapRealm realm = new KnoxLdapRealm();
- realm.setSearchBase("dc=knox,dc=example,dc=com");
- assertEquals("dc=knox,dc=example,dc=com", realm.getUserSearchBase());
- }
-
- @Test
- public void verifyDefaultGroupSearchBase() {
- KnoxLdapRealm realm = new KnoxLdapRealm();
- realm.setSearchBase("dc=knox,dc=example,dc=com");
- assertEquals("dc=knox,dc=example,dc=com", realm.getGroupSearchBase());
- }
-}
diff --git
a/gateway-adapter/src/test/java/org/apache/hadoop/gateway/shirorealm/KnoxPamRealmTest.java
b/gateway-adapter/src/test/java/org/apache/hadoop/gateway/shirorealm/KnoxPamRealmTest.java
deleted file mode 100644
index a09953404..000000000
---
a/gateway-adapter/src/test/java/org/apache/hadoop/gateway/shirorealm/KnoxPamRealmTest.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.hadoop.gateway.shirorealm;
-
-import org.junit.Test;
-
-import org.apache.shiro.authc.AuthenticationInfo;
-import org.apache.shiro.authc.UsernamePasswordToken;
-
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assume.assumeTrue;
-
-@SuppressWarnings("deprecation")
-public class KnoxPamRealmTest {
- @Test
- public void setService() {
- KnoxPamRealm realm = new KnoxPamRealm();
- realm.setService("knox-pam-os-service");
- assertEquals("knox-pam-os-service", realm.getService());
- }
-
- @Test
- public void testDoGetAuthenticationInfo() {
- KnoxPamRealm realm = new KnoxPamRealm();
- realm.setService("sshd"); // pam settings being used: /etc/pam.d/sshd
-
- // use environment variables and skip the test if not set.
- String pamuser = System.getenv("PAMUSER");
- String pampass = System.getenv("PAMPASS");
- assumeTrue(pamuser != null);
- assumeTrue(pampass != null);
-
- // mock shiro auth token
- UsernamePasswordToken authToken = createMock(UsernamePasswordToken.class);
- expect(authToken.getUsername()).andReturn(pamuser);
- expect(authToken.getPassword()).andReturn(pampass.toCharArray());
- expect(authToken.getCredentials()).andReturn(pampass);
- replay(authToken);
-
- // login
- AuthenticationInfo authInfo = realm.doGetAuthenticationInfo(authToken);
-
- // verify success
- assertNotNull(authInfo.getCredentials());
- }
-
- public static void main(String[] args) throws Exception {
- KnoxPamRealmTest pamTest = new KnoxPamRealmTest();
- pamTest.testDoGetAuthenticationInfo();
- }
-}
diff --git
a/gateway-admin-ui/admin-ui/app/provider-config-wizard/ldap-provider-config.ts
b/gateway-admin-ui/admin-ui/app/provider-config-wizard/ldap-provider-config.ts
index 20879c047..b31470201 100644
---
a/gateway-admin-ui/admin-ui/app/provider-config-wizard/ldap-provider-config.ts
+++
b/gateway-admin-ui/admin-ui/app/provider-config-wizard/ldap-provider-config.ts
@@ -69,9 +69,9 @@ export class LDAPProviderConfig extends
AuthenticationProviderConfig implements
constructor() {
super('ShiroProvider');
this.setParam(this.getDisplayNamePropertyBinding(LDAPProviderConfig.REALM),
- 'org.apache.hadoop.gateway.shirorealm.KnoxLdapRealm');
+ 'org.apache.knox.gateway.shirorealm.KnoxLdapRealm');
this.setParam(this.getDisplayNamePropertyBinding(LDAPProviderConfig.CONTEXT_FACTORY),
- 'org.apache.hadoop.gateway.shirorealm.KnoxLdapContextFactory');
+ 'org.apache.knox.gateway.shirorealm.KnoxLdapContextFactory');
this.setParam(this.getDisplayNamePropertyBinding(LDAPProviderConfig.REALM_CONTEXT_FACTORY),
'$ldapContextFactory');
this.setParam(this.getDisplayNamePropertyBinding(LDAPProviderConfig.AUTH_CHAIN),
'authcBasic');
}
diff --git a/gateway-release/pom.xml b/gateway-release/pom.xml
index 856cf3992..7df1c6c22 100644
--- a/gateway-release/pom.xml
+++ b/gateway-release/pom.xml
@@ -480,10 +480,6 @@
<groupId>org.apache.knox</groupId>
<artifactId>gateway-discovery-cm</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.knox</groupId>
- <artifactId>gateway-adapter</artifactId>
- </dependency>
<dependency>
<groupId>org.apache.knox</groupId>
<artifactId>gateway-service-hashicorp-vault</artifactId>
diff --git
a/gateway-server/src/test/java/org/apache/knox/gateway/topology/simple/ProviderConfigurationParserTest.java
b/gateway-server/src/test/java/org/apache/knox/gateway/topology/simple/ProviderConfigurationParserTest.java
index bde99e819..25b3f5f50 100644
---
a/gateway-server/src/test/java/org/apache/knox/gateway/topology/simple/ProviderConfigurationParserTest.java
+++
b/gateway-server/src/test/java/org/apache/knox/gateway/topology/simple/ProviderConfigurationParserTest.java
@@ -130,8 +130,8 @@ public class ProviderConfigurationParserTest {
" \"name\":\"ShiroProvider\",\n" +
" \"enabled\":\"true\",\n" +
" \"params\":{\n" +
- "
\"main.ldapContextFactory\":\"org.apache.hadoop.gateway.shirorealm.KnoxLdapContextFactory\",\n"
+
- "
\"main.ldapRealm\":\"org.apache.hadoop.gateway.shirorealm.KnoxLdapRealm\",\n" +
+ "
\"main.ldapContextFactory\":\"org.apache.knox.gateway.shirorealm.KnoxLdapContextFactory\",\n"
+
+ "
\"main.ldapRealm\":\"org.apache.knox.gateway.shirorealm.KnoxLdapRealm\",\n" +
" \"main.ldapRealm.contextFactory\":\"$ldapContextFactory\",\n" +
"
\"main.ldapRealm.userDnTemplate\":\"uid={0},ou=people,dc=hadoop,dc=apache,dc=org\",\n"
+
"
\"main.ldapRealm.contextFactory.url\":\"ldap://localhost:33389\",\n"; +
@@ -200,8 +200,8 @@ public class ProviderConfigurationParserTest {
" enabled: true\n" +
" params:\n" +
" sessionTimeout: 30\n" +
- " main.ldapRealm:
org.apache.hadoop.gateway.shirorealm.KnoxLdapRealm\n" +
- " main.ldapContextFactory:
org.apache.hadoop.gateway.shirorealm.KnoxLdapContextFactory\n" +
+ " main.ldapRealm:
org.apache.knox.gateway.shirorealm.KnoxLdapRealm\n" +
+ " main.ldapContextFactory:
org.apache.knox.gateway.shirorealm.KnoxLdapContextFactory\n" +
" main.ldapRealm.contextFactory: $ldapContextFactory\n" +
" main.ldapRealm.userDnTemplate:
uid={0},ou=people,dc=hadoop,dc=apache,dc=org\n" +
" main.ldapRealm.contextFactory.url: ldap://localhost:33389\n"; +
@@ -246,8 +246,8 @@ public class ProviderConfigurationParserTest {
assertNotNull(params);
assertEquals(8, params.size());
assertEquals(params.get("sessionTimeout"), "30");
- assertEquals(params.get("main.ldapRealm"),
"org.apache.hadoop.gateway.shirorealm.KnoxLdapRealm");
- assertEquals(params.get("main.ldapContextFactory"),
"org.apache.hadoop.gateway.shirorealm.KnoxLdapContextFactory");
+ assertEquals(params.get("main.ldapRealm"),
"org.apache.knox.gateway.shirorealm.KnoxLdapRealm");
+ assertEquals(params.get("main.ldapContextFactory"),
"org.apache.knox.gateway.shirorealm.KnoxLdapContextFactory");
assertEquals(params.get("main.ldapRealm.contextFactory"),
"$ldapContextFactory");
assertEquals(params.get("main.ldapRealm.userDnTemplate"),
"uid={0},ou=people,dc=hadoop,dc=apache,dc=org");
assertEquals(params.get("main.ldapRealm.contextFactory.url"),
"ldap://localhost:33389";);
diff --git
a/gateway-server/src/test/java/org/apache/knox/gateway/topology/xml/TopologyRulesModuleTest.java
b/gateway-server/src/test/java/org/apache/knox/gateway/topology/xml/TopologyRulesModuleTest.java
index ffe54f56d..18ca005ec 100644
---
a/gateway-server/src/test/java/org/apache/knox/gateway/topology/xml/TopologyRulesModuleTest.java
+++
b/gateway-server/src/test/java/org/apache/knox/gateway/topology/xml/TopologyRulesModuleTest.java
@@ -273,7 +273,7 @@ public class TopologyRulesModuleTest {
assertThat( "Failed to find dispatch", dispatch, notNullValue() );
assertThat( dispatch.getContributorName(), is("testContributor") );
assertThat( dispatch.getHaContributorName(), is("testHAContributor") );
- assertThat( dispatch.getClassName(),
is("org.apache.hadoop.gateway.hbase.HBaseDispatch") );
+ assertThat( dispatch.getClassName(),
is("org.apache.knox.gateway.hbase.HBaseDispatch") );
assertThat( dispatch.getHaClassName(), is("testHAClassName") );
assertThat( dispatch.getHttpClientFactory(), is("testHttpClientFactory") );
assertThat( dispatch.getUseTwoWaySsl(), is(true) );
@@ -298,7 +298,7 @@ public class TopologyRulesModuleTest {
assertThat( "Failed to find dispatch", dispatch, notNullValue() );
assertThat( dispatch.getContributorName(), is("testContributor") );
assertThat( dispatch.getHaContributorName(), is("testHAContributor") );
- assertThat( dispatch.getClassName(),
is("org.apache.hadoop.gateway.hbase.HBaseDispatch") );
+ assertThat( dispatch.getClassName(),
is("org.apache.knox.gateway.hbase.HBaseDispatch") );
assertThat( dispatch.getHaClassName(), is("testHAClassName") );
assertThat( dispatch.getHttpClientFactory(), is("testHttpClientFactory") );
assertThat( dispatch.getUseTwoWaySsl(), is(true) );
diff --git
a/gateway-server/src/test/resources/org/apache/knox/gateway/topology/xml/TopologyRulesModuleTest/topology-with-dispatch-parameters.xml
b/gateway-server/src/test/resources/org/apache/knox/gateway/topology/xml/TopologyRulesModuleTest/topology-with-dispatch-parameters.xml
index d0dc78de1..fb8831e82 100644
---
a/gateway-server/src/test/resources/org/apache/knox/gateway/topology/xml/TopologyRulesModuleTest/topology-with-dispatch-parameters.xml
+++
b/gateway-server/src/test/resources/org/apache/knox/gateway/topology/xml/TopologyRulesModuleTest/topology-with-dispatch-parameters.xml
@@ -22,7 +22,7 @@
<dispatch>
<contributor-name>testContributor</contributor-name>
<ha-contributor-name>testHAContributor</ha-contributor-name>
-
<classname>org.apache.hadoop.gateway.hbase.HBaseDispatch</classname>
+ <classname>org.apache.knox.gateway.hbase.HBaseDispatch</classname>
<ha-classname>testHAClassName</ha-classname>
<http-client-factory>testHttpClientFactory</http-client-factory>
<use-two-way-ssl>true</use-two-way-ssl>
diff --git
a/gateway-server/src/test/resources/org/apache/knox/gateway/topology/xml/TopologyRulesModuleTest/topology-with-dispatch.xml
b/gateway-server/src/test/resources/org/apache/knox/gateway/topology/xml/TopologyRulesModuleTest/topology-with-dispatch.xml
index a73f03d43..fd6b1e25d 100644
---
a/gateway-server/src/test/resources/org/apache/knox/gateway/topology/xml/TopologyRulesModuleTest/topology-with-dispatch.xml
+++
b/gateway-server/src/test/resources/org/apache/knox/gateway/topology/xml/TopologyRulesModuleTest/topology-with-dispatch.xml
@@ -22,7 +22,7 @@
<dispatch>
<contributor-name>testContributor</contributor-name>
<ha-contributor-name>testHAContributor</ha-contributor-name>
-
<classname>org.apache.hadoop.gateway.hbase.HBaseDispatch</classname>
+ <classname>org.apache.knox.gateway.hbase.HBaseDispatch</classname>
<ha-classname>testHAClassName</ha-classname>
<http-client-factory>testHttpClientFactory</http-client-factory>
<use-two-way-ssl>true</use-two-way-ssl>
diff --git
a/gateway-service-definitions/src/main/resources/services/elasticsearch/1.0.0/service.xml
b/gateway-service-definitions/src/main/resources/services/elasticsearch/1.0.0/service.xml
index fdf560336..f9e2941ec 100644
---
a/gateway-service-definitions/src/main/resources/services/elasticsearch/1.0.0/service.xml
+++
b/gateway-service-definitions/src/main/resources/services/elasticsearch/1.0.0/service.xml
@@ -26,5 +26,5 @@
<route path="/elasticsearch"/>
<route path="/elasticsearch/**"/>
</routes>
- <dispatch
classname="org.apache.hadoop.gateway.dispatch.PassAllHeadersDispatch"/>
+ <dispatch
classname="org.apache.knox.gateway.dispatch.PassAllHeadersDispatch"/>
</service>
diff --git
a/gateway-topology-hadoop-xml/src/test/java/org/apache/knox/gateway/topology/hadoop/xml/HadoopXmlResourceParserTest.java
b/gateway-topology-hadoop-xml/src/test/java/org/apache/knox/gateway/topology/hadoop/xml/HadoopXmlResourceParserTest.java
index 3f80d91c4..587b3ceee 100644
---
a/gateway-topology-hadoop-xml/src/test/java/org/apache/knox/gateway/topology/hadoop/xml/HadoopXmlResourceParserTest.java
+++
b/gateway-topology-hadoop-xml/src/test/java/org/apache/knox/gateway/topology/hadoop/xml/HadoopXmlResourceParserTest.java
@@ -306,7 +306,7 @@ public class HadoopXmlResourceParserTest {
assertEquals(expectUserDnTemplateParam ? 10 : 9,
authenticationProvider.getParams().size());
assertEquals("30",
authenticationProvider.getParams().get("sessionTimeout"));
assertEquals("org.apache.knox.gateway.shirorealm.KnoxLdapContextFactory",
authenticationProvider.getParams().get("main.ldapContextFactory"));
- assertEquals("org.apache.hadoop.gateway.shirorealm.KnoxLdapRealm",
authenticationProvider.getParams().get("main.ldapRealm"));
+ assertEquals("org.apache.knox.gateway.shirorealm.KnoxLdapRealm",
authenticationProvider.getParams().get("main.ldapRealm"));
assertEquals("$ldapContextFactory",
authenticationProvider.getParams().get("main.ldapRealm.contextFactory"));
assertEquals("simple",
authenticationProvider.getParams().get("main.ldapRealm.contextFactory.authenticationMechanism"));
assertEquals(expectedLdapUrl,
authenticationProvider.getParams().get("main.ldapRealm.contextFactory.url"));
diff --git a/gateway-topology-hadoop-xml/src/test/resources/testDelete.xml
b/gateway-topology-hadoop-xml/src/test/resources/testDelete.xml
index 609562757..752e719a1 100644
--- a/gateway-topology-hadoop-xml/src/test/resources/testDelete.xml
+++ b/gateway-topology-hadoop-xml/src/test/resources/testDelete.xml
@@ -52,7 +52,7 @@ limitations under the License.
role=authentication#
authentication.name=ShiroProvider#
authentication.param.sessionTimeout=30#
-
authentication.param.main.ldapRealm=org.apache.hadoop.gateway.shirorealm.KnoxLdapRealm#
+
authentication.param.main.ldapRealm=org.apache.knox.gateway.shirorealm.KnoxLdapRealm#
authentication.param.main.ldapContextFactory=org.apache.knox.gateway.shirorealm.KnoxLdapContextFactory#
authentication.param.main.ldapRealm.contextFactory=$ldapContextFactory#
authentication.param.main.ldapRealm.contextFactory.authenticationMechanism=simple#
diff --git a/gateway-topology-hadoop-xml/src/test/resources/testDescriptor.xml
b/gateway-topology-hadoop-xml/src/test/resources/testDescriptor.xml
index 42a23fe11..bf35934fc 100644
--- a/gateway-topology-hadoop-xml/src/test/resources/testDescriptor.xml
+++ b/gateway-topology-hadoop-xml/src/test/resources/testDescriptor.xml
@@ -52,7 +52,7 @@ limitations under the License.
role=authentication#
authentication.name=ShiroProvider#
authentication.param.sessionTimeout=30#
-
authentication.param.main.ldapRealm=org.apache.hadoop.gateway.shirorealm.KnoxLdapRealm#
+
authentication.param.main.ldapRealm=org.apache.knox.gateway.shirorealm.KnoxLdapRealm#
authentication.param.main.ldapContextFactory=org.apache.knox.gateway.shirorealm.KnoxLdapContextFactory#
authentication.param.main.ldapRealm.contextFactory=$ldapContextFactory#
authentication.param.main.ldapRealm.contextFactory.authenticationMechanism=simple#
diff --git a/pom.xml b/pom.xml
index 356e6b771..26a680e5c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -128,7 +128,6 @@
<module>gateway-shell</module>
<module>gateway-shell-launcher</module>
<module>knox-cli-launcher</module>
- <module>gateway-adapter</module>
<module>hadoop-examples</module>
<module>gateway-release</module>
<module>gateway-test</module>
@@ -1331,11 +1330,6 @@
<artifactId>gateway-shell-launcher</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.knox</groupId>
- <artifactId>gateway-adapter</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.knox</groupId>
<artifactId>hadoop-examples</artifactId>
