KNOX-998 - Some more refactoring, making sure all the Unit Tests run and build passes !
Project: http://git-wip-us.apache.org/repos/asf/knox/repo Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/2e6713b6 Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/2e6713b6 Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/2e6713b6 Branch: refs/heads/KNOX-998-Package_Restructuring Commit: 2e6713b6c33b54533e6d81ab575ce292aaa43f0d Parents: 912c536 Author: Sandeep More <m...@apache.org> Authored: Thu Aug 31 16:39:06 2017 -0400 Committer: Sandeep More <m...@apache.org> Committed: Thu Aug 31 16:39:06 2017 -0400 ---------------------------------------------------------------------- .gitignore | 2 +- .../applications/knoxauth/app/redirecting.jsp | 2 +- .../src/main/resources/META-INF/launcher.cfg | 2 +- gateway-demo-ldap/pom.xml | 4 +- .../src/main/resources/log4j.properties | 4 +- .../ha/dispatch/i18n/HaDispatchMessages.java | 2 +- .../ha/provider/impl/i18n/HaMessages.java | 2 +- .../knox/gateway/IdentityAsserterMessages.java | 2 +- .../gateway/ConcatIdentityAsserterMessages.java | 2 +- ...adoopGroupProviderDeploymentContributor.java | 2 +- .../filter/HadoopGroupProviderMessages.java | 2 +- .../knox/gateway/IdentityAsserterMessages.java | 2 +- .../hostmap/impl/HostmapFunctionProcessor.java | 4 +- .../ServiceMappedHostFunctionProcessor.java | 4 +- .../gateway/encrypturi/EncryptUriMessages.java | 2 +- .../securequery/SecureQueryMessages.java | 2 +- .../filter/rewrite/i18n/UrlRewriteMessages.java | 2 +- .../src/test/resources/log4j.properties | 8 +- .../AnonymousAuthDeploymentContributor.java | 2 +- .../impl/AclsAuthzDeploymentContributor.java | 2 +- .../filter/AclsAuthorizationMessages.java | 2 +- .../gateway/hadoopauth/HadoopAuthMessages.java | 2 +- .../provider/federation/jwt/JWTMessages.java | 2 +- .../knox/gateway/pac4j/Pac4jMessages.java | 2 +- .../pac4j/filter/Pac4jIdentityAdapter.java | 12 +- .../gateway/picketlink/PicketlinkMessages.java | 2 +- .../knox/gateway/preauth/PreAuthMessages.java | 2 +- .../deploy/HeaderPreAuthContributor.java | 2 +- .../HeaderPreAuthFederationFilterTest.java | 2 +- .../provider/federation/PreAuthServiceTest.java | 2 +- .../deploy/impl/ShiroDeploymentContributor.java | 6 +- .../shirorealm/impl/i18n/KnoxShiroMessages.java | 2 +- .../gateway/webappsec/WebAppSecMessages.java | 2 +- .../webappsec/deploy/WebAppSecContributor.java | 5 +- .../home/conf/gateway-log4j.properties | 20 +- .../home/conf/knoxcli-log4j.properties | 4 +- .../src/main/resources/META-INF/launcher.cfg | 2 +- .../services/metrics/impl/instr/InstrUtils.java | 54 ------ .../apache/knox/gateway/GatewayMessages.java | 2 +- .../ServiceDefinitionDeploymentContributor.java | 2 +- .../gateway/services/CLIGatewayServices.java | 4 +- .../services/DefaultGatewayServices.java | 4 +- .../GatewayServicesContextListener.java | 4 +- .../hostmap/impl/DefaultHostMapperService.java | 6 +- .../security/impl/DefaultAliasService.java | 6 +- .../impl/DefaultTokenAuthorityService.java | 8 +- .../knox/gateway/trace/AccessHandler.java | 2 +- .../apache/knox/gateway/trace/TraceHandler.java | 2 +- .../org/apache/knox/gateway/util/KnoxCLI.java | 4 +- .../websockets/WebsocketLogMessages.java | 2 +- .../src/main/resources/conf/log4j.properties | 2 +- .../org/apache/knox/gateway/GatewayServer.xml | 2 +- .../org/apache/knox/gateway/GatewayFuncTest.xml | 4 +- .../apache/knox/gateway/util/KnoxCLITest.java | 4 +- .../src/test/resources/conf-demo/conf/shiro.ini | 2 +- .../conf-demo/conf/topologies/admin.xml | 4 +- .../conf-demo/conf/topologies/sandbox.xml | 4 +- .../src/test/resources/log4j.properties | 2 +- .../org/apache/knox/gateway/GatewayFuncTest.xml | 2 +- .../xml/simple-topology-ambari-format.conf | 2 +- .../xml/simple-topology-knox-format.xml | 2 +- gateway-server/src/test/resources/shiro.ini | 2 +- .../AdminServiceDeploymentContributor.java | 2 +- .../resources/services/ambari/2.2.0/service.xml | 2 +- .../services/ambariui/2.2.0/service.xml | 2 +- .../services/atlas-api/0.8.0/service.xml | 2 +- .../resources/services/atlas/0.8.0/service.xml | 2 +- .../resources/services/hbase/0.98.0/service.xml | 2 +- .../services/hbaseui/1.1.0/service.xml | 2 +- .../resources/services/hdfsui/2.7.0/service.xml | 2 +- .../resources/services/hive/0.13.0/service.xml | 2 +- .../resources/services/ranger/0.5.0/service.xml | 2 +- .../services/rangerui/0.5.0/service.xml | 2 +- .../resources/services/solr/5.5.0/service.xml | 2 +- .../resources/services/storm/0.9.3/service.xml | 2 +- .../services/webhdfs/2.4.0/service.xml | 2 +- .../services/yarn-rm/2.5.0/service.xml | 2 +- .../resources/services/yarnui/2.7.0/service.xml | 2 +- .../services/zeppelinui/0.6.0/service.xml | 2 +- .../definition/ServiceDefinitionTest.java | 8 +- .../resources/services/foo/1.0.0/service.xml | 2 +- .../service/health/HealthServiceMessages.java | 2 +- .../HealthServiceDeploymentContributor.java | 2 +- .../service/knoxsso/KnoxSSOMessages.java | 2 +- .../KnoxSSOServiceDeploymentContributor.java | 2 +- .../service/knoxsso/KnoxSSOutMessages.java | 2 +- .../KnoxSSOutServiceDeploymentContributor.java | 2 +- .../service/knoxtoken/TokenServiceMessages.java | 2 +- .../TokenServiceDeploymentContributor.java | 2 +- .../apache/knox/gateway/rm/i18n/RMMessages.java | 2 +- .../ServiceTestDeploymentContributor.java | 2 +- .../VaultServiceDeploymentContributor.java | 2 +- .../knox/gateway/hdfs/i18n/WebHdfsMessages.java | 2 +- .../src/main/resources/META-INF/launcher.cfg | 2 +- gateway-shell-release/home/bin/knoxshell.sh | 6 +- .../main/resources/samples/ExampleHBase.groovy | 6 +- .../samples/ExampleOozieWorkflow.groovy | 8 +- .../resources/samples/ExampleWebHCatJob.groovy | 8 +- .../samples/ExampleWebHCatJobTeragen.groovy | 8 +- .../resources/samples/ExampleWebHCatPig.groovy | 8 +- .../samples/ExampleWebHCatQueue.groovy | 6 +- .../samples/ExampleWebHCatSqoop.groovy | 8 +- .../resources/samples/ExampleWebHdfsLs.groovy | 6 +- .../samples/ExampleWebHdfsPutGet.groovy | 6 +- .../samples/SampleComplexCommand.groovy | 6 +- .../main/resources/samples/SampleScript.groovy | 4 +- .../main/resources/samples/SampleService.groovy | 2 +- .../samples/SampleSimpleCommand.groovy | 6 +- .../HiveJDBCSample.groovy | 2 +- .../groovy/jdbc/sandbox/HiveJDBCSample.groovy | 2 +- .../HiveJDBCSample.java | 2 +- .../hive/java/jdbc/sandbox/HiveJDBCSample.java | 2 +- .../samples/sandbox-with-knox-inside.xml | 4 +- .../apache/knox/gateway/SpiGatewayMessages.java | 2 +- .../knox/gateway/config/GatewayConfig.java | 2 +- .../ServiceDeploymentContributorBase.java | 2 +- .../knox/gateway/i18n/GatewaySpiMessages.java | 2 +- .../principal/SimplePrincipalMapper.java | 6 +- .../knox/gateway/services/GatewayServices.java | 4 +- .../token/impl/JWTProviderMessages.java | 2 +- .../gateway/topology/topology_binding-json.xml | 2 +- .../gateway/topology/topology_binding-xml.xml | 2 +- .../apache/knox/gateway/SecureClusterTest.java | 2 +- .../java/org/apache/knox/gateway/ShellTest.java | 2 +- .../knox/gateway/GatewayBasicFuncTest.java | 18 +- .../knox/gateway/GatewayHealthFuncTest.java | 2 +- .../GatewayPortMappingDisableFeatureTest.java | 2 +- .../gateway/GatewayPortMappingFuncTest.java | 2 +- .../TestJerseyServiceDeploymentContributor.java | 2 +- .../apache/knox/gateway/WebHdfsHaFuncTest.java | 2 +- .../deploy/DeploymentFactoryFuncTest.java | 194 +++++++++---------- .../src/test/resources/log4j.properties | 8 +- .../solr/query_response.xml | 20 -- .../gateway/GatewayBasicFuncTest/changes.txt | 2 +- .../solr/query_response.xml | 20 ++ gateway-test/src/test/resources/shiro.ini | 2 +- .../gateway/i18n/GatewayUtilCommonMessages.java | 2 +- .../knox/gateway/util/urltemplate/Messages.java | 2 +- .../util/urltemplate/MatcherTest.java.orig | 2 +- .../gateway/util/urltemplate/RewriterTest.java | 2 +- .../src/main/resources/META-INF/launcher.cfg | 2 +- 141 files changed, 345 insertions(+), 394 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/.gitignore ---------------------------------------------------------------------- diff --git a/.gitignore b/.gitignore index 61d27c8..b518a2f 100644 --- a/.gitignore +++ b/.gitignore @@ -31,7 +31,7 @@ target install patch candidate -org.apache.hadoop.gateway.security.EmbeddedApacheDirectoryServer/ +org.apache.knox.gateway.security.EmbeddedApacheDirectoryServer/ velocity.log *.pyc *.py~ http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-applications/src/main/resources/applications/knoxauth/app/redirecting.jsp ---------------------------------------------------------------------- diff --git a/gateway-applications/src/main/resources/applications/knoxauth/app/redirecting.jsp b/gateway-applications/src/main/resources/applications/knoxauth/app/redirecting.jsp index e3a0673..f9dc732 100644 --- a/gateway-applications/src/main/resources/applications/knoxauth/app/redirecting.jsp +++ b/gateway-applications/src/main/resources/applications/knoxauth/app/redirecting.jsp @@ -40,7 +40,7 @@ <script type="text/javascript" src="js/knoxauth.js"></script> <% - Topology topology = (Topology)request.getSession().getServletContext().getAttribute("org.apache.hadoop.gateway.topology"); + Topology topology = (Topology)request.getSession().getServletContext().getAttribute("org.apache.knox.gateway.topology"); String whitelist = null; Collection services = topology.getServices(); for (Object service : services) { http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-demo-ldap-launcher/src/main/resources/META-INF/launcher.cfg ---------------------------------------------------------------------- diff --git a/gateway-demo-ldap-launcher/src/main/resources/META-INF/launcher.cfg b/gateway-demo-ldap-launcher/src/main/resources/META-INF/launcher.cfg index 3a06075..35b32f3 100644 --- a/gateway-demo-ldap-launcher/src/main/resources/META-INF/launcher.cfg +++ b/gateway-demo-ldap-launcher/src/main/resources/META-INF/launcher.cfg @@ -12,6 +12,6 @@ # 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.hadoop.gateway.security.ldap.SimpleLdapDirectoryServer +main.class = org.apache.knox.gateway.security.ldap.SimpleLdapDirectoryServer class.path = ../lib/*.jar;../dep/*.jar;../ext;../ext/*.jar log4j.configuration=${launcher.dir}/../conf/${launcher.name}-log4j.properties http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-demo-ldap/pom.xml ---------------------------------------------------------------------- diff --git a/gateway-demo-ldap/pom.xml b/gateway-demo-ldap/pom.xml index a1ddba5..5936a20 100644 --- a/gateway-demo-ldap/pom.xml +++ b/gateway-demo-ldap/pom.xml @@ -52,7 +52,7 @@ </execution> </executions> <configuration> - <mainClass>org.apache.hadoop.gateway.security.EmbeddedApacheDirectoryServer</mainClass> + <mainClass>org.apache.knox.gateway.security.EmbeddedApacheDirectoryServer</mainClass> </configuration> </plugin> </plugins> @@ -74,7 +74,7 @@ <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"> <manifestEntries> - <Main-Class>org.apache.hadoop.gateway.security.EmbeddedApacheDirectoryServer + <Main-Class>org.apache.knox.gateway.security.EmbeddedApacheDirectoryServer </Main-Class> </manifestEntries> </transformer> http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-demo-ldap/src/main/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/gateway-demo-ldap/src/main/resources/log4j.properties b/gateway-demo-ldap/src/main/resources/log4j.properties index 40b5546..529380f 100644 --- a/gateway-demo-ldap/src/main/resources/log4j.properties +++ b/gateway-demo-ldap/src/main/resources/log4j.properties @@ -21,5 +21,5 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %-5p %m%n #log4j.logger.org.apache.directory=INFO -#log4j.logger.org.apache.hadoop.gateway=INFO -#log4j.logger.org.apache.hadoop.gateway=DEBUG \ No newline at end of file +#log4j.logger.org.apache.knox.gateway=INFO +#log4j.logger.org.apache.knox.gateway=DEBUG \ No newline at end of file http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/dispatch/i18n/HaDispatchMessages.java ---------------------------------------------------------------------- diff --git a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/dispatch/i18n/HaDispatchMessages.java b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/dispatch/i18n/HaDispatchMessages.java index 8efc773..c3bb50c 100644 --- a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/dispatch/i18n/HaDispatchMessages.java +++ b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/dispatch/i18n/HaDispatchMessages.java @@ -22,7 +22,7 @@ import org.apache.knox.gateway.i18n.messages.MessageLevel; import org.apache.knox.gateway.i18n.messages.Messages; import org.apache.knox.gateway.i18n.messages.StackTrace; -@Messages(logger = "org.apache.hadoop.gateway") +@Messages(logger = "org.apache.knox.gateway") public interface HaDispatchMessages { @Message(level = MessageLevel.INFO, text = "Initializing Ha Dispatch for: {0}") void initializingForResourceRole(String resourceRole); http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/i18n/HaMessages.java ---------------------------------------------------------------------- diff --git a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/i18n/HaMessages.java b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/i18n/HaMessages.java index 3848c46..018d5c6 100644 --- a/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/i18n/HaMessages.java +++ b/gateway-provider-ha/src/main/java/org/apache/knox/gateway/ha/provider/impl/i18n/HaMessages.java @@ -21,7 +21,7 @@ import org.apache.knox.gateway.i18n.messages.Message; import org.apache.knox.gateway.i18n.messages.MessageLevel; import org.apache.knox.gateway.i18n.messages.Messages; -@Messages(logger = "org.apache.hadoop.gateway") +@Messages(logger = "org.apache.knox.gateway") public interface HaMessages { @Message(level = MessageLevel.ERROR, text = "Failed to Write HA Descriptor: {0}") http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/IdentityAsserterMessages.java ---------------------------------------------------------------------- diff --git a/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/IdentityAsserterMessages.java b/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/IdentityAsserterMessages.java index e614c25..196e91e 100644 --- a/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/IdentityAsserterMessages.java +++ b/gateway-provider-identity-assertion-common/src/main/java/org/apache/knox/gateway/IdentityAsserterMessages.java @@ -22,7 +22,7 @@ import org.apache.knox.gateway.i18n.messages.MessageLevel; import org.apache.knox.gateway.i18n.messages.Messages; import org.apache.knox.gateway.i18n.messages.StackTrace; -@Messages(logger="org.apache.hadoop.gateway") +@Messages(logger="org.apache.knox.gateway") public interface IdentityAsserterMessages { @Message( level = MessageLevel.WARN, text = "Skipping unencodable parameter {0}={1}, {2}: {3}" ) http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-provider-identity-assertion-concat/src/main/java/org/apache/knox/gateway/ConcatIdentityAsserterMessages.java ---------------------------------------------------------------------- diff --git a/gateway-provider-identity-assertion-concat/src/main/java/org/apache/knox/gateway/ConcatIdentityAsserterMessages.java b/gateway-provider-identity-assertion-concat/src/main/java/org/apache/knox/gateway/ConcatIdentityAsserterMessages.java index a1d9db1..341e52d 100644 --- a/gateway-provider-identity-assertion-concat/src/main/java/org/apache/knox/gateway/ConcatIdentityAsserterMessages.java +++ b/gateway-provider-identity-assertion-concat/src/main/java/org/apache/knox/gateway/ConcatIdentityAsserterMessages.java @@ -22,7 +22,7 @@ import org.apache.knox.gateway.i18n.messages.MessageLevel; import org.apache.knox.gateway.i18n.messages.Messages; import org.apache.knox.gateway.i18n.messages.StackTrace; -@Messages(logger="org.apache.hadoop.gateway") +@Messages(logger="org.apache.knox.gateway") public interface ConcatIdentityAsserterMessages { @Message( level = MessageLevel.WARN, text = "Skipping unencodable parameter {0}={1}, {2}: {3}" ) http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-provider-identity-assertion-hadoop-groups/src/main/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderDeploymentContributor.java ---------------------------------------------------------------------- diff --git a/gateway-provider-identity-assertion-hadoop-groups/src/main/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderDeploymentContributor.java b/gateway-provider-identity-assertion-hadoop-groups/src/main/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderDeploymentContributor.java index d04713d..d9388a1 100644 --- a/gateway-provider-identity-assertion-hadoop-groups/src/main/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderDeploymentContributor.java +++ b/gateway-provider-identity-assertion-hadoop-groups/src/main/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderDeploymentContributor.java @@ -53,7 +53,7 @@ public class HadoopGroupProviderDeploymentContributor /* * (non-Javadoc) * - * @see org.apache.hadoop.gateway.identityasserter.common.filter. + * @see org.apache.knox.gateway.identityasserter.common.filter. * AbstractIdentityAsserterDeploymentContributor#getFilterClassname() */ @Override http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-provider-identity-assertion-hadoop-groups/src/main/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderMessages.java ---------------------------------------------------------------------- diff --git a/gateway-provider-identity-assertion-hadoop-groups/src/main/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderMessages.java b/gateway-provider-identity-assertion-hadoop-groups/src/main/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderMessages.java index 311b00a..c46a987 100644 --- a/gateway-provider-identity-assertion-hadoop-groups/src/main/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderMessages.java +++ b/gateway-provider-identity-assertion-hadoop-groups/src/main/java/org/apache/knox/gateway/identityasserter/hadoop/groups/filter/HadoopGroupProviderMessages.java @@ -28,7 +28,7 @@ import org.apache.knox.gateway.i18n.messages.StackTrace; * @since 0.11 */ -@Messages(logger="org.apache.hadoop.gateway") +@Messages(logger="org.apache.knox.gateway") public interface HadoopGroupProviderMessages { @Message( level = MessageLevel.ERROR, text = "Error getting groups for principal {0}" ) http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-provider-identity-assertion-pseudo/src/main/java/org/apache/knox/gateway/IdentityAsserterMessages.java ---------------------------------------------------------------------- diff --git a/gateway-provider-identity-assertion-pseudo/src/main/java/org/apache/knox/gateway/IdentityAsserterMessages.java b/gateway-provider-identity-assertion-pseudo/src/main/java/org/apache/knox/gateway/IdentityAsserterMessages.java index e614c25..196e91e 100644 --- a/gateway-provider-identity-assertion-pseudo/src/main/java/org/apache/knox/gateway/IdentityAsserterMessages.java +++ b/gateway-provider-identity-assertion-pseudo/src/main/java/org/apache/knox/gateway/IdentityAsserterMessages.java @@ -22,7 +22,7 @@ import org.apache.knox.gateway.i18n.messages.MessageLevel; import org.apache.knox.gateway.i18n.messages.Messages; import org.apache.knox.gateway.i18n.messages.StackTrace; -@Messages(logger="org.apache.hadoop.gateway") +@Messages(logger="org.apache.knox.gateway") public interface IdentityAsserterMessages { @Message( level = MessageLevel.WARN, text = "Skipping unencodable parameter {0}={1}, {2}: {3}" ) http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-provider-rewrite-func-hostmap-static/src/main/java/org/apache/knox/gateway/hostmap/impl/HostmapFunctionProcessor.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite-func-hostmap-static/src/main/java/org/apache/knox/gateway/hostmap/impl/HostmapFunctionProcessor.java b/gateway-provider-rewrite-func-hostmap-static/src/main/java/org/apache/knox/gateway/hostmap/impl/HostmapFunctionProcessor.java index 5b16b47..7fe9eef 100644 --- a/gateway-provider-rewrite-func-hostmap-static/src/main/java/org/apache/knox/gateway/hostmap/impl/HostmapFunctionProcessor.java +++ b/gateway-provider-rewrite-func-hostmap-static/src/main/java/org/apache/knox/gateway/hostmap/impl/HostmapFunctionProcessor.java @@ -74,10 +74,10 @@ public class HostmapFunctionProcessor result = new ArrayList<String>( parameters.size() ); for( String parameter : parameters ) { switch( context.getDirection() ) { - case UrlRewriter.Direction.IN: + case IN: parameter = hostMapper.resolveInboundHostName( parameter ); break; - case UrlRewriter.Direction.OUT: + case OUT: parameter = hostMapper.resolveOutboundHostName( parameter ); break; } http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServiceMappedHostFunctionProcessor.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServiceMappedHostFunctionProcessor.java b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServiceMappedHostFunctionProcessor.java index 39c162c..e12dc62 100644 --- a/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServiceMappedHostFunctionProcessor.java +++ b/gateway-provider-rewrite-func-service-registry/src/main/java/org/apache/knox/gateway/svcregfunc/impl/ServiceMappedHostFunctionProcessor.java @@ -66,10 +66,10 @@ public class ServiceMappedHostFunctionProcessor String hostStr = host.getFirstValue().getPattern(); if( hostmap != null ) { switch( context.getDirection() ) { - case UrlRewriter.Direction.IN: + case IN: parameter = hostmap.resolveInboundHostName( hostStr ); break; - case UrlRewriter.Direction.OUT: + case OUT: parameter = hostmap.resolveOutboundHostName( hostStr ); break; } http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-provider-rewrite-step-encrypt-uri/src/main/java/org/apache/knox/gateway/encrypturi/EncryptUriMessages.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite-step-encrypt-uri/src/main/java/org/apache/knox/gateway/encrypturi/EncryptUriMessages.java b/gateway-provider-rewrite-step-encrypt-uri/src/main/java/org/apache/knox/gateway/encrypturi/EncryptUriMessages.java index afcc384..37c7fbc 100644 --- a/gateway-provider-rewrite-step-encrypt-uri/src/main/java/org/apache/knox/gateway/encrypturi/EncryptUriMessages.java +++ b/gateway-provider-rewrite-step-encrypt-uri/src/main/java/org/apache/knox/gateway/encrypturi/EncryptUriMessages.java @@ -22,7 +22,7 @@ import org.apache.knox.gateway.i18n.messages.MessageLevel; import org.apache.knox.gateway.i18n.messages.Messages; import org.apache.knox.gateway.i18n.messages.StackTrace; -@Messages(logger="org.apache.hadoop.gateway.encrypturi") +@Messages(logger="org.apache.knox.gateway.encrypturi") public interface EncryptUriMessages { @Message( level = MessageLevel.ERROR, text = "Failed to create or verify the presence of a password for URL encryption: {0}" ) http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/knox/gateway/securequery/SecureQueryMessages.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/knox/gateway/securequery/SecureQueryMessages.java b/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/knox/gateway/securequery/SecureQueryMessages.java index 62f0e9f..2375011 100644 --- a/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/knox/gateway/securequery/SecureQueryMessages.java +++ b/gateway-provider-rewrite-step-secure-query/src/main/java/org/apache/knox/gateway/securequery/SecureQueryMessages.java @@ -22,7 +22,7 @@ import org.apache.knox.gateway.i18n.messages.MessageLevel; import org.apache.knox.gateway.i18n.messages.Messages; import org.apache.knox.gateway.i18n.messages.StackTrace; -@Messages(logger="org.apache.hadoop.gateway.securequery") +@Messages(logger="org.apache.knox.gateway.securequery") public interface SecureQueryMessages { @Message( level = MessageLevel.ERROR, text = "Failed to create or verify the presence of a password for query string encryption: {0}" ) http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/i18n/UrlRewriteMessages.java ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/i18n/UrlRewriteMessages.java b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/i18n/UrlRewriteMessages.java index 35247c9..ad8b60e 100644 --- a/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/i18n/UrlRewriteMessages.java +++ b/gateway-provider-rewrite/src/main/java/org/apache/knox/gateway/filter/rewrite/i18n/UrlRewriteMessages.java @@ -25,7 +25,7 @@ import org.apache.knox.gateway.i18n.messages.Messages; import org.apache.knox.gateway.i18n.messages.StackTrace; import org.apache.knox.gateway.util.urltemplate.Template; -@Messages(logger="org.apache.hadoop.gateway") +@Messages(logger="org.apache.knox.gateway") public interface UrlRewriteMessages { @Message( level = MessageLevel.DEBUG, text = "Failed to parse value as URL: {0}" ) http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-provider-rewrite/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/gateway-provider-rewrite/src/test/resources/log4j.properties b/gateway-provider-rewrite/src/test/resources/log4j.properties index c2cbce6..be84440 100644 --- a/gateway-provider-rewrite/src/test/resources/log4j.properties +++ b/gateway-provider-rewrite/src/test/resources/log4j.properties @@ -22,10 +22,10 @@ log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%5p [%c] %m%n -#log4j.logger.org.apache.hadoop.gateway=DEBUG -#log4j.logger.org.apache.hadoop.gateway.http=TRACE -#log4j.logger.org.apache.hadoop.gateway.http.request.body=OFF -#log4j.logger.org.apache.hadoop.gateway.http.response.body=OFF +#log4j.logger.org.apache.knox.gateway=DEBUG +#log4j.logger.org.apache.knox.gateway.http=TRACE +#log4j.logger.org.apache.knox.gateway.http.request.body=OFF +#log4j.logger.org.apache.knox.gateway.http.response.body=OFF #log4j.logger.org.apache.directory=DEBUG #log4j.logger.org.eclipse.jetty=DEBUG http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-provider-security-authc-anon/src/main/java/org/apache/knox/gateway/deploy/AnonymousAuthDeploymentContributor.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-authc-anon/src/main/java/org/apache/knox/gateway/deploy/AnonymousAuthDeploymentContributor.java b/gateway-provider-security-authc-anon/src/main/java/org/apache/knox/gateway/deploy/AnonymousAuthDeploymentContributor.java index e0c0609..533064e 100755 --- a/gateway-provider-security-authc-anon/src/main/java/org/apache/knox/gateway/deploy/AnonymousAuthDeploymentContributor.java +++ b/gateway-provider-security-authc-anon/src/main/java/org/apache/knox/gateway/deploy/AnonymousAuthDeploymentContributor.java @@ -32,7 +32,7 @@ public class AnonymousAuthDeploymentContributor extends ProviderDeploymentContri private static final String ROLE = "authentication"; private static final String NAME = "Anonymous"; - private static final String FILTER_CLASSNAME = "AnonymousAuthFilter"; + private static final String FILTER_CLASSNAME = "org.apache.knox.gateway.filter.AnonymousAuthFilter"; @Override public String getRole() { http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-provider-security-authz-acls/src/main/java/org/apache/knox/gateway/deploy/impl/AclsAuthzDeploymentContributor.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-authz-acls/src/main/java/org/apache/knox/gateway/deploy/impl/AclsAuthzDeploymentContributor.java b/gateway-provider-security-authz-acls/src/main/java/org/apache/knox/gateway/deploy/impl/AclsAuthzDeploymentContributor.java index fc5e549..e15ddfe 100644 --- a/gateway-provider-security-authz-acls/src/main/java/org/apache/knox/gateway/deploy/impl/AclsAuthzDeploymentContributor.java +++ b/gateway-provider-security-authz-acls/src/main/java/org/apache/knox/gateway/deploy/impl/AclsAuthzDeploymentContributor.java @@ -31,7 +31,7 @@ import java.util.Map.Entry; public class AclsAuthzDeploymentContributor extends ProviderDeploymentContributorBase { - private static final String FILTER_CLASSNAME = "AclsAuthorizationFilter"; + private static final String FILTER_CLASSNAME = "org.apache.knox.gateway.filter.AclsAuthorizationFilter"; @Override public String getRole() { http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-provider-security-authz-acls/src/main/java/org/apache/knox/gateway/filter/AclsAuthorizationMessages.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-authz-acls/src/main/java/org/apache/knox/gateway/filter/AclsAuthorizationMessages.java b/gateway-provider-security-authz-acls/src/main/java/org/apache/knox/gateway/filter/AclsAuthorizationMessages.java index 206348d..7104443 100644 --- a/gateway-provider-security-authz-acls/src/main/java/org/apache/knox/gateway/filter/AclsAuthorizationMessages.java +++ b/gateway-provider-security-authz-acls/src/main/java/org/apache/knox/gateway/filter/AclsAuthorizationMessages.java @@ -21,7 +21,7 @@ import org.apache.knox.gateway.i18n.messages.Message; import org.apache.knox.gateway.i18n.messages.MessageLevel; import org.apache.knox.gateway.i18n.messages.Messages; -@Messages(logger="org.apache.hadoop.gateway") +@Messages(logger="org.apache.knox.gateway") public interface AclsAuthorizationMessages { @Message( level = MessageLevel.INFO, text = "Initializing AclsAuthz Provider for: {0}" ) http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-provider-security-hadoopauth/src/main/java/org/apache/knox/gateway/hadoopauth/HadoopAuthMessages.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-hadoopauth/src/main/java/org/apache/knox/gateway/hadoopauth/HadoopAuthMessages.java b/gateway-provider-security-hadoopauth/src/main/java/org/apache/knox/gateway/hadoopauth/HadoopAuthMessages.java index 6141686..57755a5 100755 --- a/gateway-provider-security-hadoopauth/src/main/java/org/apache/knox/gateway/hadoopauth/HadoopAuthMessages.java +++ b/gateway-provider-security-hadoopauth/src/main/java/org/apache/knox/gateway/hadoopauth/HadoopAuthMessages.java @@ -21,7 +21,7 @@ import org.apache.knox.gateway.i18n.messages.Message; import org.apache.knox.gateway.i18n.messages.MessageLevel; import org.apache.knox.gateway.i18n.messages.Messages; -@Messages(logger="org.apache.hadoop.gateway.provider.global.hadoopauth") +@Messages(logger="org.apache.knox.gateway.provider.global.hadoopauth") public interface HadoopAuthMessages { @Message( level = MessageLevel.INFO, text = "Initializing Hadoop Auth Property, name: {0}, value: {1}" ) http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/JWTMessages.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/JWTMessages.java b/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/JWTMessages.java index 39df1bb..e1e0dcb 100644 --- a/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/JWTMessages.java +++ b/gateway-provider-security-jwt/src/main/java/org/apache/knox/gateway/provider/federation/jwt/JWTMessages.java @@ -23,7 +23,7 @@ import org.apache.knox.gateway.i18n.messages.MessageLevel; import org.apache.knox.gateway.i18n.messages.Messages; import org.apache.knox.gateway.i18n.messages.StackTrace; -@Messages(logger="org.apache.hadoop.gateway.provider.federation.jwt") +@Messages(logger="org.apache.knox.gateway.provider.federation.jwt") public interface JWTMessages { @Message( level = MessageLevel.WARN, text = "Failed to validate the audience attribute." ) void failedToValidateAudience(); http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/Pac4jMessages.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/Pac4jMessages.java b/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/Pac4jMessages.java index 32e07e6..78b3c56 100644 --- a/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/Pac4jMessages.java +++ b/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/Pac4jMessages.java @@ -26,7 +26,7 @@ import org.apache.knox.gateway.i18n.messages.Messages; * * @since 0.8.0 */ -@Messages(logger="org.apache.hadoop.gateway.pac4j") +@Messages(logger="org.apache.knox.gateway.pac4j") public interface Pac4jMessages { @Message( level = MessageLevel.ERROR, text = "pac4j callback URL required") http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/filter/Pac4jIdentityAdapter.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/filter/Pac4jIdentityAdapter.java b/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/filter/Pac4jIdentityAdapter.java index 87d0e8e..90395f1 100644 --- a/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/filter/Pac4jIdentityAdapter.java +++ b/gateway-provider-security-pac4j/src/main/java/org/apache/knox/gateway/pac4j/filter/Pac4jIdentityAdapter.java @@ -17,16 +17,15 @@ */ package org.apache.knox.gateway.pac4j.filter; -import org.apache.hadoop.gateway.audit.api.*; import org.apache.knox.gateway.audit.api.Action; import org.apache.knox.gateway.audit.api.ActionOutcome; +import org.apache.knox.gateway.audit.api.AuditService; +import org.apache.knox.gateway.audit.api.AuditServiceFactory; import org.apache.knox.gateway.audit.api.Auditor; import org.apache.knox.gateway.audit.api.ResourceType; import org.apache.knox.gateway.audit.log4j.audit.AuditConstants; import org.apache.knox.gateway.filter.AbstractGatewayFilter; import org.apache.knox.gateway.security.PrimaryPrincipal; -import org.apache.knox.gateway.audit.api.AuditService; -import org.apache.knox.gateway.audit.api.AuditServiceFactory; import org.pac4j.core.config.ConfigSingleton; import org.pac4j.core.context.J2EContext; import org.pac4j.core.profile.ProfileManager; @@ -35,7 +34,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import javax.security.auth.Subject; -import javax.servlet.*; +import javax.servlet.Filter; +import javax.servlet.FilterChain; +import javax.servlet.FilterConfig; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-provider-security-picketlink/src/main/java/org/apache/knox/gateway/picketlink/PicketlinkMessages.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-picketlink/src/main/java/org/apache/knox/gateway/picketlink/PicketlinkMessages.java b/gateway-provider-security-picketlink/src/main/java/org/apache/knox/gateway/picketlink/PicketlinkMessages.java index bcb347c..86f2854 100644 --- a/gateway-provider-security-picketlink/src/main/java/org/apache/knox/gateway/picketlink/PicketlinkMessages.java +++ b/gateway-provider-security-picketlink/src/main/java/org/apache/knox/gateway/picketlink/PicketlinkMessages.java @@ -22,7 +22,7 @@ import org.apache.knox.gateway.i18n.messages.MessageLevel; import org.apache.knox.gateway.i18n.messages.Messages; import org.apache.knox.gateway.i18n.messages.StackTrace; -@Messages(logger="org.apache.hadoop.gateway.picketlink") +@Messages(logger="org.apache.knox.gateway.picketlink") public interface PicketlinkMessages { @Message( level = MessageLevel.DEBUG, text = "Found Original URL in reequest: {0}") http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/PreAuthMessages.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/PreAuthMessages.java b/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/PreAuthMessages.java index dfe4ca9..adcc5e2 100644 --- a/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/PreAuthMessages.java +++ b/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/PreAuthMessages.java @@ -19,6 +19,6 @@ package org.apache.knox.gateway.preauth; import org.apache.knox.gateway.i18n.messages.Messages; -@Messages(logger="org.apache.hadoop.gateway.provider.global.csrf") +@Messages(logger="org.apache.knox.gateway.provider.global.csrf") public interface PreAuthMessages { } http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/deploy/HeaderPreAuthContributor.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/deploy/HeaderPreAuthContributor.java b/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/deploy/HeaderPreAuthContributor.java index 2a5cebd..e9177e8 100644 --- a/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/deploy/HeaderPreAuthContributor.java +++ b/gateway-provider-security-preauth/src/main/java/org/apache/knox/gateway/preauth/deploy/HeaderPreAuthContributor.java @@ -33,7 +33,7 @@ public class HeaderPreAuthContributor extends ProviderDeploymentContributorBase { private static final String ROLE = "federation"; private static final String NAME = "HeaderPreAuth"; - private static final String PREAUTH_FILTER_CLASSNAME = "HeaderPreAuthFederationFilter"; + private static final String PREAUTH_FILTER_CLASSNAME = "org.apache.knox.gateway.preauth.filter.HeaderPreAuthFederationFilter"; @Override public String getRole() { http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-provider-security-preauth/src/test/java/org/apache/knox/gateway/provider/federation/HeaderPreAuthFederationFilterTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-preauth/src/test/java/org/apache/knox/gateway/provider/federation/HeaderPreAuthFederationFilterTest.java b/gateway-provider-security-preauth/src/test/java/org/apache/knox/gateway/provider/federation/HeaderPreAuthFederationFilterTest.java index efa0774..79e6fe8 100644 --- a/gateway-provider-security-preauth/src/test/java/org/apache/knox/gateway/provider/federation/HeaderPreAuthFederationFilterTest.java +++ b/gateway-provider-security-preauth/src/test/java/org/apache/knox/gateway/provider/federation/HeaderPreAuthFederationFilterTest.java @@ -18,7 +18,7 @@ package org.apache.knox.gateway.provider.federation; import junit.framework.TestCase; -import org.apache.hadoop.gateway.preauth.filter.*; +import org.apache.knox.gateway.preauth.filter.*; import org.apache.knox.gateway.preauth.filter.DefaultValidator; import org.apache.knox.gateway.preauth.filter.HeaderPreAuthFederationFilter; import org.apache.knox.gateway.preauth.filter.IPValidator; http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-provider-security-preauth/src/test/java/org/apache/knox/gateway/provider/federation/PreAuthServiceTest.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-preauth/src/test/java/org/apache/knox/gateway/provider/federation/PreAuthServiceTest.java b/gateway-provider-security-preauth/src/test/java/org/apache/knox/gateway/provider/federation/PreAuthServiceTest.java index 5a5cced..bf023e7 100644 --- a/gateway-provider-security-preauth/src/test/java/org/apache/knox/gateway/provider/federation/PreAuthServiceTest.java +++ b/gateway-provider-security-preauth/src/test/java/org/apache/knox/gateway/provider/federation/PreAuthServiceTest.java @@ -18,7 +18,7 @@ package org.apache.knox.gateway.provider.federation; import junit.framework.TestCase; -import org.apache.hadoop.gateway.preauth.filter.*; +import org.apache.knox.gateway.preauth.filter.*; import org.apache.knox.gateway.preauth.filter.DefaultValidator; import org.apache.knox.gateway.preauth.filter.IPValidator; import org.apache.knox.gateway.preauth.filter.PreAuthService; http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/deploy/impl/ShiroDeploymentContributor.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/deploy/impl/ShiroDeploymentContributor.java b/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/deploy/impl/ShiroDeploymentContributor.java index 111b13b..26e6deb 100644 --- a/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/deploy/impl/ShiroDeploymentContributor.java +++ b/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/deploy/impl/ShiroDeploymentContributor.java @@ -37,9 +37,9 @@ public class ShiroDeploymentContributor extends ProviderDeploymentContributorBas private static final String LISTENER_CLASSNAME = "org.apache.shiro.web.env.EnvironmentLoaderListener"; private static final String SHIRO_FILTER_CLASSNAME = "org.apache.shiro.web.servlet.ShiroFilter"; - private static final String POST_FILTER_CLASSNAME = "ShiroSubjectIdentityAdapter"; - private static final String COOKIE_FILTER_CLASSNAME = "ResponseCookieFilter"; - private static final String REDIRECT_FILTER_CLASSNAME = "RedirectToUrlFilter"; + private static final String POST_FILTER_CLASSNAME = "org.apache.knox.gateway.filter.ShiroSubjectIdentityAdapter"; + private static final String COOKIE_FILTER_CLASSNAME = "org.apache.knox.gateway.filter.ResponseCookieFilter"; + private static final String REDIRECT_FILTER_CLASSNAME = "org.apache.knox.gateway.filter.RedirectToUrlFilter"; private static final String SESSION_TIMEOUT = "sessionTimeout"; private static final String REMEMBER_ME = "rememberme"; private static final String SHRIO_CONFIG_FILE_NAME = "shiro.ini"; http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/impl/i18n/KnoxShiroMessages.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/impl/i18n/KnoxShiroMessages.java b/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/impl/i18n/KnoxShiroMessages.java index 736a544..fb5bba2 100644 --- a/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/impl/i18n/KnoxShiroMessages.java +++ b/gateway-provider-security-shiro/src/main/java/org/apache/knox/gateway/shirorealm/impl/i18n/KnoxShiroMessages.java @@ -26,7 +26,7 @@ import org.apache.knox.gateway.i18n.messages.StackTrace; import org.apache.shiro.authc.AuthenticationToken; import org.apache.shiro.subject.Subject; -@Messages(logger = "org.apache.hadoop.gateway") +@Messages(logger = "org.apache.knox.gateway") public interface KnoxShiroMessages { @Message(level = MessageLevel.ERROR, text = "Shiro unable to login: {0}") http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/WebAppSecMessages.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/WebAppSecMessages.java b/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/WebAppSecMessages.java index 8ea2467..0f70b66 100644 --- a/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/WebAppSecMessages.java +++ b/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/WebAppSecMessages.java @@ -19,6 +19,6 @@ package org.apache.knox.gateway.webappsec; import org.apache.knox.gateway.i18n.messages.Messages; -@Messages(logger="org.apache.hadoop.gateway.provider.global.csrf") +@Messages(logger="org.apache.knox.gateway.provider.global.csrf") public interface WebAppSecMessages { } http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/deploy/WebAppSecContributor.java ---------------------------------------------------------------------- diff --git a/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/deploy/WebAppSecContributor.java b/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/deploy/WebAppSecContributor.java index 57d76fa..383dffe 100644 --- a/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/deploy/WebAppSecContributor.java +++ b/gateway-provider-security-webappsec/src/main/java/org/apache/knox/gateway/webappsec/deploy/WebAppSecContributor.java @@ -34,15 +34,16 @@ public class WebAppSecContributor extends private static final String ROLE = "webappsec"; private static final String NAME = "WebAppSec"; private static final String CSRF_SUFFIX = "_CSRF"; - private static final String CSRF_FILTER_CLASSNAME = "CSRFPreventionFilter"; + private static final String CSRF_FILTER_CLASSNAME = "org.apache.knox.gateway.webappsec.filter.CSRFPreventionFilter"; private static final String CSRF_ENABLED = "csrf.enabled"; private static final String CORS_SUFFIX = "_CORS"; private static final String CORS_FILTER_CLASSNAME = "com.thetransactioncompany.cors.CORSFilter"; private static final String CORS_ENABLED = "cors.enabled"; private static final String XFRAME_OPTIONS_SUFFIX = "_XFRAMEOPTIONS"; - private static final String XFRAME_OPTIONS_FILTER_CLASSNAME = "XFrameOptionsFilter"; + private static final String XFRAME_OPTIONS_FILTER_CLASSNAME = "org.apache.knox.gateway.webappsec.filter.XFrameOptionsFilter"; private static final String XFRAME_OPTIONS_ENABLED = "xframe.options.enabled"; + @Override public String getRole() { return ROLE; http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-release/home/conf/gateway-log4j.properties ---------------------------------------------------------------------- diff --git a/gateway-release/home/conf/gateway-log4j.properties b/gateway-release/home/conf/gateway-log4j.properties index 85c623e..ece2fbb 100644 --- a/gateway-release/home/conf/gateway-log4j.properties +++ b/gateway-release/home/conf/gateway-log4j.properties @@ -20,8 +20,8 @@ app.audit.file=${launcher.name}-audit.log log4j.rootLogger=ERROR, drfa -log4j.logger.org.apache.hadoop.gateway=INFO -#log4j.logger.org.apache.hadoop.gateway=DEBUG +log4j.logger.org.apache.knox.gateway=INFO +#log4j.logger.org.apache.knox.gateway=DEBUG #log4j.logger.org.eclipse.jetty=DEBUG #log4j.logger.org.apache.shiro=DEBUG @@ -47,15 +47,15 @@ log4j.appender.auditfile.Append = true log4j.appender.auditfile.DatePattern = '.'yyyy-MM-dd log4j.appender.auditfile.layout = org.apache.knox.gateway.audit.log4j.layout.AuditLayout -#log4j.logger.org.apache.hadoop.gateway.access=TRACE,httpaccess -#log4j.additivity.org.apache.hadoop.gateway.access=false +#log4j.logger.org.apache.knox.gateway.access=TRACE,httpaccess +#log4j.additivity.org.apache.knox.gateway.access=false -#log4j.logger.org.apache.hadoop.gateway.http=TRACE,httpserver -#log4j.additivity.org.apache.hadoop.gateway.http=false -##log4j.logger.org.apache.hadoop.gateway.http.request.headers=OFF -##log4j.logger.org.apache.hadoop.gateway.http.response.headers=OFF -##log4j.logger.org.apache.hadoop.gateway.http.request.body=OFF -##log4j.logger.org.apache.hadoop.gateway.http.response.body=OFF +#log4j.logger.org.apache.knox.gateway.http=TRACE,httpserver +#log4j.additivity.org.apache.knox.gateway.http=false +##log4j.logger.org.apache.knox.gateway.http.request.headers=OFF +##log4j.logger.org.apache.knox.gateway.http.response.headers=OFF +##log4j.logger.org.apache.knox.gateway.http.request.body=OFF +##log4j.logger.org.apache.knox.gateway.http.response.body=OFF #log4j.logger.org.apache.http.wire=DEBUG,httpclient #log4j.additivity.org.apache.http.wire=false http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-release/home/conf/knoxcli-log4j.properties ---------------------------------------------------------------------- diff --git a/gateway-release/home/conf/knoxcli-log4j.properties b/gateway-release/home/conf/knoxcli-log4j.properties index c7fab24..4a8317e 100644 --- a/gateway-release/home/conf/knoxcli-log4j.properties +++ b/gateway-release/home/conf/knoxcli-log4j.properties @@ -19,8 +19,8 @@ app.log.file=${launcher.name}.log log4j.rootLogger=ERROR, drfa -log4j.logger.org.apache.hadoop.gateway=INFO -#log4j.logger.org.apache.hadoop.gateway=DEBUG +log4j.logger.org.apache.knox.gateway=INFO +#log4j.logger.org.apache.knox.gateway=DEBUG log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-server-launcher/src/main/resources/META-INF/launcher.cfg ---------------------------------------------------------------------- diff --git a/gateway-server-launcher/src/main/resources/META-INF/launcher.cfg b/gateway-server-launcher/src/main/resources/META-INF/launcher.cfg index fd22919..c866c62 100644 --- a/gateway-server-launcher/src/main/resources/META-INF/launcher.cfg +++ b/gateway-server-launcher/src/main/resources/META-INF/launcher.cfg @@ -12,7 +12,7 @@ # 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.hadoop.gateway.GatewayServer +main.class = org.apache.knox.gateway.GatewayServer class.path = ../conf;../lib/*.jar;../dep/*.jar;../ext;../ext/*.jar GATEWAY_HOME=${launcher.dir}/.. log4j.configuration=${GATEWAY_HOME}/conf/${launcher.name}-log4j.properties http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-server/src/main/java/org/apache/hadoop/gateway/services/metrics/impl/instr/InstrUtils.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/hadoop/gateway/services/metrics/impl/instr/InstrUtils.java b/gateway-server/src/main/java/org/apache/hadoop/gateway/services/metrics/impl/instr/InstrUtils.java deleted file mode 100644 index 20e359b..0000000 --- a/gateway-server/src/main/java/org/apache/hadoop/gateway/services/metrics/impl/instr/InstrUtils.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 - * <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.services.metrics.impl.instr; - -import com.google.common.base.Strings; - -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -public class InstrUtils { - - //This regular expression pattern is used to parse the *first* two elements - //of a path. For example, if the path is â/webhdfs/v1/d1/d2/d2/d4â, this pattern - //can be used to get the first two ("/webhdfs/v1/"). The "?" in pattern - //ensures not to be greedy in matching. - private static Pattern p = Pattern.compile("/.*?/.*?/"); - - /** - * This function parses the pathinfo provided in any servlet context and - * returns the segment that is related to the resource. - * For example, if the path is "/webhdfs/v1/d1/d2/d2/d4". it returns "/webhdfs/v1" - * - * @param fullPath - * @return - */ - public static String getResourcePath(String fullPath) { - String resourcePath = ""; - if (!Strings.isNullOrEmpty(fullPath)) { - Matcher m = p.matcher(fullPath); - if (m.find()) { - resourcePath = m.group(0); - } else { - resourcePath = fullPath; - } - } - return resourcePath; - } - -} http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-server/src/main/java/org/apache/knox/gateway/GatewayMessages.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/GatewayMessages.java b/gateway-server/src/main/java/org/apache/knox/gateway/GatewayMessages.java index 8fef9bb..66828cd 100644 --- a/gateway-server/src/main/java/org/apache/knox/gateway/GatewayMessages.java +++ b/gateway-server/src/main/java/org/apache/knox/gateway/GatewayMessages.java @@ -33,7 +33,7 @@ import java.util.Set; /** * */ -@Messages(logger="org.apache.hadoop.gateway") +@Messages(logger="org.apache.knox.gateway") public interface GatewayMessages { @Message( level = MessageLevel.FATAL, text = "Failed to parse command line: {0}" ) http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-server/src/main/java/org/apache/knox/gateway/deploy/impl/ServiceDefinitionDeploymentContributor.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/deploy/impl/ServiceDefinitionDeploymentContributor.java b/gateway-server/src/main/java/org/apache/knox/gateway/deploy/impl/ServiceDefinitionDeploymentContributor.java index 322bb08..9ac71bd 100644 --- a/gateway-server/src/main/java/org/apache/knox/gateway/deploy/impl/ServiceDefinitionDeploymentContributor.java +++ b/gateway-server/src/main/java/org/apache/knox/gateway/deploy/impl/ServiceDefinitionDeploymentContributor.java @@ -56,7 +56,7 @@ public class ServiceDefinitionDeploymentContributor extends ServiceDeploymentCon private static final String XFORWARDED_FILTER_ROLE = "xforwardedheaders"; - private static final String DEFAULT_HA_DISPATCH_CLASS = "org.apache.hadoop.gateway.ha.dispatch.DefaultHaDispatch"; + private static final String DEFAULT_HA_DISPATCH_CLASS = "org.apache.knox.gateway.ha.dispatch.DefaultHaDispatch"; private static final String COOKIE_SCOPING_FILTER_NAME = "CookieScopeServletFilter"; http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-server/src/main/java/org/apache/knox/gateway/services/CLIGatewayServices.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/services/CLIGatewayServices.java b/gateway-server/src/main/java/org/apache/knox/gateway/services/CLIGatewayServices.java index 49664b1..3f29930 100644 --- a/gateway-server/src/main/java/org/apache/knox/gateway/services/CLIGatewayServices.java +++ b/gateway-server/src/main/java/org/apache/knox/gateway/services/CLIGatewayServices.java @@ -98,7 +98,7 @@ public class CLIGatewayServices implements GatewayServices { } /* (non-Javadoc) - * @see org.apache.hadoop.gateway.GatewayServices#getServiceNames() + * @see org.apache.knox.gateway.GatewayServices#getServiceNames() */ @Override public Collection<String> getServiceNames() { @@ -106,7 +106,7 @@ public class CLIGatewayServices implements GatewayServices { } /* (non-Javadoc) - * @see org.apache.hadoop.gateway.GatewayServices#getService(java.lang.String) + * @see org.apache.knox.gateway.GatewayServices#getService(java.lang.String) */ @Override public <T> T getService(String serviceName) { http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-server/src/main/java/org/apache/knox/gateway/services/DefaultGatewayServices.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/services/DefaultGatewayServices.java b/gateway-server/src/main/java/org/apache/knox/gateway/services/DefaultGatewayServices.java index 894f993..09c0505 100644 --- a/gateway-server/src/main/java/org/apache/knox/gateway/services/DefaultGatewayServices.java +++ b/gateway-server/src/main/java/org/apache/knox/gateway/services/DefaultGatewayServices.java @@ -163,7 +163,7 @@ public class DefaultGatewayServices implements GatewayServices { } /* (non-Javadoc) - * @see org.apache.hadoop.gateway.GatewayServices#getServiceNames() + * @see org.apache.knox.gateway.GatewayServices#getServiceNames() */ @Override public Collection<String> getServiceNames() { @@ -171,7 +171,7 @@ public class DefaultGatewayServices implements GatewayServices { } /* (non-Javadoc) - * @see org.apache.hadoop.gateway.GatewayServices#getService(java.lang.String) + * @see org.apache.knox.gateway.GatewayServices#getService(java.lang.String) */ @Override public <T> T getService(String serviceName) { http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-server/src/main/java/org/apache/knox/gateway/services/GatewayServicesContextListener.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/services/GatewayServicesContextListener.java b/gateway-server/src/main/java/org/apache/knox/gateway/services/GatewayServicesContextListener.java index 96771fa..ec94a09 100644 --- a/gateway-server/src/main/java/org/apache/knox/gateway/services/GatewayServicesContextListener.java +++ b/gateway-server/src/main/java/org/apache/knox/gateway/services/GatewayServicesContextListener.java @@ -30,10 +30,10 @@ public class GatewayServicesContextListener implements ServletContextListener { public void contextInitialized(ServletContextEvent sce) { GatewayServices gs = GatewayServer.getGatewayServices(); sce.getServletContext().setAttribute(GatewayServices.GATEWAY_SERVICES_ATTRIBUTE, gs); - String topologyName = (String) sce.getServletContext().getAttribute("org.apache.hadoop.gateway.gateway.cluster"); + String topologyName = (String) sce.getServletContext().getAttribute("org.apache.knox.gateway.gateway.cluster"); TopologyService ts = gs.getService(GatewayServices.TOPOLOGY_SERVICE); Topology topology = getTopology(ts, topologyName); - sce.getServletContext().setAttribute("org.apache.hadoop.gateway.topology", topology); + sce.getServletContext().setAttribute("org.apache.knox.gateway.topology", topology); } private Topology getTopology(TopologyService ts, String topologyName) { http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-server/src/main/java/org/apache/knox/gateway/services/hostmap/impl/DefaultHostMapperService.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/services/hostmap/impl/DefaultHostMapperService.java b/gateway-server/src/main/java/org/apache/knox/gateway/services/hostmap/impl/DefaultHostMapperService.java index 6a53483..22df1e8 100644 --- a/gateway-server/src/main/java/org/apache/knox/gateway/services/hostmap/impl/DefaultHostMapperService.java +++ b/gateway-server/src/main/java/org/apache/knox/gateway/services/hostmap/impl/DefaultHostMapperService.java @@ -55,7 +55,7 @@ public class DefaultHostMapperService implements HostMapperService { } /* (non-Javadoc) - * @see org.apache.hadoop.gateway.services.hostmap.HostMappingService#getHostMapper(java.lang.String) + * @see org.apache.knox.gateway.services.hostmap.HostMappingService#getHostMapper(java.lang.String) */ @Override public HostMapper getHostMapper( String clusterName ) { @@ -63,7 +63,7 @@ public class DefaultHostMapperService implements HostMapperService { } /* (non-Javadoc) - * @see org.apache.hadoop.gateway.services.hostmap.HostMappingService#registerHostMapperForCluster(java.lang.String, HostMapper) + * @see org.apache.knox.gateway.services.hostmap.HostMappingService#registerHostMapperForCluster(java.lang.String, HostMapper) */ @Override public void registerHostMapperForCluster( String clusterName, HostMapper hostMapper ) { @@ -71,7 +71,7 @@ public class DefaultHostMapperService implements HostMapperService { } /* (non-Javadoc) - * @see org.apache.hadoop.gateway.services.hostmap.HostMappingService#removeHostMapperForCluster(java.lang.String) + * @see org.apache.knox.gateway.services.hostmap.HostMappingService#removeHostMapperForCluster(java.lang.String) */ @Override public void removeHostMapperForCluster( String clusterName ) { http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/DefaultAliasService.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/DefaultAliasService.java b/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/DefaultAliasService.java index 9c7121a..f52a7b3 100644 --- a/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/DefaultAliasService.java +++ b/gateway-server/src/main/java/org/apache/knox/gateway/services/security/impl/DefaultAliasService.java @@ -73,7 +73,7 @@ public class DefaultAliasService implements AliasService { } /* (non-Javadoc) - * @see org.apache.hadoop.gateway.services.security.impl.AliasService#getAliasForCluster(java.lang.String, java.lang.String) + * @see org.apache.knox.gateway.services.security.impl.AliasService#getAliasForCluster(java.lang.String, java.lang.String) */ @Override public char[] getPasswordFromAliasForCluster(String clusterName, String alias) @@ -82,7 +82,7 @@ public class DefaultAliasService implements AliasService { } /* (non-Javadoc) - * @see org.apache.hadoop.gateway.services.security.impl.AliasService#getAliasForCluster(java.lang.String, java.lang.String, boolean) + * @see org.apache.knox.gateway.services.security.impl.AliasService#getAliasForCluster(java.lang.String, java.lang.String, boolean) */ @Override public char[] getPasswordFromAliasForCluster(String clusterName, String alias, boolean generate) @@ -135,7 +135,7 @@ public class DefaultAliasService implements AliasService { } /* (non-Javadoc) - * @see org.apache.hadoop.gateway.services.security.impl.AliasService#addAliasForCluster(java.lang.String, java.lang.String, java.lang.String) + * @see org.apache.knox.gateway.services.security.impl.AliasService#addAliasForCluster(java.lang.String, java.lang.String, java.lang.String) */ @Override public void addAliasForCluster(String clusterName, String alias, String value) { http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/DefaultTokenAuthorityService.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/DefaultTokenAuthorityService.java b/gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/DefaultTokenAuthorityService.java index 79560aa..44f4d4b 100644 --- a/gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/DefaultTokenAuthorityService.java +++ b/gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/DefaultTokenAuthorityService.java @@ -60,7 +60,7 @@ public class DefaultTokenAuthorityService implements JWTokenAuthority, Service { } /* (non-Javadoc) - * @see org.apache.hadoop.gateway.provider.federation.jwt.JWTokenAuthority#issueToken(javax.security.auth.Subject, java.lang.String) + * @see org.apache.knox.gateway.provider.federation.jwt.JWTokenAuthority#issueToken(javax.security.auth.Subject, java.lang.String) */ @Override public JWTToken issueToken(Subject subject, String algorithm) throws TokenServiceException { @@ -69,7 +69,7 @@ public class DefaultTokenAuthorityService implements JWTokenAuthority, Service { } /* (non-Javadoc) - * @see org.apache.hadoop.gateway.provider.federation.jwt.JWTokenAuthority#issueToken(java.security.Principal, java.lang.String) + * @see org.apache.knox.gateway.provider.federation.jwt.JWTokenAuthority#issueToken(java.security.Principal, java.lang.String) */ @Override public JWTToken issueToken(Principal p, String algorithm) throws TokenServiceException { @@ -77,7 +77,7 @@ public class DefaultTokenAuthorityService implements JWTokenAuthority, Service { } /* (non-Javadoc) - * @see org.apache.hadoop.gateway.provider.federation.jwt.JWTokenAuthority#issueToken(java.security.Principal, java.lang.String, long expires) + * @see org.apache.knox.gateway.provider.federation.jwt.JWTokenAuthority#issueToken(java.security.Principal, java.lang.String, long expires) */ @Override public JWTToken issueToken(Principal p, String algorithm, long expires) throws TokenServiceException { @@ -90,7 +90,7 @@ public class DefaultTokenAuthorityService implements JWTokenAuthority, Service { } /* (non-Javadoc) - * @see org.apache.hadoop.gateway.provider.federation.jwt.JWTokenAuthority#issueToken(java.security.Principal, java.lang.String, java.lang.String) + * @see org.apache.knox.gateway.provider.federation.jwt.JWTokenAuthority#issueToken(java.security.Principal, java.lang.String, java.lang.String) */ @Override public JWTToken issueToken(Principal p, String audience, String algorithm, long expires) http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-server/src/main/java/org/apache/knox/gateway/trace/AccessHandler.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/trace/AccessHandler.java b/gateway-server/src/main/java/org/apache/knox/gateway/trace/AccessHandler.java index 6ee7c83..dfb7213 100644 --- a/gateway-server/src/main/java/org/apache/knox/gateway/trace/AccessHandler.java +++ b/gateway-server/src/main/java/org/apache/knox/gateway/trace/AccessHandler.java @@ -25,7 +25,7 @@ import org.eclipse.jetty.util.component.AbstractLifeCycle; public class AccessHandler extends AbstractLifeCycle implements RequestLog { - private static Logger log = Logger.getLogger( "org.apache.hadoop.gateway.access" ); + private static Logger log = Logger.getLogger( "org.apache.knox.gateway.access" ); @Override public void log( Request request, Response response ) { http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-server/src/main/java/org/apache/knox/gateway/trace/TraceHandler.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/trace/TraceHandler.java b/gateway-server/src/main/java/org/apache/knox/gateway/trace/TraceHandler.java index af2bc22..34bee67 100644 --- a/gateway-server/src/main/java/org/apache/knox/gateway/trace/TraceHandler.java +++ b/gateway-server/src/main/java/org/apache/knox/gateway/trace/TraceHandler.java @@ -28,7 +28,7 @@ import java.util.Set; public class TraceHandler extends HandlerWrapper { - static final String HTTP_LOGGER = "org.apache.hadoop.gateway.http"; + static final String HTTP_LOGGER = "org.apache.knox.gateway.http"; static final String HTTP_REQUEST_LOGGER = HTTP_LOGGER + ".request"; static final String HTTP_REQUEST_HEADER_LOGGER = HTTP_REQUEST_LOGGER + ".headers"; static final String HTTP_REQUEST_BODY_LOGGER = HTTP_REQUEST_LOGGER + ".body"; http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-server/src/main/java/org/apache/knox/gateway/util/KnoxCLI.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/util/KnoxCLI.java b/gateway-server/src/main/java/org/apache/knox/gateway/util/KnoxCLI.java index 531b494..1cd1e11 100644 --- a/gateway-server/src/main/java/org/apache/knox/gateway/util/KnoxCLI.java +++ b/gateway-server/src/main/java/org/apache/knox/gateway/util/KnoxCLI.java @@ -1261,8 +1261,8 @@ public class KnoxCLI extends Configured implements Tool { // Build the Ini with minimum requirements Ini ini = new Ini(); ini.addSection("main"); - ini.setSectionProperty("main", "ldapRealm", "org.apache.hadoop.gateway.shirorealm.KnoxLdapRealm"); - ini.setSectionProperty("main", "ldapContextFactory", "org.apache.hadoop.gateway.shirorealm.KnoxLdapContextFactory"); + ini.setSectionProperty("main", "ldapRealm", "org.apache.knox.gateway.shirorealm.KnoxLdapRealm"); + ini.setSectionProperty("main", "ldapContextFactory", "org.apache.knox.gateway.shirorealm.KnoxLdapContextFactory"); ini.setSectionProperty("main", "ldapRealm.contextFactory.url", url); username = getSystemUsername(t); http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-server/src/main/java/org/apache/knox/gateway/websockets/WebsocketLogMessages.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/java/org/apache/knox/gateway/websockets/WebsocketLogMessages.java b/gateway-server/src/main/java/org/apache/knox/gateway/websockets/WebsocketLogMessages.java index 25a4b9e..b3abd10 100644 --- a/gateway-server/src/main/java/org/apache/knox/gateway/websockets/WebsocketLogMessages.java +++ b/gateway-server/src/main/java/org/apache/knox/gateway/websockets/WebsocketLogMessages.java @@ -28,7 +28,7 @@ import org.apache.knox.gateway.i18n.messages.StackTrace; * @since 0.10 */ -@Messages(logger = "org.apache.hadoop.gateway.websockets") +@Messages(logger = "org.apache.knox.gateway.websockets") public interface WebsocketLogMessages { @Message(level = MessageLevel.ERROR, http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-server/src/main/resources/conf/log4j.properties ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/resources/conf/log4j.properties b/gateway-server/src/main/resources/conf/log4j.properties index 90edf58..ffb5d20 100644 --- a/gateway-server/src/main/resources/conf/log4j.properties +++ b/gateway-server/src/main/resources/conf/log4j.properties @@ -21,4 +21,4 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout #log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %c{2} (%F:%M(%L)) - %m%n log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %-5p [%t] %m%n -log4j.logger.org.apache.hadoop.gateway=INFO \ No newline at end of file +log4j.logger.org.apache.knox.gateway=INFO \ No newline at end of file http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-server/src/main/resources/org/apache/knox/gateway/GatewayServer.xml ---------------------------------------------------------------------- diff --git a/gateway-server/src/main/resources/org/apache/knox/gateway/GatewayServer.xml b/gateway-server/src/main/resources/org/apache/knox/gateway/GatewayServer.xml index 99330a1..994bb78 100644 --- a/gateway-server/src/main/resources/org/apache/knox/gateway/GatewayServer.xml +++ b/gateway-server/src/main/resources/org/apache/knox/gateway/GatewayServer.xml @@ -46,7 +46,7 @@ </filter> <filter> <name>dispatch</name> - <class>org.apache.org.apache.hadoop.gateway.dispatch.HdfsDispatch</class> + <class>org.apache.org.apache.knox.gateway.dispatch.HdfsDispatch</class> </filter> </service> http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-server/src/test/java/org/apache/knox/gateway/GatewayFuncTest.xml ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/GatewayFuncTest.xml b/gateway-server/src/test/java/org/apache/knox/gateway/GatewayFuncTest.xml index d3c185a..8c0080c 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/GatewayFuncTest.xml +++ b/gateway-server/src/test/java/org/apache/knox/gateway/GatewayFuncTest.xml @@ -43,11 +43,11 @@ <name>rewrite</name> <class>org.apache.org.apache.knox.gateway.filter.rewrite.api.UrlRewriteServletFilter</class> <rewrite>webhdfs://*:*/{path=**} - http://{org.apache.org.apache.hadoop.gateway.address}/org.apache.hadoopache.hadoop.gateway/gateway/webhdfs/v1/{path=**}</rewrite> + http://{org.apache.org.apache.knox.gateway.address}/org.apache.hadoopache.hadoop.gateway/gateway/webhdfs/v1/{path=**}</rewrite> </filter> <filter> <name>dispatch</name> - <class>org.apache.org.apache.hadoop.gateway.dispatch.HdfsDispatch</class> + <class>org.apache.org.apache.knox.gateway.dispatch.HdfsDispatch</class> </filter> </service> http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-server/src/test/java/org/apache/knox/gateway/util/KnoxCLITest.java ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/java/org/apache/knox/gateway/util/KnoxCLITest.java b/gateway-server/src/test/java/org/apache/knox/gateway/util/KnoxCLITest.java index e84bbbd..4c4d419 100644 --- a/gateway-server/src/test/java/org/apache/knox/gateway/util/KnoxCLITest.java +++ b/gateway-server/src/test/java/org/apache/knox/gateway/util/KnoxCLITest.java @@ -496,7 +496,7 @@ public class KnoxCLITest { .addTag( "enabled" ).addText( "123" ) .addTag( "param" ) .addTag( "name" ).addText( "" ) - .addTag( "value" ).addText( "org.apache.hadoop.gateway.shirorealm.KnoxLdapRealm" ).gotoParent() + .addTag( "value" ).addText( "org.apache.knox.gateway.shirorealm.KnoxLdapRealm" ).gotoParent() .addTag( "param" ) .addTag( "name" ).addText( "main.ldapRealm.userDnTemplate" ) .addTag( "value" ).addText( "uid={0},ou=people,dc=hadoop,dc=apache,dc=org" ).gotoParent() @@ -532,7 +532,7 @@ public class KnoxCLITest { .addTag( "enabled" ).addText( "true" ) .addTag( "param" ) .addTag( "name" ).addText( "main.ldapRealm" ) - .addTag( "value" ).addText( "org.apache.hadoop.gateway.shirorealm.KnoxLdapRealm" ).gotoParent() + .addTag( "value" ).addText( "org.apache.knox.gateway.shirorealm.KnoxLdapRealm" ).gotoParent() .addTag( "param" ) .addTag( "name" ).addText( "main.ldapRealm.userDnTemplate" ) .addTag( "value" ).addText( "uid={0},ou=people,dc=hadoop,dc=apache,dc=org" ).gotoParent() http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-server/src/test/resources/conf-demo/conf/shiro.ini ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/resources/conf-demo/conf/shiro.ini b/gateway-server/src/test/resources/conf-demo/conf/shiro.ini index b3472a2..8bb3303 100644 --- a/gateway-server/src/test/resources/conf-demo/conf/shiro.ini +++ b/gateway-server/src/test/resources/conf-demo/conf/shiro.ini @@ -17,7 +17,7 @@ ########################################################################## [main] -ldapRealm = org.apache.hadoop.gateway.shirorealm.KnoxLdapRealm +ldapRealm = org.apache.knox.gateway.shirorealm.KnoxLdapRealm ldapRealm.userDnTemplate = uid={0},ou=people,dc=hadoop,dc=apache,dc=org ldapRealm.contextFactory.url = ldap://localhost:33389 ldapRealm.contextFactory.authenticationMechanism = simple http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-server/src/test/resources/conf-demo/conf/topologies/admin.xml ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/resources/conf-demo/conf/topologies/admin.xml b/gateway-server/src/test/resources/conf-demo/conf/topologies/admin.xml index 2f3d9a9..efcd3c8 100644 --- a/gateway-server/src/test/resources/conf-demo/conf/topologies/admin.xml +++ b/gateway-server/src/test/resources/conf-demo/conf/topologies/admin.xml @@ -34,11 +34,11 @@ </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.ldapContextFactory</name> - <value>org.apache.hadoop.gateway.shirorealm.KnoxLdapContextFactory</value> + <value>org.apache.knox.gateway.shirorealm.KnoxLdapContextFactory</value> </param> <param> <name>main.ldapRealm.contextFactory</name> http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-server/src/test/resources/conf-demo/conf/topologies/sandbox.xml ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/resources/conf-demo/conf/topologies/sandbox.xml b/gateway-server/src/test/resources/conf-demo/conf/topologies/sandbox.xml index 2aaaf10..c7ae79a 100644 --- a/gateway-server/src/test/resources/conf-demo/conf/topologies/sandbox.xml +++ b/gateway-server/src/test/resources/conf-demo/conf/topologies/sandbox.xml @@ -34,11 +34,11 @@ </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.ldapContextFactory</name> - <value>org.apache.hadoop.gateway.shirorealm.KnoxLdapContextFactory</value> + <value>org.apache.knox.gateway.shirorealm.KnoxLdapContextFactory</value> </param> <param> <name>main.ldapRealm.contextFactory</name> http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-server/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/resources/log4j.properties b/gateway-server/src/test/resources/log4j.properties index 7474633..b212231 100644 --- a/gateway-server/src/test/resources/log4j.properties +++ b/gateway-server/src/test/resources/log4j.properties @@ -26,7 +26,7 @@ log4j.appender.stdout.layout.ConversionPattern=%5p [%c] %m%n log4j.logger.audit = INFO, collectappender log4j.appender.collectappender = org.apache.hadoop.test.log.CollectAppender -#log4j.logger.org.apache.hadoop.gateway=DEBUG +#log4j.logger.org.apache.knox.gateway=DEBUG #log4j.logger.org.eclipse.jetty=DEBUG #log4j.logger.org.apache.shiro=DEBUG #log4j.logger.org.apache.http=DEBUG http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-server/src/test/resources/org/apache/knox/gateway/GatewayFuncTest.xml ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/resources/org/apache/knox/gateway/GatewayFuncTest.xml b/gateway-server/src/test/resources/org/apache/knox/gateway/GatewayFuncTest.xml index 82e443d..5581ee0 100644 --- a/gateway-server/src/test/resources/org/apache/knox/gateway/GatewayFuncTest.xml +++ b/gateway-server/src/test/resources/org/apache/knox/gateway/GatewayFuncTest.xml @@ -48,7 +48,7 @@ </filter> <filter> <role>dispatch</role> - <class>org.apache.hadoop.gateway.dispatch.HdfsDispatch</class> + <class>org.apache.knox.gateway.dispatch.HdfsDispatch</class> </filter> </resource> http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-server/src/test/resources/org/apache/knox/gateway/topology/xml/simple-topology-ambari-format.conf ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/resources/org/apache/knox/gateway/topology/xml/simple-topology-ambari-format.conf b/gateway-server/src/test/resources/org/apache/knox/gateway/topology/xml/simple-topology-ambari-format.conf index 849e1b6..eacb631 100644 --- a/gateway-server/src/test/resources/org/apache/knox/gateway/topology/xml/simple-topology-ambari-format.conf +++ b/gateway-server/src/test/resources/org/apache/knox/gateway/topology/xml/simple-topology-ambari-format.conf @@ -26,7 +26,7 @@ </property> <property> <name>topology.gateway.provider.authentication.ShiroProvider.param.main.ldapRealm</name> - <value>org.apache.hadoop.gateway.shirorealm.KnoxLdapRealm</value> + <value>org.apache.knox.gateway.shirorealm.KnoxLdapRealm</value> </property> <property> <name>topology.gateway.provider.authentication.ShiroProvider.param.main.ldapRealm.userDnTemplate</name> http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-server/src/test/resources/org/apache/knox/gateway/topology/xml/simple-topology-knox-format.xml ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/resources/org/apache/knox/gateway/topology/xml/simple-topology-knox-format.xml b/gateway-server/src/test/resources/org/apache/knox/gateway/topology/xml/simple-topology-knox-format.xml index 0a208fc..c0b9b13 100644 --- a/gateway-server/src/test/resources/org/apache/knox/gateway/topology/xml/simple-topology-knox-format.xml +++ b/gateway-server/src/test/resources/org/apache/knox/gateway/topology/xml/simple-topology-knox-format.xml @@ -27,7 +27,7 @@ <name>ShiroSecurity</name> <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> http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-server/src/test/resources/shiro.ini ---------------------------------------------------------------------- diff --git a/gateway-server/src/test/resources/shiro.ini b/gateway-server/src/test/resources/shiro.ini index b3472a2..8bb3303 100644 --- a/gateway-server/src/test/resources/shiro.ini +++ b/gateway-server/src/test/resources/shiro.ini @@ -17,7 +17,7 @@ ########################################################################## [main] -ldapRealm = org.apache.hadoop.gateway.shirorealm.KnoxLdapRealm +ldapRealm = org.apache.knox.gateway.shirorealm.KnoxLdapRealm ldapRealm.userDnTemplate = uid={0},ou=people,dc=hadoop,dc=apache,dc=org ldapRealm.contextFactory.url = ldap://localhost:33389 ldapRealm.contextFactory.authenticationMechanism = simple http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/deploy/AdminServiceDeploymentContributor.java ---------------------------------------------------------------------- diff --git a/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/deploy/AdminServiceDeploymentContributor.java b/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/deploy/AdminServiceDeploymentContributor.java index 86089e3..3a69f6a 100644 --- a/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/deploy/AdminServiceDeploymentContributor.java +++ b/gateway-service-admin/src/main/java/org/apache/knox/gateway/service/admin/deploy/AdminServiceDeploymentContributor.java @@ -45,7 +45,7 @@ public class AdminServiceDeploymentContributor extends JerseyServiceDeploymentCo */ @Override protected String[] getPackages() { - return new String[]{ "org.apache.hadoop.gateway.service.admin" }; + return new String[]{ "org.apache.knox.gateway.service.admin" }; } /* (non-Javadoc) http://git-wip-us.apache.org/repos/asf/knox/blob/2e6713b6/gateway-service-definitions/src/main/resources/services/ambari/2.2.0/service.xml ---------------------------------------------------------------------- diff --git a/gateway-service-definitions/src/main/resources/services/ambari/2.2.0/service.xml b/gateway-service-definitions/src/main/resources/services/ambari/2.2.0/service.xml index cb6f35e..a7ce77c 100644 --- a/gateway-service-definitions/src/main/resources/services/ambari/2.2.0/service.xml +++ b/gateway-service-definitions/src/main/resources/services/ambari/2.2.0/service.xml @@ -30,5 +30,5 @@ <rewrite apply="AMBARI/ambari/api/inbound" to="request.body"/> </route> </routes> - <dispatch classname="org.apache.hadoop.gateway.dispatch.PassAllHeadersNoEncodingDispatch"/> + <dispatch classname="org.apache.knox.gateway.dispatch.PassAllHeadersNoEncodingDispatch"/> </service>
